Bump black to 24.3.0 and format files

docs/conf.py

@@ -1,4 +1,5 @@
 """conf.py."""
+
 # -*- coding: utf-8 -*-
 #
 # napalm documentation build configuration file, created by

napalm/base/helpers.py

@@ -1,4 +1,5 @@
 """Helper functions for the NAPALM base."""
+
 import ipaddress
 import itertools
 import logging

napalm/base/test/conftest.py

@@ -1,4 +1,5 @@
 """Test fixtures."""
+
 import ast
 import json
 import os

napalm/base/test/double.py

@@ -1,4 +1,5 @@
 """Base class for Test doubles."""
+
 import json
 import re
 import os

napalm/base/test/getters.py

@@ -1,4 +1,5 @@
 """Testing framework."""
+
 import functools
 from itertools import zip_longest
 import inspect

napalm/base/utils/jinja_filters.py

@@ -1,4 +1,5 @@
 """Some common jinja filters."""
+
 from typing import Dict, Any
 
 

napalm/base/utils/string_parsers.py

@@ -1,4 +1,5 @@
 """ Common methods to normalize a string """
+
 import re
 import struct
 from typing import Union, List, Iterable, Dict, Optional, Tuple

napalm/base/validate.py

@@ -3,6 +3,7 @@
 
 See: https://napalm.readthedocs.io/en/latest/validate.html
 """
+
 import yaml
 import copy
 import re

napalm/eos/eos.py

@@ -1395,7 +1395,7 @@ def get_interfaces_ip(self):
                         interface_details.get("linkLocal", {})
                         .get("subnet", "::/0")
                         .split("/")[-1]
-                    )
+                    ),
                     # when no link-local set, address will be None and maslken 0
                 }
             )

napalm/eos/utils/versions.py

@@ -1,4 +1,5 @@
 """Some functions to work with EOS version numbers"""
+
 import re
 
 

napalm/ios/ios.py

@@ -1,4 +1,5 @@
 """NAPALM Cisco IOS Handler."""
+
 # Copyright 2015 Spotify AB. All rights reserved.
 #
 # The contents of this file are licensed under the Apache License, Version 2.0
@@ -2100,46 +2101,54 @@ def get_bgp_neighbors_detail(self, neighbor_address=""):
                 "up": neigh["up"] != "never",
                 "local_as": napalm.base.helpers.as_number(neigh["local_as"]),
                 "remote_as": napalm.base.helpers.as_number(neigh["remote_as"]),
-                "router_id": napalm.base.helpers.ip(bgp_neigh["router_id"])
-                if bgp_neigh["router_id"]
-                else "",
-                "local_address": napalm.base.helpers.ip(bgp_neigh["local_address"])
-                if bgp_neigh["local_address"]
-                else "",
+                "router_id": (
+                    napalm.base.helpers.ip(bgp_neigh["router_id"])
+                    if bgp_neigh["router_id"]
+                    else ""
+                ),
+                "local_address": (
+                    napalm.base.helpers.ip(bgp_neigh["local_address"])
+                    if bgp_neigh["local_address"]
+                    else ""
+                ),
                 "local_address_configured": False,
-                "local_port": napalm.base.helpers.as_number(bgp_neigh["local_port"])
-                if bgp_neigh["local_port"]
-                else 0,
+                "local_port": (
+                    napalm.base.helpers.as_number(bgp_neigh["local_port"])
+                    if bgp_neigh["local_port"]
+                    else 0
+                ),
                 "routing_table": bgp_neigh["vrf"] if bgp_neigh["vrf"] else "global",
                 "remote_address": napalm.base.helpers.ip(bgp_neigh["neighbor"]),
-                "remote_port": napalm.base.helpers.as_number(bgp_neigh["remote_port"])
-                if bgp_neigh["remote_port"]
-                else 0,
+                "remote_port": (
+                    napalm.base.helpers.as_number(bgp_neigh["remote_port"])
+                    if bgp_neigh["remote_port"]
+                    else 0
+                ),
                 "multihop": False,
                 "multipath": False,
                 "remove_private_as": False,
                 "import_policy": "",
                 "export_policy": "",
-                "input_messages": napalm.base.helpers.as_number(
-                    bgp_neigh["msg_total_in"]
-                )
-                if bgp_neigh["msg_total_in"]
-                else 0,
-                "output_messages": napalm.base.helpers.as_number(
-                    bgp_neigh["msg_total_out"]
-                )
-                if bgp_neigh["msg_total_out"]
-                else 0,
-                "input_updates": napalm.base.helpers.as_number(
-                    bgp_neigh["msg_update_in"]
-                )
-                if bgp_neigh["msg_update_in"]
-                else 0,
-                "output_updates": napalm.base.helpers.as_number(
-                    bgp_neigh["msg_update_out"]
-                )
-                if bgp_neigh["msg_update_out"]
-                else 0,
+                "input_messages": (
+                    napalm.base.helpers.as_number(bgp_neigh["msg_total_in"])
+                    if bgp_neigh["msg_total_in"]
+                    else 0
+                ),
+                "output_messages": (
+                    napalm.base.helpers.as_number(bgp_neigh["msg_total_out"])
+                    if bgp_neigh["msg_total_out"]
+                    else 0
+                ),
+                "input_updates": (
+                    napalm.base.helpers.as_number(bgp_neigh["msg_update_in"])
+                    if bgp_neigh["msg_update_in"]
+                    else 0
+                ),
+                "output_updates": (
+                    napalm.base.helpers.as_number(bgp_neigh["msg_update_out"])
+                    if bgp_neigh["msg_update_out"]
+                    else 0
+                ),
                 "messages_queued_out": napalm.base.helpers.as_number(neigh["out_q"]),
                 "connection_state": bgp_neigh["bgp_state"],
                 "previous_connection_state": "",
@@ -2150,13 +2159,17 @@ def get_bgp_neighbors_detail(self, neighbor_address=""):
                     else False
                 ),
                 "local_as_prepend": False,
-                "holdtime": napalm.base.helpers.as_number(bgp_neigh["holdtime"])
-                if bgp_neigh["holdtime"]
-                else 0,
+                "holdtime": (
+                    napalm.base.helpers.as_number(bgp_neigh["holdtime"])
+                    if bgp_neigh["holdtime"]
+                    else 0
+                ),
                 "configured_holdtime": 0,
-                "keepalive": napalm.base.helpers.as_number(bgp_neigh["keepalive"])
-                if bgp_neigh["keepalive"]
-                else 0,
+                "keepalive": (
+                    napalm.base.helpers.as_number(bgp_neigh["keepalive"])
+                    if bgp_neigh["keepalive"]
+                    else 0
+                ),
                 "configured_keepalive": 0,
                 "active_prefix_count": 0,
                 "received_prefix_count": 0,
@@ -3209,10 +3222,10 @@ def get_route_to(self, destination="", protocol="", longer=False):
                             # was not specified
                             if protocol == "" or protocol == route_entry["protocol"]:
                                 if route_proto == "bgp":
-                                    route_entry[
-                                        "protocol_attributes"
-                                    ] = self._get_bgp_route_attr(
-                                        destination, _vrf, nh, ip_version
+                                    route_entry["protocol_attributes"] = (
+                                        self._get_bgp_route_attr(
+                                            destination, _vrf, nh, ip_version
+                                        )
                                     )
                                 nh_line_found = (
                                     False  # for next RT entry processing ...
@@ -3305,12 +3318,16 @@ def get_users(self):
             output = self._send_command(command)
         for match in re.finditer(username_regex, output, re.M):
             users[match.groupdict()["username"]] = {
-                "level": int(match.groupdict()["priv_level"])
-                if match.groupdict()["priv_level"]
-                else 1,
-                "password": match.groupdict()["pwd_hash"]
-                if match.groupdict()["pwd_hash"]
-                else "",
+                "level": (
+                    int(match.groupdict()["priv_level"])
+                    if match.groupdict()["priv_level"]
+                    else 1
+                ),
+                "password": (
+                    match.groupdict()["pwd_hash"]
+                    if match.groupdict()["pwd_hash"]
+                    else ""
+                ),
                 "sshkeys": [],
             }
         for match in re.finditer(pub_keychain_regex, output, re.M):

napalm/iosxr/iosxr.py

@@ -318,9 +318,9 @@ def get_interfaces(self):
                     "is_enabled": enabled,
                     "mac_address": mac_address,
                     "description": description,
-                    "last_flapped": last_flapped / 1e9
-                    if last_flapped != -1.0
-                    else -1.0,
+                    "last_flapped": (
+                        last_flapped / 1e9 if last_flapped != -1.0 else -1.0
+                    ),
                 }
             )
 
@@ -587,23 +587,23 @@ def generate_vrf_query(vrf_name):
                         ),
                         0,
                     )
-                    this_neighbor["address_family"][this_afi][
-                        "accepted_prefixes"
-                    ] = napalm.base.helpers.convert(
-                        int,
-                        napalm.base.helpers.find_txt(
-                            neighbor, "AFData/Entry/PrefixesAccepted"
-                        ),
-                        0,
+                    this_neighbor["address_family"][this_afi]["accepted_prefixes"] = (
+                        napalm.base.helpers.convert(
+                            int,
+                            napalm.base.helpers.find_txt(
+                                neighbor, "AFData/Entry/PrefixesAccepted"
+                            ),
+                            0,
+                        )
                     )
-                    this_neighbor["address_family"][this_afi][
-                        "sent_prefixes"
-                    ] = napalm.base.helpers.convert(
-                        int,
-                        napalm.base.helpers.find_txt(
-                            neighbor, "AFData/Entry/PrefixesAdvertised"
-                        ),
-                        0,
+                    this_neighbor["address_family"][this_afi]["sent_prefixes"] = (
+                        napalm.base.helpers.convert(
+                            int,
+                            napalm.base.helpers.find_txt(
+                                neighbor, "AFData/Entry/PrefixesAdvertised"
+                            ),
+                            0,
+                        )
                     )
                 except AttributeError:
                     this_neighbor["address_family"][this_afi]["received_prefixes"] = -1
@@ -947,11 +947,11 @@ def cli(self, commands, encoding="text"):
             try:
                 cli_output[str(command)] = str(self.device._execute_show(command))
             except TimeoutError:
-                cli_output[
-                    str(command)
-                ] = 'Execution of command \
+                cli_output[str(command)] = (
+                    'Execution of command \
                     "{command}" took too long! Please adjust your params!'.format(
-                    command=command
+                        command=command
+                    )
                 )
                 logger.error(str(cli_output))
                 raise CommandTimeoutException(str(cli_output))
@@ -2288,9 +2288,9 @@ def traceroute(
                 last_probe_host_name = tag_value
                 continue
             if tag_name == "DeltaTime":
-                last_hop_dict["probes"][last_probe_index][
-                    "rtt"
-                ] = napalm.base.helpers.convert(float, tag_value, 0.0)
+                last_hop_dict["probes"][last_probe_index]["rtt"] = (
+                    napalm.base.helpers.convert(float, tag_value, 0.0)
+                )
                 continue
 
         if last_hop_index:

napalm/iosxr_netconf/iosxr_netconf.py

@@ -801,30 +801,30 @@ def get_vrf_neighbors(rpc_reply_etree, xpath):
                         ),
                         0,
                     )
-                    this_neighbor["address_family"][this_afi][
-                        "accepted_prefixes"
-                    ] = napalm.base.helpers.convert(
-                        int,
-                        self._find_txt(
-                            neighbor,
-                            "./bgp:af-data/bgp:prefixes-accepted",
-                            default="",
-                            namespaces=C.NS,
-                        ),
-                        0,
+                    this_neighbor["address_family"][this_afi]["accepted_prefixes"] = (
+                        napalm.base.helpers.convert(
+                            int,
+                            self._find_txt(
+                                neighbor,
+                                "./bgp:af-data/bgp:prefixes-accepted",
+                                default="",
+                                namespaces=C.NS,
+                            ),
+                            0,
+                        )
                     )
-                    this_neighbor["address_family"][this_afi][
-                        "sent_prefixes"
-                    ] = napalm.base.helpers.convert(
-                        int,
-                        self._find_txt(
-                            neighbor,
-                            "./bgp:af-data/\
+                    this_neighbor["address_family"][this_afi]["sent_prefixes"] = (
+                        napalm.base.helpers.convert(
+                            int,
+                            self._find_txt(
+                                neighbor,
+                                "./bgp:af-data/\
                             bgp:prefixes-advertised",
-                            default="",
-                            namespaces=C.NS,
-                        ),
-                        0,
+                                default="",
+                                namespaces=C.NS,
+                            ),
+                            0,
+                        )
                     )
                 except AttributeError:
                     this_neighbor["address_family"][this_afi]["received_prefixes"] = -1

napalm/junos/junos.py

@@ -1484,7 +1484,7 @@ def get_bgp_neighbors_detail(self, neighbor_address=""):
             "RemovePrivateAS": "remove_private_as",
             "Multipath": "multipath",
             "Multihop": "multihop",
-            "AddressFamily": "local_address_configured"
+            "AddressFamily": "local_address_configured",
             # 'AuthKey'        : 'authentication_key_set'
             # but other vendors do not specify if auth key is set
             # other options:
@@ -1728,7 +1728,7 @@ def get_interfaces_ip(self):
 
         _FAMILY_VMAP_ = {
             "inet": "ipv4",
-            "inet6": "ipv6"
+            "inet6": "ipv6",
             # can add more mappings
         }
         _FAMILY_MAX_PREFIXLEN = {"inet": 32, "inet6": 128}

napalm/junos/utils/junos_views.py

@@ -1,6 +1,7 @@
 """
 Load tables/views
 """
+
 import yaml
 import re
 from jnpr.junos.factory import FactoryLoader

napalm/nxapi_plumbing/__init__.py

@@ -3,6 +3,7 @@
 
 Re-implemented by ktbyers to support XML-RPC in addition to JSON-RPC
 """
+
 from napalm.nxapi_plumbing.device import Device
 from napalm.nxapi_plumbing.api_client import RPCClient, XMLClient
 from napalm.nxapi_plumbing.errors import (

napalm/nxapi_plumbing/api_client.py

@@ -3,6 +3,7 @@
 
 Reimplemented by ktbyers to support XML-RPC in addition to JSON-RPC
 """
+
 from __future__ import print_function, unicode_literals
 
 from builtins import super