addons: bridge: fix NoneType is not iterable exception

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

diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
index ff902c22cc73072af95ea45d774b189dc7f36daa..d990b66a550750307780bc491391e74cb3cdd148 100644 (file)
--- a/ifupdown2/addons/bridge.py
+++ b/ifupdown2/addons/bridge.py
@@ -3516,7 +3516,7 @@ class bridge(Addon, moduleBase):
         fail = False
         cached_vlans, cached_vnis = self.get_vlan_vni_ranges(self.cache.get_vlan_vni(ifaceobj.name))
 
-        for bridge_vlan_vni_map in ifaceobj.get_attr_value("bridge-vlan-vni-map"):
+        for bridge_vlan_vni_map in ifaceobj.get_attr_value("bridge-vlan-vni-map") or []:
 
             if fail:
                 ifaceobjcurr.update_config_with_status("bridge-vlan-vni-map", bridge_vlan_vni_map, 1)
@@ -3570,6 +3570,9 @@ class bridge(Addon, moduleBase):
         vlans = []
         vnis = []
 
+        if not bridge_vlan_tunnel:
+            return vlans, vnis
+
         tunnel_vlan_range = None
         tunnel_vni_range = None