Merge pull request #4613 from c-po/add-pylint

T7648: Set up a linter check to check complete files for syntax errors and missing imports

4 files changed, 12 insertions, 13 deletions

diff --git a/src/migration-scripts/interfaces/0-to-1 b/src/migration-scripts/interfaces/0-to-1
index 6ed5f118f..c4417c4ca 100644
--- a/src/migration-scripts/interfaces/0-to-1
+++ b/src/migration-scripts/interfaces/0-to-1
@@ -20,6 +20,8 @@
 
 from vyos.configtree import ConfigTree
 
+base = ['interfaces', 'bridge']
+
 def migrate_bridge(config, tree, intf):
     # check if bridge-group exists
     tree_bridge = tree + ['bridge-group']
@@ -49,8 +51,6 @@ def migrate_bridge(config, tree, intf):
 
 
 def migrate(config: ConfigTree) -> None:
-    base = ['interfaces', 'bridge']
-
     if not config.exists(base):
         # Nothing to do
         return
diff --git a/src/migration-scripts/interfaces/5-to-6 b/src/migration-scripts/interfaces/5-to-6
index 45a6daef7..8f406b5c8 100644
--- a/src/migration-scripts/interfaces/5-to-6
+++ b/src/migration-scripts/interfaces/5-to-6
@@ -56,7 +56,7 @@ def copy_rtradv(c, old_base, interface):
         # cleanup boolean nodes in individual route
         route_base = new_base + ['route']
         if c.exists(route_base):
-            for route in config.list_nodes(route_base):
+            for route in c.list_nodes(route_base):
                 if c.exists(route_base + [route, 'remove-route']):
                     tmp = c.return_value(route_base + [route, 'remove-route'])
                     c.delete(route_base + [route, 'remove-route'])
@@ -66,7 +66,7 @@ def copy_rtradv(c, old_base, interface):
         # cleanup boolean nodes in individual prefix
         prefix_base = new_base + ['prefix']
         if c.exists(prefix_base):
-            for prefix in config.list_nodes(prefix_base):
+            for prefix in c.list_nodes(prefix_base):
                 if c.exists(prefix_base + [prefix, 'autonomous-flag']):
                     tmp = c.return_value(prefix_base + [prefix, 'autonomous-flag'])
                     c.delete(prefix_base + [prefix, 'autonomous-flag'])
diff --git a/src/migration-scripts/quagga/2-to-3 b/src/migration-scripts/quagga/2-to-3
index b619d1edc..2494abdae 100644
--- a/src/migration-scripts/quagga/2-to-3
+++ b/src/migration-scripts/quagga/2-to-3
@@ -15,6 +15,8 @@
 
 from vyos.configtree import ConfigTree
 
+# Just to avoid writing it so many times
+af_path = ['address-family', 'ipv4-unicast']
 
 def migrate_neighbor(config, neighbor_path, neighbor):
     if config.exists(neighbor_path):
@@ -106,9 +108,6 @@ def migrate(config: ConfigTree) -> None:
         # Nothing to do
         return
 
-    # Just to avoid writing it so many times
-    af_path = ['address-family', 'ipv4-unicast']
-
     # Check if BGP is actually configured and obtain the ASN
     asn_list = config.list_nodes(['protocols', 'bgp'])
     if asn_list:
diff --git a/src/migration-scripts/vrrp/1-to-2 b/src/migration-scripts/vrrp/1-to-2
index a717df29c..706537813 100644
--- a/src/migration-scripts/vrrp/1-to-2
+++ b/src/migration-scripts/vrrp/1-to-2
@@ -25,7 +25,7 @@ from vyos.configtree import ConfigTree
 # It was supported only under ethernet and bonding and their
 # respective vif, vif-s, and vif-c subinterfaces
 
-def get_vrrp_group(path):
+def get_vrrp_group(config, path):
     group = {"preempt": True, "rfc_compatibility": False, "disable": False}
 
     if config.exists(path + ["advertise-interval"]):
@@ -115,7 +115,7 @@ def migrate(config: ConfigTree) -> None:
             if config.exists(parent_path + vg_path):
                 pgroups = config.list_nodes(parent_path + vg_path)
                 for pg in pgroups:
-                    g = get_vrrp_group(parent_path + vg_path + [pg])
+                    g = get_vrrp_group(config, parent_path + vg_path + [pg])
                     g["interface"] = pi
                     g["vrid"] = pg
                     groups.append(g)
@@ -132,7 +132,7 @@ def migrate(config: ConfigTree) -> None:
                     if config.exists(parent_path + vif_vg_path):
                         vifgroups = config.list_nodes(parent_path + vif_vg_path)
                         for vif_group in vifgroups:
-                            g = get_vrrp_group(parent_path + vif_vg_path + [vif_group])
+                            g = get_vrrp_group(config, parent_path + vif_vg_path + [vif_group])
                             g["interface"] = "{0}.{1}".format(pi, vif)
                             g["vrid"] = vif_group
                             groups.append(g)
@@ -147,7 +147,7 @@ def migrate(config: ConfigTree) -> None:
                     if config.exists(parent_path + vifs_vg_path):
                         vifsgroups = config.list_nodes(parent_path + vifs_vg_path)
                         for vifs_group in vifsgroups:
-                            g = get_vrrp_group(parent_path + vifs_vg_path + [vifs_group])
+                            g = get_vrrp_group(config, parent_path + vifs_vg_path + [vifs_group])
                             g["interface"] = "{0}.{1}".format(pi, vif_s)
                             g["vrid"] = vifs_group
                             groups.append(g)
@@ -161,7 +161,7 @@ def migrate(config: ConfigTree) -> None:
                              vifc_vg_path = [pi, "vif-s", vif_s, "vif-c", vif_c, "vrrp", "vrrp-group"]
                              vifcgroups = config.list_nodes(parent_path + vifc_vg_path)
                              for vifc_group in vifcgroups:
-                                  g = get_vrrp_group(parent_path + vifc_vg_path + [vifc_group])
+                                  g = get_vrrp_group(config, parent_path + vifc_vg_path + [vifc_group])
                                   g["interface"] = "{0}.{1}.{2}".format(pi, vif_s, vif_c)
                                   g["vrid"] = vifc_group
                                   groups.append(g)
@@ -173,7 +173,7 @@ def migrate(config: ConfigTree) -> None:
         return
 
     # Otherwise, there is VRRP to convert
-     
+
     # Now convert the collected groups to the new syntax
     base_group_path = ["high-availability", "vrrp", "group"]
     sync_path = ["high-availability", "vrrp", "sync-group"]