Skip to content

Commit 2b815d2

Browse files
authored
Merge pull request sonic-net#25 from gechiang/202205
Revert "Updated default ECN settings for T2 chassis (sonic-net#14388)"
2 parents c229648 + b7cbb38 commit 2b815d2

35 files changed

+12
-34276
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1 @@
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-
211
{%- include 'qos_config.j2' %}

0 commit comments

Comments
 (0)