From 97fc950ce18076ba3d82d262feee003f6728a509 Mon Sep 17 00:00:00 2001 From: Andriy Moroz Date: Tue, 29 Aug 2017 15:05:21 +0300 Subject: [PATCH 1/4] PG buffer profile based on port configuration --- dockers/docker-orchagent/swssconfig.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh index f075ca4f22ac..7b22fe7d190d 100755 --- a/dockers/docker-orchagent/swssconfig.sh +++ b/dockers/docker-orchagent/swssconfig.sh @@ -45,10 +45,9 @@ elif [ "$HWSKU" == "Force10-S6000-Q32" ]; then SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json " elif [ "$HWSKU" == "Arista-7050-QX32" ]; then SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json " -elif [ "$HWSKU" == "ACS-MSN2700" ]; then - SWSSCONFIG_ARGS+="msn2700.32ports.buffers.json msn2700.32ports.qos.json " -elif [ "$HWSKU" == "ACS-MSN2740" ]; then - SWSSCONFIG_ARGS+="msn2740.32ports.buffers.json msn2740.32ports.qos.json " +elif [[ "$HWSKU" == "ACS-MSN27"* ]]; then + sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/msn27xx.32ports.buffers.json.j2 > /etc/swss/config.d/msn27xx.32ports.buffers.json + SWSSCONFIG_ARGS+="msn27xx.32ports.buffers.json msn2700.32ports.qos.json " fi for file in $SWSSCONFIG_ARGS; do From 8f3b658755944a294a77e51ae456d08899970f18 Mon Sep 17 00:00:00 2001 From: Andriy Moroz Date: Fri, 22 Sep 2017 17:09:34 +0300 Subject: [PATCH 2/4] Fix small minigraph parsing issue Strip quotes from the device name --- src/sonic-config-engine/minigraph.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index b5e97b485b44..95a45b8530de 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -101,6 +101,7 @@ def parse_png(png, hname): for device in child.findall(str(QName(ns, "Device"))): (lo_prefix, mgmt_prefix, name, hwsku, d_type) = parse_device(device) device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku } + name = name.replace('"', '') if neighbors.has_key(name): neighbors[name].update(device_data) else: From adc8bdcd568d2fe3c283bde63a81d6c2fb328c10 Mon Sep 17 00:00:00 2001 From: Andriy Moroz Date: Tue, 26 Sep 2017 10:13:33 +0300 Subject: [PATCH 3/4] Update swss submodule reference Signed-off-by: Andriy Moroz --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 4c56d23b9ff4..770a8f33c1bf 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 4c56d23b9ff4940bdf576cf7c9e5aa77adcbbdcc +Subproject commit 770a8f33c1bff299be683bfc7f8e07a2d65f9ef3 From c8e68ebdc22459c066e03f423697f7357f93cb42 Mon Sep 17 00:00:00 2001 From: Andriy Moroz Date: Tue, 26 Sep 2017 17:50:47 +0300 Subject: [PATCH 4/4] Update swss-common submodule reference Signed-off-by: Andriy Moroz --- src/sonic-swss-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss-common b/src/sonic-swss-common index d4adb725ae6d..53bb53179d91 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit d4adb725ae6d7cbfcff939b1e3b6a4a544bd4de3 +Subproject commit 53bb53179d916a45eafa75e1e958f1432d2a716e