Merge pull request #243 from networktocode/fix-black-21.10b0

dgarros · web-flow · commit 2f4e8827d505 · 2021-11-30T00:09:58.000-05:00
Update black to 21.10b0
diff --git a/examples/multi_site_02/nautobot_setup.py b/examples/multi_site_02/nautobot_setup.py
@@ -128,7 +128,10 @@ def main():
     for dev_role in DEVICE_ROLES:
         print(f"Checking on device role: {dev_role}")
         device_role_obj, created = get_or_create(
-            object_endpoint=nautobot.dcim.device_roles, search_key="name", search_term=dev_role, slug=dev_role,
+            object_endpoint=nautobot.dcim.device_roles,
+            search_key="name",
+            search_term=dev_role,
+            slug=dev_role,
         )
 
         if created:
diff --git a/examples/spine_leaf_01/nautobot_setup.py b/examples/spine_leaf_01/nautobot_setup.py
@@ -115,7 +115,10 @@ def main():
     for dev_role in DEVICE_ROLES:
         print(f"Checking on device role: {dev_role}")
         device_role_obj, created = get_or_create(
-            object_endpoint=nautobot.dcim.device_roles, search_key="name", search_term=dev_role, slug=dev_role,
+            object_endpoint=nautobot.dcim.device_roles,
+            search_key="name",
+            search_term=dev_role,
+            slug=dev_role,
         )
 
         if created:
diff --git a/network_importer/adapters/nautobot_api/adapter.py b/network_importer/adapters/nautobot_api/adapter.py
@@ -65,7 +65,9 @@ def _is_tag_present(self, nautobot_obj):
         for tag in self.settings.model_flag_tags:
             if tag in nautobot_obj["tags"]:
                 LOGGER.debug(
-                    "Tag (%s) found for object %s. Marked for diffsync flag assignment.", tag, nautobot_obj,
+                    "Tag (%s) found for object %s. Marked for diffsync flag assignment.",
+                    tag,
+                    nautobot_obj,
                 )
                 return True
         return False
@@ -76,7 +78,9 @@ def apply_model_flag(self, diffsync_obj, nautobot_obj):
 
         if model_flag and self._is_tag_present(nautobot_obj):
             LOGGER.info(
-                "DiffSync model flag (%s) applied to object %s", model_flag, nautobot_obj,
+                "DiffSync model flag (%s) applied to object %s",
+                model_flag,
+                nautobot_obj,
             )
             diffsync_obj.model_flags = model_flag
         return diffsync_obj
@@ -173,7 +177,11 @@ def load_nautobot_prefix(self, site):
 
         for nb_prefix in prefixes:
 
-            prefix = self.prefix(prefix=nb_prefix.prefix, site_name=site.name, remote_id=nb_prefix.id,)
+            prefix = self.prefix(
+                prefix=nb_prefix.prefix,
+                site_name=site.name,
+                remote_id=nb_prefix.id,
+            )
             prefix = self.apply_model_flag(prefix, nb_prefix)
 
             if nb_prefix.vlan:
diff --git a/network_importer/adapters/nautobot_api/inventory.py b/network_importer/adapters/nautobot_api/inventory.py
@@ -18,10 +18,15 @@ class NautobotAPIInventory(NetworkImporterInventory):
     """Nautobot API Inventory Class."""
 
     # pylint: disable=dangerous-default-value, too-many-branches, too-many-statements
-    def __init__(self, *args, **kwargs: Any,) -> None:
+    def __init__(
+        self,
+        *args,
+        **kwargs: Any,
+    ) -> None:
         """Nornir Inventory Plugin for Nautobot API."""
         super().__init__(
-            *args, **kwargs,
+            *args,
+            **kwargs,
         )
 
         try:
diff --git a/network_importer/adapters/nautobot_api/models.py b/network_importer/adapters/nautobot_api/models.py
@@ -294,7 +294,8 @@ def translate_attrs_for_nautobot(self, attrs=None):  # pylint: disable=unused-ar
 
         try:
             interface = self.diffsync.get(
-                self.diffsync.interface, identifier=dict(device_name=self.device_name, name=self.interface_name),
+                self.diffsync.interface,
+                identifier=dict(device_name=self.device_name, name=self.interface_name),
             )
             nb_params["assigned_object_type"] = "dcim.interface"
             nb_params["assigned_object_id"] = interface.remote_id
@@ -467,7 +468,10 @@ def update(self, attrs: dict) -> Optional["DiffSyncModel"]:
             LOGGER.info("Updated Prefix %s (%s) in Nautobot", self.prefix, self.remote_id)
         except pynautobot.core.query.RequestError as exc:
             LOGGER.warning(
-                "Unable to update perfix %s in %s (%s)", self.prefix, self.diffsync.name, exc.error,
+                "Unable to update perfix %s in %s (%s)",
+                self.prefix,
+                self.diffsync.name,
+                exc.error,
             )
             return None
 
diff --git a/network_importer/adapters/netbox_api/adapter.py b/network_importer/adapters/netbox_api/adapter.py
@@ -68,7 +68,9 @@ def _is_tag_present(self, netbox_obj):
         for tag in self.settings.model_flag_tags:
             if tag in netbox_obj["tags"]:
                 LOGGER.debug(
-                    "Tag (%s) found for object %s. Marked for diffsync flag assignment.", tag, netbox_obj,
+                    "Tag (%s) found for object %s. Marked for diffsync flag assignment.",
+                    tag,
+                    netbox_obj,
                 )
                 return True
         return False
@@ -79,7 +81,9 @@ def apply_model_flag(self, diffsync_obj, netbox_obj):
 
         if model_flag and self._is_tag_present(netbox_obj):
             LOGGER.info(
-                "DiffSync model flag (%s) applied to object %s", model_flag, netbox_obj,
+                "DiffSync model flag (%s) applied to object %s",
+                model_flag,
+                netbox_obj,
             )
             diffsync_obj.model_flags = model_flag
         return diffsync_obj
@@ -180,7 +184,11 @@ def load_netbox_prefix(self, site):
 
         for nb_prefix in prefixes:
 
-            prefix = self.prefix(prefix=nb_prefix.prefix, site_name=site.name, remote_id=nb_prefix.id,)
+            prefix = self.prefix(
+                prefix=nb_prefix.prefix,
+                site_name=site.name,
+                remote_id=nb_prefix.id,
+            )
             prefix = self.apply_model_flag(prefix, nb_prefix)
 
             if nb_prefix.vlan:
diff --git a/network_importer/adapters/netbox_api/inventory.py b/network_importer/adapters/netbox_api/inventory.py
@@ -19,7 +19,11 @@
 class NetBoxAPIInventory(NetworkImporterInventory):
     """Netbox API Inventory Class."""
 
-    def __init__(self, *args, **kwargs: Any,) -> None:
+    def __init__(
+        self,
+        *args,
+        **kwargs: Any,
+    ) -> None:
         """Nornir Inventory Plugin for Netbox API."""
         super().__init__(*args, **kwargs)
 
diff --git a/network_importer/adapters/netbox_api/models.py b/network_importer/adapters/netbox_api/models.py
@@ -294,7 +294,8 @@ def translate_attrs_for_netbox(self, attrs=None):  # pylint: disable=unused-argu
 
         try:
             interface = self.diffsync.get(
-                self.diffsync.interface, identifier=dict(device_name=self.device_name, name=self.interface_name),
+                self.diffsync.interface,
+                identifier=dict(device_name=self.device_name, name=self.interface_name),
             )
             nb_params["assigned_object_type"] = "dcim.interface"
             nb_params["assigned_object_id"] = interface.remote_id
@@ -400,7 +401,8 @@ def translate_attrs_for_netbox(self, attrs=None):
 
         try:
             interface = self.diffsync.get(
-                self.diffsync.interface, identifier=dict(device_name=self.device_name, name=self.interface_name),
+                self.diffsync.interface,
+                identifier=dict(device_name=self.device_name, name=self.interface_name),
             )
             nb_params["interface"] = interface.remote_id
         except ObjectNotFound:
@@ -501,7 +503,10 @@ def update(self, attrs: dict) -> Optional["DiffSyncModel"]:
             LOGGER.info("Updated Prefix %s (%s) in NetBox", self.prefix, self.remote_id)
         except pynetbox.core.query.RequestError as exc:
             LOGGER.warning(
-                "Unable to update perfix %s in %s (%s)", self.prefix, self.diffsync.name, exc.error,
+                "Unable to update perfix %s in %s (%s)",
+                self.prefix,
+                self.diffsync.name,
+                exc.error,
             )
             return None
 
diff --git a/network_importer/adapters/network_importer/adapter.py b/network_importer/adapters/network_importer/adapter.py
@@ -283,7 +283,11 @@ def load_batfish_ip_address(
         Returns:
             IPAddress
         """
-        ip_address = self.ip_address(address=address, device_name=device.name, interface_name=interface.name,)
+        ip_address = self.ip_address(
+            address=address,
+            device_name=device.name,
+            interface_name=interface.name,
+        )
 
         if config.SETTINGS.main.import_ips:
             LOGGER.debug("%s | Import %s for %s::%s", self.name, ip_address.address, device.name, interface.name)
@@ -431,7 +435,11 @@ def load_cabling_from_cmds(self):
             self.nornir.filter(filter_func=valid_and_reachable_devs)
             .filter(filter_func=hosts_for_cabling)
             .with_processors([GetNeighbors()])
-            .run(task=dispatcher, method="get_neighbors", on_failed=True,)
+            .run(
+                task=dispatcher,
+                method="get_neighbors",
+                on_failed=True,
+            )
         )
 
         nbr_cables = 0
diff --git a/network_importer/drivers/cisco_default.py b/network_importer/drivers/cisco_default.py
@@ -128,7 +128,8 @@ def get_vlans(task: Task) -> Result:
             results = task.run(task=netmiko_send_command, command_string="show vlan", use_genie=True)
         except NornirSubTaskError:
             LOGGER.debug(
-                "An exception occured while pulling the vlans information", exc_info=True,
+                "An exception occured while pulling the vlans information",
+                exc_info=True,
             )
             return Result(host=task.host, failed=True)
 
diff --git a/network_importer/drivers/converters.py b/network_importer/drivers/converters.py
@@ -116,7 +116,9 @@ def convert_cisco_genie_cdp_neighbors_details(device_name, data):
                 continue
 
             LOGGER.warning(
-                "%s | More than 1 neighbor found for %s, SKIPPING", device_name, intf_name,
+                "%s | More than 1 neighbor found for %s, SKIPPING",
+                device_name,
+                intf_name,
             )
             results.neighbors[intf_name] = []
 
diff --git a/network_importer/main.py b/network_importer/main.py
@@ -160,7 +160,9 @@ def update_configurations(self):
         self.nornir.filter(filter_func=reachable_devs).run(task=warning_not_reachable, on_failed=True)
 
         self.nornir.filter(filter_func=reachable_devs).with_processors([GetConfig()]).run(
-            task=dispatcher, method="get_config", on_failed=True,
+            task=dispatcher,
+            method="get_config",
+            on_failed=True,
         )
 
         return True
diff --git a/network_importer/performance.py b/network_importer/performance.py
@@ -50,16 +50,16 @@ def print_from_ms(msec) -> str:
     millis = msec - (ms_per_min * minutes) - (ms_per_sec * seconds)
 
     if minutes == 0 and seconds == 0:
-        return "%dms" % (millis)
+        return f"{millis}ms"
     if minutes == 0:
-        return "%ds %dms" % (seconds, millis)
+        return f"{seconds}s {millis}ms"
 
-    return "%dm %ds %dms" % (minutes, seconds, millis)
+    return f"{minutes}m {seconds}s {millis}ms"
 
 
 def timeit(method):
     """Decorator to record the execution time of a function."""
-    global TIME_TRACKER
+    global TIME_TRACKER  # pylint: disable=global-variable-not-assigned
 
     def timed(*args, **kw):
         """Decorator to record the execution time of a function and store the result in TIME_TRACKER."""
diff --git a/network_importer/tasks.py b/network_importer/tasks.py
@@ -43,7 +43,10 @@ def device_save_hostvars(task: Task) -> Result:
         os.makedirs(f"{config.SETTINGS.main.hostvars_directory}/{task.host.name}")
         LOGGER.debug("Directory %s/%s was missing, created it", config.SETTINGS.main.hostvars_directory, task.host.name)
 
-    with open(f"{config.SETTINGS.main.hostvars_directory}/{task.host.name}/network_importer.yaml", "w",) as out_file:
+    with open(
+        f"{config.SETTINGS.main.hostvars_directory}/{task.host.name}/network_importer.yaml",
+        "w",
+    ) as out_file:
         out_file.write(yaml.dump(task.host.data["obj"].hostvars, default_flow_style=False))
         LOGGER.debug(
             "%s - Host variables saved in %s/%s/network_importer.yaml",
@@ -135,7 +138,8 @@ def check_if_reachable(task: Task) -> Result:
         results = task.run(task=tcp_ping, ports=[port_to_check])
     except:  # noqa: E722 # pylint: disable=bare-except
         LOGGER.debug(
-            "An exception occured while running the reachability test (tcp_ping)", exc_info=True,
+            "An exception occured while running the reachability test (tcp_ping)",
+            exc_info=True,
         )
         return Result(host=task.host, failed=True)
 
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/tasks.py b/tasks.py
diff --git a/tests/unit/adapters/nautobot_api/test_nautobot_inventory.py b/tests/unit/adapters/nautobot_api/test_nautobot_inventory.py
diff --git a/tests/unit/adapters/netbox_api/test_netbox_inventory.py b/tests/unit/adapters/netbox_api/test_netbox_inventory.py
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,8 @@ def get_vlans(task: Task) -> Result:`
`128`	`128`	`results = task.run(task=netmiko_send_command, command_string="show vlan", use_genie=True)`
`129`	`129`	`except NornirSubTaskError:`
`130`	`130`	`LOGGER.debug(`
`131`		`- "An exception occured while pulling the vlans information", exc_info=True,`
	`131`	`+ "An exception occured while pulling the vlans information",`
	`132`	`+ exc_info=True,`
`132`	`133`	`)`
`133`	`134`	`return Result(host=task.host, failed=True)`
`134`	`135`