Update PG headroom settings ports based on port speed/cable length (#…

…15287) Why I did it Update cable length for uplink/downlink ports for chassis and and update PG/pool headroom size accordingly. Work item tracking 17880812 How I did it Updated cable length as well as buffer config in HWSKU files.
sonic-net · Jun 2, 2023 · 723c508 · 723c508
1 parent feb8671
commit 723c508
Show file tree

Hide file tree

Showing 41 changed files with 43,037 additions and 29 deletions.
diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,192,4) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11678515"
+            "xoff": "20761804"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,192,4) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11678515"
+            "xoff": "1056256819"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,144,8) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "396096307"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(144,288,8) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "396096307"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,144,4) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "396096307"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,144,4) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "396096307"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,144,8) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "1582033305"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/buffers_defaults_t2.j2 b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(144,288,8) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "1582033305"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/buffers_defaults_t2.j2 b/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "24979046"
+            "xoff": "7785676"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/buffers_defaults_t2.j2 b/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "24979046"
+            "xoff": "7785676"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/buffers_defaults_t2.j2 b/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "1582033305"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/buffers_defaults_t2.j2 b/...ce/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/buffers_defaults_t2.j2
@@ -1,5 +1,14 @@
 {%- set default_cable = '300m' %}
 
+{%- set ports2cable = {
+        'torrouter_server'       : '300m',
+        'leafrouter_torrouter'   : '300m',
+        'spinerouter_leafrouter' : '2000m',
+        'regionalhub_spinerouter': '120000m',
+        'aznghub_spinerouter'    : '120000m'
+        }
+-%}
+
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
     {%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
             "size": "6441610000",
             "type": "both",
             "mode": "dynamic",
-            "xoff": "11354112"
+            "xoff": "1582033305"
         }
     },
     "BUFFER_PROFILE": {

diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
@@ -41,7 +41,9 @@ def
             'internal'               : '5m',
             'torrouter_server'       : '5m',
             'leafrouter_torrouter'   : '40m',
-            'spinerouter_leafrouter' : '300m'
+            'spinerouter_leafrouter' : '300m',
+            'regionalhub_spinerouter': '80000m',
+            'aznghub_spinerouter'    : '80000m'
             }
     -%}
 {%- endif %}