From e58210a5822bcf88fbc00dcdbc23d5891dca7d7d Mon Sep 17 00:00:00 2001 From: Stephen Sun <5379172+stephenxs@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:02:21 +0800 Subject: [PATCH 1/4] Support dot in the additional information of the PFC watchdog event in the yang model (#18235) ### Why I did it Support dot (`.`) in the `additional_info` field in the PFC watchdog event in the yang model. The `additional_info` field was introduced to represent diagnosis information when a PFC storm is detected, which can include fragments. Signed-off-by: Stephen Sun ### How I did it #### How to verify it Unit test. --- .../yang_model_tests/tests/sonic-events-swss.json | 3 +++ .../tests_config/sonic-events-swss.json | 12 ++++++++++++ .../yang-models/sonic-events-swss.yang | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-swss.json b/src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-swss.json index 6592fd1013..56a05d1736 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-swss.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-swss.json @@ -40,6 +40,9 @@ "SONIC_EVENTS_SWSS_PFC_STORM_VALID_WITH_ADDITIONAL_INFO": { "desc": "VALID IF_STATE EVENT." }, + "SONIC_EVENTS_SWSS_PFC_STORM_VALID_WITH_ADDITIONAL_INFO_FRAGMENT": { + "desc": "VALID IF_STATE EVENT." + }, "SONIC_EVENTS_SWSS_PFC_STORM_WITH_INVALID_ADDITIONAL_INFO_1": { "desc": "PFC_STORM_EVENT_INCORRECT_ADDITIONAL_INFO failure.", "eStrKey": "Pattern" diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-swss.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-swss.json index e56acc0a47..919468dcbc 100644 --- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-swss.json +++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-swss.json @@ -113,6 +113,18 @@ } } }, + "SONIC_EVENTS_SWSS_PFC_STORM_VALID_WITH_ADDITIONAL_INFO_FRAGMENT": { + "sonic-events-swss:sonic-events-swss": { + "sonic-events-swss:pfc-storm": { + "ifname": "Ethernet0", + "queue_index": 0, + "queue_id": 0, + "port_id": 0, + "additional_info": "info1:1.2|info2:3.25", + "timestamp": "1985-04-12T23:20:50.52Z" + } + } + }, "SONIC_EVENTS_SWSS_PFC_STORM_WITH_INVALID_ADDITIONAL_INFO_1": { "sonic-events-swss:sonic-events-swss": { "sonic-events-swss:pfc-storm": { diff --git a/src/sonic-yang-models/yang-models/sonic-events-swss.yang b/src/sonic-yang-models/yang-models/sonic-events-swss.yang index 93c617776c..4092fe42d2 100644 --- a/src/sonic-yang-models/yang-models/sonic-events-swss.yang +++ b/src/sonic-yang-models/yang-models/sonic-events-swss.yang @@ -80,7 +80,7 @@ module sonic-events-swss { leaf additional_info { type string { - pattern '[-a-zA-Z0-9_]+:[-a-zA-Z0-9_]+(\|{1}[-a-zA-Z0-9_]+:[-a-zA-Z0-9_]+)*'; + pattern '[-a-zA-Z0-9_]+:[-a-zA-Z0-9_.]+(\|{1}[-a-zA-Z0-9_]+:[-a-zA-Z0-9_.]+)*'; } description "Additional information to investigate PFC storm"; } From 69b000ef274f7286b42edf7bb058480e6e563c77 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:01:23 +0800 Subject: [PATCH 2/4] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#18779) #### Why I did it src/sonic-swss ``` * 4a9b7eee - (HEAD -> 202305, origin/202305) [ACL] Remove flex counter when updating ACL rule (#3118) (3 days ago) [bingwang-ms] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 9ee794f4f8..4a9b7eee5a 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 9ee794f4f8c6bc438fd1d21369fb4adc8aa4bdcf +Subproject commit 4a9b7eee5a0ea7eceb9a6fe69d67b7505eb8446c From a43ee42f2351a9795437fdbefc128262a4e22935 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:01:29 +0800 Subject: [PATCH 3/4] [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#18778) #### Why I did it src/sonic-platform-daemons ``` * 0694d33 - (HEAD -> 202305, origin/202305) [chassis][linecard] Fix Module LINECARD<> went off-line message for empty slot issue (#462) (3 days ago) [Marty Y. Lok] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-platform-daemons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 8ee30090e8..0694d338dc 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 8ee30090e839cbbf938dac02b3031d1686e96449 +Subproject commit 0694d338dc871d11016ea7809c747552263a43f1 From af2247603c2c9d8b74c8642f825a487f4fac4032 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:01:39 +0800 Subject: [PATCH 4/4] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#18776) #### Why I did it src/sonic-platform-common ``` * b7a38f7 - (HEAD -> 202305, origin/202305) Separate common code for remote target FW upgrade supported optics (#453) (3 days ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-platform-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-platform-common b/src/sonic-platform-common index ed3ec1f2f4..b7a38f7760 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit ed3ec1f2f4c4137d25c11ec7a7420692f56fe444 +Subproject commit b7a38f776019e34112898d1685a00852a68efed4