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

[Yang] Update YANG for PORT_QOS_MAP to support switch level mapping #11089

Merged
merged 5 commits into from
Jun 16, 2022
Merged

[Yang] Update YANG for PORT_QOS_MAP to support switch level mapping #11089

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
e34abdc
Update YANG for PORT_QOS_MAP to support switch level mapping
bingwang-ms Jun 9, 2022
2a33acb
Merge branch 'master' into update_yang_for_global_qos_map
neethajohn Jun 10, 2022
806cfab
Merge branch 'master' into update_yang_for_global_qos_map
bingwang-ms Jun 13, 2022
6781224
Merge branch 'master' into update_yang_for_global_qos_map
bingwang-ms Jun 14, 2022
83bdfff
Merge branch 'master' into update_yang_for_global_qos_map
neethajohn Jun 14, 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: 5 additions & 1 deletion src/sonic-yang-models/tests/yang_model_tests/tests/qosmaps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
"PORT_QOS_MAP_APPLY_MAPS": {
"desc": "Configure qos maps on port."
},

"PORT_QOS_MAP_APPLY_MAP_TO_GLOBAL": {
"desc": "Configure qos maps on switch level."
},

"PORT_QOS_MAP_APPLY_NON_EXISTS_MAPS": {
"desc": "Configure non exists qos maps on port.",
Expand All @@ -94,7 +98,7 @@

"PORT_QOS_MAP_APPLY_NON_EXISTS_PORT": {
"desc": "Configure port qos map entry on non exists port.",
"eStrKey": "LeafRef"
"eStr": "Invalid value"
},

"PORT_QOS_MAP_APPLY_INVALID_PFC": {
Expand Down
33 changes: 33 additions & 0 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 @@ -629,6 +629,39 @@
}
},

"PORT_QOS_MAP_APPLY_MAP_TO_GLOBAL": {
"sonic-dscp-tc-map:sonic-dscp-tc-map": {
"sonic-dscp-tc-map:DSCP_TO_TC_MAP": {
"DSCP_TO_TC_MAP_LIST": [
{
"name": "map1",
"DSCP_TO_TC_MAP": [
{
"dscp": "1",
"tc": "1"
},
{
"dscp":"2",
"tc":"2"
}
]
}
]
}
},

"sonic-port-qos-map:sonic-port-qos-map": {
"sonic-port-qos-map:PORT_QOS_MAP": {
"PORT_QOS_MAP_LIST": [
{
"ifname": "global",
"dscp_to_tc_map": "map1"
}
]
}
}
},

"PORT_QOS_MAP_APPLY_NON_EXISTS_MAPS": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
Expand Down
15 changes: 10 additions & 5 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 @@ -56,11 +56,16 @@ module sonic-port-qos-map {
key "ifname";

leaf ifname {
type leafref {
path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:name";
}
description
"Reference of port on which QOS MAPS to be configured.";
type union {
type string {
pattern "global";
}
type leafref {
path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:name";
}
}
description
"Reference of port or global on which QOS MAPS to be configured.";
}

leaf tc_to_pg_map {
Expand Down