Merge pull request #5020 from natali-rs1985/T8325

vpp: T8325: Migrate gre interface to 'interfaces vpp gre'

4 files changed, 98 insertions, 130 deletions

diff --git a/src/conf_mode/vpp.py b/src/conf_mode/vpp.py
index 6d2e2866f..92777a16a 100755
--- a/src/conf_mode/vpp.py
+++ b/src/conf_mode/vpp.py
@@ -612,17 +612,17 @@ def verify(config):
                 )
 
     # check GRE tunnels as part of the bridge, only tunnel-type teb is allowed
-    #   set vpp interfaces bridge br1 member interface gre1
-    #   set vpp interfaces gre gre1 tunnel-type teb
+    #   set vpp interfaces bridge br1 member interface vppgre1
+    #   set interfaces vpp gre vppgre1 tunnel-type teb
     if 'interfaces' in config:
         if 'bridge' in config['interfaces']:
             for iface, iface_config in config['interfaces']['bridge'].items():
                 if 'member' in iface_config:
                     for member in iface_config['member'].get('interface', []):
-                        if member.startswith('gre'):
+                        if member.startswith('vppgre'):
                             if (
-                                'gre' in config['interfaces']
-                                and config['interfaces']['gre']
+                                'gre' in config['interfaces_vpp']
+                                and config['interfaces_vpp']['gre']
                                 .get(member, {})
                                 .get('tunnel_type')
                                 != 'teb'
@@ -631,29 +631,6 @@ def verify(config):
                                     f'Only tunnel-type teb is allowed for GRE interfaces in bridge {iface}'
                                 )
 
-        # Only one multipoint GRE tunnel is allowed from the same source address
-        #   set vpp interfaces gre gre0 mode 'point-to-multipoint'
-        #   set vpp interfaces gre gre0 remote '0.0.0.0'
-        #   set vpp interfaces gre gre0 source-address '192.0.2.1'
-        #   set vpp interfaces gre gre1 mode 'point-to-multipoint'
-        #   set vpp interfaces gre gre1 remote '0.0.0.0'
-        #   set vpp interfaces gre gre1 source-address '192.0.2.1'
-        if 'gre' in config['interfaces']:
-            for iface, iface_config in config['interfaces']['gre'].items():
-                if iface_config['mode'] == 'point-to-multipoint':
-                    for other_iface, other_iface_config in config['interfaces'][
-                        'gre'
-                    ].items():
-                        if (
-                            other_iface_config['mode'] == 'point-to-multipoint'
-                            and other_iface_config['source_address']
-                            == iface_config['source_address']
-                            and iface != other_iface
-                        ):
-                            raise ConfigError(
-                                'Only one multipoint GRE tunnel is allowed from the same source address'
-                            )
-
     # Check if deleted interfaces are not xconnect memebrs
     for iface_config in config.get('removed_ifaces', []):
         if iface_config['iface_name'] in config.get('xconn_members', {}):
diff --git a/src/conf_mode/vpp_interfaces_bridge.py b/src/conf_mode/vpp_interfaces_bridge.py
index d53173f04..edf3f2dd2 100644
--- a/src/conf_mode/vpp_interfaces_bridge.py
+++ b/src/conf_mode/vpp_interfaces_bridge.py
@@ -96,7 +96,7 @@ def verify(config):
 
     # Check if interface exists in vpp before adding to bridge-domain
 
-    allowed_prefixes = ('vppbond', 'gre', 'geneve', 'vpplo', 'vppvxlan')
+    allowed_prefixes = ('vppbond', 'vppgre', 'geneve', 'vpplo', 'vppvxlan')
 
     if 'member' in config:
         bvi_exists = False
diff --git a/src/conf_mode/vpp_interfaces_gre.py b/src/conf_mode/vpp_interfaces_gre.py
index 53a423dd9..453845bcf 100644
--- a/src/conf_mode/vpp_interfaces_gre.py
+++ b/src/conf_mode/vpp_interfaces_gre.py
@@ -16,25 +16,20 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-import os
-
 from vyos import ConfigError
 
 from vyos.config import Config
-from vyos.configdict import leaf_node_changed
+from vyos.configdict import get_interface_dict
 from vyos.configdep import set_dependents, call_dependents
-from vyos.template import is_interface
+from vyos.utils.process import is_systemd_service_active
 
-from vyos.vpp.interface import GREInterface
+from vyos.ifconfig.vpp import VPPGREInterface
 from vyos.vpp.config_deps import deps_xconnect_dict
 from vyos.vpp.config_verify import (
-    verify_vpp_remove_kernel_interface,
-    verify_vpp_change_kernel_interface,
     verify_vpp_remove_xconnect_interface,
-    verify_vpp_exists_kernel_interface,
     verify_vpp_tunnel_source_address,
 )
-from vyos.vpp.utils import cli_ifaces_lcp_kernel_list, cli_ethernet_with_vifs_ifaces
+from vyos.vpp.utils import cli_ethernet_with_vifs_ifaces
 
 
 def get_config(config=None) -> dict:
@@ -50,55 +45,14 @@ def get_config(config=None) -> dict:
     else:
         conf = Config()
 
-    base = ['vpp', 'interfaces', 'gre']
-    base_kernel_interfaces = ['vpp', 'kernel-interfaces']
-
-    ifname = os.environ['VYOS_TAGNODE_VALUE']
+    base = ['interfaces', 'vpp', 'gre']
 
-    # Get config_dict with default values
-    config = conf.get_config_dict(
-        base + [ifname],
-        key_mangling=('-', '_'),
-        get_first_key=True,
-        no_tag_node_value_mangle=True,
-        with_defaults=True,
-        with_recursive_defaults=True,
-    )
+    ifname, config = get_interface_dict(conf, base)
 
-    if not conf.exists(['vpp']):
+    if not conf.exists(['vpp']) and not conf.exists(base):
         config['remove_vpp'] = True
         return config
 
-    # Get effective config as we need full dicitonary per interface delete
-    effective_config = conf.get_config_dict(
-        base + [ifname],
-        key_mangling=('-', '_'),
-        effective=True,
-        get_first_key=True,
-        no_tag_node_value_mangle=True,
-    )
-
-    if effective_config:
-        config.update({'effective': effective_config})
-
-    if not conf.exists(base + [ifname]):
-        config['remove'] = True
-
-    # Get global 'vpp kernel-interfaces' for verify
-    config['vpp_kernel_interfaces'] = conf.get_config_dict(
-        base_kernel_interfaces,
-        key_mangling=('-', '_'),
-        get_first_key=True,
-        no_tag_node_value_mangle=True,
-    )
-
-    tmp = leaf_node_changed(conf, base + [ifname, 'kernel-interface'])
-    if tmp:
-        config['kernel_interface_removed'] = tmp
-
-    # list of all kernel interfaces `vpp interface xxx kernel-interface xxx`
-    config['candidate_kernel_interfaces'] = cli_ifaces_lcp_kernel_list(conf)
-
     # list of all Ethernet interfaces with vifs
     config['vpp_ether_vif_ifaces'] = cli_ethernet_with_vifs_ifaces(conf)
 
@@ -108,11 +62,23 @@ def get_config(config=None) -> dict:
         for xconn_iface in config['xconn_members'][ifname]:
             set_dependents('vpp_interfaces_xconnect', conf, xconn_iface)
 
-    if effective_config.get('kernel_interface'):
-        if conf.exists(base + [ifname, 'kernel-interface']):
-            iface = config.get('kernel_interface')
-            if conf.exists(['vpp', 'kernel-interfaces', iface]):
-                set_dependents('vpp_kernel_interface', conf, iface)
+    # Get 'vpp settings' config
+    config['vpp_settings'] = conf.get_config_dict(
+        ['vpp', 'settings'],
+        key_mangling=('-', '_'),
+        get_first_key=True,
+        no_tag_node_value_mangle=True,
+    )
+
+    # Get all gre interfaces config
+    config['gre_interfaces'] = conf.get_config_dict(
+        base,
+        key_mangling=('-', '_'),
+        get_first_key=True,
+        no_tag_node_value_mangle=True,
+        with_defaults=True,
+        with_recursive_defaults=True,
+    )
 
     # NAT dependency
     if conf.exists(['vpp', 'nat', 'nat44']):
@@ -124,7 +90,6 @@ def get_config(config=None) -> dict:
     if conf.exists(['vpp', 'acl']):
         set_dependents('vpp_acl', conf)
 
-    config['ifname'] = ifname
     return config
 
 
@@ -133,19 +98,19 @@ def verify(config):
     if 'remove_vpp' in config:
         return None
 
-    # Verify that removed kernel interface is not used in 'vpp kernel-interfaces'.
-    # vpp interfaces gre greX kernel-interface vpp-tunX
-    # vpp kernel-interface vpp-tunX
-    verify_vpp_remove_kernel_interface(config)
-
     verify_vpp_remove_xconnect_interface(config)
 
     # config removed
-    if 'remove' in config:
+    if 'deleted' in config:
         return None
 
+    if not is_systemd_service_active('vpp.service'):
+        raise ConfigError(
+            'Cannot configure VPP GRE interface: vpp.service is not running'
+        )
+
     # source-address and remote are mandatory options
-    required_keys = {'source_address', 'remote', 'mode', 'tunnel_type'}
+    required_keys = {'source_address', 'remote', 'tunnel_type'}
     if not all(key in config for key in required_keys):
         missing_keys = required_keys - set(config.keys())
         raise ConfigError(
@@ -157,17 +122,28 @@ def verify(config):
     if config.get('source_address') == config.get('remote'):
         raise ConfigError('Remote address must not be the same as source address')
 
-    # check multipoint mode
-    if config.get('mode') == 'point-to-multipoint':
-        # For multipoint mode, remote IP must be 0.0.0.0
-        if config.get('remote') != '0.0.0.0':
-            raise ConfigError('For point-to-multipoint mode, remote must be 0.0.0.0')
-
-    # Change 'vpp interfaces gre greX kernel-interface vpp-tunX'
-    #     => 'vpp interfaces gre greX kernel-interface vpp-tunY'
-    # check if we have kernel interface config 'vpp kernel-interface vpp-tunX'
-    verify_vpp_change_kernel_interface(config)
-    verify_vpp_exists_kernel_interface(config)
+    # Disable checks as point-to-multipoint mode does not work without 'teib' feature that is not implemented yet
+    # # check multipoint mode
+    # if config.get('mode') == 'point-to-multipoint':
+    #     # For multipoint mode, remote IP must be 0.0.0.0
+    #     if config.get('remote') != '0.0.0.0':
+    #         raise ConfigError('For point-to-multipoint mode, remote must be 0.0.0.0')
+    #
+    #     # Only one multipoint GRE tunnel is allowed from the same source address
+    #     #   set interfaces vpp gre vppgre0 mode 'point-to-multipoint'
+    #     #   set interfaces vpp gre vppgre0 remote '0.0.0.0'
+    #     #   set interfaces vpp gre vppgre0 source-address '192.0.2.1'
+    #     #   set interfaces vpp gre vppgre1 mode 'point-to-multipoint'
+    #     #   set interfaces vpp gre vppgre1 remote '0.0.0.0'
+    #     #   set interfaces vpp gre vppgre1 source-address '192.0.2.1'
+    #     for other_iface, other_iface_config in config['gre_interfaces'].items():
+    #         if other_iface == config['ifname']:
+    #             continue
+    #         if other_iface_config['mode'] == 'point-to-multipoint':
+    #             if config['source_address'] == other_iface_config.get('source_address'):
+    #                 raise ConfigError(
+    #                     'Only one multipoint GRE tunnel is allowed from the same source address'
+    #                 )
 
 
 def generate(config):
@@ -179,32 +155,13 @@ def apply(config):
         return None
 
     ifname = config.get('ifname')
-    # Delete interface
-    if 'effective' in config:
-        remove_config = config.get('effective')
-        src_addr = remove_config.get('source_address')
-        dst_addr = remove_config.get('remote')
-        i = GREInterface(ifname, src_addr, dst_addr)
-        i.delete()
-
-    if 'remove' in config:
-        return None
+    gre = VPPGREInterface(ifname, config)
+    gre.remove()
 
-    # Add interface
-    src_addr = config.get('source_address')
-    dst_addr = config.get('remote')
-    kernel_interface = config.get('kernel_interface', '')
-    mode = config.get('mode')
-    tunnel_type = config.get('tunnel_type')
-    state = 'up' if 'disable' not in config else 'down'
-    i = GREInterface(
-        ifname, src_addr, dst_addr, tunnel_type, mode, kernel_interface, state
-    )
-    i.add()
+    if 'deleted' in config:
+        return
 
-    # Add kernel-interface (LCP) if interface is not exist
-    if 'kernel_interface' in config and not is_interface(kernel_interface):
-        i.kernel_add()
+    gre.update(config)
 
     call_dependents()
 
diff --git a/src/migration-scripts/vpp/5-to-6 b/src/migration-scripts/vpp/5-to-6
index 23b2d4eaa..03c20d970 100644
--- a/src/migration-scripts/vpp/5-to-6
+++ b/src/migration-scripts/vpp/5-to-6
@@ -45,6 +45,8 @@
 #
 # Migrate loopback interface from vpp section to 'interfaces vpp loopback' (T8324)
 #
+# Migrate gre interface to 'interfaces vpp gre', remove interfaces with mode "point-to-multipoint" (T8325)
+#
 
 from vyos.configtree import ConfigTree
 
@@ -463,6 +465,37 @@ def _migrate_vpp_loopback_interface(config: ConfigTree) -> None:
         config.delete(['vpp', 'interfaces'])
 
 
+def _migrate_vpp_gre_interface(config: ConfigTree) -> None:
+    base = ['vpp', 'interfaces', 'gre']
+    new_base = ['interfaces', 'vpp', 'gre']
+    kernel_interface_base = ['vpp', 'kernel-interfaces']
+
+    if not config.exists(base):
+        return
+
+    config.set(new_base)
+
+    for ifname in config.list_nodes(base):
+        if config.exists(base + [ifname, 'mode']):
+            if config.return_value(base + [ifname, 'mode']) == 'point-to-multipoint':
+                config.delete(base + [ifname])
+                continue
+            config.delete(base + [ifname, 'mode'])
+
+        _migrate_interface(config, 'gre', ifname)
+
+        _migrate_members_bridge(config, ifname)
+        _migrate_members_xconnect(config, ifname)
+
+    config.delete(base)
+
+    if config.exists(kernel_interface_base) and len(config.list_nodes(kernel_interface_base)) == 0:
+        config.delete(['vpp', 'kernel-interfaces'])
+
+    if len(config.list_nodes(['vpp', 'interfaces'])) == 0:
+        config.delete(['vpp', 'interfaces'])
+
+
 def migrate(config: ConfigTree) -> None:
     if not config.exists(['vpp']):
         # Nothing to do
@@ -482,3 +515,4 @@ def migrate(config: ConfigTree) -> None:
     _migrate_vpp_vxlan_interface(config)
     _migrate_vpp_ipip_interface(config)
     _migrate_vpp_loopback_interface(config)
+    _migrate_vpp_gre_interface(config)