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

Define qos map AZURE_TUNNEL for QoS remapping of tunnel traffic (#10565)

Browse Source 
* Add AZURE_TUNNEL map

Signed-off-by: bingwang <wang.bing@microsoft.com>
This commit is contained in:
bingwang-ms 2022-04-25 15:06:10 +08:00 committed by GitHub
parent d8c27b6ed2
commit 3fc3259a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 400 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2
View File

@ -66,6 +66,72 @@
"61": "1", "61": "1",
"62": "1", "62": "1",
"63": "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 %} {%- endmacro %}
@ -80,6 +146,16 @@
"5": "0", "5": "0",
"6": "0", "6": "0",
"7": "7" "7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "0",
"2": "0",
"3": "2",
"4": "6",
"5": "0",
"6": "0",
"7": "0"
} }
}, },
{%- endmacro %} {%- endmacro %}
@ -94,6 +170,30 @@
"5": "5", "5": "5",
"6": "6", "6": "6",
"7": "7" "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 %} {%- endmacro %}

102
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/qos.json.j2
View File

@ -151,6 +151,72 @@
"61": "1", "61": "1",
"62": "1", "62": "1",
"63": "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 %} {%- endmacro %}
@ -165,6 +231,16 @@
"5": "0", "5": "0",
"6": "0", "6": "0",
"7": "7" "7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "0",
"2": "0",
"3": "2",
"4": "6",
"5": "0",
"6": "0",
"7": "0"
} }
}, },
{%- endmacro %} {%- endmacro %}
@ -173,12 +249,36 @@
"AZURE": { "AZURE": {
"0": "0", "0": "0",
"1": "1", "1": "1",
"2": "1", "2": "1",
"3": "3", "3": "3",
"4": "4", "4": "4",
"5": "5", "5": "5",
"6": "6", "6": "6",
"7": "7" "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 %} {%- endmacro %}

3
files/build_templates/qos_config.j2
View File

@ -172,6 +172,9 @@
} }
}, },
{% endif %} {% endif %}
{% if generate_tc_to_dscp_map is defined %}
{{- generate_tc_to_dscp_map() }}
{% endif %}
{% if 'resource_type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['resource_type'] in apollo_resource_types %} {% if 'resource_type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['resource_type'] in apollo_resource_types %}
"SCHEDULER": { "SCHEDULER": {
"scheduler.0": { "scheduler.0": {

98
src/sonic-config-engine/tests/sample_output/py3/qos-arista7050cx3-dualtor.json
View File

@ -21,6 +21,16 @@
"5": "5", "5": "5",
"6": "6", "6": "6",
"7": "7" "7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "1",
"2": "1",
"3": "2",
"4": "6",
"5": "5",
"6": "1",
"7": "7"
} }
}, },
"DSCP_TO_TC_MAP": { "DSCP_TO_TC_MAP": {
@ -89,6 +99,72 @@
"61": "1", "61": "1",
"62": "1", "62": "1",
"63": "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"
} }
}, },
"TC_TO_PRIORITY_GROUP_MAP": { "TC_TO_PRIORITY_GROUP_MAP": {
@ -101,6 +177,28 @@
"5": "0", "5": "0",
"6": "0", "6": "0",
"7": "7" "7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "0",
"2": "0",
"3": "2",
"4": "6",
"5": "0",
"6": "0",
"7": "0"
}
},
"TC_TO_DSCP_MAP": {
"AZURE_TUNNEL": {
"0": "8",
"1": "0",
"2": "33",
"3": "2",
"4": "6",
"5": "46",
"6": "0",
"7": "48"
} }
}, },
"SCHEDULER": { "SCHEDULER": {

98
src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
View File

@ -21,6 +21,16 @@
"5": "5", "5": "5",
"6": "6", "6": "6",
"7": "7" "7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "1",
"2": "1",
"3": "2",
"4": "6",
"5": "5",
"6": "1",
"7": "7"
} }
}, },
"DSCP_TO_TC_MAP": { "DSCP_TO_TC_MAP": {
@ -89,6 +99,72 @@
"61": "1", "61": "1",
"62": "1", "62": "1",
"63": "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"
} }
}, },
"TC_TO_PRIORITY_GROUP_MAP": { "TC_TO_PRIORITY_GROUP_MAP": {
@ -101,6 +177,28 @@
"5": "0", "5": "0",
"6": "0", "6": "0",
"7": "7" "7": "7"
},
"AZURE_TUNNEL": {
"0": "0",
"1": "0",
"2": "0",
"3": "2",
"4": "6",
"5": "0",
"6": "0",
"7": "0"
}
},
"TC_TO_DSCP_MAP": {
"AZURE_TUNNEL": {
"0": "8",
"1": "0",
"2": "33",
"3": "2",
"4": "6",
"5": "46",
"6": "0",
"7": "48"
} }
}, },
"SCHEDULER": { "SCHEDULER": {