Merge pull request #3440 from vyos/mergify/bp/sagitta/pr-3430

bridge: T6317: add dependency call for wireless interfaces (backport #3430)

1 files changed, 25 insertions, 6 deletions

diff --git a/src/conf_mode/interfaces_bridge.py b/src/conf_mode/interfaces_bridge.py
index 9789f7bd3..7b2c1ee0b 100755
--- a/src/conf_mode/interfaces_bridge.py
+++ b/src/conf_mode/interfaces_bridge.py
@@ -56,6 +56,17 @@ def get_config(config=None):
             bridge['member'].update({'interface_remove' : tmp })
         else:
             bridge.update({'member' : {'interface_remove' : tmp }})
+            for interface in tmp:
+                # When using VXLAN member interfaces that are configured for Single
+                # VXLAN Device (SVD) we need to call the VXLAN conf-mode script to
+                # re-create VLAN to VNI mappings if required, but only if the interface
+                # is already live on the system - this must not be done on first commit
+                if interface.startswith('vxlan') and interface_exists(interface):
+                    set_dependents('vxlan', conf, interface)
+                # When using Wireless member interfaces we need to inform hostapd
+                # to properly set-up the bridge
+                elif interface.startswith('wlan') and interface_exists(interface):
+                    set_dependents('wlan', conf, interface)
 
     if dict_search('member.interface', bridge) is not None:
         for interface in list(bridge['member']['interface']):
@@ -91,6 +102,10 @@ def get_config(config=None):
             # is already live on the system - this must not be done on first commit
             if interface.startswith('vxlan') and interface_exists(interface):
                 set_dependents('vxlan', conf, interface)
+            # When using Wireless member interfaces we need to inform hostapd
+            # to properly set-up the bridge
+            elif interface.startswith('wlan') and interface_exists(interface):
+                set_dependents('wlan', conf, interface)
 
     # delete empty dictionary keys - no need to run code paths if nothing is there to do
     if 'member' in bridge:
@@ -140,9 +155,6 @@ def verify(bridge):
             if 'enable_vlan' in bridge:
                 if 'has_vlan' in interface_config:
                     raise ConfigError(error_msg + 'it has VLAN subinterface(s) assigned!')
-
-                if 'wlan' in interface:
-                    raise ConfigError(error_msg + 'VLAN aware cannot be set!')
             else:
                 for option in ['allowed_vlan', 'native_vlan']:
                     if option in interface_config:
@@ -168,12 +180,19 @@ def apply(bridge):
     else:
         br.update(bridge)
 
-    for interface in dict_search('member.interface', bridge) or []:
-        if interface.startswith('vxlan') and interface_exists(interface):
+    tmp = []
+    if 'member' in bridge:
+        if 'interface_remove' in bridge['member']:
+            tmp.extend(bridge['member']['interface_remove'])
+        if 'interface' in bridge['member']:
+            tmp.extend(bridge['member']['interface'])
+
+    for interface in tmp:
+        if interface.startswith(tuple(['vxlan', 'wlan'])) and interface_exists(interface):
             try:
                 call_dependents()
             except ConfigError:
-                raise ConfigError('Error in updating VXLAN interface after changing bridge!')
+                raise ConfigError('Error updating member interface configuration after changing bridge!')
 
     return None