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.

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

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

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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