"style guide" changes

These changes are made to fulfil the Style Guidelines of Python.

napalm_arubaoss/ArubaOS.py

@@ -1,23 +1,23 @@
 """ArubaOS-Switch Napalm driver."""
 import logging
-import urllib3
 
-from napalm_arubaoss.helper.base import Connection
+from napalm.base.base import NetworkDriver
+
 from napalm_arubaoss.helper import (
     backup_config,
     commit_config,
     compare_config,
     confirm_commit,
-    get_mac_address_table,
-    get_facts,
     get_arp_table,
     get_config,
+    get_facts,
     get_interfaces,
     get_interfaces_ip,
     get_lldp_neighbors,
     get_lldp_neighbors_detail,
-    get_ntp_stats,
+    get_mac_address_table,
     get_ntp_servers,
+    get_ntp_stats,
     get_route_to,
     has_pending_commit,
     is_alive,
@@ -27,8 +27,10 @@
     rollback,
     traceroute,
 )
+from napalm_arubaoss.helper.base import Connection
+
+import urllib3
 
-from napalm.base.base import NetworkDriver
 
 logger = logging.getLogger("arubaoss")
 logger.setLevel(logging.INFO)

napalm_arubaoss/helper/__init__.py

@@ -24,9 +24,9 @@
 from napalm_arubaoss.helper.traceroute import traceroute
 from napalm_arubaoss.helper.utils import (
     backup_config,
-    mac_reformat,
     commit_candidate,
     config_batch,
+    mac_reformat,
     read_candidate,
     str_to_b64,
     transaction_status,

napalm_arubaoss/helper/base.py

@@ -3,12 +3,12 @@
 
 import base64
 import logging
-
 from json import JSONDecodeError
 
+from napalm.base.exceptions import ConnectAuthError, NapalmException
+
 from requests import Session
 from requests.models import Response
-from napalm.base.exceptions import ConnectAuthError, NapalmException
 
 
 logger = logging.getLogger("arubaoss.helper.base")

napalm_arubaoss/helper/commit_config.py

@@ -4,10 +4,10 @@
 
 from napalm.base.exceptions import CommitError
 
-from napalm_arubaoss.helper.utils import backup_config, commit_candidate
 from napalm_arubaoss.helper.get_config import get_config
-from napalm_arubaoss.helper.load_replace_candidate import load_replace_candidate
 from napalm_arubaoss.helper.has_pending_commit import has_pending_commit
+from napalm_arubaoss.helper.load_replace_candidate import load_replace_candidate
+from napalm_arubaoss.helper.utils import backup_config, commit_candidate
 
 logger = logging.getLogger("arubaoss.helper.commit_config")
 

napalm_arubaoss/helper/compare_config.py

@@ -1,7 +1,6 @@
 """Backups and commit the configuration, and handles commit confirm."""
 
 import logging
-
 from time import sleep
 
 from napalm.base.exceptions import CommandErrorException
@@ -65,4 +64,4 @@ def compare_config(self):
                 add_list="\n".join(diff_object.get("diff_add_list"))
             )
 
-            return out
+            return out

napalm_arubaoss/helper/get_arp_table.py

@@ -1,8 +1,9 @@
 """Backups and commit the configuration, and handles commit confirm."""
 
-from napalm.base.helpers import textfsm_extractor
 import logging
 
+from napalm.base.helpers import textfsm_extractor
+
 from napalm_arubaoss.helper.utils import mac_reformat
 
 logger = logging.getLogger("arubaoss.helper.get_arp_table")

napalm_arubaoss/helper/get_interfaces_ip.py

@@ -1,8 +1,9 @@
 """Get IP interface IP addresses."""
 
-from netaddr import IPNetwork
 import logging
 
+from netaddr import IPNetwork
+
 logger = logging.getLogger("arubaoss.helper.get_interfaces_ip")
 
 

napalm_arubaoss/helper/get_route_to.py

@@ -1,8 +1,10 @@
 """Get route to destination."""
 
+import logging
+
 from napalm.base.helpers import textfsm_extractor
+
 from netaddr import IPNetwork
-import logging
 
 
 logger = logging.getLogger("arubaoss.helper.get_route_to")

napalm_arubaoss/helper/is_alive.py

@@ -1,8 +1,9 @@
 """Check if device connection is alive."""
 
-from napalm.base.exceptions import ConnectionClosedException
 import logging
 
+from napalm.base.exceptions import ConnectionClosedException
+
 logger = logging.getLogger("arubaoss.helper.is_alive")
 
 

napalm_arubaoss/helper/load_merge_candidate.py

@@ -1,9 +1,10 @@
 """Merge candidate configuration with the running one."""
 
-from napalm.base.exceptions import MergeConfigException
 import logging
 
-from napalm_arubaoss.helper.utils import read_candidate, config_batch, backup_config
+from napalm.base.exceptions import MergeConfigException
+
+from napalm_arubaoss.helper.utils import backup_config, config_batch, read_candidate
 
 logger = logging.getLogger("arubaoss.helper.load_merge_candidate")
 

napalm_arubaoss/helper/load_replace_candidate.py

@@ -2,9 +2,9 @@
 
 import logging
 
-from napalm_arubaoss.helper.utils import str_to_b64, read_candidate
-from napalm_arubaoss.helper.is_alive import is_alive
-from napalm.base.exceptions import ReplaceConfigException, ConnectionClosedException
+from napalm.base.exceptions import ConnectionClosedException, ReplaceConfigException
+
+from napalm_arubaoss.helper.utils import read_candidate, str_to_b64
 
 logger = logging.getLogger("arubaoss.helper.load_replace_candidate")
 

napalm_arubaoss/helper/rollback.py

@@ -2,8 +2,8 @@
 
 import logging
 
-from napalm_arubaoss.helper.utils import commit_candidate
 from napalm_arubaoss.helper.compare_config import compare_config
+from napalm_arubaoss.helper.utils import commit_candidate
 
 logger = logging.getLogger("arubaoss.helper.rollback")
 

napalm_arubaoss/helper/traceroute.py

@@ -1,7 +1,7 @@
 """Execute traceroute on the device and returns a dictionary with the result."""
 
-import socket
 import logging
+import socket
 
 logger = logging.getLogger("arubaoss.helper.traceroute")
 

napalm_arubaoss/helper/utils.py

@@ -2,8 +2,9 @@
 
 import base64
 import logging
-from time import sleep
 from itertools import zip_longest
+from time import sleep
+
 from napalm.base.exceptions import CommandTimeoutException, CommitError
 
 logger = logging.getLogger("arubaoss.helper.utils")
@@ -163,7 +164,6 @@ def commit_candidate(self, config):
         raise CommitError(f"{cmd_post.json().get('failure_reason', 'failure during cfg_restore but no failure_reason')}")
 
 
-
 def mac_reformat(mac):
     """
     Reformat the MAC addresses to standard notation.
@@ -173,4 +173,4 @@ def mac_reformat(mac):
     """
     t = iter(mac.replace("-", ""))
 
-    return ":".join(a + b for a, b in zip_longest(t, t, fillvalue=""))
+    return ":".join(a + b for a, b in zip_longest(t, t, fillvalue=""))