2 files changed, 12 insertions, 12 deletions
diff --git a/src/migration-scripts/openconnect/0-to-1 b/src/migration-scripts/openconnect/0-to-1
index 83cd09143..8be15fad1 100755
--- a/src/migration-scripts/openconnect/0-to-1
+++ b/src/migration-scripts/openconnect/0-to-1
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021 VyOS maintainers and contributors
+# Copyright (C) 2021-2023 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
@@ -26,9 +26,9 @@ from vyos.pki import load_crl
 from vyos.pki import load_private_key
 from vyos.pki import encode_certificate
 from vyos.pki import encode_private_key
-from vyos.util import run
+from vyos.utils.process import run
 
-if (len(argv) < 1):
+if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
@@ -125,7 +125,7 @@ if config.exists(x509_base + ['key-file']):
         config.set(pki_base + ['certificate', pki_name, 'private', 'key'], value=wrapped_pem_to_config_value(key_pem))
     else:
         print(f'Failed to migrate private key on openconnect config')
-        
+
     config.delete(x509_base + ['key-file'])
 
 try:
diff --git a/src/migration-scripts/openconnect/1-to-2 b/src/migration-scripts/openconnect/1-to-2
index 7031fb252..7978aa56e 100755
--- a/src/migration-scripts/openconnect/1-to-2
+++ b/src/migration-scripts/openconnect/1-to-2
@@ -20,7 +20,7 @@ import sys
 
 from vyos.configtree import ConfigTree
 
-if (len(sys.argv) < 1):
+if len(sys.argv) < 2:
     print("Must specify file name!")
     sys.exit(1)
 
@@ -39,13 +39,13 @@ if not config.exists(cfg_base):
 else:
     if config.exists(cfg_base + ['authentication', 'mode']):
         if config.return_value(cfg_base + ['authentication', 'mode']) == 'radius':
-            # if "mode value radius", change to "tag node mode + valueless node radius"
-            config.delete(cfg_base + ['authentication','mode', 'radius'])
-            config.set(cfg_base + ['authentication', 'mode', 'radius'], value=None, replace=True)
-        elif not config.exists(cfg_base + ['authentication', 'mode', 'local']):
-            # if "mode local", change to "tag node mode + node local value password"
-            config.delete(cfg_base + ['authentication', 'mode', 'local'])
-            config.set(cfg_base + ['authentication', 'mode', 'local'], value='password', replace=True)
+            # if "mode value radius", change to "mode + valueless node radius"
+            config.delete_value(cfg_base + ['authentication','mode'], 'radius')
+            config.set(cfg_base + ['authentication', 'mode', 'radius'], value=None)
+        elif config.return_value(cfg_base + ['authentication', 'mode']) == 'local':
+            # if "mode local", change to "mode + node local value password"
+            config.delete_value(cfg_base + ['authentication', 'mode'], 'local')
+            config.set(cfg_base + ['authentication', 'mode', 'local'], value='password')
     try:
         with open(file_name, 'w') as f:
             f.write(config.to_string())