matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated default ECN settings for T2 chassis (#15541)

Browse Source 
* Updated default ECN settings for T2 chassis (#14388)

Why I did it
Update ECN settings for T2 chassis

How I did it
Updated qos config file to load these settings during switch bootup

How to verify it
Verified on line card on T2 chassis

* Fix for test failures

* Test case failures

* test case fix
This commit is contained in:
vmittal-msft 2023-06-22 08:17:45 -07:00 committed by GitHub
parent 5db1a495a1
commit 41cd22d04e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 314 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

20
device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/qos.json.j2
View File

@ -1 +1,21 @@
{%- macro generate_wred_profiles() %}
"WRED_PROFILE": {
"AZURE_LOSSLESS" : {
"wred_green_enable" : "true",
"wred_yellow_enable" : "true",
"wred_red_enable" : "true",
"ecn" : "ecn_all",
"green_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"
}
},
{%- endmacro %}
{%- include 'qos_config.j2' %}

2
src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-c36-lc-t2-minigraph.xml
View File

@ -914,8 +914,6 @@
<HoldTime>10</HoldTime>
<KeepAliveTime>3</KeepAliveTime>
</BGPSession>
<BGPSession>
<StartRouter>ASIC0</StartRouter>
<EndRouter>ASIC1</EndRouter>

2
src/sonic-config-engine/tests/sample-arista-7800r3a-36dm2-d36-lc-t2-minigraph.xml
View File

@ -914,8 +914,6 @@
<HoldTime>10</HoldTime>
<KeepAliveTime>3</KeepAliveTime>
</BGPSession>
<BGPSession>
<StartRouter>ASIC0</StartRouter>
<EndRouter>str3-7800-lc2-1</EndRouter>

2
src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x100g-t2-minigraph.xml
View File

@ -914,8 +914,6 @@
<HoldTime>10</HoldTime>
<KeepAliveTime>3</KeepAliveTime>
</BGPSession>
<BGPSession>
<StartRouter>ASIC0</StartRouter>
<EndRouter>ASIC1</EndRouter>

2
src/sonic-config-engine/tests/sample-nokia-ixr7250e-36x400g-t2-minigraph.xml
View File

@ -154,8 +154,6 @@
<HoldTime>10</HoldTime>
<KeepAliveTime>3</KeepAliveTime>
</BGPSession>
<BGPSession>
<StartRouter>ASIC0</StartRouter>
<EndRouter>ASIC1</EndRouter>

12
src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cq2-lc.json
View File

@ -484,12 +484,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3-48cqm2-lc.json
View File

@ -484,12 +484,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-c36-lc.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py2/qos-arista7800r3a-36dm2-d36-lc.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x100g.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py2/qos-nokia-ixr7250e-36x400g.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cq2-lc.json
View File

@ -484,12 +484,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3-48cqm2-lc.json
View File

@ -484,12 +484,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-c36-lc.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py3/qos-arista7800r3a-36dm2-d36-lc.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x100g.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

12
src/sonic-config-engine/tests/sample_output/py3/qos-nokia-ixr7250e-36x400g.json
View File

@ -268,12 +268,12 @@
"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_max_threshold" : "10000000",
"green_min_threshold" : "2000000",
"yellow_max_threshold" : "10000000",
"yellow_min_threshold" : "2000000",
"red_max_threshold" : "10000000",
"red_min_threshold" : "2000000",
"green_drop_probability" : "5",
"yellow_drop_probability": "5",
"red_drop_probability" : "5"

2
src/sonic-config-engine/tests/test_j2files.py
View File

@ -31,6 +31,8 @@ class TestJ2Files(TestCase):
self.dell9332_t1_minigraph = os.path.join(self.test_dir, 'sample-dell-9332-t1-minigraph.xml')
self.radv_test_minigraph = os.path.join(self.test_dir, 'radv-test-sample-graph.xml')
self.no_ip_helper_minigraph = os.path.join(self.test_dir, 't0-sample-no-ip-helper-graph.xml')
self.nokia_ixr7250e_36x100g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x100g-t2-minigraph.xml')
self.nokia_ixr7250e_36x400g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x400g-t2-minigraph.xml')
self.output_file = os.path.join(self.test_dir, 'output')
self.nokia_ixr7250e_36x100g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x100g-t2-minigraph.xml')
self.nokia_ixr7250e_36x400g_t2_minigraph = os.path.join(self.test_dir, 'sample-nokia-ixr7250e-36x400g-t2-minigraph.xml')