addons: mstpctl: handle vlan aware bridge port config under port

Ticket: CM-8629
Reviewed By: roopa, julien
Testing Done: used same config given in bug description

This patch avoids vlan aware bridge over-writing it's port's
config with default values

Example configuration:

auto swp9
iface swp9
   mstpctl-portautoedge no

auto frontnet
iface frontnet
   bridge-vlan-aware yes
   bridge-ports swp9
   bridge-vids 10
   bridge-stp on

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

diff --git a/addons/mstpctl.py b/addons/mstpctl.py
index 76559f9a36805102c8bd3e584b76cd910c368bf3..2727979d226d37e29ef9a769b241655d7223cdac 100644 (file)
--- a/addons/mstpctl.py
+++ b/addons/mstpctl.py
@@ -312,6 +312,8 @@ class mstpctl(moduleBase):
                     self.logger.warn('%s' %str(e))
                     pass
 
+            if self.ipcmd.bridge_is_vlan_aware(ifaceobj.name):
+                return
             # set bridge port attributes
             for attrname, dstattrname in self._port_attrs_map.items():
                 config_val = ifaceobj.get_attr_value_first(attrname)