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

Revert "Fix mstp settings ordering issues when bridge stp is toggled on and off"

Browse Source 
This reverts commit 3af351f0a005236e747913bb499c6165e3ec43a4.
This commit is contained in:
Roopa Prabhu
2015-11-05 21:28:14 -08:00
parent 159dd3e8ec
commit 74a4a724c3
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
addons/mstpctl.py
View File

@@ -359,34 +359,15 @@ class mstpctl(moduleBase):
except Exception, e: except Exception, e:
self.log_warn(str(e)) self.log_warn(str(e))
def _is_stp_on(self, ifaceobj, bridgename, ifaceobj_getfunc=None):
# Check if running stp state is on
running_stp_state = (True if self.read_file_oneline(
'/sys/class/net/%s/bridge/stp_state'
%bridgename) == '2' else False)
if not running_stp_state:
# If running stp is not on, and bridge has stp configured
# set stp on bridge
if ifaceobj_getfunc:
bridgeifaceobjlist = ifaceobj_getfunc(bridgename)
if not bridgeifaceobjlist:
return running_stp_state
for b in bridgeifaceobjlist:
stp_attrval = b.get_attr_value_first('bridge-stp')
if stp_attrval and (stp_attrval == 'on' or
stp_attrval == 'yes'):
# set stp on bridge and return True
self.brctlcmd.set_stp(bridgename, stp_attrval)
return True
return running_stp_state
def _up(self, ifaceobj, ifaceobj_getfunc=None): def _up(self, ifaceobj, ifaceobj_getfunc=None):
# Check if bridge port # Check if bridge port
bridgename = self.ipcmd.bridge_port_get_bridge_name(ifaceobj.name) bridgename = self.ipcmd.bridge_port_get_bridge_name(ifaceobj.name)
if bridgename: if bridgename:
mstpd_running = (True if self.mstpctlcmd.is_mstpd_running() mstpd_running = (True if self.mstpctlcmd.is_mstpd_running()
else False) else False)
stp_on = self._is_stp_on(ifaceobj, bridgename, ifaceobj_getfunc) stp_on = (True if self.read_file_oneline(
'/sys/class/net/%s/bridge/stp_state'
%bridgename) == '2' else False)
self._apply_bridge_port_settings(ifaceobj, bridgename, None, self._apply_bridge_port_settings(ifaceobj, bridgename, None,
stp_on, mstpd_running) stp_on, mstpd_running)
ifaceobj.module_flags[self.name] = ifaceobj.module_flags.setdefault(self.name,0) | \ ifaceobj.module_flags[self.name] = ifaceobj.module_flags.setdefault(self.name,0) | \