From b68a9ea54151aad25c148bde1a2f8638693465e5 Mon Sep 17 00:00:00 2001
From: Julien Fortin <julien@cumulusnetworks.com>
Date: Tue, 3 Jan 2017 10:40:26 +0300
Subject: [PATCH] addons: bridge: missing bridge-portmcrouter yes/no support
 under port

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>
---
 addons/bridge.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/bridge.py b/addons/bridge.py
index 050a07d..54bb6ec 100644
--- a/addons/bridge.py
+++ b/addons/bridge.py
@@ -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)