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

14 files changed, 26 insertions, 29 deletions

diff --git a/src/conf_mode/qos.py b/src/conf_mode/qos.py
index 326d617a2..4ea900bb8 100755
--- a/src/conf_mode/qos.py
+++ b/src/conf_mode/qos.py
@@ -15,7 +15,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from sys import exit
-from netifaces import interfaces
+
+from netifaces import interfaces # pylint: disable = no-name-in-module
 
 from vyos.base import Warning
 from vyos.config import Config
diff --git a/src/conf_mode/service_broadcast-relay.py b/src/conf_mode/service_broadcast-relay.py
index f7f2875f5..b3f38dd21 100755
--- a/src/conf_mode/service_broadcast-relay.py
+++ b/src/conf_mode/service_broadcast-relay.py
@@ -17,7 +17,7 @@
 import os
 
 from glob import glob
-from netifaces import AF_INET
+from socket import AF_INET
 from sys import exit
 
 from vyos.config import Config
diff --git a/src/conf_mode/service_dhcp-server.py b/src/conf_mode/service_dhcp-server.py
index 6bbe72e90..b404b1708 100755
--- a/src/conf_mode/service_dhcp-server.py
+++ b/src/conf_mode/service_dhcp-server.py
@@ -29,9 +29,9 @@ from vyos.template import render
 from vyos.utils.dict import dict_search
 from vyos.utils.dict import dict_search_args
 from vyos.utils.file import chmod_775
-from vyos.utils.file import chown
 from vyos.utils.file import makedir
 from vyos.utils.file import write_file
+from vyos.utils.permission import chown
 from vyos.utils.process import call
 from vyos.utils.network import interface_exists
 from vyos.utils.network import is_subnet_connected
diff --git a/src/conf_mode/service_dhcpv6-server.py b/src/conf_mode/service_dhcpv6-server.py
index 07dd08337..8344f99b4 100755
--- a/src/conf_mode/service_dhcpv6-server.py
+++ b/src/conf_mode/service_dhcpv6-server.py
@@ -25,11 +25,11 @@ from vyos.config import Config
 from vyos.template import render
 from vyos.utils.process import call
 from vyos.utils.file import chmod_775
-from vyos.utils.file import chown
 from vyos.utils.file import makedir
 from vyos.utils.file import write_file
 from vyos.utils.dict import dict_search
 from vyos.utils.network import is_subnet_connected
+from vyos.utils.permission import chown
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
diff --git a/src/conf_mode/service_mdns_repeater.py b/src/conf_mode/service_mdns_repeater.py
index 360b94588..aa10a687e 100755
--- a/src/conf_mode/service_mdns_repeater.py
+++ b/src/conf_mode/service_mdns_repeater.py
@@ -18,7 +18,9 @@ import os
 
 from json import loads
 from sys import exit
-from netifaces import ifaddresses, AF_INET, AF_INET6
+from socket import AF_INET
+from socket import AF_INET6
+from netifaces import ifaddresses # pylint: disable = no-name-in-module
 
 from vyos.config import Config
 from vyos.configverify import verify_interface_exists
diff --git a/src/conf_mode/service_stunnel.py b/src/conf_mode/service_stunnel.py
index eb1d4dea2..5ea5b88b4 100644
--- a/src/conf_mode/service_stunnel.py
+++ b/src/conf_mode/service_stunnel.py
@@ -19,7 +19,7 @@ from shutil import rmtree
 
 from sys import exit
 
-from netifaces import AF_INET
+from socket import AF_INET
 from psutil import net_if_addrs
 
 from vyos.config import Config
diff --git a/src/conf_mode/system_login.py b/src/conf_mode/system_login.py
index 00cacccd1..234b24770 100755
--- a/src/conf_mode/system_login.py
+++ b/src/conf_mode/system_login.py
@@ -37,7 +37,7 @@ from vyos.utils.auth import get_current_user
 from vyos.utils.configfs import delete_cli_node
 from vyos.utils.configfs import add_cli_node
 from vyos.utils.dict import dict_search
-from vyos.utils.file import chown
+from vyos.utils.permission import chown
 from vyos.utils.process import cmd
 from vyos.utils.process import call
 from vyos.utils.process import run
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"]
diff --git a/src/op_mode/connect_disconnect.py b/src/op_mode/connect_disconnect.py
index 9035ce072..117e65713 100755
--- a/src/op_mode/connect_disconnect.py
+++ b/src/op_mode/connect_disconnect.py
@@ -18,6 +18,7 @@ import os
 import argparse
 
 from psutil import process_iter
+from time import sleep
 
 from vyos.configquery import ConfigTreeQuery
 from vyos.utils.process import call
@@ -68,7 +69,7 @@ def connect(interface):
             if ( count % 60 == 0 ):
                 print(f'Commit still in progress after {count}s - waiting')
             count += 1
-            time.sleep(1)
+            sleep(1)
         call('/usr/libexec/vyos/conf_mode/qos.py')
 
 def disconnect(interface):
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py
index 2ee57a458..0f144443b 100755
--- a/src/op_mode/pki.py
+++ b/src/op_mode/pki.py
@@ -417,7 +417,7 @@ def parse_san_string(san_string):
             output.append(ipaddress.IPv6Address(value))
         elif tag == 'dns' or tag == 'rfc822':
             output.append(value)
-    return
+    return output
 
 
 def generate_certificate_request(
diff --git a/src/op_mode/storage.py b/src/op_mode/storage.py
index 7e869e9d9..0f3fabe32 100755
--- a/src/op_mode/storage.py
+++ b/src/op_mode/storage.py
@@ -13,10 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
 
 import sys
-
 import vyos.opmode
 
 from jinja2 import Template
@@ -28,9 +26,6 @@ Used:       {{used}} ({{use_percentage}}%)
 Available:  {{avail}} ({{avail_percentage}}%)
 """
 
-def _get_formatted_output():
-    return _get_system_storage()
-
 def show(raw: bool):
     from vyos.utils.disk import get_persistent_storage_stats
 
@@ -49,7 +44,7 @@ def show(raw: bool):
             tmpl = Template(output_tmpl)
             return tmpl.render(data).strip()
 
-    return output
+    return None
 
 if __name__ == '__main__':
     try:
@@ -59,4 +54,3 @@ if __name__ == '__main__':
     except (ValueError, vyos.opmode.Error) as e:
         print(e)
         sys.exit(1)
-