mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

addons: bridge: fix 'NoneType' object has no attribute 'keys' exception

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2018-06-12 19:22:34 +02:00
parent d1265fd548
commit cc99b41d8c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ifupdown2/addons/bridge.py
View File

@ -2530,7 +2530,7 @@ class bridge(moduleBase):
# bridge-l2protocol-tunnel requires separate handling
if 'bridge-ports' in diff:
self.query_check_bridge_ports(ifaceobj, ifaceobjcurr, runningattrs.get('ports').keys(), ifaceobj_getfunc)
self.query_check_bridge_ports(ifaceobj, ifaceobjcurr, runningattrs.get('ports', {}).keys(), ifaceobj_getfunc)
diff.remove('bridge-ports')
for k in diff:
@ -2651,7 +2651,7 @@ class bridge(moduleBase):
def query_check_bridge_ports(self, ifaceobj, ifaceobjcurr, running_port_list, ifaceobj_getfunc):
bridge_all_ports = []
for obj in ifaceobj_getfunc(ifaceobj.name) or []:
bridge_all_ports.extend(self._get_bridge_port_list(obj))
bridge_all_ports.extend(self._get_bridge_port_list(obj) or [])
if not running_port_list and not bridge_all_ports:
return