Merge pull request #3692 from jestabro/revise-migration

T6007: revise migration system

1 files changed, 53 insertions, 73 deletions

diff --git a/src/migration-scripts/firewall/8-to-9 b/src/migration-scripts/firewall/8-to-9
index 6e019beb2..3c9e84662 100755..100644
--- a/src/migration-scripts/firewall/8-to-9
+++ b/src/migration-scripts/firewall/8-to-9
@@ -1,18 +1,17 @@
-#!/usr/bin/env python3
+# Copyright 2022-2024 VyOS maintainers and contributors <maintainers@vyos.io>
 #
-# Copyright (C) 2022-2024 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 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,
+# 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 General Public License for more details.
+# 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 General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 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/>.
 
 # T4780: Add firewall interface group
 #  cli changes from:
@@ -20,69 +19,50 @@
 #  To
 #  set firewall [name | ipv6-name] <name> rule <number> [inbound-interface | outbound-interface]  [interface-name | interface-group] <interface_name | interface_group>
 
-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()
-
 base = ['firewall']
-config = ConfigTree(config_file)
-
-if not config.exists(base):
-    # Nothing to do
-    exit(0)
-
-if config.exists(base + ['name']):
-    for name in config.list_nodes(base + ['name']):
-        if not config.exists(base + ['name', name, 'rule']):
-            continue
-
-        for rule in config.list_nodes(base + ['name', name, 'rule']):
-            rule_iiface = base + ['name', name, 'rule', rule, 'inbound-interface']
-            rule_oiface = base + ['name', name, 'rule', rule, 'outbound-interface']
-
-            if config.exists(rule_iiface):
-                tmp = config.return_value(rule_iiface)
-                config.delete(rule_iiface)
-                config.set(rule_iiface + ['interface-name'], value=tmp)
-
-            if config.exists(rule_oiface):
-                tmp = config.return_value(rule_oiface)
-                config.delete(rule_oiface)
-                config.set(rule_oiface + ['interface-name'], value=tmp)
-
-
-if config.exists(base + ['ipv6-name']):
-    for name in config.list_nodes(base + ['ipv6-name']):
-        if not config.exists(base + ['ipv6-name', name, 'rule']):
-            continue
-
-        for rule in config.list_nodes(base + ['ipv6-name', name, 'rule']):
-            rule_iiface = base + ['ipv6-name', name, 'rule', rule, 'inbound-interface']
-            rule_oiface = base + ['ipv6-name', name, 'rule', rule, 'outbound-interface']
-
-            if config.exists(rule_iiface):
-                tmp = config.return_value(rule_iiface)
-                config.delete(rule_iiface)
-                config.set(rule_iiface + ['interface-name'], value=tmp)
-
-            if config.exists(rule_oiface):
-                tmp = config.return_value(rule_oiface)
-                config.delete(rule_oiface)
-                config.set(rule_oiface + ['interface-name'], value=tmp)
 
-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)
+def migrate(config: ConfigTree) -> None:
+    if not config.exists(base):
+        # Nothing to do
+        return
+
+    if config.exists(base + ['name']):
+        for name in config.list_nodes(base + ['name']):
+            if not config.exists(base + ['name', name, 'rule']):
+                continue
+
+            for rule in config.list_nodes(base + ['name', name, 'rule']):
+                rule_iiface = base + ['name', name, 'rule', rule, 'inbound-interface']
+                rule_oiface = base + ['name', name, 'rule', rule, 'outbound-interface']
+
+                if config.exists(rule_iiface):
+                    tmp = config.return_value(rule_iiface)
+                    config.delete(rule_iiface)
+                    config.set(rule_iiface + ['interface-name'], value=tmp)
+
+                if config.exists(rule_oiface):
+                    tmp = config.return_value(rule_oiface)
+                    config.delete(rule_oiface)
+                    config.set(rule_oiface + ['interface-name'], value=tmp)
+
+
+    if config.exists(base + ['ipv6-name']):
+        for name in config.list_nodes(base + ['ipv6-name']):
+            if not config.exists(base + ['ipv6-name', name, 'rule']):
+                continue
+
+            for rule in config.list_nodes(base + ['ipv6-name', name, 'rule']):
+                rule_iiface = base + ['ipv6-name', name, 'rule', rule, 'inbound-interface']
+                rule_oiface = base + ['ipv6-name', name, 'rule', rule, 'outbound-interface']
+
+                if config.exists(rule_iiface):
+                    tmp = config.return_value(rule_iiface)
+                    config.delete(rule_iiface)
+                    config.set(rule_iiface + ['interface-name'], value=tmp)
+
+                if config.exists(rule_oiface):
+                    tmp = config.return_value(rule_oiface)
+                    config.delete(rule_oiface)
+                    config.set(rule_oiface + ['interface-name'], value=tmp)