Merge pull request #1450 from c-po/bridge-fixes-equuleus

bridge: bugfixes for equuleus

3 files changed, 20 insertions, 54 deletions

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 70e5cd889..466433c37 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -228,24 +228,10 @@ def is_member(conf, interface, intftype=None):
         for intf in conf.list_nodes(base):
             member = base + [intf, 'member', 'interface', interface]
             if conf.exists(member):
-                member_type = Section.section(interface)
-                # Check if it's a VLAN (QinQ) interface
-                interface = interface.split('.')
-                if len(interface) == 3:
-                    if conf.exists(['interfaces', member_type, interface[0], 'vif-s', interface[1], 'vif-c', interface[2]]):
-                        tmp = conf.get_config_dict(['interfaces', member_type, interface[0]],
-                                                   key_mangling=('-', '_'), get_first_key=True)
-                        ret_val.update({intf : tmp})
-                elif len(interface) == 2:
-                    if conf.exists(['interfaces', member_type, interface[0], 'vif', interface[1]]):
-                        tmp = conf.get_config_dict(['interfaces', member_type, interface[0]],
-                                                   key_mangling=('-', '_'), get_first_key=True)
-                        ret_val.update({intf : tmp})
-                else:
-                    if conf.exists(['interfaces', member_type, interface[0]]):
-                        tmp = conf.get_config_dict(['interfaces', member_type, interface[0]],
-                                                   key_mangling=('-', '_'), get_first_key=True)
-                        ret_val.update({intf : tmp})
+                tmp = conf.get_config_dict(member, key_mangling=('-', '_'),
+                                           get_first_key=True,
+                                           no_tag_node_value_mangle=True)
+                ret_val.update({intf : tmp})
 
     old_level = conf.set_level(old_level)
     return ret_val
diff --git a/python/vyos/configverify.py b/python/vyos/configverify.py
index 44342f289..356246053 100644
--- a/python/vyos/configverify.py
+++ b/python/vyos/configverify.py
@@ -196,10 +196,10 @@ def verify_address(config):
     of a bridge or bond.
     """
     if {'is_bridge_member', 'address'} <= set(config):
-        raise ConfigError(
-            'Cannot assign address to interface "{ifname}" as it is a '
-            'member of bridge "{is_bridge_member}"!'.format(**config))
-
+        interface = config['ifname']
+        bridge_name = next(iter(config['is_bridge_member']))
+        raise ConfigError(f'Cannot assign address to interface "{interface}" '
+                          f'as it is a member of bridge "{bridge_name}"!')
 
 def verify_bridge_delete(config):
     """
@@ -209,9 +209,9 @@ def verify_bridge_delete(config):
     """
     if 'is_bridge_member' in config:
         interface = config['ifname']
-        for bridge in config['is_bridge_member']:
-            raise ConfigError(f'Interface "{interface}" cannot be deleted as it '
-                              f'is a member of bridge "{bridge}"!')
+        bridge_name = next(iter(config['is_bridge_member']))
+        raise ConfigError(f'Interface "{interface}" cannot be deleted as it '
+                          f'is a member of bridge "{bridge_name}"!')
 
 def verify_interface_exists(ifname):
     """
diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py
index ffd9c590f..eef02f21f 100644
--- a/python/vyos/ifconfig/bridge.py
+++ b/python/vyos/ifconfig/bridge.py
@@ -183,6 +183,11 @@ class BridgeIf(Interface):
         """
         self.set_interface('vlan_filter', state)
 
+        # VLAN of bridge parent interface is always 1
+        # VLAN 1 is the default VLAN for all unlabeled packets
+        cmd = f'bridge vlan add dev {self.ifname} vid 1 pvid untagged self'
+        self._cmd(cmd)
+
     def set_multicast_querier(self, enable):
         """
         Sets whether the bridge actively runs a multicast querier or not. When a
@@ -272,30 +277,6 @@ class BridgeIf(Interface):
         vlan_filter = '1' if 'enable_vlan' in config else '0'
         self.set_vlan_filter(vlan_filter)
 
-        ifname = config['ifname']
-        if int(vlan_filter):
-            add_vlan = []
-            cur_vlan_ids = get_vlan_ids(ifname)
-
-            tmp = dict_search('vif', config)
-            if tmp:
-                for vif, vif_config in tmp.items():
-                    add_vlan.append(vif)
-
-            # Remove redundant VLANs from the system
-            for vlan in list_diff(cur_vlan_ids, add_vlan):
-                cmd = f'bridge vlan del dev {ifname} vid {vlan} self'
-                self._cmd(cmd)
-
-            for vlan in add_vlan:
-                cmd = f'bridge vlan add dev {ifname} vid {vlan} self'
-                self._cmd(cmd)
-
-            # VLAN of bridge parent interface is always 1
-            # VLAN 1 is the default VLAN for all unlabeled packets
-            cmd = f'bridge vlan add dev {ifname} vid 1 pvid untagged self'
-            self._cmd(cmd)
-
         tmp = dict_search('member.interface', config)
         if tmp:
             for interface, interface_config in tmp.items():
@@ -325,15 +306,13 @@ class BridgeIf(Interface):
 
                 # set bridge port path cost
                 if 'cost' in interface_config:
-                    value = interface_config.get('cost')
-                    lower.set_path_cost(value)
+                    lower.set_path_cost(interface_config['cost'])
 
                 # set bridge port path priority
                 if 'priority' in interface_config:
-                    value = interface_config.get('priority')
-                    lower.set_path_priority(value)
+                    lower.set_path_priority(interface_config['priority'])
 
-                if int(vlan_filter):
+                if 'enable_vlan' in config:
                     add_vlan = []
                     native_vlan_id = None
                     allowed_vlan_ids= []
@@ -363,6 +342,7 @@ class BridgeIf(Interface):
                     for vlan in allowed_vlan_ids:
                         cmd = f'bridge vlan add dev {interface} vid {vlan} master'
                         self._cmd(cmd)
+
                     # Setting native VLAN to system
                     if native_vlan_id:
                         cmd = f'bridge vlan add dev {interface} vid {native_vlan_id} pvid untagged master'