Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 5 commits into from
Apr 27, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e58210a
Support dot in the additional information of the PFC watchdog event i…
stephenxs Mar 15, 2024
69b000e
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
mssonicbld Apr 26, 2024
a43ee42
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
mssonicbld Apr 26, 2024
af22476
[submodule] Update submodule sonic-platform-common to the latest HEAD…
mssonicbld Apr 26, 2024
937109f
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-swss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-swss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-yang-models/yang-models/sonic-events-swss.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down