From ec10b24bc18455f65427011c445603fa17eea5fa Mon Sep 17 00:00:00 2001 From: Wenda Ni Date: Wed, 6 Mar 2019 20:26:47 +0000 Subject: [PATCH 1/5] Map tc 2 and 6 back to pg 1 Signed-off-by: Wenda Ni --- files/build_templates/buffers_config.j2 | 4 ++-- files/build_templates/qos_config.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index 8c6d27c26536..91455024db75 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -131,10 +131,10 @@ def {{ defs.generate_pg_profils(port_names_active) }} {% else %} "BUFFER_PG": { - "{{ port_names_active }}|0-2": { + "{{ port_names_active }}|0-1": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" }, - "{{ port_names_active }}|5-6": { + "{{ port_names_active }}|5": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" } }, diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2 index 18d12d473941..f0f82c805a12 100644 --- a/files/build_templates/qos_config.j2 +++ b/files/build_templates/qos_config.j2 @@ -39,11 +39,11 @@ "AZURE": { "0": "0", "1": "1", - "2": "2", + "2": "1", "3": "3", "4": "4", "5": "5", - "6": "6", + "6": "1", "7": "7" } }, From 1a6d21db37d15df650e861fa98a48e3c0f517e04 Mon Sep 17 00:00:00 2001 From: Wenda Ni Date: Wed, 6 Mar 2019 21:05:29 +0000 Subject: [PATCH 2/5] Map tc 5 back to pg 1 Signed-off-by: Wenda Ni --- files/build_templates/qos_config.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2 index f0f82c805a12..3134c993389d 100644 --- a/files/build_templates/qos_config.j2 +++ b/files/build_templates/qos_config.j2 @@ -42,7 +42,7 @@ "2": "1", "3": "3", "4": "4", - "5": "5", + "5": "1", "6": "1", "7": "7" } From 3bbcd4e65399abaa6304617b82dc8a223a06b75f Mon Sep 17 00:00:00 2001 From: Wenda Ni Date: Wed, 6 Mar 2019 21:08:10 +0000 Subject: [PATCH 3/5] Dettach pg 5 from lossy profile Signed-off-by: Wenda Ni --- files/build_templates/buffers_config.j2 | 3 --- 1 file changed, 3 deletions(-) diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index 91455024db75..fca61a61281f 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -133,9 +133,6 @@ def "BUFFER_PG": { "{{ port_names_active }}|0-1": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" - }, - "{{ port_names_active }}|5": { - "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" } }, {% endif %} From d1c94dae21edd28e3c1777ae463ba5a538456d74 Mon Sep 17 00:00:00 2001 From: Wenda Ni Date: Wed, 6 Mar 2019 21:15:00 +0000 Subject: [PATCH 4/5] Update s6100 qos and buffer test case Signed-off-by: Wenda Ni --- .../tests/sample_output/buffers-dell6100.json | 5 +---- .../tests/sample_output/qos-dell6100.json | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json index 269c155d68f3..27514e60c9f3 100644 --- a/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json +++ b/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json @@ -105,10 +105,7 @@ } }, "BUFFER_PG": { - "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0-2": { - "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" - }, - "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|5-6": { + "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0-1": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" } }, diff --git a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json index d1eced032f0d..85fa85211d51 100644 --- a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json +++ b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json @@ -3,11 +3,11 @@ "AZURE": { "0": "0", "1": "1", - "2": "2", + "2": "1", "3": "3", "4": "4", - "5": "5", - "6": "6", + "5": "1", + "6": "1", "7": "7" } }, From adbbfef739e6cf0c4435c51723c08a9723b062eb Mon Sep 17 00:00:00 2001 From: Wenda Ni Date: Thu, 7 Mar 2019 16:44:57 +0000 Subject: [PATCH 5/5] Map lossy traffic all to pg 0 Signed-off-by: Wenda Ni --- files/build_templates/buffers_config.j2 | 2 +- files/build_templates/qos_config.j2 | 8 ++++---- .../tests/sample_output/buffers-dell6100.json | 2 +- .../tests/sample_output/qos-dell6100.json | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2 index fca61a61281f..95830cd01a89 100644 --- a/files/build_templates/buffers_config.j2 +++ b/files/build_templates/buffers_config.j2 @@ -131,7 +131,7 @@ def {{ defs.generate_pg_profils(port_names_active) }} {% else %} "BUFFER_PG": { - "{{ port_names_active }}|0-1": { + "{{ port_names_active }}|0": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" } }, diff --git a/files/build_templates/qos_config.j2 b/files/build_templates/qos_config.j2 index 3134c993389d..a666367873bd 100644 --- a/files/build_templates/qos_config.j2 +++ b/files/build_templates/qos_config.j2 @@ -38,12 +38,12 @@ "TC_TO_PRIORITY_GROUP_MAP": { "AZURE": { "0": "0", - "1": "1", - "2": "1", + "1": "0", + "2": "0", "3": "3", "4": "4", - "5": "1", - "6": "1", + "5": "0", + "6": "0", "7": "7" } }, diff --git a/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json index 27514e60c9f3..0b6c8cbe19a3 100644 --- a/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json +++ b/src/sonic-config-engine/tests/sample_output/buffers-dell6100.json @@ -105,7 +105,7 @@ } }, "BUFFER_PG": { - "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0-1": { + "Ethernet0,Ethernet1,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet48,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58|0": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" } }, diff --git a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json index 85fa85211d51..0387e10dc2f2 100644 --- a/src/sonic-config-engine/tests/sample_output/qos-dell6100.json +++ b/src/sonic-config-engine/tests/sample_output/qos-dell6100.json @@ -2,12 +2,12 @@ "TC_TO_PRIORITY_GROUP_MAP": { "AZURE": { "0": "0", - "1": "1", - "2": "1", + "1": "0", + "2": "0", "3": "3", "4": "4", - "5": "1", - "6": "1", + "5": "0", + "6": "0", "7": "7" } },