Use only active ports when applying buffers/qos configuration (#1787)

* First part of skipping not used port for qos configuration * Use active ports only to set QoS parameters for 6100 * Add a test for qos.json.j2 * Add a test for Dell S6100 buffers.json template * Update submodulre
sonic-net · Jun 21, 2018 · 3681cfa · 3681cfa
1 parent aaac497
commit 3681cfa
Show file tree

Hide file tree

Showing 26 changed files with 1,128 additions and 14 deletions.
diff --git a/..._as7116_54x-r0/Accton-AS7116-54X/qos.json → ...7116_54x-r0/Accton-AS7116-54X/qos.json.j2 b/..._as7116_54x-r0/Accton-AS7116-54X/qos.json → ...7116_54x-r0/Accton-AS7116-54X/qos.json.j2
diff --git a/...-accton_as7212_54x-r0/AS7212-54x/qos.json → ...cton_as7212_54x-r0/AS7212-54x/qos.json.j2 b/...-accton_as7212_54x-r0/AS7212-54x/qos.json → ...cton_as7212_54x-r0/AS7212-54x/qos.json.j2
diff --git a/...rista_7050_qx32/Arista-7050-QX32/qos.json → ...ta_7050_qx32/Arista-7050-QX32/qos.json.j2 b/...rista_7050_qx32/Arista-7050-QX32/qos.json → ...ta_7050_qx32/Arista-7050-QX32/qos.json.j2
diff --git a/...ta_7050_qx32s/Arista-7050-QX-32S/qos.json → ...7050_qx32s/Arista-7050-QX-32S/qos.json.j2 b/...ta_7050_qx32s/Arista-7050-QX-32S/qos.json → ...7050_qx32s/Arista-7050-QX-32S/qos.json.j2
diff --git a/...7060_cx32s/Arista-7060CX-32S-C32/qos.json → ...0_cx32s/Arista-7060CX-32S-C32/qos.json.j2 b/...7060_cx32s/Arista-7060CX-32S-C32/qos.json → ...0_cx32s/Arista-7060CX-32S-C32/qos.json.j2
diff --git a/...60_cx32s/Arista-7060CX-32S-D48C8/qos.json → ...cx32s/Arista-7060CX-32S-D48C8/qos.json.j2 b/...60_cx32s/Arista-7060CX-32S-D48C8/qos.json → ...cx32s/Arista-7060CX-32S-D48C8/qos.json.j2
diff --git a/...7060_cx32s/Arista-7060CX-32S-Q32/qos.json → ...0_cx32s/Arista-7060CX-32S-Q32/qos.json.j2 b/...7060_cx32s/Arista-7060CX-32S-Q32/qos.json → ...0_cx32s/Arista-7060CX-32S-Q32/qos.json.j2
diff --git a/...7260cx3_64/Arista-7260CX3-D108C8/qos.json → ...0cx3_64/Arista-7260CX3-D108C8/qos.json.j2 b/...7260cx3_64/Arista-7260CX3-D108C8/qos.json → ...0cx3_64/Arista-7260CX3-D108C8/qos.json.j2
diff --git a/...ell_s6000_s1220-r0/Force10-S6000/qos.json → ..._s6000_s1220-r0/Force10-S6000/qos.json.j2 b/...ell_s6000_s1220-r0/Force10-S6000/qos.json → ..._s6000_s1220-r0/Force10-S6000/qos.json.j2
diff --git a/...ell_s6100_c2538-r0/Force10-S6100/qos.json → ..._s6100_c2538-r0/Force10-S6100/qos.json.j2 b/...ell_s6100_c2538-r0/Force10-S6100/qos.json → ..._s6100_c2538-r0/Force10-S6100/qos.json.j2
@@ -1,3 +1,30 @@
+{%- set PORT_ALL  = [] %}
+
+{%- if PORT is not defined %}
+    {%- for port_idx in range(0,64) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+{%- else %}
+    {%- for port in PORT %}
+        {%- if PORT_ALL.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+
+{%- set PORT_ACTIVE  = [] %}
+{%- if DEVICE_NEIGHBOR is not defined %}
+    {%- set PORT_ACTIVE = PORT_ALL %}
+{%- else %}
+    {%- for port in DEVICE_NEIGHBOR.keys() %}
+        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+
+{%- set port_names_list_active  = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if port_names_list_active.append(port) %}{%- endif %}
+{%- endfor %}
+{%- set port_names_active  = port_names_list_active  | join(',') %}
+
 {
     "TC_TO_PRIORITY_GROUP_MAP": {
         "AZURE": {
@@ -118,7 +145,7 @@
         }
     },
     "PORT_QOS_MAP": {
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63": {
+        "{{ port_names_active }}": {
             "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
             "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
             "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
@@ -141,14 +168,14 @@
         }
     },
     "QUEUE": {
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|3-4" : {
+        "{{ port_names_active }}|3-4" : {
             "scheduler"     :   "[SCHEDULER|scheduler.0]",
             "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|0" : {
+        "{{ port_names_active }}|0" : {
             "scheduler"     :   "[SCHEDULER|scheduler.1]"
         },
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|1" : {
+        "{{ port_names_active }}|1" : {
             "scheduler"     :   "[SCHEDULER|scheduler.2]"
         }
     }

diff --git a/..._z9100_c2538-r0/Force10-Z9100-T0/qos.json → ...100_c2538-r0/Force10-Z9100-T0/qos.json.j2 b/..._z9100_c2538-r0/Force10-Z9100-T0/qos.json → ...100_c2538-r0/Force10-Z9100-T0/qos.json.j2
diff --git a/...ell_z9100_c2538-r0/Force10-Z9100/qos.json → ..._z9100_c2538-r0/Force10-Z9100/qos.json.j2 b/...ell_z9100_c2538-r0/Force10-Z9100/qos.json → ..._z9100_c2538-r0/Force10-Z9100/qos.json.j2
diff --git a/..._s9130_32x-r0/INGRASYS-S9130-32X/qos.json → ...130_32x-r0/INGRASYS-S9130-32X/qos.json.j2 b/..._s9130_32x-r0/INGRASYS-S9130-32X/qos.json → ...130_32x-r0/INGRASYS-S9130-32X/qos.json.j2
diff --git a/..._s9230_64x-r0/INGRASYS-S9230-64X/qos.json → ...230_64x-r0/INGRASYS-S9230-64X/qos.json.j2 b/..._s9230_64x-r0/INGRASYS-S9230-64X/qos.json → ...230_64x-r0/INGRASYS-S9230-64X/qos.json.j2
diff --git a/...86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json → ...64-mlnx_lssn2700-r0/LS-SN2700/qos.json.j2 b/...86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json → ...64-mlnx_lssn2700-r0/LS-SN2700/qos.json.j2
diff --git a/...6_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json → ...4-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2 b/...6_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json → ...4-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2
diff --git a/...6_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json → ...4-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2 b/...6_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json → ...4-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2
diff --git a/...6_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json → ...4-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 b/...6_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json → ...4-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
diff --git a/...msn2700-r0/Mellanox-SN2700-D48C8/qos.json → ...2700-r0/Mellanox-SN2700-D48C8/qos.json.j2 b/...msn2700-r0/Mellanox-SN2700-D48C8/qos.json → ...2700-r0/Mellanox-SN2700-D48C8/qos.json.j2
diff --git a/...6_64-mlnx_msn2740-r0/ACS-MSN2740/qos.json → ...4-mlnx_msn2740-r0/ACS-MSN2740/qos.json.j2 b/...6_64-mlnx_msn2740-r0/ACS-MSN2740/qos.json → ...4-mlnx_msn2740-r0/ACS-MSN2740/qos.json.j2
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
@@ -90,11 +90,20 @@ def
     {%- endfor %}
 {%- endif %}
 
-{%- set port_names_list_all  = [] %}
-{%- for port in PORT_ALL %}
-    {%- if port_names_list_all.append(port) %}{%- endif %}
+{%- set PORT_ACTIVE  = [] %}
+{%- if DEVICE_NEIGHBOR is not defined %}
+    {%- set PORT_ACTIVE = PORT_ALL %}
+{%- else %}
+    {%- for port in DEVICE_NEIGHBOR.keys() %}
+        {%- if PORT_ACTIVE.append(port) %}{%- endif %}
+    {%- endfor %}
+{%- endif %}
+
+{%- set port_names_list_active  = [] %}
+{%- for port in PORT_ACTIVE %}
+    {%- if port_names_list_active.append(port) %}{%- endif %}
 {%- endfor %}
-{%- set port_names_all  = port_names_list_all  | join(',') %}
+{%- set port_names_active  = port_names_list_active  | join(',') %}
 
 {
     "CABLE_LENGTH": {
@@ -112,27 +121,27 @@ def
 {% endif %}
 
 {%- if defs.generate_profile_lists is defined %}
-{{ defs.generate_profile_lists(port_names_all) }},
+{{ defs.generate_profile_lists(port_names_active) }},
 {% endif %}
 
 {%- if defs.generate_pg_profils is defined %}
 {{ defs.generate_pg_profils }},
 {% else %}
     "BUFFER_PG": {
-        "{{ port_names_all }}|0-1": {
+        "{{ port_names_active }}|0-1": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         }
     },
 {% endif %}
 
 {% if defs.generate_queue_buffers is defined %}
-{{ defs.generate_queue_buffers(port_names_all) }}
+{{ defs.generate_queue_buffers(port_names_active) }}
 {% else %}
     "BUFFER_QUEUE": {
-        "{{ port_names_all }}|3-4": {
+        "{{ port_names_active }}|3-4": {
             "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
         },
-        "{{ port_names_all }}|0-1": {
+        "{{ port_names_active }}|0-1": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
         }
     }