vxlan: T4120: code cleanup for multiple remotes

(cherry picked from commit 3a605ad020d8d20b08a72cb1284f6e590d1fd7b5)

2 files changed, 27 insertions, 35 deletions

diff --git a/python/vyos/ifconfig/vxlan.py b/python/vyos/ifconfig/vxlan.py
index 93d5b20c8..ec5fd167d 100644
--- a/python/vyos/ifconfig/vxlan.py
+++ b/python/vyos/ifconfig/vxlan.py
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2019-2022 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -65,6 +65,16 @@ class VXLANIf(Interface):
             'parameters.nolearning'      : 'nolearning',
         }
 
+        # IPv6 flowlabels can only be used on IPv6 tunnels, thus we need to
+        # ensure that at least the first remote IP address is passed to the
+        # tunnel creation command. Subsequent tunnel remote addresses can later
+        # be added to the FDB
+        remote_list = None
+        if 'remote' in self.config:
+            # skip first element as this is already configured as remote
+            remote_list = self.config['remote'][1:]
+            self.config['remote'] = self.config['remote'][0]
+
         cmd = 'ip link add {ifname} type {type} id {vni} dstport {port}'
         for vyos_key, iproute2_key in mapping.items():
             # dict_search will return an empty dict "{}" for valueless nodes like
@@ -80,9 +90,9 @@ class VXLANIf(Interface):
         # interface is always A/D down. It needs to be enabled explicitly
         self.set_admin_state('down')
 
-        other_remotes = self.config.get('other_remotes')
-        if other_remotes:
-            for rem in other_remotes:
-                self.config['rem'] = rem
-                cmd2 = 'bridge fdb append to 00:00:00:00:00:00 dst {rem} port {port} dev {ifname}'
-                self._cmd(cmd2.format(**self.config))
+        # VXLAN tunnel is always recreated on any change - see interfaces-vxlan.py
+        if remote_list:
+            for remote in remote_list:
+                cmd = f'bridge fdb append to 00:00:00:00:00:00 dst {remote} ' \
+                       'port {port} dev {ifname}'
+                self._cmd(cmd.format(**self.config))
diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py
index ee8f26d21..6785169e6 100755
--- a/src/conf_mode/interfaces-vxlan.py
+++ b/src/conf_mode/interfaces-vxlan.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2019-2020 VyOS maintainers and contributors
+# Copyright (C) 2019-2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -34,8 +34,8 @@ airbag.enable()
 
 def get_config(config=None):
     """
-    Retrive CLI config as dictionary. Dictionary can never be empty, as at least the
-    interface name will be added or a deleted flag
+    Retrive CLI config as dictionary. Dictionary can never be empty, as at least
+    the interface name will be added or a deleted flag
     """
     if config:
         conf = config
@@ -44,13 +44,6 @@ def get_config(config=None):
     base = ['interfaces', 'vxlan']
     vxlan = get_interface_dict(conf, base)
 
-    # leave first remote in dict and put the other ones (if they exists) to "other_remotes"
-    remotes = vxlan.get('remote')
-    if remotes:
-        vxlan['remote'] = remotes[0]
-        if len(remotes) > 1:
-            del remotes[0]
-            vxlan['other_remotes'] = remotes
     return vxlan
 
 def verify(vxlan):
@@ -63,8 +56,7 @@ def verify(vxlan):
 
     if 'group' in vxlan:
         if 'source_interface' not in vxlan:
-            raise ConfigError('Multicast VXLAN requires an underlaying interface ')
-
+            raise ConfigError('Multicast VXLAN requires an underlaying interface')
         verify_source_interface(vxlan)
 
     if not any(tmp in ['group', 'remote', 'source_address'] for tmp in vxlan):
@@ -95,35 +87,26 @@ def verify(vxlan):
             protocol = 'ipv6'
         else:
             protocol = 'ipv4'
+
     if 'remote' in vxlan:
-        if is_ipv6(vxlan['remote']):
-            if protocol == 'ipv4':
-                raise ConfigError('IPv4 and IPV6 cannot be mixed')
-            protocol = 'ipv6'
-        else:
-            if protocol == 'ipv6':
-                raise ConfigError('IPv4 and IPV6 cannot be mixed')
-            protocol = 'ipv4'
-    if 'other_remotes' in vxlan:
-        for rem in vxlan['other_remotes']:
-            if is_ipv6(rem):
+        error_msg = 'Can not mix both IPv4 and IPv6 for VXLAN underlay'
+        for remote in vxlan['remote']:
+            if is_ipv6(remote):
                 if protocol == 'ipv4':
-                    raise ConfigError('IPv4 and IPV6 cannot be mixed')
+                    raise ConfigError(error_msg)
                 protocol = 'ipv6'
             else:
                 if protocol == 'ipv6':
-                    raise ConfigError('IPv4 and IPV6 cannot be mixed')
+                    raise ConfigError(error_msg)
                 protocol = 'ipv4'
 
     verify_mtu_ipv6(vxlan)
     verify_address(vxlan)
     return None
 
-
 def generate(vxlan):
     return None
 
-
 def apply(vxlan):
     # Check if the VXLAN interface already exists
     if vxlan['ifname'] in interfaces():
@@ -150,7 +133,6 @@ def apply(vxlan):
 
     return None
 
-
 if __name__ == '__main__':
     try:
         c = get_config()