matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[swss]: Update swss/common submodules (#988)

Browse Source 
* 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 <c_andriym@mellanox.com>
This commit is contained in:
Andriy Moroz 2017-09-30 00:44:55 +03:00 committed by Shuotian Cheng
parent f7a38e1f65
commit 9efcc9c333
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dockers/docker-orchagent/swssconfig.sh
View File

@ -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

1
src/sonic-config-engine/minigraph.py
View File

@ -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:

2
src/sonic-swss

@ -1 +1 @@
Subproject commit 4c56d23b9ff4940bdf576cf7c9e5aa77adcbbdcc
Subproject commit 770a8f33c1bff299be683bfc7f8e07a2d65f9ef3

2
src/sonic-swss-common

@ -1 +1 @@
Subproject commit d4adb725ae6d7cbfcff939b1e3b6a4a544bd4de3
Subproject commit 53bb53179d916a45eafa75e1e958f1432d2a716e