Skip to content
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

Jump to bottom

[YANG] Update YANG model for pfcwd_sw_enable #10444

Merged
merged 3 commits into from
Apr 4, 2022
Merged

[YANG] Update YANG model for pfcwd_sw_enable #10444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dead0c0
Update YANG for pfcwd_sw_enable
bingwang-ms Apr 2, 2022
18b9884
Fix alignment
bingwang-ms Apr 2, 2022
8704198
Add description
bingwang-ms Apr 2, 2022
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
6 changes: 4 additions & 2 deletions src/sonic-yang-models/tests/files/sample_config_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,8 @@
"tc_to_pg_map": "tc_to_pg_map1",
"pfc_to_queue_map": "pfc_prio_to_q_map1",
"pfc_to_pg_map" : "pfc_prio_to_pg_map1",
"pfc_enable" : "3,4"
"pfc_enable" : "3,4",
"pfcwd_sw_enable" : "3,4"
},
"Ethernet4": {
"dot1p_to_tc_map" : "Dot1p_to_tc_map2",
Expand All @@ -1612,7 +1613,8 @@
"tc_to_pg_map": "tc_to_pg_map2",
"pfc_to_queue_map": "pfc_prio_to_q_map2",
"pfc_to_pg_map" : "pfc_prio_to_pg_map2",
"pfc_enable" : "3,4"
"pfc_enable" : "3,4",
"pfcwd_sw_enable" : "3,4"
}
},

Expand Down
9 changes: 6 additions & 3 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/qosmaps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,8 @@
"pfc_to_pg_map": "map1",
"dscp_to_tc_map": "map1",
"dot1p_to_tc_map": "map1",
"pfc_enable": "3,4"
"pfc_enable": "3,4",
"pfcwd_sw_enable" : "3,4"
}
]
}
Expand Down Expand Up @@ -657,7 +658,8 @@
"pfc_to_pg_map": "map2",
"dscp_to_tc_map": "map2",
"dot1p_to_tc_map": "map2",
"pfc_enable": "3,4"
"pfc_enable": "3,4",
"pfcwd_sw_enable" : "3,4"
}
]
}
Expand Down Expand Up @@ -714,7 +716,8 @@
"PORT_QOS_MAP_LIST": [
{
"ifname": "Ethernet4",
"pfc_enable": "8"
"pfc_enable": "8",
"pfcwd_sw_enable" : "8"
}
]
}
Expand Down
8 changes: 8 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-port-qos-map.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ module sonic-port-qos-map {
}
}

leaf pfcwd_sw_enable {
type string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add description?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added. Thanks

pattern "[0-7](,[0-7])?";
}
description
"Specify the queue(s) on which software pfc watchdog are enabled.";
}

leaf pfc_to_queue_map {
type leafref {
path "/ppqm:sonic-pfc-priority-queue-map/ppqm:MAP_PFC_PRIORITY_TO_QUEUE/ppqm:MAP_PFC_PRIORITY_TO_QUEUE_LIST/ppqm:name";
Expand Down