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

[cherry-pick] [202012] Update qos config to clear queues for bounced back traffic #10608

Merged
merged 20 commits into from
Jun 2, 2022
Merged

[cherry-pick] [202012] Update qos config to clear queues for bounced back traffic #10608

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
93c8559
Update qos config to clear queues for bounced back traffic
bingwang-ms Apr 5, 2022
74f3810
Merge branch '202012' into clear_queue_202012
bingwang-ms Apr 28, 2022
2eed4c6
Fix j2 template
bingwang-ms Apr 28, 2022
efc021b
Merge branch '202012' into clear_queue_202012
bingwang-ms Apr 29, 2022
b69fa61
Add AZURE_TUNNEL map
bingwang-ms Apr 11, 2022
2ab42ee
Fix UT
bingwang-ms Apr 13, 2022
7ec40b2
PG7->0 Queue6->1
bingwang-ms Apr 19, 2022
316a1cd
Update test_j2files.py
bingwang-ms Apr 29, 2022
a2a1ddf
Merge branch '202012' into clear_queue_202012
bingwang-ms May 9, 2022
01e04d7
Merge branch '202012' into clear_queue_202012
bingwang-ms May 9, 2022
98ad1ef
Merge branch '202012' into clear_queue_202012
bingwang-ms May 16, 2022
76bf85d
Remove leading space to have a better alignment
bingwang-ms May 16, 2022
5ab771b
Merge branch '202012' into clear_queue_202012
bingwang-ms May 16, 2022
5e4fbd2
Merge branch '202012' into clear_queue_202012
bingwang-ms May 18, 2022
5bf9155
Merge branch '202012' into clear_queue_202012
qiluo-msft May 22, 2022
e115c4c
Support SYSTEM_DEFAULTS
bingwang-ms May 30, 2022
545ed8e
Merge remote-tracking branch 'origin/202012' into clear_queue_202012
bingwang-ms May 31, 2022
b13a3c6
Add check in qos_config.j2
bingwang-ms May 31, 2022
8904283
Remove empty line
bingwang-ms May 31, 2022
4338b3b
Tests cover remap-disabled
bingwang-ms May 31, 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
1 change: 0 additions & 1 deletion device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../Arista-7050CX3-32S-D48C8/qos.json.j2
201 changes: 201 additions & 0 deletions device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,202 @@
{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
{%- macro generate_dscp_to_tc_map() %}
"DSCP_TO_TC_MAP": {
"AZURE": {
"0" : "1",
"1" : "1",
"2" : "1",
"3" : "3",
"4" : "4",
"5" : "1",
"6" : "1",
"7" : "1",
"8" : "0",
"9" : "1",
"10": "1",
"11": "1",
"12": "1",
"13": "1",
"14": "1",
"15": "1",
"16": "1",
"17": "1",
"18": "1",
"19": "1",
"20": "1",
"21": "1",
"22": "1",
"23": "1",
"24": "1",
"25": "1",
"26": "1",
"27": "1",
"28": "1",
"29": "1",
"30": "1",
"31": "1",
"32": "1",
"33": "2",
"34": "1",
"35": "1",
"36": "1",
"37": "1",
"38": "1",
"39": "1",
"40": "1",
"41": "1",
"42": "1",
"43": "1",
"44": "1",
"45": "1",
"46": "5",
"47": "1",
"48": "7",
"49": "1",
"50": "1",
"51": "1",
"52": "1",
"53": "1",
"54": "1",
"55": "1",
"56": "1",
"57": "1",
"58": "1",
"59": "1",
"60": "1",
"61": "1",
"62": "1",
"63": "1"
},
"AZURE_TUNNEL": {
"0" : "1",
"1" : "1",
"2" : "1",
"3" : "3",
"4" : "4",
"5" : "1",
"6" : "1",
"7" : "1",
"8" : "0",
"9" : "1",
"10": "1",
"11": "1",
"12": "1",
"13": "1",
"14": "1",
"15": "1",
"16": "1",
"17": "1",
"18": "1",
"19": "1",
"20": "1",
"21": "1",
"22": "1",
"23": "1",
"24": "1",
"25": "1",
"26": "1",
"27": "1",
"28": "1",
"29": "1",
"30": "1",
"31": "1",
"32": "1",
"33": "2",
"34": "1",
"35": "1",
"36": "1",
"37": "1",
"38": "1",
"39": "1",
"40": "1",
"41": "1",
"42": "1",
"43": "1",
"44": "1",
"45": "1",
"46": "5",
"47": "1",
"48": "7",
"49": "1",
"50": "1",
"51": "1",
"52": "1",
"53": "1",
"54": "1",
"55": "1",
"56": "1",
"57": "1",
"58": "1",
"59": "1",
"60": "1",
"61": "1",
"62": "1",
"63": "1"
}
},
{%- endmacro %}
{%- macro generate_tc_to_pg_map() %}
"TC_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"0": "0",
"1": "0",
"2": "0",
"3": "3",
"4": "4",
"5": "0",
"6": "0",
"7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "0",
"2": "0",
"3": "2",
"4": "6",
"5": "0",
"6": "0",
"7": "0"
}
},
{%- endmacro %}
{%- macro generate_tc_to_queue_map() %}
"TC_TO_QUEUE_MAP": {
"AZURE": {
"0": "0",
"1": "1",
"2": "1",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "1",
"2": "1",
"3": "2",
"4": "6",
"5": "5",
"6": "1",
"7": "7"
}
},
{%- endmacro %}
{%- macro generate_tc_to_dscp_map() %}
"TC_TO_DSCP_MAP": {
"AZURE_TUNNEL": {
"0": "8",
"1": "0",
"2": "33",
"3": "2",
"4": "6",
"5": "46",
"6": "0",
"7": "48"
}
},
{%- endmacro %}
{% endif %}

{%- include 'qos_config.j2' %}
Loading