From d1923b7b58795f0d9635ae0e8df110f591881bdf Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 2 Aug 2023 09:12:23 +0000
Subject: T5427: Fix migration script arguments len expects 2 args

The script's name is always provided as the first argument sys.argv[0]
Expected length for argv is 2 (script itself + config file)

Change: 'if (len(argv) < 1)' to 'if len(argv) < 2'
---
 src/migration-scripts/interfaces/0-to-1   | 2 +-
 src/migration-scripts/interfaces/1-to-2   | 2 +-
 src/migration-scripts/interfaces/10-to-11 | 2 +-
 src/migration-scripts/interfaces/11-to-12 | 2 +-
 src/migration-scripts/interfaces/12-to-13 | 2 +-
 src/migration-scripts/interfaces/13-to-14 | 2 +-
 src/migration-scripts/interfaces/14-to-15 | 2 +-
 src/migration-scripts/interfaces/15-to-16 | 2 +-
 src/migration-scripts/interfaces/16-to-17 | 6 +++---
 src/migration-scripts/interfaces/17-to-18 | 2 +-
 src/migration-scripts/interfaces/18-to-19 | 2 +-
 src/migration-scripts/interfaces/19-to-20 | 2 +-
 src/migration-scripts/interfaces/2-to-3   | 2 +-
 src/migration-scripts/interfaces/20-to-21 | 2 +-
 src/migration-scripts/interfaces/21-to-22 | 2 +-
 src/migration-scripts/interfaces/22-to-23 | 2 +-
 src/migration-scripts/interfaces/23-to-24 | 2 +-
 src/migration-scripts/interfaces/24-to-25 | 2 +-
 src/migration-scripts/interfaces/25-to-26 | 2 +-
 src/migration-scripts/interfaces/26-to-27 | 2 +-
 src/migration-scripts/interfaces/27-to-28 | 2 +-
 src/migration-scripts/interfaces/28-to-29 | 2 +-
 src/migration-scripts/interfaces/3-to-4   | 2 +-
 src/migration-scripts/interfaces/4-to-5   | 2 +-
 src/migration-scripts/interfaces/5-to-6   | 2 +-
 src/migration-scripts/interfaces/6-to-7   | 2 +-
 src/migration-scripts/interfaces/7-to-8   | 2 +-
 src/migration-scripts/interfaces/8-to-9   | 2 +-
 src/migration-scripts/interfaces/9-to-10  | 2 +-
 29 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'src/migration-scripts/interfaces')

diff --git a/src/migration-scripts/interfaces/0-to-1 b/src/migration-scripts/interfaces/0-to-1
index c7f324661..25f6842eb 100755
--- a/src/migration-scripts/interfaces/0-to-1
+++ b/src/migration-scripts/interfaces/0-to-1
@@ -37,7 +37,7 @@ def migrate_bridge(config, tree, intf):
 
 
 if __name__ == '__main__':
-    if (len(sys.argv) < 1):
+    if len(sys.argv) < 2:
         print("Must specify file name!")
         sys.exit(1)
 
diff --git a/src/migration-scripts/interfaces/1-to-2 b/src/migration-scripts/interfaces/1-to-2
index c75404d85..c95623c2b 100755
--- a/src/migration-scripts/interfaces/1-to-2
+++ b/src/migration-scripts/interfaces/1-to-2
@@ -7,7 +7,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)
 
diff --git a/src/migration-scripts/interfaces/10-to-11 b/src/migration-scripts/interfaces/10-to-11
index 6b8e49ed9..cafaa3fa4 100755
--- a/src/migration-scripts/interfaces/10-to-11
+++ b/src/migration-scripts/interfaces/10-to-11
@@ -23,7 +23,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/11-to-12 b/src/migration-scripts/interfaces/11-to-12
index 0dad24642..e9eb7f939 100755
--- a/src/migration-scripts/interfaces/11-to-12
+++ b/src/migration-scripts/interfaces/11-to-12
@@ -22,7 +22,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/12-to-13 b/src/migration-scripts/interfaces/12-to-13
index f866ca9a6..ef1d93903 100755
--- a/src/migration-scripts/interfaces/12-to-13
+++ b/src/migration-scripts/interfaces/12-to-13
@@ -24,7 +24,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/13-to-14 b/src/migration-scripts/interfaces/13-to-14
index 6e6439c36..b20d8b4db 100755
--- a/src/migration-scripts/interfaces/13-to-14
+++ b/src/migration-scripts/interfaces/13-to-14
@@ -21,7 +21,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/14-to-15 b/src/migration-scripts/interfaces/14-to-15
index c38db0bf8..e21251f86 100755
--- a/src/migration-scripts/interfaces/14-to-15
+++ b/src/migration-scripts/interfaces/14-to-15
@@ -20,7 +20,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/15-to-16 b/src/migration-scripts/interfaces/15-to-16
index 804c48be0..ae3441b9f 100755
--- a/src/migration-scripts/interfaces/15-to-16
+++ b/src/migration-scripts/interfaces/15-to-16
@@ -20,7 +20,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/16-to-17 b/src/migration-scripts/interfaces/16-to-17
index d123be06f..75f160686 100755
--- a/src/migration-scripts/interfaces/16-to-17
+++ b/src/migration-scripts/interfaces/16-to-17
@@ -21,7 +21,7 @@ import sys
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(sys.argv) < 1):
+    if len(sys.argv) < 2:
         print("Must specify file name!")
         sys.exit(1)
 
@@ -35,7 +35,7 @@ if __name__ == '__main__':
     if not config.exists(base):
         # Nothing to do
         sys.exit(0)
-    
+
     for interface in config.list_nodes(base):
         mirror_old_base = base + [interface, 'mirror']
         if config.exists(mirror_old_base):
@@ -43,7 +43,7 @@ if __name__ == '__main__':
             if config.exists(mirror_old_base):
                 config.delete(mirror_old_base)
                 config.set(mirror_old_base + ['ingress'],intf[0])
-    
+
     try:
         with open(file_name, 'w') as f:
             f.write(config.to_string())
diff --git a/src/migration-scripts/interfaces/17-to-18 b/src/migration-scripts/interfaces/17-to-18
index b8cb8c119..51486ac37 100755
--- a/src/migration-scripts/interfaces/17-to-18
+++ b/src/migration-scripts/interfaces/17-to-18
@@ -22,7 +22,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/18-to-19 b/src/migration-scripts/interfaces/18-to-19
index a12c4a6cd..c3209f250 100755
--- a/src/migration-scripts/interfaces/18-to-19
+++ b/src/migration-scripts/interfaces/18-to-19
@@ -41,7 +41,7 @@ def replace_nat_interfaces(config, old, new):
 
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/19-to-20 b/src/migration-scripts/interfaces/19-to-20
index e96663e54..05abae898 100755
--- a/src/migration-scripts/interfaces/19-to-20
+++ b/src/migration-scripts/interfaces/19-to-20
@@ -19,7 +19,7 @@ from sys import exit
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/2-to-3 b/src/migration-scripts/interfaces/2-to-3
index 68d41de39..15c3bc8be 100755
--- a/src/migration-scripts/interfaces/2-to-3
+++ b/src/migration-scripts/interfaces/2-to-3
@@ -7,7 +7,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)
 
diff --git a/src/migration-scripts/interfaces/20-to-21 b/src/migration-scripts/interfaces/20-to-21
index cb1c36882..14ad0fe4d 100755
--- a/src/migration-scripts/interfaces/20-to-21
+++ b/src/migration-scripts/interfaces/20-to-21
@@ -23,7 +23,7 @@ from sys import argv
 from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
-if (len(argv) < 1):
+if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
diff --git a/src/migration-scripts/interfaces/21-to-22 b/src/migration-scripts/interfaces/21-to-22
index 098102102..1838eb1c0 100755
--- a/src/migration-scripts/interfaces/21-to-22
+++ b/src/migration-scripts/interfaces/21-to-22
@@ -17,7 +17,7 @@
 from sys import argv
 from vyos.configtree import ConfigTree
 
-if (len(argv) < 1):
+if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
diff --git a/src/migration-scripts/interfaces/22-to-23 b/src/migration-scripts/interfaces/22-to-23
index 06e07572f..8b21fce51 100755
--- a/src/migration-scripts/interfaces/22-to-23
+++ b/src/migration-scripts/interfaces/22-to-23
@@ -75,7 +75,7 @@ def migrate_ripng(config, path, interface):
             config.delete(path[:-1])
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/23-to-24 b/src/migration-scripts/interfaces/23-to-24
index d1ec2ad3e..8fd79ecc6 100755
--- a/src/migration-scripts/interfaces/23-to-24
+++ b/src/migration-scripts/interfaces/23-to-24
@@ -22,7 +22,7 @@ import sys
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(sys.argv) < 1):
+    if len(sys.argv) < 2:
         print("Must specify file name!")
         sys.exit(1)
 
diff --git a/src/migration-scripts/interfaces/24-to-25 b/src/migration-scripts/interfaces/24-to-25
index f3a1dc464..9aa6ea5e3 100755
--- a/src/migration-scripts/interfaces/24-to-25
+++ b/src/migration-scripts/interfaces/24-to-25
@@ -53,7 +53,7 @@ def read_file_for_pki(config_auth_path):
 
     return output
 
-if (len(sys.argv) < 1):
+if len(sys.argv) < 2:
     print("Must specify file name!")
     sys.exit(1)
 
diff --git a/src/migration-scripts/interfaces/25-to-26 b/src/migration-scripts/interfaces/25-to-26
index a8936235e..4967a29fa 100755
--- a/src/migration-scripts/interfaces/25-to-26
+++ b/src/migration-scripts/interfaces/25-to-26
@@ -22,7 +22,7 @@ from sys import argv
 from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
-if (len(argv) < 1):
+if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
diff --git a/src/migration-scripts/interfaces/26-to-27 b/src/migration-scripts/interfaces/26-to-27
index 949cc55b6..a0d043d11 100755
--- a/src/migration-scripts/interfaces/26-to-27
+++ b/src/migration-scripts/interfaces/26-to-27
@@ -22,7 +22,7 @@ from sys import argv
 from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
-if (len(argv) < 1):
+if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
diff --git a/src/migration-scripts/interfaces/27-to-28 b/src/migration-scripts/interfaces/27-to-28
index e36c95cc9..ad5bfa653 100755
--- a/src/migration-scripts/interfaces/27-to-28
+++ b/src/migration-scripts/interfaces/27-to-28
@@ -22,7 +22,7 @@ from sys import argv
 from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
-if (len(argv) < 1):
+if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
diff --git a/src/migration-scripts/interfaces/28-to-29 b/src/migration-scripts/interfaces/28-to-29
index 64c649b02..acb6ee1fb 100755
--- a/src/migration-scripts/interfaces/28-to-29
+++ b/src/migration-scripts/interfaces/28-to-29
@@ -21,7 +21,7 @@ from sys import argv
 from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
-if (len(argv) < 1):
+if len(argv) < 2:
     print("Must specify file name!")
     exit(1)
 
diff --git a/src/migration-scripts/interfaces/3-to-4 b/src/migration-scripts/interfaces/3-to-4
index e3bd25a68..c7fd7d01d 100755
--- a/src/migration-scripts/interfaces/3-to-4
+++ b/src/migration-scripts/interfaces/3-to-4
@@ -6,7 +6,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)
 
diff --git a/src/migration-scripts/interfaces/4-to-5 b/src/migration-scripts/interfaces/4-to-5
index f645c5aeb..68d81e846 100755
--- a/src/migration-scripts/interfaces/4-to-5
+++ b/src/migration-scripts/interfaces/4-to-5
@@ -57,7 +57,7 @@ def migrate_dialer(config, tree, intf):
 
 
 if __name__ == '__main__':
-    if (len(sys.argv) < 1):
+    if len(sys.argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/5-to-6 b/src/migration-scripts/interfaces/5-to-6
index ae79c1d1b..9d9a49c2d 100755
--- a/src/migration-scripts/interfaces/5-to-6
+++ b/src/migration-scripts/interfaces/5-to-6
@@ -98,7 +98,7 @@ def copy_rtradv(c, old_base, interface):
                 c.delete(new_base + ['link-mtu'])
 
 if __name__ == '__main__':
-    if (len(sys.argv) < 1):
+    if len(sys.argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/6-to-7 b/src/migration-scripts/interfaces/6-to-7
index 220c7e601..49b853d90 100755
--- a/src/migration-scripts/interfaces/6-to-7
+++ b/src/migration-scripts/interfaces/6-to-7
@@ -20,7 +20,7 @@ import sys
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(sys.argv) < 1):
+    if len(sys.argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/7-to-8 b/src/migration-scripts/interfaces/7-to-8
index 9845098a7..9343a48a8 100755
--- a/src/migration-scripts/interfaces/7-to-8
+++ b/src/migration-scripts/interfaces/7-to-8
@@ -37,7 +37,7 @@ def migrate_default_keys():
         os.rename(f'{kdir}/public.key', f'{location}/public.key')
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/8-to-9 b/src/migration-scripts/interfaces/8-to-9
index 2d1efd418..960962be7 100755
--- a/src/migration-scripts/interfaces/8-to-9
+++ b/src/migration-scripts/interfaces/8-to-9
@@ -22,7 +22,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
diff --git a/src/migration-scripts/interfaces/9-to-10 b/src/migration-scripts/interfaces/9-to-10
index 4aa2c42b5..e9b8cb784 100755
--- a/src/migration-scripts/interfaces/9-to-10
+++ b/src/migration-scripts/interfaces/9-to-10
@@ -23,7 +23,7 @@ from sys import exit, argv
 from vyos.configtree import ConfigTree
 
 if __name__ == '__main__':
-    if (len(argv) < 1):
+    if len(argv) < 2:
         print("Must specify file name!")
         exit(1)
 
-- 
cgit v1.2.3