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

addons: bridge: ifquery -c fix for port attributes

Browse Source 
Ticket: CM-11195
Reviewed By: roopa, julien
Testing Done: used the configuration mentioned in bug description

Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>

running values for bridge-portmcrouter, bridge-portmcfl, and bridge-portprios
were accessed using invalid keys.
This commit is contained in:
Nikhil
2016-06-29 16:38:50 -07:00
parent 0aa91758f4
commit 4a41d24b35
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/bridge.py
View File

@@ -1663,9 +1663,9 @@ class bridge(moduleBase):
ifaceobj_getfunc, ifaceobj_getfunc,
bridgename) bridgename)
for attr, dstattr in {'bridge-pathcosts' : 'pathcost', for attr, dstattr in {'bridge-pathcosts' : 'pathcost',
'bridge-portprios' : 'priority', 'bridge-portprios' : 'portprio',
'bridge-portmcrouter' : 'mcrouter', 'bridge-portmcrouter' : 'portmcrouter',
'bridge-portmcfl' : 'mcfl' }.items(): 'bridge-portmcfl' : 'portmcfl' }.items():
attrval = ifaceobj.get_attr_value_first(attr) attrval = ifaceobj.get_attr_value_first(attr)
if not attrval: if not attrval:
continue continue
@@ -1674,7 +1674,7 @@ class bridge(moduleBase):
running_attrval = self.brctlcmd.get_bridgeport_attr( running_attrval = self.brctlcmd.get_bridgeport_attr(
bridgename, ifaceobj.name, dstattr) bridgename, ifaceobj.name, dstattr)
if dstattr == 'mcrouter': if dstattr == 'portmcrouter':
if not utils.is_binary_bool(attrval) and running_attrval: if not utils.is_binary_bool(attrval) and running_attrval:
running_attrval = utils.get_yesno_boolean( running_attrval = utils.get_yesno_boolean(
utils.get_boolean_from_string(running_attrval)) utils.get_boolean_from_string(running_attrval))