[Mellanox] Support DSCP remapping in dual ToR topo on T0 switch (#12605)
- Why I did it Support DSCP remapping in dual ToR topo on T0 switch for SKU Mellanox-SN4600c-C64, Mellanox-SN4600c-D48C40, Mellanox-SN2700, Mellanox-SN2700-D48C8. - How I did it Regarding buffer settings, originally, there are two lossless PGs and queues 3, 4. In dual ToR scenario, the lossless traffic from the leaf switch to the uplink of the ToR switch can be bounced back. To avoid PFC deadlock, we need to map the bounce-back lossless traffic to different PGs and queues. Therefore, 2 additional lossless PGs and queues are allocated on uplink ports on ToR switches. On uplink ports, map DSCP 2/6 to TC 2/6 respectively On downlink ports, both DSCP 2/6 are still mapped to TC 1 Buffer adjusted according to the ports information: Mellanox-SN4600c-C64: 56 downlinks 50G + 8 uplinks 100G Mellanox-SN4600c-D48C40, Mellanox-SN2700, Mellanox-SN2700-D48C8: 24 downlinks 50G + 8 uplinks 100G - How to verify it Unit test. Signed-off-by: Stephen Sun <stephens@nvidia.com>
This commit is contained in:
Stephen Sun
GitHub
parent
0704ff5e6c
commit
e3ff08833e
@ -1,5 +1,5 @@
|
||||
{#
|
||||
Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
|
||||
Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES.
|
||||
Apache-2.0
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -15,10 +15,17 @@
|
||||
limitations under the License.
|
||||
#}
|
||||
{% set default_cable = '5m' %}
|
||||
{% set ingress_lossless_pool_size = '7719936' %}
|
||||
{% set ingress_lossless_pool_xoff = '1032192' %}
|
||||
{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
|
||||
{% set ingress_lossless_pool_size = '9047040' %}
|
||||
{% set ingress_lossless_pool_xoff = '851968' %}
|
||||
{% set egress_lossless_pool_size = '13945824' %}
|
||||
{% set egress_lossy_pool_size = '7719936' %}
|
||||
{% set egress_lossy_pool_size = '9047040' %}
|
||||
{%- else -%}
|
||||
{% set ingress_lossless_pool_size = '9595904' %}
|
||||
{% set ingress_lossless_pool_xoff = '614400' %}
|
||||
{% set egress_lossless_pool_size = '13945824' %}
|
||||
{% set egress_lossy_pool_size = '9595904' %}
|
||||
{%- endif -%}
|
||||
|
||||
{% import 'buffers_defaults_objects.j2' as defs with context %}
|
||||
|
||||
@ -30,10 +37,18 @@
|
||||
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
{#
|
||||
Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
|
||||
Apache-2.0
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
#}
|
||||
{%- include 'qos_config.j2' %}
|
||||
@ -0,0 +1 @@
|
||||
../../x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
|
||||
@ -1,5 +1,5 @@
|
||||
{#
|
||||
Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES.
|
||||
Copyright (c) 2021-2023 NVIDIA CORPORATION & AFFILIATES.
|
||||
Apache-2.0
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -15,10 +15,17 @@
|
||||
limitations under the License.
|
||||
#}
|
||||
{% set default_cable = '5m' %}
|
||||
{% set ingress_lossless_pool_size = '10177536' %}
|
||||
{% set ingress_lossless_pool_xoff = '688128' %}
|
||||
{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
|
||||
{% set ingress_lossless_pool_size = '9047040' %}
|
||||
{% set ingress_lossless_pool_xoff = '851968' %}
|
||||
{% set egress_lossless_pool_size = '13945824' %}
|
||||
{% set egress_lossy_pool_size = '10177536' %}
|
||||
{% set egress_lossy_pool_size = '9047040' %}
|
||||
{%- else -%}
|
||||
{% set ingress_lossless_pool_size = '9595904' %}
|
||||
{% set ingress_lossless_pool_xoff = '614400' %}
|
||||
{% set egress_lossless_pool_size = '13945824' %}
|
||||
{% set egress_lossy_pool_size = '9595904' %}
|
||||
{%- endif -%}
|
||||
|
||||
{% import 'buffers_defaults_objects.j2' as defs with context %}
|
||||
|
||||
@ -30,10 +37,18 @@
|
||||
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
@ -1 +1 @@
|
||||
../ACS-MSN2700/qos.json.j2
|
||||
../../x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/qos.json.j2
|
||||
@ -1,5 +1,5 @@
|
||||
{#
|
||||
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
|
||||
Copyright (c) 2018-2023 NVIDIA CORPORATION & AFFILIATES.
|
||||
Apache-2.0
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -15,10 +15,17 @@
|
||||
limitations under the License.
|
||||
#}
|
||||
{% set default_cable = '5m' %}
|
||||
{% set ingress_lossless_pool_size = '49905664' %}
|
||||
{% set ingress_lossless_pool_xoff = '3702784' %}
|
||||
{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
|
||||
{% set ingress_lossless_pool_size = '50667520' %}
|
||||
{% set ingress_lossless_pool_xoff = '2629632' %}
|
||||
{% set egress_lossless_pool_size = '60817392' %}
|
||||
{% set egress_lossy_pool_size = '49905664' %}
|
||||
{% set egress_lossy_pool_size = '50667520' %}
|
||||
{%- else -%}
|
||||
{% set ingress_lossless_pool_size = '51511296' %}
|
||||
{% set ingress_lossless_pool_xoff = '2097152' %}
|
||||
{% set egress_lossless_pool_size = '60817392' %}
|
||||
{% set egress_lossy_pool_size = '51511296' %}
|
||||
{%- endif -%}
|
||||
|
||||
{% import 'buffers_defaults_objects.j2' as defs with context %}
|
||||
|
||||
@ -30,10 +37,18 @@
|
||||
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{#
|
||||
Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
|
||||
Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES.
|
||||
Apache-2.0
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -14,77 +14,13 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
#}
|
||||
{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
|
||||
|
||||
{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') or
|
||||
('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
|
||||
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
|
||||
{% set different_dscp_to_tc_map = true %}
|
||||
{%- macro generate_dscp_to_tc_map() %}
|
||||
"DSCP_TO_TC_MAP": {
|
||||
"AZURE": {
|
||||
"0" : "1",
|
||||
"1" : "1",
|
||||
"2" : "2",
|
||||
"3" : "3",
|
||||
"4" : "4",
|
||||
"5" : "1",
|
||||
"6" : "6",
|
||||
"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": "1",
|
||||
"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_UPLINK": {
|
||||
{%- macro generate_normal_dscp_to_tc_map(tc_mapped_from_dscp_33) -%}
|
||||
{
|
||||
"0" : "1",
|
||||
"1" : "1",
|
||||
"2" : "1",
|
||||
@ -118,7 +54,7 @@
|
||||
"30": "1",
|
||||
"31": "1",
|
||||
"32": "1",
|
||||
"33": "1",
|
||||
"33": "{{tc_mapped_from_dscp_33}}",
|
||||
"34": "1",
|
||||
"35": "1",
|
||||
"36": "1",
|
||||
@ -150,10 +86,120 @@
|
||||
"62": "1",
|
||||
"63": "1"
|
||||
}
|
||||
{%- endmacro -%}
|
||||
{%- macro generate_dscp_to_tc_map_with_addition_lossless_pgs_n_queues(tc_mapped_from_dscp_33) -%}
|
||||
{
|
||||
"0" : "1",
|
||||
"1" : "1",
|
||||
"2" : "2",
|
||||
"3" : "3",
|
||||
"4" : "4",
|
||||
"5" : "1",
|
||||
"6" : "6",
|
||||
"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": "{{tc_mapped_from_dscp_33}}",
|
||||
"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_dscp_to_tc_map() %}
|
||||
"DSCP_TO_TC_MAP": {
|
||||
{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'LeafRouter') %}
|
||||
"AZURE_UPLINK":
|
||||
{{ generate_normal_dscp_to_tc_map("1") }},
|
||||
"AZURE":
|
||||
{{ generate_dscp_to_tc_map_with_addition_lossless_pgs_n_queues("1") }}
|
||||
{% endif %}
|
||||
{% if ('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') %}
|
||||
"AZURE_UPLINK":
|
||||
{{ generate_dscp_to_tc_map_with_addition_lossless_pgs_n_queues("8") }},
|
||||
"AZURE_TUNNEL":
|
||||
{{ generate_normal_dscp_to_tc_map("8") }},
|
||||
"AZURE":
|
||||
{{ generate_normal_dscp_to_tc_map("8") }}
|
||||
{% endif %}
|
||||
},
|
||||
{%- endmacro %}
|
||||
{%- macro generate_tc_to_pg_map() %}
|
||||
"TC_TO_PRIORITY_GROUP_MAP": {
|
||||
{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
|
||||
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
|
||||
"AZURE_TUNNEL": {
|
||||
"0": "0",
|
||||
"1": "0",
|
||||
"2": "0",
|
||||
"3": "2",
|
||||
"4": "6",
|
||||
"5": "0",
|
||||
"6": "0",
|
||||
"7": "0",
|
||||
"8": "0"
|
||||
},
|
||||
"AZURE": {
|
||||
"0": "0",
|
||||
"1": "0",
|
||||
"2": "2",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "0",
|
||||
"6": "6",
|
||||
"7": "0",
|
||||
"8": "0"
|
||||
}
|
||||
{% else %}
|
||||
"AZURE": {
|
||||
"0": "0",
|
||||
"1": "0",
|
||||
@ -164,8 +210,67 @@
|
||||
"6": "6",
|
||||
"7": "0"
|
||||
}
|
||||
{% endif %}
|
||||
},
|
||||
{%- endmacro %}
|
||||
{%- macro generate_tc_to_queue_map() %}
|
||||
"TC_TO_QUEUE_MAP": {
|
||||
{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
|
||||
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
|
||||
"AZURE_TUNNEL": {
|
||||
"0": "0",
|
||||
"1": "1",
|
||||
"2": "2",
|
||||
"3": "2",
|
||||
"4": "6",
|
||||
"5": "5",
|
||||
"6": "6",
|
||||
"7": "7",
|
||||
"8": "1"
|
||||
},
|
||||
"AZURE": {
|
||||
"0": "0",
|
||||
"1": "1",
|
||||
"2": "2",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "5",
|
||||
"6": "6",
|
||||
"7": "7",
|
||||
"8": "1"
|
||||
}
|
||||
{% else %}
|
||||
"AZURE": {
|
||||
"0": "0",
|
||||
"1": "1",
|
||||
"2": "2",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "5",
|
||||
"6": "6",
|
||||
"7": "7"
|
||||
}
|
||||
{% endif %}
|
||||
},
|
||||
{%- endmacro %}
|
||||
{% if (('type' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['type'] == 'ToRRouter') and
|
||||
('subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR')) %}
|
||||
{%- macro generate_tc_to_dscp_map() %}
|
||||
"TC_TO_DSCP_MAP": {
|
||||
"AZURE_TUNNEL": {
|
||||
"0": "8",
|
||||
"1": "0",
|
||||
"2": "2",
|
||||
"3": "2",
|
||||
"4": "6",
|
||||
"5": "46",
|
||||
"6": "6",
|
||||
"7": "48",
|
||||
"8": "33"
|
||||
}
|
||||
},
|
||||
{%- endmacro %}
|
||||
{%- endif %}
|
||||
{%- macro generate_global_dscp_to_tc_map() %}
|
||||
{# This is an empty macro since the global DSCP_TO_TC map is not required #}
|
||||
{%- endmacro %}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{#
|
||||
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
|
||||
Copyright (c) 2018-2023 NVIDIA CORPORATION & AFFILIATES.
|
||||
Apache-2.0
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@ -15,10 +15,17 @@
|
||||
limitations under the License.
|
||||
#}
|
||||
{% set default_cable = '5m' %}
|
||||
{% set ingress_lossless_pool_size = '47398912' %}
|
||||
{% set ingress_lossless_pool_xoff = '3604480' %}
|
||||
{%- if ((SYSTEM_DEFAULTS is defined) and ('tunnel_qos_remap' in SYSTEM_DEFAULTS) and (SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled')) -%}
|
||||
{% set ingress_lossless_pool_size = '55058432' %}
|
||||
{% set ingress_lossless_pool_xoff = '1712128' %}
|
||||
{% set egress_lossless_pool_size = '60817392' %}
|
||||
{% set egress_lossy_pool_size = '47398912' %}
|
||||
{% set egress_lossy_pool_size = '55058432' %}
|
||||
{%- else -%}
|
||||
{% set ingress_lossless_pool_size = '55902208' %}
|
||||
{% set ingress_lossless_pool_xoff = '1179648' %}
|
||||
{% set egress_lossless_pool_size = '60817392' %}
|
||||
{% set egress_lossy_pool_size = '55902208' %}
|
||||
{%- endif -%}
|
||||
|
||||
{% import 'buffers_defaults_objects.j2' as defs with context %}
|
||||
|
||||
@ -30,10 +37,18 @@
|
||||
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_extra_lossless_queues_with_inactive_ports(port_names_active, port_names_extra_queues, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names_active, port_names_extra_queues, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_extra_lossless_pgs_with_inactive_ports(port_names_active, port_names_extra_pgs, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles_with_extra_lossless_pgs(port_names_active, port_names_extra_pgs, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
|
||||
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
|
||||
{%- endmacro %}
|
||||
|
||||
@ -1 +1 @@
|
||||
../ACS-MSN4600C/qos.json.j2
|
||||
../Mellanox-SN4600C-C64/qos.json.j2
|
||||
@ -6,5 +6,7 @@
|
||||
"asic_id": "{{ DEVICE_METADATA.localhost.asic_id }}",
|
||||
"mac": "{{ DEVICE_METADATA.localhost.mac }}",
|
||||
"resource_type": "{{ DEVICE_METADATA.localhost.resource_type }}",
|
||||
"synchronous_mode": {% if DEVICE_METADATA.localhost.synchronous_mode == "disable" %}"disable"{% else %}"enable"{% endif %}
|
||||
"synchronous_mode": {% if DEVICE_METADATA.localhost.synchronous_mode == "disable" %}"disable"{% else %}"enable"{% endif %},
|
||||
"dual_tor": {% if DEVICE_METADATA.localhost.type == "ToRRouter" and DEVICE_METADATA.localhost.subtype == "DualToR" %}"enable"{% else %}"disable"{% endif %},
|
||||
"dscp_remapping": {% if SYSTEM_DEFAULTS is defined and SYSTEM_DEFAULTS.tunnel_qos_remap is defined and SYSTEM_DEFAULTS.tunnel_qos_remap.status == "enabled" %}"enable"{% else %}"disable"{% endif %}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
3929
src/sonic-config-engine/tests/sample-mellanox-4600c-t0-minigraph.xml
Normal file
3929
src/sonic-config-engine/tests/sample-mellanox-4600c-t0-minigraph.xml
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,884 @@
|
||||
|
||||
{
|
||||
"TC_TO_PRIORITY_GROUP_MAP": {
|
||||
"AZURE": {
|
||||
"0": "0",
|
||||
"1": "0",
|
||||
"2": "0",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "0",
|
||||
"6": "0",
|
||||
"7": "7"
|
||||
}
|
||||
},
|
||||
"MAP_PFC_PRIORITY_TO_QUEUE": {
|
||||
"AZURE": {
|
||||
"0": "0",
|
||||
"1": "1",
|
||||
"2": "2",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "5",
|
||||
"6": "6",
|
||||
"7": "7"
|
||||
}
|
||||
},
|
||||
"TC_TO_QUEUE_MAP": {
|
||||
"AZURE": {
|
||||
"0": "0",
|
||||
"1": "1",
|
||||
"2": "2",
|
||||
"3": "3",
|
||||
"4": "4",
|
||||
"5": "5",
|
||||
"6": "6",
|
||||
"7": "7"
|
||||
}
|
||||
},
|
||||
"DSCP_TO_TC_MAP": {
|
||||
"AZURE": {
|
||||
"0" : "1",
|
||||
"1" : "1",
|
||||
"2" : "1",
|
||||
"3" : "3",
|
||||
"4" : "4",
|
||||
"5" : "2",
|
||||
"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": "1",
|
||||
"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": "6",
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"SCHEDULER": {
|
||||
"scheduler.0": {
|
||||
"type" : "DWRR",
|
||||
"weight": "14"
|
||||
},
|
||||
"scheduler.1": {
|
||||
"type" : "DWRR",
|
||||
"weight": "15"
|
||||
}
|
||||
},
|
||||
"PORT_QOS_MAP": {
|
||||
"global": {
|
||||
"dscp_to_tc_map" : "AZURE"
|
||||
}, "Ethernet2": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet4": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet6": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet8": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet10": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet12": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet14": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet16": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet18": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet20": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet22": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet24": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet26": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet28": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet30": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet32": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet34": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet36": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet38": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet48": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet248": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet250": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet252": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
},
|
||||
"Ethernet254": {
|
||||
"dscp_to_tc_map" : "AZURE",
|
||||
"tc_to_queue_map" : "AZURE",
|
||||
"tc_to_pg_map" : "AZURE",
|
||||
"pfc_to_queue_map": "AZURE",
|
||||
"pfc_enable" : "3,4",
|
||||
"pfcwd_sw_enable" : "3,4"
|
||||
}
|
||||
},
|
||||
"WRED_PROFILE": {
|
||||
"AZURE_LOSSLESS" : {
|
||||
"wred_green_enable" : "true",
|
||||
"wred_yellow_enable" : "true",
|
||||
"wred_red_enable" : "true",
|
||||
"ecn" : "ecn_all",
|
||||
"green_max_threshold" : "2097152",
|
||||
"green_min_threshold" : "1048576",
|
||||
"yellow_max_threshold" : "2097152",
|
||||
"yellow_min_threshold" : "1048576",
|
||||
"red_max_threshold" : "2097152",
|
||||
"red_min_threshold" : "1048576",
|
||||
"green_drop_probability" : "5",
|
||||
"yellow_drop_probability": "5",
|
||||
"red_drop_probability" : "5"
|
||||
}
|
||||
},
|
||||
"QUEUE": {
|
||||
"Ethernet2|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet4|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet6|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet8|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet10|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet12|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet14|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet16|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet18|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet20|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet22|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet24|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet26|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet28|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet30|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet32|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet34|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet36|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet38|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet48|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet248|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet250|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet252|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet254|3": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet2|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet4|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet6|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet8|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet10|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet12|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet14|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet16|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet18|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet20|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet22|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet24|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet26|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet28|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet30|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet32|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet34|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet36|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet38|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet48|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet248|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet250|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet252|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet254|4": {
|
||||
"scheduler" : "scheduler.1",
|
||||
"wred_profile": "AZURE_LOSSLESS"
|
||||
},
|
||||
"Ethernet2|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet4|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet6|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet8|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet10|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet12|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet14|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet16|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet18|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet20|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet22|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet24|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet26|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet28|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet30|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet32|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet34|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet36|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet38|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet48|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet248|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet250|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet252|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet254|0": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet2|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet4|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet6|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet8|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet10|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet12|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet14|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet16|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet18|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet20|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet22|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet24|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet26|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet28|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet30|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet32|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet34|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet36|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet38|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet48|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet248|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet250|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet252|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet254|1": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet2|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet4|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet6|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet8|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet10|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet12|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet14|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet16|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet18|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet20|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet22|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet24|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet26|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet28|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet30|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet32|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet34|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet36|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet38|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet48|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet248|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet250|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet252|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet254|2": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet2|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet4|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet6|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet8|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet10|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet12|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet14|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet16|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet18|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet20|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet22|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet24|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet26|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet28|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet30|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet32|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet34|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet36|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet38|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet48|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet248|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet250|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet252|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet254|5": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet2|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet4|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet6|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet8|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet10|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet12|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet14|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet16|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet18|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet20|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet22|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet24|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet26|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet28|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet30|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet32|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet34|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet36|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet38|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet48|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet248|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet250|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet252|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
},
|
||||
"Ethernet254|6": {
|
||||
"scheduler": "scheduler.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -365,6 +365,8 @@ class TestJ2Files(TestCase):
|
||||
'../../../device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64',
|
||||
'../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64',
|
||||
'../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64',
|
||||
'../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40',
|
||||
'../../../device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40',
|
||||
'../../../device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S'
|
||||
]
|
||||
sample_outputs = [
|
||||
@ -376,6 +378,8 @@ class TestJ2Files(TestCase):
|
||||
'qos-arista7260-t1-remap-disabled.json',
|
||||
'qos-mellanox4600c-c64.json',
|
||||
'qos-mellanox4600c-c64-remap-disabled.json',
|
||||
'qos-mellanox4600c-d48c40-t0.json',
|
||||
'qos-mellanox4600c-d48c40-t0-remap-disabled.json',
|
||||
'qos-arista7050-t0-storage-backend.json'
|
||||
]
|
||||
sample_minigraph_files = [
|
||||
@ -387,6 +391,8 @@ class TestJ2Files(TestCase):
|
||||
'sample-arista-7260-t1-minigraph-remap-disabled.xml',
|
||||
'sample-mellanox-4600c-t1-minigraph.xml',
|
||||
'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml',
|
||||
'sample-mellanox-4600c-t0-minigraph.xml',
|
||||
'sample-mellanox-4600c-t0-minigraph-remap-disabled.xml',
|
||||
'sample-arista-7050-t0-storage-backend-minigraph.xml'
|
||||
]
|
||||
|
||||
@ -482,9 +488,6 @@ class TestJ2Files(TestCase):
|
||||
def test_buffers_dell6100_render_template(self):
|
||||
self._test_buffers_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'buffers.json.j2', 'buffers-dell6100.json')
|
||||
|
||||
def test_buffers_mellanox2700_render_template(self):
|
||||
self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2700-r0', 'Mellanox-SN2700-D48C8', 'sample-mellanox-2700-t0-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2700.json')
|
||||
|
||||
def test_buffers_mellanox2410_render_template(self):
|
||||
self._test_buffers_render_template('mellanox', 'x86_64-mlnx_msn2410-r0', 'ACS-MSN2410', 'sample-mellanox-2410-t1-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox2410.json')
|
||||
|
||||
@ -507,8 +510,12 @@ class TestJ2Files(TestCase):
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph.xml', 'buffers_dynamic.json.j2', 'buffers-mellanox4600c-t1-dynamic.json'),
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox4600c-t1.json'),
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml', 'buffers_dynamic.json.j2', 'buffers-mellanox4600c-t1-dynamic-remap-disabled.json'),
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffers-mellanox4600c-t1-remap-disabled.json')
|
||||
]
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-C64', 'sample-mellanox-4600c-t1-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffers-mellanox4600c-t1-remap-disabled.json'),
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-D48C40', 'sample-mellanox-4600c-t0-minigraph.xml', 'buffers_dynamic.json.j2', 'buffers-mellanox4600c-t0-dynamic.json'),
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-D48C40', 'sample-mellanox-4600c-t0-minigraph.xml', 'buffers.json.j2', 'buffers-mellanox4600c-t0.json'),
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-D48C40', 'sample-mellanox-4600c-t0-minigraph-remap-disabled.xml', 'buffers_dynamic.json.j2', 'buffers-mellanox4600c-t0-dynamic-remap-disabled.json'),
|
||||
('mellanox', 'x86_64-mlnx_msn4600c-r0', 'Mellanox-SN4600C-D48C40', 'sample-mellanox-4600c-t0-minigraph-remap-disabled.xml', 'buffers.json.j2', 'buffers-mellanox4600c-t0-remap-disabled.json')
|
||||
]
|
||||
|
||||
for test_data in TEST_DATA:
|
||||
self._test_buffers_render_template(vendor=test_data[0],
|
||||
|
||||
Loading…
Reference in New Issue
Block a user