Skip to content

Commit ecb4db5

Browse files
vmittal-msftvmittal-msft
authored
Update PG headroom settings ports based on port speed/cable length (#14908)
* Update PG headroom settings ports based on port speed/cable length * Updated XOFF settings to use chip level numbers than core * Updated PG headroom based on uplink/downlink side * fix for sonic-config-gen tests * More fixes for unit test cases * more test fixes * Merged multiple functions into one
1 parent c900abb commit ecb4db5

29 files changed

+9043
-59
lines changed

‎device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,192,4) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11678515"
25+
"xoff": "20761804"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,192,4) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11678515"
25+
"xoff": "1056256819"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,144,8) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "396096307"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(144,288,8) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "396096307"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,144,4) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "396096307"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,144,4) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "396096307"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,144,8) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "1582033305"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(144,288,8) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "1582033305"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "24979046"
25+
"xoff": "7785676"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "24979046"
25+
"xoff": "7785676"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "1582033305"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/buffers_defaults_t2.j2

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{%- set default_cable = '300m' %}
22

3+
{%- set ports2cable = {
4+
'torrouter_server' : '300m',
5+
'leafrouter_torrouter' : '300m',
6+
'spinerouter_leafrouter' : '2000m',
7+
'regionalhub_spinerouter': '120000m',
8+
'aznghub_spinerouter' : '120000m'
9+
}
10+
-%}
11+
312
{%- macro generate_port_lists(PORT_ALL) %}
413
{# Generate list of ports #}
514
{%- for port_idx in range(0,36) %}
@@ -13,7 +22,7 @@
1322
"size": "6441610000",
1423
"type": "both",
1524
"mode": "dynamic",
16-
"xoff": "11354112"
25+
"xoff": "1582033305"
1726
}
1827
},
1928
"BUFFER_PROFILE": {

‎files/build_templates/buffers_config.j2

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ def
4141
'internal' : '5m',
4242
'torrouter_server' : '5m',
4343
'leafrouter_torrouter' : '40m',
44-
'spinerouter_leafrouter' : '300m'
44+
'spinerouter_leafrouter' : '300m',
45+
'regionalhub_spinerouter': '80000m',
46+
'aznghub_spinerouter' : '80000m'
4547
}
4648
-%}
4749
{%- endif %}

0 commit comments

Comments
 (0)