4 files changed, 59 insertions, 5 deletions
diff --git a/src/migration-scripts/vrf/0-to-1 b/src/migration-scripts/vrf/0-to-1
index 70abae2a8..3a9567ab9 100644
--- a/src/migration-scripts/vrf/0-to-1
+++ b/src/migration-scripts/vrf/0-to-1
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 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
diff --git a/src/migration-scripts/vrf/1-to-2 b/src/migration-scripts/vrf/1-to-2
index 557a9ec58..2b7dd556c 100644
--- a/src/migration-scripts/vrf/1-to-2
+++ b/src/migration-scripts/vrf/1-to-2
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 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
@@ -37,7 +37,10 @@ def migrate(config: ConfigTree) -> None:
         new_static_base = vrf_base + [vrf, 'protocols']
         config.set(new_static_base)
         config.copy(static_base, new_static_base + ['static'])
-        config.set_tag(new_static_base + ['static', 'route'])
+        if config.exists(new_static_base + ['static', 'route']):
+            config.set_tag(new_static_base + ['static', 'route'])
+        if config.exists(new_static_base + ['static', 'route6']):
+            config.set_tag(new_static_base + ['static', 'route6'])
 
     # Now delete the old configuration
     config.delete(base)
diff --git a/src/migration-scripts/vrf/2-to-3 b/src/migration-scripts/vrf/2-to-3
index acacffb41..b43067031 100644
--- a/src/migration-scripts/vrf/2-to-3
+++ b/src/migration-scripts/vrf/2-to-3
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 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
@@ -76,7 +76,8 @@ def migrate(config: ConfigTree) -> None:
     # Get a list of all currently used VRFs and tables
     vrfs_current = {}
     for vrf in config.list_nodes(base):
-        vrfs_current[vrf] = int(config.return_value(base + [vrf, 'table']))
+        if config.exists(base + [vrf, 'table']):
+            vrfs_current[vrf] = int(config.return_value(base + [vrf, 'table']))
 
     # Check VRF names and table numbers
     name_regex = re.compile(r'^\d.*$')
diff --git a/src/migration-scripts/vrf/3-to-4 b/src/migration-scripts/vrf/3-to-4
new file mode 100644
index 000000000..959b736e5
--- /dev/null
+++ b/src/migration-scripts/vrf/3-to-4
@@ -0,0 +1,50 @@
+# Copyright 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+# T7664:
+#   FRR 10.5 doesn't have ip protocols:
+#   - connected
+#   - kernel
+#   - table
+#
+#   Remove them from
+#   - vrf name VRF ip protocol
+#   - vrf name VRF ipv6 protocol
+
+from vyos.configtree import ConfigTree
+
+subbases = [
+    ['ip', 'protocol'],
+    ['ipv6', 'protocol'],
+]
+remove_ip_protocols = ['connected', 'kernel', 'table']
+
+base = ['vrf', 'name']
+
+def migrate(config: ConfigTree) -> None:
+    if not config.exists(base):
+        # Nothing to do
+        return
+
+    for vrf in config.list_nodes(base):
+        for subbase in subbases:
+            protocol_base = base + [vrf] + subbase
+
+            if not config.exists(protocol_base):
+                continue
+
+            for protocol in remove_ip_protocols:
+                if config.exists(protocol_base + [protocol]):
+                    config.delete(protocol_base + [protocol])