Skip to content

Commit 9efcc9c

Browse files
andriymoroz-mlnxShuotian Cheng
authored andcommitted
[swss]: Update swss/common submodules (#988)
* Update swss submodule reference * Update swss-common submodule reference This pull request introduces changes including 1. Use unified buffer configurations fro all Mellanox 27xx platforms 2. Refactor TableConsumable and optimize popping empty logics 3. Add SwitchOrch to deal with switch attributes changes 4. Refactor doAclTableTask and doAclRuleTask 5. Add PFC watchdog tables and runRedisScript function in common library Signed-off-by: Andriy Moroz <[email protected]>
1 parent f7a38e1 commit 9efcc9c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

dockers/docker-orchagent/swssconfig.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@ elif [ "$HWSKU" == "Force10-S6000-Q32" ]; then
4545
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
4646
elif [ "$HWSKU" == "Arista-7050-QX32" ]; then
4747
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
48-
elif [ "$HWSKU" == "ACS-MSN2700" ]; then
49-
SWSSCONFIG_ARGS+="msn2700.32ports.buffers.json msn2700.32ports.qos.json "
50-
elif [ "$HWSKU" == "ACS-MSN2740" ]; then
51-
SWSSCONFIG_ARGS+="msn2740.32ports.buffers.json msn2740.32ports.qos.json "
48+
elif [[ "$HWSKU" == "ACS-MSN27"* ]]; then
49+
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
50+
SWSSCONFIG_ARGS+="msn27xx.32ports.buffers.json msn2700.32ports.qos.json "
5251
fi
5352

5453
for file in $SWSSCONFIG_ARGS; do

src/sonic-config-engine/minigraph.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ def parse_png(png, hname):
101101
for device in child.findall(str(QName(ns, "Device"))):
102102
(lo_prefix, mgmt_prefix, name, hwsku, d_type) = parse_device(device)
103103
device_data = {'lo_addr': lo_prefix, 'type': d_type, 'mgmt_addr': mgmt_prefix, 'hwsku': hwsku }
104+
name = name.replace('"', '')
104105
if neighbors.has_key(name):
105106
neighbors[name].update(device_data)
106107
else:

src/sonic-swss

src/sonic-swss-common

0 commit comments

Comments
 (0)