2 files changed, 73 insertions, 4 deletions
diff --git a/src/migration-scripts/dhcpv6-server/4-to-5 b/src/migration-scripts/dhcpv6-server/4-to-5
index e808edbe0..ae506b9c5 100755
--- a/src/migration-scripts/dhcpv6-server/4-to-5
+++ b/src/migration-scripts/dhcpv6-server/4-to-5
@@ -39,14 +39,34 @@ if not config.exists(base):
 def find_subnet_interface(subnet):
     subnet_net = ip_network(subnet)
 
+    def check_addr(if_path):
+        if config.exists(if_path + ['address']):
+            for addr in config.return_values(if_path + ['address']):
+                if ip_network(addr, strict=False) == subnet_net:
+                    return True
+        return None
+
     for iftype in config.list_nodes(['interfaces']):
         for ifname in config.list_nodes(['interfaces', iftype]):
             if_base = ['interfaces', iftype, ifname]
 
-            if config.exists(if_base + ['address']):
-                for addr in config.return_values(if_base + ['address']):
-                    if ip_network(addr, strict=False) == subnet_net:
-                        return ifname
+            if check_addr(if_base):
+                return ifname
+
+            if config.exists(if_base + ['vif']):
+                for vif in config.list_nodes(if_base + ['vif']):
+                    if check_addr(if_base + ['vif', vif]):
+                        return f'{ifname}.{vif}'
+
+            if config.exists(if_base + ['vif-s']):
+                for vifs in config.list_nodes(if_base + ['vif-s']):
+                    if check_addr(if_base + ['vif-s', vifs]):
+                        return f'{ifname}.{vifs}'
+
+                    if config.exists(if_base + ['vif-s', vifs, 'vif-c']):
+                        for vifc in config.list_nodes(if_base + ['vif-s', vifs, 'vif-c']):
+                            if check_addr(if_base + ['vif-s', vifs, 'vif-c', vifc]):
+                                return f'{ifname}.{vifs}.{vifc}'
 
     return False
 
diff --git a/src/migration-scripts/l2tp/8-to-9 b/src/migration-scripts/l2tp/8-to-9
new file mode 100755
index 000000000..e85a3892b
--- /dev/null
+++ b/src/migration-scripts/l2tp/8-to-9
@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2024 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/>.
+
+# Deleted 'dhcp-interface' from l2tp
+
+import os
+
+from sys import argv
+from sys import exit
+from vyos.configtree import ConfigTree
+
+
+if len(argv) < 2:
+    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)
+base = ['vpn', 'l2tp', 'remote-access']
+if not config.exists(base):
+    exit(0)
+
+#deleting unused dhcp-interface
+if config.exists(base + ['dhcp-interface']):
+    config.delete(base + ['dhcp-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)