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

[202012] [cherry-pick] Generate switch level dscp_to_tc_map entry from qos_config template #11132

Merged
merged 5 commits into from
Jun 17, 2022
Merged

[202012] [cherry-pick] Generate switch level dscp_to_tc_map entry from qos_config template #11132

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e81249
Generate switch level dscp_to_tc_map
bingwang-ms Jun 14, 2022
ec1449b
Address comments
bingwang-ms Jun 15, 2022
5676647
Fix vs test
bingwang-ms Jun 16, 2022
b6bdf39
Add extra lossy PG profile for ports between T1 and T2
bingwang-ms Jun 16, 2022
337806e
Fix 7800 sample output
bingwang-ms Jun 17, 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
7 changes: 7 additions & 0 deletions files/build_templates/qos_config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,13 @@
},
{% endif %}
"PORT_QOS_MAP": {
{% if generate_global_dscp_to_tc_map is defined %}
{{- generate_global_dscp_to_tc_map() }}
{% else %}
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
{% endif %}
{% for port in PORT_ACTIVE %}
"{{ port }}": {
{% if 'type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] in backend_device_types and 'storage_device' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['storage_device'] == 'true' %}
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet4": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "AZURE",
"tc_to_queue_map" : "AZURE",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py2/qos-dell9332.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet4": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions ...sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor-remap-disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "AZURE",
bingwang-ms marked this conversation as resolved.
Show resolved Hide resolved
"tc_to_queue_map" : "AZURE",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down
3 changes: 3 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/qos-dell9332.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@
}
},
"PORT_QOS_MAP": {
"global": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]"
},
"Ethernet0": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
Expand Down