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 Activity

A few more fixes to the vlan aware bridge case

Browse Source 
Ticket: CM-3346
Reviewed By:
Testing Done: Tested with new and old bridge formats
This commit is contained in:
Roopa Prabhu
2014-10-09 19:10:20 -07:00
parent 15ef32ea14
commit 39804250c7
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/bridgevlanaware.py
View File

@@ -174,7 +174,7 @@ class bridgevlanaware(moduleBase):
return False
def _is_bridge(self, ifaceobj):
if ifaceobj.get_attr_value_first('type') == 'bridge':
if ifaceobj.type == ifaceType.BRIDGE:
return True
return False
@@ -192,7 +192,8 @@ class bridgevlanaware(moduleBase):
# XXX: mark this iface as a bridge_vlan iface
ifaceobj.type = ifaceType.BRIDGE_VLAN
return [bridge]
elif ifaceobj.get_attr_value_first('type') == 'bridge':
ifaceobj.type = ifaceType.BRIDGE
return None
def get_dependent_ifacenames_running(self, ifaceobj):
@@ -396,7 +397,6 @@ class bridgevlanaware(moduleBase):
if running_pvid != pvid:
self.ipcmd.bridge_port_pvid_del(ifaceobj.name,
running_pvid)
else:
self.ipcmd.bridge_port_pvid_add(ifaceobj.name, pvid)
else:
self.ipcmd.bridge_port_pvid_add(ifaceobj.name, pvid)