Update 7260 MMU and ECN settings (#11449)
Signed-off-by: Neetha John <nejo@microsoft.com> Why I did it Improve throughput and latency for 7260 deployments How I did it Update the dynamic threshold to 0 and ECN settings as 2mb/10mb/5% How to verify it Updated unit tests to use the modified values for 7260 ecn settings.
This commit is contained in:
parent
0dfa79d3c4
commit
765741ac73
@ -1,8 +1,8 @@
|
|||||||
# PG lossless profiles.
|
# PG lossless profiles.
|
||||||
# speed cable size xon xoff threshold xon_offset
|
# speed cable size xon xoff threshold xon_offset
|
||||||
50000 5m 1248 1248 56160 -3 2496
|
50000 5m 1248 1248 56160 0 2496
|
||||||
100000 5m 1248 1248 96928 -3 2496
|
100000 5m 1248 1248 96928 0 2496
|
||||||
50000 40m 1248 1248 96096 -3 2496
|
50000 40m 1248 1248 96096 0 2496
|
||||||
100000 40m 1248 1248 177632 -3 2496
|
100000 40m 1248 1248 177632 0 2496
|
||||||
50000 300m 1248 1248 141856 -3 2496
|
50000 300m 1248 1248 141856 0 2496
|
||||||
100000 300m 1248 1248 268736 -3 2496
|
100000 300m 1248 1248 268736 0 2496
|
||||||
|
@ -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" : "2097152",
|
||||||
|
"yellow_min_threshold" : "1048576",
|
||||||
|
"red_max_threshold" : "2097152",
|
||||||
|
"red_min_threshold" : "1048576",
|
||||||
|
"green_drop_probability" : "5",
|
||||||
|
"yellow_drop_probability": "5",
|
||||||
|
"red_drop_probability" : "5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
{%- include 'qos_config.j2' %}
|
{%- include 'qos_config.j2' %}
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
# PG lossless profiles.
|
# PG lossless profiles.
|
||||||
# speed cable size xon xoff threshold xon_offset
|
# speed cable size xon xoff threshold xon_offset
|
||||||
100000 5m 1248 1248 54080 -3 2496
|
100000 5m 1248 1248 54080 0 2496
|
||||||
100000 40m 1248 1248 59696 -3 2496
|
100000 40m 1248 1248 59696 0 2496
|
||||||
100000 300m 1248 1248 101088 -3 2496
|
100000 300m 1248 1248 101088 0 2496
|
||||||
50000 5m 1248 1248 54080 -3 2496
|
50000 5m 1248 1248 54080 0 2496
|
||||||
50000 40m 1248 1248 59696 -3 2496
|
50000 40m 1248 1248 59696 0 2496
|
||||||
50000 300m 1248 1248 101088 -3 2496
|
50000 300m 1248 1248 101088 0 2496
|
||||||
40000 5m 1248 1248 29536 -3 2496
|
40000 5m 1248 1248 29536 0 2496
|
||||||
40000 40m 1248 1248 31616 -3 2496
|
40000 40m 1248 1248 31616 0 2496
|
||||||
40000 300m 1248 1248 48256 -3 2496
|
40000 300m 1248 1248 48256 0 2496
|
||||||
|
@ -289,4 +289,24 @@
|
|||||||
{%- endmacro %}
|
{%- endmacro %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{%- 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" : "2097152",
|
||||||
|
"yellow_min_threshold" : "1048576",
|
||||||
|
"red_max_threshold" : "2097152",
|
||||||
|
"red_min_threshold" : "1048576",
|
||||||
|
"green_drop_probability" : "5",
|
||||||
|
"yellow_drop_probability": "5",
|
||||||
|
"red_drop_probability" : "5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
{%- include 'qos_config.j2' %}
|
{%- include 'qos_config.j2' %}
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
# PG lossless profiles.
|
# PG lossless profiles.
|
||||||
# speed cable size xon xoff threshold xon_offset
|
# speed cable size xon xoff threshold xon_offset
|
||||||
100000 5m 1248 1248 54080 -3 2496
|
100000 5m 1248 1248 54080 0 2496
|
||||||
100000 40m 1248 1248 59696 -3 2496
|
100000 40m 1248 1248 59696 0 2496
|
||||||
100000 300m 1248 1248 101088 -3 2496
|
100000 300m 1248 1248 101088 0 2496
|
||||||
50000 5m 1248 1248 54080 -3 2496
|
50000 5m 1248 1248 54080 0 2496
|
||||||
50000 40m 1248 1248 59696 -3 2496
|
50000 40m 1248 1248 59696 0 2496
|
||||||
50000 300m 1248 1248 101088 -3 2496
|
50000 300m 1248 1248 101088 0 2496
|
||||||
40000 5m 1248 1248 29536 -3 2496
|
40000 5m 1248 1248 29536 0 2496
|
||||||
40000 40m 1248 1248 31616 -3 2496
|
40000 40m 1248 1248 31616 0 2496
|
||||||
40000 300m 1248 1248 48256 -3 2496
|
40000 300m 1248 1248 48256 0 2496
|
||||||
|
@ -289,4 +289,24 @@
|
|||||||
{%- endmacro %}
|
{%- endmacro %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{%- 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" : "2097152",
|
||||||
|
"yellow_min_threshold" : "1048576",
|
||||||
|
"red_max_threshold" : "2097152",
|
||||||
|
"red_min_threshold" : "1048576",
|
||||||
|
"green_drop_probability" : "5",
|
||||||
|
"yellow_drop_probability": "5",
|
||||||
|
"red_drop_probability" : "5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{%- endmacro %}
|
||||||
|
|
||||||
{%- include 'qos_config.j2' %}
|
{%- include 'qos_config.j2' %}
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
../py3/qos-arista7260-t1-remap-disabled.json
|
@ -636,8 +636,8 @@
|
|||||||
"wred_yellow_enable" : "true",
|
"wred_yellow_enable" : "true",
|
||||||
"wred_red_enable" : "true",
|
"wred_red_enable" : "true",
|
||||||
"ecn" : "ecn_all",
|
"ecn" : "ecn_all",
|
||||||
"green_max_threshold" : "2097152",
|
"green_max_threshold" : "10000000",
|
||||||
"green_min_threshold" : "1048576",
|
"green_min_threshold" : "2000000",
|
||||||
"yellow_max_threshold" : "2097152",
|
"yellow_max_threshold" : "2097152",
|
||||||
"yellow_min_threshold" : "1048576",
|
"yellow_min_threshold" : "1048576",
|
||||||
"red_max_threshold" : "2097152",
|
"red_max_threshold" : "2097152",
|
||||||
|
@ -739,8 +739,8 @@
|
|||||||
"wred_yellow_enable" : "true",
|
"wred_yellow_enable" : "true",
|
||||||
"wred_red_enable" : "true",
|
"wred_red_enable" : "true",
|
||||||
"ecn" : "ecn_all",
|
"ecn" : "ecn_all",
|
||||||
"green_max_threshold" : "2097152",
|
"green_max_threshold" : "10000000",
|
||||||
"green_min_threshold" : "1048576",
|
"green_min_threshold" : "2000000",
|
||||||
"yellow_max_threshold" : "2097152",
|
"yellow_max_threshold" : "2097152",
|
||||||
"yellow_min_threshold" : "1048576",
|
"yellow_min_threshold" : "1048576",
|
||||||
"red_max_threshold" : "2097152",
|
"red_max_threshold" : "2097152",
|
||||||
|
@ -348,8 +348,8 @@
|
|||||||
"wred_yellow_enable" : "true",
|
"wred_yellow_enable" : "true",
|
||||||
"wred_red_enable" : "true",
|
"wred_red_enable" : "true",
|
||||||
"ecn" : "ecn_all",
|
"ecn" : "ecn_all",
|
||||||
"green_max_threshold" : "2097152",
|
"green_max_threshold" : "10000000",
|
||||||
"green_min_threshold" : "1048576",
|
"green_min_threshold" : "2000000",
|
||||||
"yellow_max_threshold" : "2097152",
|
"yellow_max_threshold" : "2097152",
|
||||||
"yellow_min_threshold" : "1048576",
|
"yellow_min_threshold" : "1048576",
|
||||||
"red_max_threshold" : "2097152",
|
"red_max_threshold" : "2097152",
|
||||||
|
@ -348,8 +348,8 @@
|
|||||||
"wred_yellow_enable" : "true",
|
"wred_yellow_enable" : "true",
|
||||||
"wred_red_enable" : "true",
|
"wred_red_enable" : "true",
|
||||||
"ecn" : "ecn_all",
|
"ecn" : "ecn_all",
|
||||||
"green_max_threshold" : "2097152",
|
"green_max_threshold" : "10000000",
|
||||||
"green_min_threshold" : "1048576",
|
"green_min_threshold" : "2000000",
|
||||||
"yellow_max_threshold" : "2097152",
|
"yellow_max_threshold" : "2097152",
|
||||||
"yellow_min_threshold" : "1048576",
|
"yellow_min_threshold" : "1048576",
|
||||||
"red_max_threshold" : "2097152",
|
"red_max_threshold" : "2097152",
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
qos-arista7260-t1-remap-disabled.json
|
@ -320,6 +320,9 @@ class TestJ2Files(TestCase):
|
|||||||
def test_qos_dell6100_render_template(self):
|
def test_qos_dell6100_render_template(self):
|
||||||
self._test_qos_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'qos-dell6100.json')
|
self._test_qos_render_template('dell', 'x86_64-dell_s6100_c2538-r0', 'Force10-S6100', 'sample-dell-6100-t0-minigraph.xml', 'qos-dell6100.json')
|
||||||
|
|
||||||
|
def test_qos_arista7260_render_template(self):
|
||||||
|
self._test_qos_render_template('arista', 'x86_64-arista_7260cx3_64', 'Arista-7260CX3-D96C16', 'sample-arista-7260-t1-minigraph-remap-disabled.xml', 'qos-arista7260.json')
|
||||||
|
|
||||||
def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
|
def _test_qos_render_template(self, vendor, platform, sku, minigraph, expected):
|
||||||
file_exist, dir_exist = self.create_machine_conf(platform, vendor)
|
file_exist, dir_exist = self.create_machine_conf(platform, vendor)
|
||||||
dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)
|
dir_path = os.path.join(self.test_dir, '..', '..', '..', 'device', vendor, platform, sku)
|
||||||
|
Loading…
Reference in New Issue
Block a user