addons: bridge: get default mcsnoop value when bridge_vxlan is not set

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>

diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
index 9677b3bc1d2d08561bbec3206561daf0bb8ffa7b..ad6b7634224f94a41f101f4876972a36ec70bbc7 100644 (file)
--- a/ifupdown2/addons/bridge.py
+++ b/ifupdown2/addons/bridge.py
@@ -1230,9 +1230,15 @@ class bridge(moduleBase):
 
     def get_bridge_mcsnoop_value(self, ifaceobj):
         mcsnoop = ifaceobj.get_attr_value_first('bridge-mcsnoop')
-        if not mcsnoop and ifaceobj.link_privflags & ifaceLinkPrivFlags.BRIDGE_VXLAN:
-            return self._vxlan_bridge_default_igmp_snooping
-        return mcsnoop
+
+        if mcsnoop:
+            return mcsnoop
+
+        if ifaceobj.link_privflags & ifaceLinkPrivFlags.BRIDGE_VXLAN:
+            if self._vxlan_bridge_default_igmp_snooping is not None:
+                return self._vxlan_bridge_default_igmp_snooping
+
+        return self.get_attr_default_value("bridge-mcsnoop")
 
     def fill_ifla_info_data_with_ifla_br_attribute(self,
                                                    ifla_info_data,