matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use dot1p to tc mapping for backend switches (#3412)

Browse Source 
* Use dot1p to tc mapping for backend switches

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Do not write DSCP to TC mapping into CONFIG_DB or config_db.json for
storage switches

Signed-off-by: Wenda Ni <wenni@microsoft.com>
This commit is contained in:
Wenda Ni 2019-09-06 11:59:47 -07:00 committed by lguohan
parent fdcb69d048
commit ca43dad12f
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
files/build_templates/qos_config.j2
View File

@ -29,6 +29,7 @@
{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%} {%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
{%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}
{ {
@ -72,6 +73,20 @@
"7": "7" "7": "7"
} }
}, },
{% if DEVICE_METADATA['localhost']['type'] in backend_device_types %}
"DOT1P_TO_TC_MAP": {
"AZURE": {
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7"
}
},
{% else %}
"DSCP_TO_TC_MAP": { "DSCP_TO_TC_MAP": {
"AZURE": { "AZURE": {
"0" : "1", "0" : "1",
@ -140,6 +155,7 @@
"63": "1" "63": "1"
} }
}, },
{% endif %}
"SCHEDULER": { "SCHEDULER": {
"scheduler.0": { "scheduler.0": {
"type" : "DWRR", "type" : "DWRR",
@ -160,7 +176,11 @@
{% endif %} {% endif %}
"PORT_QOS_MAP": { "PORT_QOS_MAP": {
"{{ port_names_active }}": { "{{ port_names_active }}": {
{% if DEVICE_METADATA['localhost']['type'] in backend_device_types %}
"dot1p_to_tc_map" : "[DOT1P_TO_TC_MAP|AZURE]",
{% else %}
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
{% endif %}
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]", "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]", "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",