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

[202211] Add yang model for scheduler in PORT_QOS_MAP (#16244) #16359

Merged
merged 1 commit into from
Sep 19, 2023
Merged

[202211] Add yang model for scheduler in PORT_QOS_MAP (#16244) #16359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 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 @@ -1684,6 +1684,15 @@
"pbs": "2048",
"pir": "2560000",
"type": "STRICT"
},
"port_scheduler": {
"cbs": "256",
"cir": "1250000",
"meter_type": "bytes",
"pbs": "1024",
"pir": "25000000",
"type": "DWRR",
"weight": "10"
}
},

Expand Down Expand Up @@ -1848,14 +1857,15 @@
},
"PORT_QOS_MAP": {
"Ethernet0": {
"dot1p_to_tc_map" : "Dot1p_to_tc_map1",
"dscp_to_tc_map": "Dscp_to_tc_map1",
"tc_to_queue_map": "tc_to_q_map1",
"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",
"pfcwd_sw_enable" : "3,4"
"dot1p_to_tc_map" : "Dot1p_to_tc_map1",
"dscp_to_tc_map": "Dscp_to_tc_map1",
"tc_to_queue_map": "tc_to_q_map1",
"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",
"pfcwd_sw_enable" : "3,4",
"scheduler" : "port_scheduler"
},
"Ethernet4": {
"dot1p_to_tc_map" : "Dot1p_to_tc_map2",
Expand Down
5 changes: 5 additions & 0 deletions 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 @@ -96,6 +96,11 @@
"eStrKey": "LeafRef"
},

"PORT_QOS_MAP_APPLY_NON_EXISTS_SCHEDULER": {
"desc": "Configure non exists scheduler on port.",
"eStrKey": "LeafRef"
},

"PORT_QOS_MAP_APPLY_NON_EXISTS_PORT": {
"desc": "Configure port qos map entry on non exists port.",
"eStr": "Invalid value"
Expand Down
52 changes: 50 additions & 2 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 @@ -657,6 +657,24 @@
]
}
},

"sonic-scheduler:sonic-scheduler":{
"sonic-scheduler:SCHEDULER": {
"SCHEDULER_LIST": [
{
"name":"port_scheduler",
"cbs": "256",
"cir": "1250000",
"meter_type": "bytes",
"pbs": "1024",
"pir": "25000000",
"type": "DWRR",
"weight": "10"
}
]
}
},

"sonic-port-qos-map:sonic-port-qos-map": {
"sonic-port-qos-map:PORT_QOS_MAP": {
"PORT_QOS_MAP_LIST": [
Expand All @@ -670,7 +688,8 @@
"dscp_to_tc_map": "map1",
"dot1p_to_tc_map": "map1",
"pfc_enable": "2,3,4,6",
"pfcwd_sw_enable" : "2,3,4,6"
"pfcwd_sw_enable" : "2,3,4,6",
"scheduler" : "port_scheduler"
}
]
}
Expand Down Expand Up @@ -750,7 +769,36 @@
}
}
},


"PORT_QOS_MAP_APPLY_NON_EXISTS_SCHEDULER": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
{
"admin_status": "up",
"alias": "eth0",
"description": "Ethernet0",
"lanes": "65",
"mtu": "9000",
"name": "Ethernet0",
"tpid": "0x8100",
"speed": "25000"
}
]
}
},
"sonic-port-qos-map:sonic-port-qos-map": {
"sonic-port-qos-map:PORT_QOS_MAP": {
"PORT_QOS_MAP_LIST": [
{
"ifname": "Ethernet0",
"scheduler": "scheduler1"
}
]
}
}
},

"PORT_QOS_MAP_APPLY_NON_EXISTS_PORT": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
Expand Down
11 changes: 11 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 @@ -34,6 +34,10 @@ module sonic-port-qos-map {
prefix dot1ptm;
}

import sonic-scheduler {
prefix sch;
}

organization
"SONiC";

Expand Down Expand Up @@ -117,6 +121,13 @@ module sonic-port-qos-map {
path "/dot1ptm:sonic-dot1p-tc-map/dot1ptm:DOT1P_TO_TC_MAP/dot1ptm:DOT1P_TO_TC_MAP_LIST/dot1ptm:name";
}
}

leaf scheduler {
type leafref {
path "/sch:sonic-scheduler/sch:SCHEDULER/sch:SCHEDULER_LIST/sch:name"; //Reference to SCHEDULER table
}
description "Scheduler for port.";
}
}
}
}
Expand Down