vpp: T8314: Migrate ipip interface to 'interfaces vpp ipip'

1 files changed, 27 insertions, 0 deletions

diff --git a/src/migration-scripts/vpp/5-to-6 b/src/migration-scripts/vpp/5-to-6
index 25529cf36..18f0f70d2 100644
--- a/src/migration-scripts/vpp/5-to-6
+++ b/src/migration-scripts/vpp/5-to-6
@@ -41,6 +41,8 @@
 #
 # Move vxlan interface from vpp section to 'interfaces vpp vxlan' (T8296)
 #
+# Move ipip interface from vpp section to 'interfaces vpp ipip' (T8314)
+#
 
 from vyos.configtree import ConfigTree
 
@@ -411,6 +413,30 @@ def _migrate_vpp_vxlan_interface(config: ConfigTree) -> None:
         config.delete(['vpp', 'interfaces'])
 
 
+def _migrate_vpp_ipip_interface(config: ConfigTree) -> None:
+    base = ['vpp', 'interfaces', 'ipip']
+    new_base = ['interfaces', 'vpp', 'ipip']
+    kernel_interface_base = ['vpp', 'kernel-interfaces']
+
+    if not config.exists(base):
+        return
+
+    config.set(new_base)
+
+    for ifname in config.list_nodes(base):
+        _migrate_interface(config, 'ipip', 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
@@ -428,3 +454,4 @@ def migrate(config: ConfigTree) -> None:
     _migrate_vpp_resources(config)
     _migrate_vpp_bonding_interface(config)
     _migrate_vpp_vxlan_interface(config)
+    _migrate_vpp_ipip_interface(config)