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

Fix bridge port vid settings during ifup of a bridge port

Ticket: CM-3346
Reviewed By:
Testing Done: ifupdown2 sanity test for the new bridge driver
This commit is contained in:
Roopa Prabhu
2014-10-24 20:43:50 -07:00
parent fe91c3484f
commit 7baa2093ba

View File

@ -593,7 +593,7 @@ class bridge(moduleBase):
%(bportifaceobj.name, pvid, str(e)))
def _apply_bridge_vlan_aware_port_settings_all(self, bportifaceobj,
bridge_vids):
bridge_vids=None):
running_vidinfo = self._get_running_vidinfo()
vids = None
pvids = None
@ -706,6 +706,9 @@ class bridge(moduleBase):
self.logger.warn('%s: unable to determine bridge name'
%ifaceobj.name)
return
if self.ipcmd.bridge_is_vlan_aware(bridgename):
self._apply_bridge_vlan_aware_port_settings_all(
ifaceobj)
self._apply_bridge_port_settings(ifaceobj, bridgename=bridgename)
return