Merge pull request #594 from jack9603301/T3042

bridge: T3042: Support VLAN filter and VLAN sub-interface on the bridge

3 files changed, 79 insertions, 2 deletions

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index e43b68f6f..0b03dfc7d 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -219,6 +219,28 @@ def is_member(conf, interface, intftype=None):
     old_level = conf.set_level(old_level)
     return ret_val
 
+def has_vlan_subinterface_configured(conf, intf):
+    """
+    Checks if interface has an VLAN subinterface configured.
+    Checks the following config nodes:
+    'vif', 'vif-s'
+
+    Returns True if interface has VLAN subinterface configured, False if it doesn't.
+    """
+    from vyos.ifconfig import Section
+    ret = False
+
+    old_level = conf.get_level()
+    conf.set_level([])
+
+    intfpath = 'interfaces ' + Section.get_config_path(intf)
+    if ( conf.exists(f'{intfpath} vif') or
+            conf.exists(f'{intfpath} vif-s')):
+        ret = True
+
+    conf.set_level(old_level)
+    return ret
+
 def is_source_interface(conf, interface, intftype=None):
     """
     Checks if passed interface is configured as source-interface of other
diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py
index bd43d4874..772db3543 100644
--- a/python/vyos/ifconfig/bridge.py
+++ b/python/vyos/ifconfig/bridge.py
@@ -41,6 +41,7 @@ class BridgeIf(Interface):
             'section': 'bridge',
             'prefixes': ['br', ],
             'broadcast': True,
+            'vlan': True,
         },
     }
 
@@ -73,6 +74,10 @@ class BridgeIf(Interface):
             'validate': assert_boolean,
             'location': '/sys/class/net/{ifname}/bridge/stp_state',
         },
+        'vlan_filter': {
+            'validate': assert_boolean,
+            'location': '/sys/class/net/{ifname}/bridge/vlan_filtering',
+        },
         'multicast_querier': {
             'validate': assert_boolean,
             'location': '/sys/class/net/{ifname}/bridge/multicast_querier',
@@ -152,6 +157,16 @@ class BridgeIf(Interface):
         >>> BridgeIf('br0').set_stp(1)
         """
         self.set_interface('stp', state)
+    
+    def set_vlan_filter(self, state):
+        """
+        Set bridge Vlan Filter state. 0 -> Vlan Filter disabled, 1 -> Vlan Filter enabled
+
+        Example:
+        >>> from vyos.ifconfig import BridgeIf
+        >>> BridgeIf('br0').set_vlan_filter(1)
+        """
+        self.set_interface('vlan_filter', state)
 
     def set_multicast_querier(self, enable):
         """
@@ -183,6 +198,7 @@ class BridgeIf(Interface):
 
         return self.set_interface('add_port', interface)
 
+
     def del_port(self, interface):
         """
         Remove member port from bridge instance.
@@ -201,6 +217,8 @@ class BridgeIf(Interface):
 
         # call base class first
         super().update(config)
+        
+        ifname = config['ifname']
 
         # Set ageing time
         value = config.get('aging')
@@ -236,6 +254,7 @@ class BridgeIf(Interface):
         for member in (tmp or []):
             if member in interfaces():
                 self.del_port(member)
+        vlan_filter = 0
 
         tmp = dict_search('member.interface', config)
         if tmp:
@@ -264,7 +283,44 @@ class BridgeIf(Interface):
                 if 'priority' in interface_config:
                     value = interface_config.get('priority')
                     lower.set_path_priority(value)
-
+                
+                tmp = dict_search('native_vlan_removed', interface_config)
+                
+                if tmp and 'native_vlan_removed' not in interface_config:
+                    vlan_id = tmp
+                    cmd = f'bridge vlan add dev {interface} vid 1 pvid untagged master'
+                    self._cmd(cmd)
+                    cmd = f'bridge vlan del dev {interface} vid {vlan_id}'
+                    self._cmd(cmd)
+                    
+                tmp = dict_search('allowed_vlan_removed', interface_config)
+                
+                
+                for vlan_id in (tmp or []):
+                    cmd = f'bridge vlan del dev {interface} vid {vlan_id}'
+                    self._cmd(cmd)
+                
+                if 'native_vlan' in interface_config:
+                    vlan_filter = 1
+                    cmd = f'bridge vlan del dev {interface} vid 1'
+                    self._cmd(cmd)
+                    vlan_id = interface_config['native_vlan']
+                    cmd = f'bridge vlan add dev {interface} vid {vlan_id} pvid untagged master'
+                    self._cmd(cmd)
+                else:
+                    cmd = f'bridge vlan del dev {interface} vid 1'
+                    self._cmd(cmd)
+                
+                if 'allowed_vlan' in interface_config:
+                    vlan_filter = 1
+                    for vlan in interface_config['allowed_vlan']:
+                        cmd = f'bridge vlan add dev {interface} vid {vlan} master'
+                        self._cmd(cmd)
+        
+        # enable/disable Vlan Filter
+        self.set_vlan_filter(vlan_filter)
+                        
+                            
         # Enable/Disable of an interface must always be done at the end of the
         # derived class to make use of the ref-counting set_admin_state()
         # function. We will only enable the interface if 'up' was called as
diff --git a/python/vyos/validate.py b/python/vyos/validate.py
index 74488bed6..74b8adcfc 100644
--- a/python/vyos/validate.py
+++ b/python/vyos/validate.py
@@ -239,7 +239,6 @@ def assert_mac(m):
     if octets[:5] == (0, 0, 94, 0, 1):
         raise ValueError(f'{m} is a VRRP MAC address')
 
-
 def has_address_configured(conf, intf):
     """
     Checks if interface has an address configured.