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: missing bridge-portmcrouter yes/no support under port

Browse Source 
Ticket: CM-14199
Reviewed By: Roopa, Nikhil G, Daniel W
Testing Done:

$ cat /etc/network/interfaces
auto br0
iface br0
        bridge-ports swp1

auto swp1
iface swp1
        bridge-portmcrouter yes

$ ifreload -a
$ ifquery -a -c
auto br0
iface br0                                                           [pass]
      bridge-ports swp1                                           [pass]

auto swp1
iface swp1                                                          [pass]
      bridge-portmcrouter yes                                     [pass]

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2017-01-03 10:40:26 +03:00
parent 2ff98bb9aa
commit b68a9ea541
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/bridge.py
View File

@@ -1078,7 +1078,6 @@ class bridge(moduleBase):
for attrname, dstattrname in {
'bridge-pathcosts' : 'pathcost',
'bridge-portprios' : 'portprio',
'bridge-portmcrouter' : 'portmcrouter',
'bridge-portmcfl' : 'portmcfl'}.items():
attrval = bportifaceobj.get_attr_value_first(attrname)
if not attrval:
@@ -1090,6 +1089,11 @@ class bridge(moduleBase):
#else:
continue
portattrs[dstattrname] = attrval
portmcrouter = bportifaceobj.get_attr_value_first('bridge-portmcrouter')
if portmcrouter:
portattrs['portmcrouter'] = utils.boolean_support_binary(portmcrouter)
try:
self.brctlcmd.set_bridgeport_attrs(bridgename,
bportifaceobj.name, portattrs)