Skip to content

Commit 41cd22d

Browse files
authored
Updated default ECN settings for T2 chassis (#15541)
* 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
1 parent 5db1a49 commit 41cd22d

29 files changed

+314
-80
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
1+
{%- macro generate_wred_profiles() %}
2+
"WRED_PROFILE": {
3+
"AZURE_LOSSLESS" : {
4+
"wred_green_enable" : "true",
5+
"wred_yellow_enable" : "true",
6+
"wred_red_enable" : "true",
7+
"ecn" : "ecn_all",
8+
"green_max_threshold" : "10000000",
9+
"green_min_threshold" : "2000000",
10+
"yellow_max_threshold" : "10000000",
11+
"yellow_min_threshold" : "2000000",
12+
"red_max_threshold" : "10000000",
13+
"red_min_threshold" : "2000000",
14+
"green_drop_probability" : "5",
15+
"yellow_drop_probability": "5",
16+
"red_drop_probability" : "5"
17+
}
18+
},
19+
{%- endmacro %}
20+
121
{%- include 'qos_config.j2' %}

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

-2
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,6 @@
914914
<HoldTime>10</HoldTime>
915915
<KeepAliveTime>3</KeepAliveTime>
916916
</BGPSession>
917-
918-
919917
<BGPSession>
920918
<StartRouter>ASIC0</StartRouter>
921919
<EndRouter>ASIC1</EndRouter>

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

-2
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,6 @@
914914
<HoldTime>10</HoldTime>
915915
<KeepAliveTime>3</KeepAliveTime>
916916
</BGPSession>
917-
918-
919917
<BGPSession>
920918
<StartRouter>ASIC0</StartRouter>
921919
<EndRouter>str3-7800-lc2-1</EndRouter>

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

-2
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,6 @@
914914
<HoldTime>10</HoldTime>
915915
<KeepAliveTime>3</KeepAliveTime>
916916
</BGPSession>
917-
918-
919917
<BGPSession>
920918
<StartRouter>ASIC0</StartRouter>
921919
<EndRouter>ASIC1</EndRouter>

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

-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@
154154
<HoldTime>10</HoldTime>
155155
<KeepAliveTime>3</KeepAliveTime>
156156
</BGPSession>
157-
158-
159157
<BGPSession>
160158
<StartRouter>ASIC0</StartRouter>
161159
<EndRouter>ASIC1</EndRouter>

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -484,12 +484,12 @@
484484
"wred_yellow_enable" : "true",
485485
"wred_red_enable" : "true",
486486
"ecn" : "ecn_all",
487-
"green_max_threshold" : "2097152",
488-
"green_min_threshold" : "1048576",
489-
"yellow_max_threshold" : "2097152",
490-
"yellow_min_threshold" : "1048576",
491-
"red_max_threshold" : "2097152",
492-
"red_min_threshold" : "1048576",
487+
"green_max_threshold" : "10000000",
488+
"green_min_threshold" : "2000000",
489+
"yellow_max_threshold" : "10000000",
490+
"yellow_min_threshold" : "2000000",
491+
"red_max_threshold" : "10000000",
492+
"red_min_threshold" : "2000000",
493493
"green_drop_probability" : "5",
494494
"yellow_drop_probability": "5",
495495
"red_drop_probability" : "5"

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -484,12 +484,12 @@
484484
"wred_yellow_enable" : "true",
485485
"wred_red_enable" : "true",
486486
"ecn" : "ecn_all",
487-
"green_max_threshold" : "2097152",
488-
"green_min_threshold" : "1048576",
489-
"yellow_max_threshold" : "2097152",
490-
"yellow_min_threshold" : "1048576",
491-
"red_max_threshold" : "2097152",
492-
"red_min_threshold" : "1048576",
487+
"green_max_threshold" : "10000000",
488+
"green_min_threshold" : "2000000",
489+
"yellow_max_threshold" : "10000000",
490+
"yellow_min_threshold" : "2000000",
491+
"red_max_threshold" : "10000000",
492+
"red_min_threshold" : "2000000",
493493
"green_drop_probability" : "5",
494494
"yellow_drop_probability": "5",
495495
"red_drop_probability" : "5"

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,12 @@
268268
"wred_yellow_enable" : "true",
269269
"wred_red_enable" : "true",
270270
"ecn" : "ecn_all",
271-
"green_max_threshold" : "2097152",
272-
"green_min_threshold" : "1048576",
273-
"yellow_max_threshold" : "2097152",
274-
"yellow_min_threshold" : "1048576",
275-
"red_max_threshold" : "2097152",
276-
"red_min_threshold" : "1048576",
271+
"green_max_threshold" : "10000000",
272+
"green_min_threshold" : "2000000",
273+
"yellow_max_threshold" : "10000000",
274+
"yellow_min_threshold" : "2000000",
275+
"red_max_threshold" : "10000000",
276+
"red_min_threshold" : "2000000",
277277
"green_drop_probability" : "5",
278278
"yellow_drop_probability": "5",
279279
"red_drop_probability" : "5"

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,12 @@
268268
"wred_yellow_enable" : "true",
269269
"wred_red_enable" : "true",
270270
"ecn" : "ecn_all",
271-
"green_max_threshold" : "2097152",
272-
"green_min_threshold" : "1048576",
273-
"yellow_max_threshold" : "2097152",
274-
"yellow_min_threshold" : "1048576",
275-
"red_max_threshold" : "2097152",
276-
"red_min_threshold" : "1048576",
271+
"green_max_threshold" : "10000000",
272+
"green_min_threshold" : "2000000",
273+
"yellow_max_threshold" : "10000000",
274+
"yellow_min_threshold" : "2000000",
275+
"red_max_threshold" : "10000000",
276+
"red_min_threshold" : "2000000",
277277
"green_drop_probability" : "5",
278278
"yellow_drop_probability": "5",
279279
"red_drop_probability" : "5"

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,12 @@
268268
"wred_yellow_enable" : "true",
269269
"wred_red_enable" : "true",
270270
"ecn" : "ecn_all",
271-
"green_max_threshold" : "2097152",
272-
"green_min_threshold" : "1048576",
273-
"yellow_max_threshold" : "2097152",
274-
"yellow_min_threshold" : "1048576",
275-
"red_max_threshold" : "2097152",
276-
"red_min_threshold" : "1048576",
271+
"green_max_threshold" : "10000000",
272+
"green_min_threshold" : "2000000",
273+
"yellow_max_threshold" : "10000000",
274+
"yellow_min_threshold" : "2000000",
275+
"red_max_threshold" : "10000000",
276+
"red_min_threshold" : "2000000",
277277
"green_drop_probability" : "5",
278278
"yellow_drop_probability": "5",
279279
"red_drop_probability" : "5"

0 commit comments

Comments
 (0)