From ec0bb47adef12056c5bacfb7f06bbdccb174171a Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Tue, 29 Sep 2020 19:28:05 +0000 Subject: [PATCH 1/2] Fix config qos reload on Multi-asic platfroms. The sort Function on Portname is not able to understand Backplance Interface name. Fix is to to remove sorting from j2 template as this is not needed as all Ports are dervice port_config.ini where ports are listed in fixed static sort order. Also we do not sort port in buffer_config.j2 so made logic similar to that and keep it simple instead of enhancing sort function. Signed-off-by: Abhishek Dosi --- files/build_templates/qos_config.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2 index 9420be7a0671..db978378c5d4 100644 --- a/files/build_templates/qos_config.j2 +++ b/files/build_templates/qos_config.j2 @@ -2,7 +2,6 @@ {%- for port in PORT %} {%- if PORT_ALL.append(port) %}{% endif %} {%- endfor %} -{%- if PORT_ALL | sort_by_port_index %}{% endif %} {%- set port_names_list_all = [] %} {%- for port in PORT_ALL %} @@ -19,7 +18,6 @@ {%- if PORT_ACTIVE.append(port) %}{%- endif %} {%- endfor %} {%- endif %} -{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %} {%- set port_names_list_active = [] %} {%- for port in PORT_ACTIVE %} From 5467f094535d1596b9c1a0baa715cc6d919f2c1c Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Sat, 13 Nov 2021 01:03:18 +0000 Subject: [PATCH 2/2] Fix the UT Signed-off-by: Abhishek Dosi --- .../sample_output/py2/qos-arista7050.json | 144 +++--- .../tests/sample_output/py2/qos-dell6100.json | 472 +++++++++--------- .../sample_output/py3/qos-arista7050.json | 144 +++--- .../tests/sample_output/py3/qos-dell6100.json | 472 +++++++++--------- 4 files changed, 616 insertions(+), 616 deletions(-) diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json index 9a6f8a2ada78..df9e2dbd549a 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-arista7050.json @@ -114,196 +114,196 @@ } }, "PORT_QOS_MAP": { - "Ethernet4": { + "Ethernet112": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet8": { + "Ethernet116": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet12": { + "Ethernet120": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet16": { + "Ethernet124": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet20": { + "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" }, - "Ethernet24": { + "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" }, - "Ethernet28": { + "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" }, - "Ethernet32": { + "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" }, - "Ethernet36": { + "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" }, - "Ethernet40": { + "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" }, - "Ethernet44": { + "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" }, - "Ethernet48": { + "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" }, - "Ethernet52": { + "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" }, - "Ethernet56": { + "Ethernet40": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet60": { + "Ethernet44": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet64": { + "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" }, - "Ethernet68": { + "Ethernet52": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet72": { + "Ethernet56": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet76": { + "Ethernet60": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet80": { + "Ethernet64": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet84": { + "Ethernet68": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet88": { + "Ethernet72": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet92": { + "Ethernet76": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet96": { + "Ethernet80": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet112": { + "Ethernet84": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet116": { + "Ethernet88": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet120": { + "Ethernet92": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet124": { + "Ethernet96": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", @@ -329,6 +329,22 @@ } }, "QUEUE": { + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet116|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet124|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, "Ethernet4|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" @@ -425,19 +441,19 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet112|3": { + "Ethernet112|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet116|3": { + "Ethernet116|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet120|3": { + "Ethernet120|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet124|3": { + "Ethernet124|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, @@ -537,21 +553,17 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet112|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet112|0": { + "scheduler": "scheduler.0" }, - "Ethernet116|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet116|0": { + "scheduler": "scheduler.0" }, - "Ethernet120|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet120|0": { + "scheduler": "scheduler.0" }, - "Ethernet124|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet124|0": { + "scheduler": "scheduler.0" }, "Ethernet4|0": { "scheduler": "scheduler.0" @@ -625,16 +637,16 @@ "Ethernet96|0": { "scheduler": "scheduler.0" }, - "Ethernet112|0": { + "Ethernet112|1": { "scheduler": "scheduler.0" }, - "Ethernet116|0": { + "Ethernet116|1": { "scheduler": "scheduler.0" }, - "Ethernet120|0": { + "Ethernet120|1": { "scheduler": "scheduler.0" }, - "Ethernet124|0": { + "Ethernet124|1": { "scheduler": "scheduler.0" }, "Ethernet4|1": { @@ -709,16 +721,16 @@ "Ethernet96|1": { "scheduler": "scheduler.0" }, - "Ethernet112|1": { + "Ethernet112|2": { "scheduler": "scheduler.0" }, - "Ethernet116|1": { + "Ethernet116|2": { "scheduler": "scheduler.0" }, - "Ethernet120|1": { + "Ethernet120|2": { "scheduler": "scheduler.0" }, - "Ethernet124|1": { + "Ethernet124|2": { "scheduler": "scheduler.0" }, "Ethernet4|2": { @@ -793,16 +805,16 @@ "Ethernet96|2": { "scheduler": "scheduler.0" }, - "Ethernet112|2": { + "Ethernet112|5": { "scheduler": "scheduler.0" }, - "Ethernet116|2": { + "Ethernet116|5": { "scheduler": "scheduler.0" }, - "Ethernet120|2": { + "Ethernet120|5": { "scheduler": "scheduler.0" }, - "Ethernet124|2": { + "Ethernet124|5": { "scheduler": "scheduler.0" }, "Ethernet4|5": { @@ -877,16 +889,16 @@ "Ethernet96|5": { "scheduler": "scheduler.0" }, - "Ethernet112|5": { + "Ethernet112|6": { "scheduler": "scheduler.0" }, - "Ethernet116|5": { + "Ethernet116|6": { "scheduler": "scheduler.0" }, - "Ethernet120|5": { + "Ethernet120|6": { "scheduler": "scheduler.0" }, - "Ethernet124|5": { + "Ethernet124|6": { "scheduler": "scheduler.0" }, "Ethernet4|6": { @@ -960,18 +972,6 @@ }, "Ethernet96|6": { "scheduler": "scheduler.0" - }, - "Ethernet112|6": { - "scheduler": "scheduler.0" - }, - "Ethernet116|6": { - "scheduler": "scheduler.0" - }, - "Ethernet120|6": { - "scheduler": "scheduler.0" - }, - "Ethernet124|6": { - "scheduler": "scheduler.0" } } } diff --git a/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json index eecd81c99e5c..18819af7601f 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json +++ b/src/sonic-config-engine/tests/sample_output/py2/qos-dell6100.json @@ -142,224 +142,224 @@ "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet6": { + "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" }, - "Ethernet7": { + "Ethernet17": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet8": { + "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" }, - "Ethernet9": { + "Ethernet21": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet10": { + "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" }, - "Ethernet11": { + "Ethernet7": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet12": { + "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" }, - "Ethernet13": { + "Ethernet9": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet14": { + "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" }, - "Ethernet15": { + "Ethernet11": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet16": { + "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" }, - "Ethernet17": { + "Ethernet13": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet20": { + "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" }, - "Ethernet21": { + "Ethernet15": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet22": { + "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" }, - "Ethernet23": { + "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" }, - "Ethernet24": { + "Ethernet37": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet25": { + "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" }, - "Ethernet26": { + "Ethernet39": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet27": { + "Ethernet40": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet28": { + "Ethernet41": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet29": { + "Ethernet42": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet30": { + "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" }, - "Ethernet31": { + "Ethernet23": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet32": { + "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" }, - "Ethernet36": { + "Ethernet25": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet37": { + "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" }, - "Ethernet38": { + "Ethernet27": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet39": { + "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" }, - "Ethernet40": { + "Ethernet29": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet41": { + "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" }, - "Ethernet42": { + "Ethernet31": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", @@ -457,131 +457,131 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet6|3": { + "Ethernet16|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet7|3": { + "Ethernet17|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet8|3": { + "Ethernet20|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet9|3": { + "Ethernet21|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet10|3": { + "Ethernet6|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet11|3": { + "Ethernet7|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet12|3": { + "Ethernet8|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet13|3": { + "Ethernet9|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet14|3": { + "Ethernet10|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet15|3": { + "Ethernet11|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet16|3": { + "Ethernet12|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet17|3": { + "Ethernet13|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet20|3": { + "Ethernet14|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet21|3": { + "Ethernet15|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet22|3": { + "Ethernet32|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet23|3": { + "Ethernet36|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet24|3": { + "Ethernet37|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet25|3": { + "Ethernet38|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet26|3": { + "Ethernet39|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet27|3": { + "Ethernet40|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet28|3": { + "Ethernet41|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet29|3": { + "Ethernet42|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet30|3": { + "Ethernet22|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet31|3": { + "Ethernet23|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet32|3": { + "Ethernet24|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet36|3": { + "Ethernet25|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet37|3": { + "Ethernet26|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet38|3": { + "Ethernet27|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet39|3": { + "Ethernet28|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet40|3": { + "Ethernet29|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet41|3": { + "Ethernet30|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet42|3": { + "Ethernet31|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, @@ -633,131 +633,131 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet6|4": { + "Ethernet16|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet7|4": { + "Ethernet17|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet8|4": { + "Ethernet20|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet9|4": { + "Ethernet21|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet10|4": { + "Ethernet6|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet11|4": { + "Ethernet7|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet12|4": { + "Ethernet8|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet13|4": { + "Ethernet9|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet14|4": { + "Ethernet10|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet15|4": { + "Ethernet11|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet16|4": { + "Ethernet12|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet17|4": { + "Ethernet13|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet20|4": { + "Ethernet14|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet21|4": { + "Ethernet15|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet22|4": { + "Ethernet32|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet23|4": { + "Ethernet36|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet24|4": { + "Ethernet37|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet25|4": { + "Ethernet38|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet26|4": { + "Ethernet39|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet27|4": { + "Ethernet40|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet28|4": { + "Ethernet41|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet29|4": { + "Ethernet42|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet30|4": { + "Ethernet22|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet31|4": { + "Ethernet23|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet32|4": { + "Ethernet24|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet36|4": { + "Ethernet25|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet37|4": { + "Ethernet26|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet38|4": { + "Ethernet27|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet39|4": { + "Ethernet28|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet40|4": { + "Ethernet29|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet41|4": { + "Ethernet30|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet42|4": { + "Ethernet31|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, @@ -805,6 +805,18 @@ "Ethernet5|0": { "scheduler": "scheduler.0" }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet17|0": { + "scheduler": "scheduler.0" + }, + "Ethernet20|0": { + "scheduler": "scheduler.0" + }, + "Ethernet21|0": { + "scheduler": "scheduler.0" + }, "Ethernet6|0": { "scheduler": "scheduler.0" }, @@ -835,16 +847,28 @@ "Ethernet15|0": { "scheduler": "scheduler.0" }, - "Ethernet16|0": { + "Ethernet32|0": { "scheduler": "scheduler.0" }, - "Ethernet17|0": { + "Ethernet36|0": { "scheduler": "scheduler.0" }, - "Ethernet20|0": { + "Ethernet37|0": { "scheduler": "scheduler.0" }, - "Ethernet21|0": { + "Ethernet38|0": { + "scheduler": "scheduler.0" + }, + "Ethernet39|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet41|0": { + "scheduler": "scheduler.0" + }, + "Ethernet42|0": { "scheduler": "scheduler.0" }, "Ethernet22|0": { @@ -877,30 +901,6 @@ "Ethernet31|0": { "scheduler": "scheduler.0" }, - "Ethernet32|0": { - "scheduler": "scheduler.0" - }, - "Ethernet36|0": { - "scheduler": "scheduler.0" - }, - "Ethernet37|0": { - "scheduler": "scheduler.0" - }, - "Ethernet38|0": { - "scheduler": "scheduler.0" - }, - "Ethernet39|0": { - "scheduler": "scheduler.0" - }, - "Ethernet40|0": { - "scheduler": "scheduler.0" - }, - "Ethernet41|0": { - "scheduler": "scheduler.0" - }, - "Ethernet42|0": { - "scheduler": "scheduler.0" - }, "Ethernet48|0": { "scheduler": "scheduler.0" }, @@ -937,6 +937,18 @@ "Ethernet5|1": { "scheduler": "scheduler.0" }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet17|1": { + "scheduler": "scheduler.0" + }, + "Ethernet20|1": { + "scheduler": "scheduler.0" + }, + "Ethernet21|1": { + "scheduler": "scheduler.0" + }, "Ethernet6|1": { "scheduler": "scheduler.0" }, @@ -967,16 +979,28 @@ "Ethernet15|1": { "scheduler": "scheduler.0" }, - "Ethernet16|1": { + "Ethernet32|1": { "scheduler": "scheduler.0" }, - "Ethernet17|1": { + "Ethernet36|1": { "scheduler": "scheduler.0" }, - "Ethernet20|1": { + "Ethernet37|1": { "scheduler": "scheduler.0" }, - "Ethernet21|1": { + "Ethernet38|1": { + "scheduler": "scheduler.0" + }, + "Ethernet39|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet41|1": { + "scheduler": "scheduler.0" + }, + "Ethernet42|1": { "scheduler": "scheduler.0" }, "Ethernet22|1": { @@ -1009,30 +1033,6 @@ "Ethernet31|1": { "scheduler": "scheduler.0" }, - "Ethernet32|1": { - "scheduler": "scheduler.0" - }, - "Ethernet36|1": { - "scheduler": "scheduler.0" - }, - "Ethernet37|1": { - "scheduler": "scheduler.0" - }, - "Ethernet38|1": { - "scheduler": "scheduler.0" - }, - "Ethernet39|1": { - "scheduler": "scheduler.0" - }, - "Ethernet40|1": { - "scheduler": "scheduler.0" - }, - "Ethernet41|1": { - "scheduler": "scheduler.0" - }, - "Ethernet42|1": { - "scheduler": "scheduler.0" - }, "Ethernet48|1": { "scheduler": "scheduler.0" }, @@ -1069,6 +1069,18 @@ "Ethernet5|2": { "scheduler": "scheduler.0" }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet17|2": { + "scheduler": "scheduler.0" + }, + "Ethernet20|2": { + "scheduler": "scheduler.0" + }, + "Ethernet21|2": { + "scheduler": "scheduler.0" + }, "Ethernet6|2": { "scheduler": "scheduler.0" }, @@ -1099,16 +1111,28 @@ "Ethernet15|2": { "scheduler": "scheduler.0" }, - "Ethernet16|2": { + "Ethernet32|2": { "scheduler": "scheduler.0" }, - "Ethernet17|2": { + "Ethernet36|2": { "scheduler": "scheduler.0" }, - "Ethernet20|2": { + "Ethernet37|2": { "scheduler": "scheduler.0" }, - "Ethernet21|2": { + "Ethernet38|2": { + "scheduler": "scheduler.0" + }, + "Ethernet39|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet41|2": { + "scheduler": "scheduler.0" + }, + "Ethernet42|2": { "scheduler": "scheduler.0" }, "Ethernet22|2": { @@ -1141,30 +1165,6 @@ "Ethernet31|2": { "scheduler": "scheduler.0" }, - "Ethernet32|2": { - "scheduler": "scheduler.0" - }, - "Ethernet36|2": { - "scheduler": "scheduler.0" - }, - "Ethernet37|2": { - "scheduler": "scheduler.0" - }, - "Ethernet38|2": { - "scheduler": "scheduler.0" - }, - "Ethernet39|2": { - "scheduler": "scheduler.0" - }, - "Ethernet40|2": { - "scheduler": "scheduler.0" - }, - "Ethernet41|2": { - "scheduler": "scheduler.0" - }, - "Ethernet42|2": { - "scheduler": "scheduler.0" - }, "Ethernet48|2": { "scheduler": "scheduler.0" }, @@ -1201,6 +1201,18 @@ "Ethernet5|5": { "scheduler": "scheduler.0" }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet17|5": { + "scheduler": "scheduler.0" + }, + "Ethernet20|5": { + "scheduler": "scheduler.0" + }, + "Ethernet21|5": { + "scheduler": "scheduler.0" + }, "Ethernet6|5": { "scheduler": "scheduler.0" }, @@ -1231,16 +1243,28 @@ "Ethernet15|5": { "scheduler": "scheduler.0" }, - "Ethernet16|5": { + "Ethernet32|5": { "scheduler": "scheduler.0" }, - "Ethernet17|5": { + "Ethernet36|5": { "scheduler": "scheduler.0" }, - "Ethernet20|5": { + "Ethernet37|5": { "scheduler": "scheduler.0" }, - "Ethernet21|5": { + "Ethernet38|5": { + "scheduler": "scheduler.0" + }, + "Ethernet39|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet41|5": { + "scheduler": "scheduler.0" + }, + "Ethernet42|5": { "scheduler": "scheduler.0" }, "Ethernet22|5": { @@ -1273,30 +1297,6 @@ "Ethernet31|5": { "scheduler": "scheduler.0" }, - "Ethernet32|5": { - "scheduler": "scheduler.0" - }, - "Ethernet36|5": { - "scheduler": "scheduler.0" - }, - "Ethernet37|5": { - "scheduler": "scheduler.0" - }, - "Ethernet38|5": { - "scheduler": "scheduler.0" - }, - "Ethernet39|5": { - "scheduler": "scheduler.0" - }, - "Ethernet40|5": { - "scheduler": "scheduler.0" - }, - "Ethernet41|5": { - "scheduler": "scheduler.0" - }, - "Ethernet42|5": { - "scheduler": "scheduler.0" - }, "Ethernet48|5": { "scheduler": "scheduler.0" }, @@ -1333,6 +1333,18 @@ "Ethernet5|6": { "scheduler": "scheduler.0" }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet17|6": { + "scheduler": "scheduler.0" + }, + "Ethernet20|6": { + "scheduler": "scheduler.0" + }, + "Ethernet21|6": { + "scheduler": "scheduler.0" + }, "Ethernet6|6": { "scheduler": "scheduler.0" }, @@ -1363,16 +1375,28 @@ "Ethernet15|6": { "scheduler": "scheduler.0" }, - "Ethernet16|6": { + "Ethernet32|6": { "scheduler": "scheduler.0" }, - "Ethernet17|6": { + "Ethernet36|6": { "scheduler": "scheduler.0" }, - "Ethernet20|6": { + "Ethernet37|6": { "scheduler": "scheduler.0" }, - "Ethernet21|6": { + "Ethernet38|6": { + "scheduler": "scheduler.0" + }, + "Ethernet39|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet41|6": { + "scheduler": "scheduler.0" + }, + "Ethernet42|6": { "scheduler": "scheduler.0" }, "Ethernet22|6": { @@ -1405,30 +1429,6 @@ "Ethernet31|6": { "scheduler": "scheduler.0" }, - "Ethernet32|6": { - "scheduler": "scheduler.0" - }, - "Ethernet36|6": { - "scheduler": "scheduler.0" - }, - "Ethernet37|6": { - "scheduler": "scheduler.0" - }, - "Ethernet38|6": { - "scheduler": "scheduler.0" - }, - "Ethernet39|6": { - "scheduler": "scheduler.0" - }, - "Ethernet40|6": { - "scheduler": "scheduler.0" - }, - "Ethernet41|6": { - "scheduler": "scheduler.0" - }, - "Ethernet42|6": { - "scheduler": "scheduler.0" - }, "Ethernet48|6": { "scheduler": "scheduler.0" }, diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json index 9a6f8a2ada78..df9e2dbd549a 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7050.json @@ -114,196 +114,196 @@ } }, "PORT_QOS_MAP": { - "Ethernet4": { + "Ethernet112": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet8": { + "Ethernet116": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet12": { + "Ethernet120": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet16": { + "Ethernet124": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet20": { + "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" }, - "Ethernet24": { + "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" }, - "Ethernet28": { + "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" }, - "Ethernet32": { + "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" }, - "Ethernet36": { + "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" }, - "Ethernet40": { + "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" }, - "Ethernet44": { + "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" }, - "Ethernet48": { + "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" }, - "Ethernet52": { + "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" }, - "Ethernet56": { + "Ethernet40": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet60": { + "Ethernet44": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet64": { + "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" }, - "Ethernet68": { + "Ethernet52": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet72": { + "Ethernet56": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet76": { + "Ethernet60": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet80": { + "Ethernet64": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet84": { + "Ethernet68": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet88": { + "Ethernet72": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet92": { + "Ethernet76": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet96": { + "Ethernet80": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet112": { + "Ethernet84": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet116": { + "Ethernet88": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet120": { + "Ethernet92": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet124": { + "Ethernet96": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", @@ -329,6 +329,22 @@ } }, "QUEUE": { + "Ethernet112|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet116|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet120|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, + "Ethernet124|3": { + "scheduler" : "scheduler.1", + "wred_profile": "AZURE_LOSSLESS" + }, "Ethernet4|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" @@ -425,19 +441,19 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet112|3": { + "Ethernet112|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet116|3": { + "Ethernet116|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet120|3": { + "Ethernet120|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet124|3": { + "Ethernet124|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, @@ -537,21 +553,17 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet112|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet112|0": { + "scheduler": "scheduler.0" }, - "Ethernet116|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet116|0": { + "scheduler": "scheduler.0" }, - "Ethernet120|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet120|0": { + "scheduler": "scheduler.0" }, - "Ethernet124|4": { - "scheduler" : "scheduler.1", - "wred_profile": "AZURE_LOSSLESS" + "Ethernet124|0": { + "scheduler": "scheduler.0" }, "Ethernet4|0": { "scheduler": "scheduler.0" @@ -625,16 +637,16 @@ "Ethernet96|0": { "scheduler": "scheduler.0" }, - "Ethernet112|0": { + "Ethernet112|1": { "scheduler": "scheduler.0" }, - "Ethernet116|0": { + "Ethernet116|1": { "scheduler": "scheduler.0" }, - "Ethernet120|0": { + "Ethernet120|1": { "scheduler": "scheduler.0" }, - "Ethernet124|0": { + "Ethernet124|1": { "scheduler": "scheduler.0" }, "Ethernet4|1": { @@ -709,16 +721,16 @@ "Ethernet96|1": { "scheduler": "scheduler.0" }, - "Ethernet112|1": { + "Ethernet112|2": { "scheduler": "scheduler.0" }, - "Ethernet116|1": { + "Ethernet116|2": { "scheduler": "scheduler.0" }, - "Ethernet120|1": { + "Ethernet120|2": { "scheduler": "scheduler.0" }, - "Ethernet124|1": { + "Ethernet124|2": { "scheduler": "scheduler.0" }, "Ethernet4|2": { @@ -793,16 +805,16 @@ "Ethernet96|2": { "scheduler": "scheduler.0" }, - "Ethernet112|2": { + "Ethernet112|5": { "scheduler": "scheduler.0" }, - "Ethernet116|2": { + "Ethernet116|5": { "scheduler": "scheduler.0" }, - "Ethernet120|2": { + "Ethernet120|5": { "scheduler": "scheduler.0" }, - "Ethernet124|2": { + "Ethernet124|5": { "scheduler": "scheduler.0" }, "Ethernet4|5": { @@ -877,16 +889,16 @@ "Ethernet96|5": { "scheduler": "scheduler.0" }, - "Ethernet112|5": { + "Ethernet112|6": { "scheduler": "scheduler.0" }, - "Ethernet116|5": { + "Ethernet116|6": { "scheduler": "scheduler.0" }, - "Ethernet120|5": { + "Ethernet120|6": { "scheduler": "scheduler.0" }, - "Ethernet124|5": { + "Ethernet124|6": { "scheduler": "scheduler.0" }, "Ethernet4|6": { @@ -960,18 +972,6 @@ }, "Ethernet96|6": { "scheduler": "scheduler.0" - }, - "Ethernet112|6": { - "scheduler": "scheduler.0" - }, - "Ethernet116|6": { - "scheduler": "scheduler.0" - }, - "Ethernet120|6": { - "scheduler": "scheduler.0" - }, - "Ethernet124|6": { - "scheduler": "scheduler.0" } } } diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json index eecd81c99e5c..18819af7601f 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json +++ b/src/sonic-config-engine/tests/sample_output/py3/qos-dell6100.json @@ -142,224 +142,224 @@ "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet6": { + "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" }, - "Ethernet7": { + "Ethernet17": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet8": { + "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" }, - "Ethernet9": { + "Ethernet21": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet10": { + "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" }, - "Ethernet11": { + "Ethernet7": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet12": { + "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" }, - "Ethernet13": { + "Ethernet9": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet14": { + "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" }, - "Ethernet15": { + "Ethernet11": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet16": { + "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" }, - "Ethernet17": { + "Ethernet13": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet20": { + "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" }, - "Ethernet21": { + "Ethernet15": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet22": { + "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" }, - "Ethernet23": { + "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" }, - "Ethernet24": { + "Ethernet37": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet25": { + "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" }, - "Ethernet26": { + "Ethernet39": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet27": { + "Ethernet40": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet28": { + "Ethernet41": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet29": { + "Ethernet42": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet30": { + "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" }, - "Ethernet31": { + "Ethernet23": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet32": { + "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" }, - "Ethernet36": { + "Ethernet25": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet37": { + "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" }, - "Ethernet38": { + "Ethernet27": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet39": { + "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" }, - "Ethernet40": { + "Ethernet29": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", "pfc_to_queue_map": "AZURE", "pfc_enable" : "3,4" }, - "Ethernet41": { + "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" }, - "Ethernet42": { + "Ethernet31": { "dscp_to_tc_map" : "AZURE", "tc_to_queue_map" : "AZURE", "tc_to_pg_map" : "AZURE", @@ -457,131 +457,131 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet6|3": { + "Ethernet16|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet7|3": { + "Ethernet17|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet8|3": { + "Ethernet20|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet9|3": { + "Ethernet21|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet10|3": { + "Ethernet6|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet11|3": { + "Ethernet7|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet12|3": { + "Ethernet8|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet13|3": { + "Ethernet9|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet14|3": { + "Ethernet10|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet15|3": { + "Ethernet11|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet16|3": { + "Ethernet12|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet17|3": { + "Ethernet13|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet20|3": { + "Ethernet14|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet21|3": { + "Ethernet15|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet22|3": { + "Ethernet32|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet23|3": { + "Ethernet36|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet24|3": { + "Ethernet37|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet25|3": { + "Ethernet38|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet26|3": { + "Ethernet39|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet27|3": { + "Ethernet40|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet28|3": { + "Ethernet41|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet29|3": { + "Ethernet42|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet30|3": { + "Ethernet22|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet31|3": { + "Ethernet23|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet32|3": { + "Ethernet24|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet36|3": { + "Ethernet25|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet37|3": { + "Ethernet26|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet38|3": { + "Ethernet27|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet39|3": { + "Ethernet28|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet40|3": { + "Ethernet29|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet41|3": { + "Ethernet30|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet42|3": { + "Ethernet31|3": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, @@ -633,131 +633,131 @@ "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet6|4": { + "Ethernet16|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet7|4": { + "Ethernet17|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet8|4": { + "Ethernet20|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet9|4": { + "Ethernet21|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet10|4": { + "Ethernet6|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet11|4": { + "Ethernet7|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet12|4": { + "Ethernet8|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet13|4": { + "Ethernet9|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet14|4": { + "Ethernet10|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet15|4": { + "Ethernet11|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet16|4": { + "Ethernet12|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet17|4": { + "Ethernet13|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet20|4": { + "Ethernet14|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet21|4": { + "Ethernet15|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet22|4": { + "Ethernet32|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet23|4": { + "Ethernet36|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet24|4": { + "Ethernet37|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet25|4": { + "Ethernet38|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet26|4": { + "Ethernet39|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet27|4": { + "Ethernet40|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet28|4": { + "Ethernet41|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet29|4": { + "Ethernet42|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet30|4": { + "Ethernet22|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet31|4": { + "Ethernet23|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet32|4": { + "Ethernet24|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet36|4": { + "Ethernet25|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet37|4": { + "Ethernet26|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet38|4": { + "Ethernet27|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet39|4": { + "Ethernet28|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet40|4": { + "Ethernet29|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet41|4": { + "Ethernet30|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, - "Ethernet42|4": { + "Ethernet31|4": { "scheduler" : "scheduler.1", "wred_profile": "AZURE_LOSSLESS" }, @@ -805,6 +805,18 @@ "Ethernet5|0": { "scheduler": "scheduler.0" }, + "Ethernet16|0": { + "scheduler": "scheduler.0" + }, + "Ethernet17|0": { + "scheduler": "scheduler.0" + }, + "Ethernet20|0": { + "scheduler": "scheduler.0" + }, + "Ethernet21|0": { + "scheduler": "scheduler.0" + }, "Ethernet6|0": { "scheduler": "scheduler.0" }, @@ -835,16 +847,28 @@ "Ethernet15|0": { "scheduler": "scheduler.0" }, - "Ethernet16|0": { + "Ethernet32|0": { "scheduler": "scheduler.0" }, - "Ethernet17|0": { + "Ethernet36|0": { "scheduler": "scheduler.0" }, - "Ethernet20|0": { + "Ethernet37|0": { "scheduler": "scheduler.0" }, - "Ethernet21|0": { + "Ethernet38|0": { + "scheduler": "scheduler.0" + }, + "Ethernet39|0": { + "scheduler": "scheduler.0" + }, + "Ethernet40|0": { + "scheduler": "scheduler.0" + }, + "Ethernet41|0": { + "scheduler": "scheduler.0" + }, + "Ethernet42|0": { "scheduler": "scheduler.0" }, "Ethernet22|0": { @@ -877,30 +901,6 @@ "Ethernet31|0": { "scheduler": "scheduler.0" }, - "Ethernet32|0": { - "scheduler": "scheduler.0" - }, - "Ethernet36|0": { - "scheduler": "scheduler.0" - }, - "Ethernet37|0": { - "scheduler": "scheduler.0" - }, - "Ethernet38|0": { - "scheduler": "scheduler.0" - }, - "Ethernet39|0": { - "scheduler": "scheduler.0" - }, - "Ethernet40|0": { - "scheduler": "scheduler.0" - }, - "Ethernet41|0": { - "scheduler": "scheduler.0" - }, - "Ethernet42|0": { - "scheduler": "scheduler.0" - }, "Ethernet48|0": { "scheduler": "scheduler.0" }, @@ -937,6 +937,18 @@ "Ethernet5|1": { "scheduler": "scheduler.0" }, + "Ethernet16|1": { + "scheduler": "scheduler.0" + }, + "Ethernet17|1": { + "scheduler": "scheduler.0" + }, + "Ethernet20|1": { + "scheduler": "scheduler.0" + }, + "Ethernet21|1": { + "scheduler": "scheduler.0" + }, "Ethernet6|1": { "scheduler": "scheduler.0" }, @@ -967,16 +979,28 @@ "Ethernet15|1": { "scheduler": "scheduler.0" }, - "Ethernet16|1": { + "Ethernet32|1": { "scheduler": "scheduler.0" }, - "Ethernet17|1": { + "Ethernet36|1": { "scheduler": "scheduler.0" }, - "Ethernet20|1": { + "Ethernet37|1": { "scheduler": "scheduler.0" }, - "Ethernet21|1": { + "Ethernet38|1": { + "scheduler": "scheduler.0" + }, + "Ethernet39|1": { + "scheduler": "scheduler.0" + }, + "Ethernet40|1": { + "scheduler": "scheduler.0" + }, + "Ethernet41|1": { + "scheduler": "scheduler.0" + }, + "Ethernet42|1": { "scheduler": "scheduler.0" }, "Ethernet22|1": { @@ -1009,30 +1033,6 @@ "Ethernet31|1": { "scheduler": "scheduler.0" }, - "Ethernet32|1": { - "scheduler": "scheduler.0" - }, - "Ethernet36|1": { - "scheduler": "scheduler.0" - }, - "Ethernet37|1": { - "scheduler": "scheduler.0" - }, - "Ethernet38|1": { - "scheduler": "scheduler.0" - }, - "Ethernet39|1": { - "scheduler": "scheduler.0" - }, - "Ethernet40|1": { - "scheduler": "scheduler.0" - }, - "Ethernet41|1": { - "scheduler": "scheduler.0" - }, - "Ethernet42|1": { - "scheduler": "scheduler.0" - }, "Ethernet48|1": { "scheduler": "scheduler.0" }, @@ -1069,6 +1069,18 @@ "Ethernet5|2": { "scheduler": "scheduler.0" }, + "Ethernet16|2": { + "scheduler": "scheduler.0" + }, + "Ethernet17|2": { + "scheduler": "scheduler.0" + }, + "Ethernet20|2": { + "scheduler": "scheduler.0" + }, + "Ethernet21|2": { + "scheduler": "scheduler.0" + }, "Ethernet6|2": { "scheduler": "scheduler.0" }, @@ -1099,16 +1111,28 @@ "Ethernet15|2": { "scheduler": "scheduler.0" }, - "Ethernet16|2": { + "Ethernet32|2": { "scheduler": "scheduler.0" }, - "Ethernet17|2": { + "Ethernet36|2": { "scheduler": "scheduler.0" }, - "Ethernet20|2": { + "Ethernet37|2": { "scheduler": "scheduler.0" }, - "Ethernet21|2": { + "Ethernet38|2": { + "scheduler": "scheduler.0" + }, + "Ethernet39|2": { + "scheduler": "scheduler.0" + }, + "Ethernet40|2": { + "scheduler": "scheduler.0" + }, + "Ethernet41|2": { + "scheduler": "scheduler.0" + }, + "Ethernet42|2": { "scheduler": "scheduler.0" }, "Ethernet22|2": { @@ -1141,30 +1165,6 @@ "Ethernet31|2": { "scheduler": "scheduler.0" }, - "Ethernet32|2": { - "scheduler": "scheduler.0" - }, - "Ethernet36|2": { - "scheduler": "scheduler.0" - }, - "Ethernet37|2": { - "scheduler": "scheduler.0" - }, - "Ethernet38|2": { - "scheduler": "scheduler.0" - }, - "Ethernet39|2": { - "scheduler": "scheduler.0" - }, - "Ethernet40|2": { - "scheduler": "scheduler.0" - }, - "Ethernet41|2": { - "scheduler": "scheduler.0" - }, - "Ethernet42|2": { - "scheduler": "scheduler.0" - }, "Ethernet48|2": { "scheduler": "scheduler.0" }, @@ -1201,6 +1201,18 @@ "Ethernet5|5": { "scheduler": "scheduler.0" }, + "Ethernet16|5": { + "scheduler": "scheduler.0" + }, + "Ethernet17|5": { + "scheduler": "scheduler.0" + }, + "Ethernet20|5": { + "scheduler": "scheduler.0" + }, + "Ethernet21|5": { + "scheduler": "scheduler.0" + }, "Ethernet6|5": { "scheduler": "scheduler.0" }, @@ -1231,16 +1243,28 @@ "Ethernet15|5": { "scheduler": "scheduler.0" }, - "Ethernet16|5": { + "Ethernet32|5": { "scheduler": "scheduler.0" }, - "Ethernet17|5": { + "Ethernet36|5": { "scheduler": "scheduler.0" }, - "Ethernet20|5": { + "Ethernet37|5": { "scheduler": "scheduler.0" }, - "Ethernet21|5": { + "Ethernet38|5": { + "scheduler": "scheduler.0" + }, + "Ethernet39|5": { + "scheduler": "scheduler.0" + }, + "Ethernet40|5": { + "scheduler": "scheduler.0" + }, + "Ethernet41|5": { + "scheduler": "scheduler.0" + }, + "Ethernet42|5": { "scheduler": "scheduler.0" }, "Ethernet22|5": { @@ -1273,30 +1297,6 @@ "Ethernet31|5": { "scheduler": "scheduler.0" }, - "Ethernet32|5": { - "scheduler": "scheduler.0" - }, - "Ethernet36|5": { - "scheduler": "scheduler.0" - }, - "Ethernet37|5": { - "scheduler": "scheduler.0" - }, - "Ethernet38|5": { - "scheduler": "scheduler.0" - }, - "Ethernet39|5": { - "scheduler": "scheduler.0" - }, - "Ethernet40|5": { - "scheduler": "scheduler.0" - }, - "Ethernet41|5": { - "scheduler": "scheduler.0" - }, - "Ethernet42|5": { - "scheduler": "scheduler.0" - }, "Ethernet48|5": { "scheduler": "scheduler.0" }, @@ -1333,6 +1333,18 @@ "Ethernet5|6": { "scheduler": "scheduler.0" }, + "Ethernet16|6": { + "scheduler": "scheduler.0" + }, + "Ethernet17|6": { + "scheduler": "scheduler.0" + }, + "Ethernet20|6": { + "scheduler": "scheduler.0" + }, + "Ethernet21|6": { + "scheduler": "scheduler.0" + }, "Ethernet6|6": { "scheduler": "scheduler.0" }, @@ -1363,16 +1375,28 @@ "Ethernet15|6": { "scheduler": "scheduler.0" }, - "Ethernet16|6": { + "Ethernet32|6": { "scheduler": "scheduler.0" }, - "Ethernet17|6": { + "Ethernet36|6": { "scheduler": "scheduler.0" }, - "Ethernet20|6": { + "Ethernet37|6": { "scheduler": "scheduler.0" }, - "Ethernet21|6": { + "Ethernet38|6": { + "scheduler": "scheduler.0" + }, + "Ethernet39|6": { + "scheduler": "scheduler.0" + }, + "Ethernet40|6": { + "scheduler": "scheduler.0" + }, + "Ethernet41|6": { + "scheduler": "scheduler.0" + }, + "Ethernet42|6": { "scheduler": "scheduler.0" }, "Ethernet22|6": { @@ -1405,30 +1429,6 @@ "Ethernet31|6": { "scheduler": "scheduler.0" }, - "Ethernet32|6": { - "scheduler": "scheduler.0" - }, - "Ethernet36|6": { - "scheduler": "scheduler.0" - }, - "Ethernet37|6": { - "scheduler": "scheduler.0" - }, - "Ethernet38|6": { - "scheduler": "scheduler.0" - }, - "Ethernet39|6": { - "scheduler": "scheduler.0" - }, - "Ethernet40|6": { - "scheduler": "scheduler.0" - }, - "Ethernet41|6": { - "scheduler": "scheduler.0" - }, - "Ethernet42|6": { - "scheduler": "scheduler.0" - }, "Ethernet48|6": { "scheduler": "scheduler.0" },