T9351: Fix lint errors (includes fixes for other areas of code in the files not related to T9351)

2 files changed, 85 insertions, 51 deletions

diff --git a/python/vyos/accel_ppp_util.py b/python/vyos/accel_ppp_util.py
index 01da7ab5c..1c2cc9009 100644
--- a/python/vyos/accel_ppp_util.py
+++ b/python/vyos/accel_ppp_util.py
@@ -25,6 +25,7 @@ from vyos import ConfigError
 from vyos.base import Warning
 from vyos.utils.dict import dict_search
 
+
 def get_pools_in_order(data: dict) -> list:
     """Return a list of dictionaries representing pool data in the order
     in which they should be allocated. Pool must be defined before we can
@@ -121,8 +122,7 @@ def verify_accel_ppp_name_servers(config):
 
 def verify_accel_ppp_wins_servers(config):
     if 'wins_server' in config and len(config['wins_server']) > 2:
-        raise ConfigError(
-            'Not more then two WINS name-servers can be configured')
+        raise ConfigError('Not more then two WINS name-servers can be configured')
 
 
 def verify_accel_ppp_authentication(config, local_users=True):
@@ -138,8 +138,9 @@ def verify_accel_ppp_authentication(config, local_users=True):
 
     # verify auth settings
     if local_users and dict_search("authentication.mode", config) == "local":
-        local_users_config = dict_search('authentication.local_users.username',
-                                         config, default={})
+        local_users_config = dict_search(
+            'authentication.local_users.username', config, default={}
+        )
 
         if not local_users_config and not any_login:
             raise ConfigError(
@@ -163,21 +164,27 @@ def verify_accel_ppp_authentication(config, local_users=True):
             raise ConfigError("RADIUS authentication requires at least one server")
 
         ma_include_request = dict_search(
-            'authentication.radius.message_authenticator.include_access_request', config)
+            'authentication.radius.message_authenticator.include_access_request', config
+        )
         ma_require_response = dict_search(
-            'authentication.radius.message_authenticator.require_access_response', config)
+            'authentication.radius.message_authenticator.require_access_response',
+            config,
+        )
         if ma_require_response is not None and ma_include_request is None:
             Warning(
                 'Message-Authenticator is not included in Access-Request packets; '
-                'so the RADIUS server might omit it from Access response packets')
+                'so the RADIUS server might omit it from Access response packets'
+            )
 
         for server in dict_search("authentication.radius.server", config):
             radius_config = config["authentication"]["radius"]["server"][server]
             if "key" not in radius_config:
                 raise ConfigError(f'Missing RADIUS secret key for server "{server}"')
 
-    if dict_search("server_type", config) == 'ipoe' and dict_search(
-            "authentication.mode", config) == "local":
+    if (
+        dict_search("server_type", config) == 'ipoe'
+        and dict_search("authentication.mode", config) == "local"
+    ):
         if not dict_search("authentication.interface", config):
             raise ConfigError(
                 "Authentication mode local requires authentication interface to be configured!"
@@ -186,7 +193,8 @@ def verify_accel_ppp_authentication(config, local_users=True):
             user_config = config["authentication"]["interface"][interface]
             if "mac" not in user_config:
                 raise ConfigError(
-                    f'Users MAC addresses are not configured for interface "{interface}"')
+                    f'Users MAC addresses are not configured for interface "{interface}"'
+                )
 
     if dict_search('authentication.radius.dynamic_author.server', config):
         if not dict_search('authentication.radius.dynamic_author.key', config):
@@ -204,8 +212,7 @@ def verify_accel_ppp_ip_pool(vpn_config):
             next_pool = dict_search(f"next_pool", pool_config)
             if next_pool:
                 if next_pool not in vpn_config["client_ip_pool"]:
-                    raise ConfigError(
-                        f'Next pool "{next_pool}" does not exist')
+                    raise ConfigError(f'Next pool "{next_pool}" does not exist')
                 if not dict_search(f"range", pool_config):
                     raise ConfigError(
                         f'Pool "{pool_name}" does not contain range but next-pool exists'
@@ -215,20 +222,22 @@ def verify_accel_ppp_ip_pool(vpn_config):
 
     default_pool = dict_search("default_pool", vpn_config)
     if default_pool:
-        if not dict_search('client_ip_pool',
-                           vpn_config) or default_pool not in dict_search(
-                'client_ip_pool', vpn_config):
+        if not dict_search(
+            'client_ip_pool', vpn_config
+        ) or default_pool not in dict_search('client_ip_pool', vpn_config):
             raise ConfigError(f'Default pool "{default_pool}" does not exists')
 
     if 'client_ipv6_pool' in vpn_config:
         for ipv6_pool, ipv6_pool_config in vpn_config['client_ipv6_pool'].items():
             if 'delegate' in ipv6_pool_config and 'prefix' not in ipv6_pool_config:
                 raise ConfigError(
-                    f'IPv6 delegate-prefix requires IPv6 prefix to be configured in "{ipv6_pool}"!')
+                    f'IPv6 delegate-prefix requires IPv6 prefix to be configured in "{ipv6_pool}"!'
+                )
 
     if dict_search('authentication.mode', vpn_config) in ['local', 'noauth']:
         if not dict_search('client_ip_pool', vpn_config) and not dict_search(
-                'client_ipv6_pool', vpn_config):
+            'client_ipv6_pool', vpn_config
+        ):
             if dict_search('server_type', vpn_config) == 'ipoe':
                 if 'interface' in vpn_config:
                     for interface, interface_config in vpn_config['interface'].items():
@@ -239,15 +248,17 @@ def verify_accel_ppp_ip_pool(vpn_config):
                     else:
                         raise ConfigError(
                             'Local auth and noauth mode requires local client-ip-pool \
-                             or client-ipv6-pool or client-subnet or dhcp-relay to be configured!')
+                             or client-ipv6-pool or client-subnet or dhcp-relay to be configured!'
+                        )
             else:
-                raise ConfigError(
-                    "Local auth mode requires local client-ip-pool \
+                raise ConfigError("Local auth mode requires local client-ip-pool \
                     or client-ipv6-pool to be configured!")
 
         if dict_search('client_ip_pool', vpn_config) and not dict_search(
-                'default_pool', vpn_config):
+            'default_pool', vpn_config
+        ):
             Warning("'default-pool' is not defined")
         if dict_search('client_ipv6_pool', vpn_config) and not dict_search(
-                'default_ipv6_pool', vpn_config):
+            'default_ipv6_pool', vpn_config
+        ):
             Warning("'default-ipv6-pool' is not defined")
diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py
index 5bdea796c..bf1ea5d13 100644
--- a/smoketest/scripts/cli/base_accel_ppp_test.py
+++ b/smoketest/scripts/cli/base_accel_ppp_test.py
@@ -24,6 +24,7 @@ from vyos.utils.cpu import get_core_count
 from vyos.utils.process import process_named_running
 from vyos.utils.process import cmdl
 
+
 class BasicAccelPPPTest:
     class TestCase(VyOSUnitTestSHIM.TestCase):
         _base_path = None
@@ -343,18 +344,22 @@ class BasicAccelPPPTest:
             source_address = "1.2.3.4"
             self.set(["authentication", "radius", "source-address", source_address])
 
-            self.set([
-                "authentication",
-                "radius",
-                "message-authenticator",
-                "include-access-request",
-            ])
-            self.set([
-                "authentication",
-                "radius",
-                "message-authenticator",
-                "require-access-response",
-            ])
+            self.set(
+                [
+                    "authentication",
+                    "radius",
+                    "message-authenticator",
+                    "include-access-request",
+                ]
+            )
+            self.set(
+                [
+                    "authentication",
+                    "radius",
+                    "message-authenticator",
+                    "require-access-response",
+                ]
+            )
 
             # commit changes
             self.cli_commit()
@@ -369,7 +374,9 @@ class BasicAccelPPPTest:
             # check auth
             self.assertTrue(conf["radius"].getboolean("verbose"))
             self.assertEqual(conf["radius"]["acct-timeout"], acct_timeout)
-            self.assertEqual(conf["radius"]["acct-interim-interval"], acct_interim_interval)
+            self.assertEqual(
+                conf["radius"]["acct-interim-interval"], acct_interim_interval
+            )
             self.assertEqual(conf["radius"]["acct-interim-jitter"], acct_interim_jitter)
             self.assertEqual(conf["radius"]["timeout"], "3")
             self.assertEqual(conf["radius"]["max-try"], "3")
@@ -380,8 +387,12 @@ class BasicAccelPPPTest:
             self.assertEqual(conf["radius"]["nas-identifier"], nas_id)
             self.assertEqual(conf["radius"]["nas-ip-address"], nas_ip)
             self.assertEqual(conf["radius"]["bind"], source_address)
-            self.assertEqual(conf["radius"]["message-authenticator-include-access-request"], "1")
-            self.assertEqual(conf["radius"]["message-authenticator-require-access-response"], "1")
+            self.assertEqual(
+                conf["radius"]["message-authenticator-include-access-request"], "1"
+            )
+            self.assertEqual(
+                conf["radius"]["message-authenticator-require-access-response"], "1"
+            )
 
             server = conf["radius"]["server"].split(",")
             self.assertEqual(radius_server, server[0])
@@ -517,28 +528,41 @@ class BasicAccelPPPTest:
             client_prefix_1 = f'{prefix_1},{prefix_mask}'
             client_prefix_2 = f'{prefix_2},{prefix_mask}'
             self.set(
-                ['client-ipv6-pool', pool_name, 'prefix', prefix_1, 'mask',
-                 prefix_mask])
+                ['client-ipv6-pool', pool_name, 'prefix', prefix_1, 'mask', prefix_mask]
+            )
             self.set(
-                ['client-ipv6-pool', pool_name, 'prefix', prefix_2, 'mask',
-                 prefix_mask])
+                ['client-ipv6-pool', pool_name, 'prefix', prefix_2, 'mask', prefix_mask]
+            )
 
             delegate_1_prefix = '2001:db8:fff1::/56'
             delegate_2_prefix = '2001:db8:fff2::/56'
             delegate_mask = '64'
             self.set(
-                ['client-ipv6-pool', pool_name, 'delegate', delegate_1_prefix,
-                 'delegation-prefix', delegate_mask])
+                [
+                    'client-ipv6-pool',
+                    pool_name,
+                    'delegate',
+                    delegate_1_prefix,
+                    'delegation-prefix',
+                    delegate_mask,
+                ]
+            )
             self.set(
-                ['client-ipv6-pool', pool_name, 'delegate', delegate_2_prefix,
-                 'delegation-prefix', delegate_mask])
+                [
+                    'client-ipv6-pool',
+                    pool_name,
+                    'delegate',
+                    delegate_2_prefix,
+                    'delegation-prefix',
+                    delegate_mask,
+                ]
+            )
 
             # commit changes
             self.cli_commit()
 
             # Validate configuration values
-            conf = ConfigParser(allow_no_value=True, delimiters='=',
-                                strict=False)
+            conf = ConfigParser(allow_no_value=True, delimiters='=', strict=False)
             conf.read(self._config_file)
 
             for tmp in ['ipv6pool', 'ipv6_nd', 'ipv6_dhcp']:
@@ -603,12 +627,12 @@ delegate={delegate_2_prefix},{delegate_mask},name={pool_name}"""
             self.assertEqual(conf['ppp']['min-mtu'], min_mtu)
             self.assertEqual(conf['ppp']['mru'], mru)
 
-            self.assertEqual(conf['ppp']['ccp'],'0')
+            self.assertEqual(conf['ppp']['ccp'], '0')
 
             # check interface-cache
             self.assertEqual(conf['ppp']['unit-cache'], interface_cache)
 
-            #check ipv6
+            # check ipv6
             for tmp in ['ipv6pool', 'ipv6_nd', 'ipv6_dhcp']:
                 self.assertEqual(conf['modules'][tmp], None)
 
@@ -620,7 +644,6 @@ delegate={delegate_2_prefix},{delegate_mask},name={pool_name}"""
             self.assertEqual(conf['ppp']['lcp-echo-interval'], lcp_interval)
             self.assertEqual(conf['ppp']['lcp-echo-timeout'], lcp_timeout)
 
-
         def test_accel_wins_server(self):
             self.basic_config()
             winsservers = ["192.0.2.1", "192.0.2.2"]
@@ -639,7 +662,7 @@ delegate={delegate_2_prefix},{delegate_mask},name={pool_name}"""
             conf = ConfigParser(allow_no_value=True, delimiters="=", strict=False)
             conf.read(self._config_file)
             self.assertEqual(conf['modules']['net-snmp'], None)
-            self.assertEqual(conf['snmp']['master'],'1')
+            self.assertEqual(conf['snmp']['master'], '1')
 
         def test_accel_shaper(self):
             self.basic_config()