Merge pull request #4050 from jestabro/revise-migration-circinus

T6007: revise migration system

1 files changed, 10 insertions, 29 deletions

diff --git a/src/migration-scripts/firewall/15-to-16 b/src/migration-scripts/firewall/15-to-16
index 28df1256e..8e28bba6f 100755..100644
--- a/src/migration-scripts/firewall/15-to-16
+++ b/src/migration-scripts/firewall/15-to-16
@@ -18,39 +18,20 @@
     # from: set system conntrack timeout ..
     # to: set firewall global-options timeout ...
 
-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()
-
 firewall_base = ['firewall', 'global-options']
 conntrack_base = ['system', 'conntrack', 'timeout']
-config = ConfigTree(config_file)
-
-if not config.exists(conntrack_base):
-    # Nothing to do
-    exit(0)
 
-for protocol in ['icmp', 'tcp', 'udp', 'other']:
-    if config.exists(conntrack_base + [protocol]):
-        if not config.exists(firewall_base + ['timeout']):
-            config.set(firewall_base + ['timeout'])
+def migrate(config: ConfigTree) -> None:
+    if not config.exists(conntrack_base):
+        # Nothing to do
+        return
 
-        config.copy(conntrack_base + [protocol], firewall_base + ['timeout', protocol])
-        config.delete(conntrack_base + [protocol])
+    for protocol in ['icmp', 'tcp', 'udp', 'other']:
+        if config.exists(conntrack_base + [protocol]):
+            if not config.exists(firewall_base + ['timeout']):
+                config.set(firewall_base + ['timeout'])
 
-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)
+            config.copy(conntrack_base + [protocol], firewall_base + ['timeout', protocol])
+            config.delete(conntrack_base + [protocol])