3 files changed, 79 insertions, 5 deletions
diff --git a/src/migration-scripts/container/2-to-3 b/src/migration-scripts/container/2-to-3
new file mode 100644
index 000000000..54c6ec4c8
--- /dev/null
+++ b/src/migration-scripts/container/2-to-3
@@ -0,0 +1,31 @@
+# Copyright 2024 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/>.
+
+# T7473: container: allow log-driver to be set per container
+
+from vyos.configtree import ConfigTree
+
+def migrate(config: ConfigTree) -> None:
+    log_base = ['container', 'log-driver']
+    container_base = ['container', 'name']
+
+    if not config.exists(log_base):
+        return
+    else:
+        log_driver = config.return_value(log_base)
+        for container in config.list_nodes(container_base):
+            # Set the log-driver for each container
+            config.set(container_base + [container, 'log-driver'], value=log_driver)
+        config.delete(log_base)
diff --git a/src/migration-scripts/firewall/18-to-19 b/src/migration-scripts/firewall/18-to-19
new file mode 100644
index 000000000..3564e0e01
--- /dev/null
+++ b/src/migration-scripts/firewall/18-to-19
@@ -0,0 +1,35 @@
+# Copyright (C) 2024-2025 VyOS maintainers and contributors
+#
+# 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/>.
+
+# From
+#   set firewall global-options apply-to-bridged-traffic invalid-connections
+# To
+#   set firewall global-options apply-to-bridged-traffic accept-invalid ethernet-type <ethertype>
+
+from vyos.configtree import ConfigTree
+
+base = ['firewall', 'global-options', 'apply-to-bridged-traffic']
+
+def migrate(config: ConfigTree) -> None:
+    if not config.exists(base + ['invalid-connections']):
+        # Nothing to do
+        return
+
+    ether_types = ['dhcp', 'arp', 'pppoe-discovery', 'pppoe', '802.1q', '802.1ad', 'wol']
+
+    for ether_type in ether_types:
+        config.set(base + ['accept-invalid', 'ethernet-type'], value=ether_type, replace=False)
+
+    config.delete(base + ['invalid-connections'])
diff --git a/src/migration-scripts/quagga/8-to-9 b/src/migration-scripts/quagga/8-to-9
index eece6c15d..c28e07e5c 100644
--- a/src/migration-scripts/quagga/8-to-9
+++ b/src/migration-scripts/quagga/8-to-9
@@ -16,6 +16,7 @@
 # - T2450: drop interface-route and interface-route6 from "protocols static"
 
 from vyos.configtree import ConfigTree
+from vyos.template import is_ip
 
 def migrate_interface_route(config, base, path, route_route6):
     """ Generic migration function which can be called on every instance of
@@ -31,11 +32,18 @@ def migrate_interface_route(config, base, path, route_route6):
 
             tmp = base + path + [route, 'next-hop-interface']
             for interface in config.list_nodes(tmp):
-                new_base = base + [route_route6, route, 'interface']
-                config.set(new_base)
-                config.set_tag(base + [route_route6])
-                config.set_tag(new_base)
-                config.copy(tmp + [interface], new_base + [interface])
+                if is_ip(interface): # not prohibited in 1.3.x, hence allowed
+                    new_base = base + [route_route6, route, 'next-hop']
+                    config.set(new_base)
+                    config.set_tag(base + [route_route6])
+                    config.set_tag(new_base)
+                    config.copy(tmp + [interface], new_base + [interface])
+                else:
+                    new_base = base + [route_route6, route, 'interface']
+                    config.set(new_base)
+                    config.set_tag(base + [route_route6])
+                    config.set_tag(new_base)
+                    config.copy(tmp + [interface], new_base + [interface])
 
         config.delete(base + path)