vxlan: pseudo-ethernet: T2260: convert link nodes to source-interface

3 files changed, 76 insertions, 23 deletions

diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index 50b5a12a0..ce3d472c4 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -51,8 +51,8 @@ default_config_data = {
     'ipv6_forwarding': 1,
     'ipv6_dup_addr_detect': 1,
     'intf': '',
-    'link': '',
-    'link_changed': False,
+    'source_interface': '',
+    'source_interface_changed': False,
     'mac': '',
     'mode': 'private',
     'vif_s': [],
@@ -166,12 +166,12 @@ def get_config():
     if conf.exists('ipv6 dup-addr-detect-transmits'):
         peth['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
 
-    # Lower link device
-    if conf.exists(['link']):
-        peth['link'] = conf.return_value(['link'])
-        tmp = conf.return_effective_value(['link'])
-        if tmp != peth['link']:
-            peth['link_changed'] = True
+    # Physical interface
+    if conf.exists(['source-interface']):
+        peth['source_interface'] = conf.return_value(['source-interface'])
+        tmp = conf.return_effective_value(['source-interface'])
+        if tmp != peth['source_interface']:
+            peth['source_interface_changed'] = True
 
     # Media Access Control (MAC) address
     if conf.exists(['mac']):
@@ -227,10 +227,10 @@ def verify(peth):
                               'is a member of bridge "{1}"!'.format(interface, bridge))
         return None
 
-    if not peth['link']:
+    if not peth['source_interface']:
         raise ConfigError('Link device must be set for virtual ethernet {}'.format(peth['intf']))
 
-    if not peth['link'] in interfaces():
+    if not peth['source_interface'] in interfaces():
         raise ConfigError('Pseudo-ethernet source interface does not exist')
 
     vrf_name = peth['vrf']
@@ -253,12 +253,12 @@ def apply(peth):
         p.remove()
         return None
 
-    elif peth['link_changed']:
+    elif peth['source_interface_changed']:
         # Check if MACVLAN interface already exists. Parameters like the
-        # underlaying link device can not be changed  on the fly and the
-        # interface needs to be recreated from the bottom.
+        # underlaying source-interface device can not be changed  on the fly
+        # and the interface needs to be recreated from the bottom.
         #
-        # link_changed also means - the interface was not present in the
+        # source_interface_changed also means - the interface was not present in the
         # beginning and is newly created
         if peth['intf'] in interfaces():
             p = MACVLANIf(peth['intf'])
@@ -269,7 +269,7 @@ def apply(peth):
         conf = deepcopy(MACVLANIf.get_config())
 
         # Assign MACVLAN instance configuration parameters to config dict
-        conf['link'] = peth['link']
+        conf['source_interface'] = peth['source_interface']
         conf['mode'] = peth['mode']
 
         # It is safe to "re-create" the interface always, there is a sanity check
diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py
index b9bfb242a..54446d6de 100755
--- a/src/conf_mode/interfaces-vxlan.py
+++ b/src/conf_mode/interfaces-vxlan.py
@@ -42,7 +42,7 @@ default_config_data = {
     'ipv6_eui64_prefix': '',
     'ipv6_forwarding': 1,
     'ipv6_dup_addr_detect': 1,
-    'link': '',
+    'source_interface': '',
     'mtu': 1450,
     'remote': '',
     'remote_port': 8472, # The Linux implementation of VXLAN pre-dates
@@ -125,8 +125,8 @@ def get_config():
         vxlan['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
 
     # VXLAN underlay interface
-    if conf.exists('link'):
-        vxlan['link'] = conf.return_value('link')
+    if conf.exists('source-interface'):
+        vxlan['source_interface'] = conf.return_value('source-interface')
 
     # Maximum Transmission Unit (MTU)
     if conf.exists('mtu'):
@@ -162,18 +162,19 @@ def verify(vxlan):
         print('WARNING: RFC7348 recommends VXLAN tunnels preserve a 1500 byte MTU')
 
     if vxlan['group']:
-        if not vxlan['link']:
+        if not vxlan['source_interface']:
             raise ConfigError('Multicast VXLAN requires an underlaying interface ')
-        if not vxlan['link'] in interfaces():
+
+        if not vxlan['source_interface'] in interfaces():
             raise ConfigError('VXLAN source interface does not exist')
 
     if not vxlan['vni']:
         raise ConfigError('Must configure VNI for VXLAN')
 
-    if vxlan['link']:
+    if vxlan['source_interface']:
         # VXLAN adds a 50 byte overhead - we need to check the underlaying MTU
         # if our configured MTU is at least 50 bytes less
-        underlay_mtu = int(Interface(vxlan['link']).get_mtu())
+        underlay_mtu = int(Interface(vxlan['source_interface']).get_mtu())
         if underlay_mtu < (vxlan['mtu'] + 50):
             raise ConfigError('VXLAN has a 50 byte overhead, underlaying device ' \
                               'MTU is to small ({})'.format(underlay_mtu))
@@ -202,7 +203,7 @@ def apply(vxlan):
         # Assign VXLAN instance configuration parameters to config dict
         conf['vni'] = vxlan['vni']
         conf['group'] = vxlan['group']
-        conf['dev'] = vxlan['link']
+        conf['dev'] = vxlan['source_interface']
         conf['remote'] = vxlan['remote']
         conf['port'] = vxlan['remote_port']
 
diff --git a/src/migration-scripts/interfaces/8-to-9 b/src/migration-scripts/interfaces/8-to-9
new file mode 100755
index 000000000..e0b9dd375
--- /dev/null
+++ b/src/migration-scripts/interfaces/8-to-9
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 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
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Rename link nodes to source-interface for the following interface types:
+# - vxlan
+# - pseudo ethernet
+
+from sys import exit, argv
+from vyos.configtree import ConfigTree
+
+if __name__ == '__main__':
+    if (len(argv) < 1):
+        print("Must specify file name!")
+        exit(1)
+
+    file_name = argv[1]
+    with open(file_name, 'r') as f:
+        config_file = f.read()
+
+    config = ConfigTree(config_file)
+
+    for if_type in ['vxlan', 'pseudo-ethernet']:
+        base = ['interfaces', if_type]
+        if not config.exists(base):
+            # Nothing to do
+            exit(0)
+
+        # list all individual interface isntance
+        for i in config.list_nodes(base):
+            iface = base + [i]
+            if config.exists(iface + ['link']):
+                config.rename(iface + ['link'], 'source-interface')
+
+    try:
+        with open(file_name, 'w') as f:
+            f.write(config.to_string())
+    except OSError as e:
+        print("Failed to save the modified config: {}".format(e))
+        exit(1)