peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-30 04:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

statd: add missing default {} when snooping is disabled

Browse Source 
When multicast snooping is disabled on a bridge, mctl will exit with a
non-zero return code.  Default to {} for these cases so that the bridge
and its ports are properly returned by yanger.

Fixes #618

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-09-13 16:31:39 +02:00
parent cfa9c74ef4
commit a8cf1a853c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/statd/python/yanger/yanger.py
+7 -4
View File
@@ -528,7 +528,9 @@ def add_container(containers):
def get_brport_multicast(ifname):
data = run_json_cmd(['mctl', 'show', 'igmp', 'json'], "igmp-status.json")
data = run_json_cmd(['mctl', 'show', 'igmp', 'json'],
"igmp-status.json",
default={})
multicast = {}
if ifname in data.get('fast-leave-ports', []):
@@ -888,7 +890,9 @@ def main():
add_ethtool_std(ifname, iface_out)
if 'type' in iface_out and iface_out['type'] == "infix-if-type:bridge":
mc_status = run_json_cmd(['mctl', '-p', 'show', 'igmp', 'json'], "igmp-status.json")
mc_status = run_json_cmd(['mctl', '-p', 'show', 'igmp', 'json'],
"igmp-status.json",
default={})
add_vlans_to_bridge(ifname, iface_out, mc_status)
add_mdb_to_bridge(ifname, iface_out, mc_status)
@@ -900,8 +904,7 @@ def main():
"rib": [{
"name": "ipv4",
"address-family": "ipv4"
},
{
}, {
"name": "ipv6",
"address-family": "ipv6"
}]