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

remove code that makes a bridge port inherit stp/mstp/igmp attributes from bridge

Browse Source 
Ticket: CM-4035
Reviewed By:
Testing Done: Tested ifupdown2 sanity
This commit is contained in:
Roopa Prabhu
2014-10-24 14:21:54 -07:00
parent 84ca006f82
commit fe91c3484f
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/bridge.py
View File

@ -640,16 +640,17 @@ class bridge(moduleBase):
'bridge-priority' : 'portprio',
'bridge-mcrouter' : 'portmcrouter',
'bridge-multicast-router' : 'portmcrouter',
'bridge-mcfl' : 'portmcfl',
'bridge-multicast-fast-leave' : 'portmcfl'}.items():
attrval = bportifaceobj.get_attr_value_first(attrname)
if not attrval:
# Check if bridge has that attribute
if bridgeifaceobj:
attrval = bridgeifaceobj.get_attr_value_first(attrname)
if not attrval:
continue
else:
continue
#if bridgeifaceobj:
# attrval = bridgeifaceobj.get_attr_value_first(attrname)
# if not attrval:
# continue
#else:
continue
portattrs[dstattrname] = attrval
try:
self.brctlcmd.set_bridgeport_attrs(bridgename,

18
addons/mstpctl.py
View File

@ -357,15 +357,15 @@ class mstpctl(moduleBase):
for attrname, dstattrname in self._port_attrs_map.items():
attrval = ifaceobj.get_attr_value_first(attrname)
if not attrval:
if bridgeifaceobj:
# If bridge object available, check if the bridge
# has the attribute set, in which case,
# inherit it from the bridge
attrval = bridgeifaceobj.get_attr_value_first(attrname)
if not attrval:
continue
else:
continue
#if bridgeifaceobj:
# # If bridge object available, check if the bridge
# # has the attribute set, in which case,
# # inherit it from the bridge
# attrval = bridgeifaceobj.get_attr_value_first(attrname)
# if not attrval:
# continue
#else:
continue
try:
self.mstpctlcmd.set_bridgeport_attr(bridgename,
ifaceobj.name, dstattrname, attrval, check)