From 97e47fb0da92e08765613d7e497f1fcc88a6aa2b Mon Sep 17 00:00:00 2001 From: Mircea Ulinic Date: Thu, 21 Mar 2024 12:21:36 +0000 Subject: [PATCH] Bump black to 24.3.0 and format files --- docs/conf.py | 1 + napalm/base/helpers.py | 1 + napalm/base/test/conftest.py | 1 + napalm/base/test/double.py | 1 + napalm/base/test/getters.py | 1 + napalm/base/utils/jinja_filters.py | 1 + napalm/base/utils/string_parsers.py | 1 + napalm/base/validate.py | 1 + napalm/eos/eos.py | 2 +- napalm/eos/utils/versions.py | 1 + napalm/ios/ios.py | 113 +++++++++++++++----------- napalm/iosxr/iosxr.py | 52 ++++++------ napalm/iosxr_netconf/iosxr_netconf.py | 44 +++++----- napalm/junos/junos.py | 4 +- napalm/junos/utils/junos_views.py | 1 + napalm/nxapi_plumbing/__init__.py | 1 + napalm/nxapi_plumbing/api_client.py | 1 + napalm/nxos/nxos.py | 16 ++-- napalm/nxos_ssh/nxos_ssh.py | 6 +- napalm/pyIOSXR/exceptions.py | 1 - requirements-dev.txt | 2 +- setup.py | 1 + test/base/test_get_network_driver.py | 1 + test/base/validate/test_unit.py | 1 + test/base/validate/test_validate.py | 1 + test/eos/conftest.py | 1 + test/eos/test_versions.py | 1 + test/ios/conftest.py | 1 + test/ios/test_getters.py | 1 + test/iosxr/conftest.py | 1 + test/iosxr/test_getters.py | 1 + test/iosxr_netconf/conftest.py | 1 + test/iosxr_netconf/test_getters.py | 1 + test/junos/TestJunOSDriver.py | 2 - test/junos/conftest.py | 3 +- test/nxos/conftest.py | 1 + test/nxos_ssh/conftest.py | 1 + test/pyiosxr/test_iosxr.py | 3 - 38 files changed, 155 insertions(+), 119 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index d9b5774cd..d9278b7a1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,5 @@ """conf.py.""" + # -*- coding: utf-8 -*- # # napalm documentation build configuration file, created by diff --git a/napalm/base/helpers.py b/napalm/base/helpers.py index dd58ddc7a..1f3bdf917 100644 --- a/napalm/base/helpers.py +++ b/napalm/base/helpers.py @@ -1,4 +1,5 @@ """Helper functions for the NAPALM base.""" + import ipaddress import itertools import logging diff --git a/napalm/base/test/conftest.py b/napalm/base/test/conftest.py index 82deb221b..1783f2cd8 100644 --- a/napalm/base/test/conftest.py +++ b/napalm/base/test/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + import ast import json import os diff --git a/napalm/base/test/double.py b/napalm/base/test/double.py index 059636fc7..e0b0747c6 100644 --- a/napalm/base/test/double.py +++ b/napalm/base/test/double.py @@ -1,4 +1,5 @@ """Base class for Test doubles.""" + import json import re import os diff --git a/napalm/base/test/getters.py b/napalm/base/test/getters.py index 5c660ab21..3d686cec5 100644 --- a/napalm/base/test/getters.py +++ b/napalm/base/test/getters.py @@ -1,4 +1,5 @@ """Testing framework.""" + import functools from itertools import zip_longest import inspect diff --git a/napalm/base/utils/jinja_filters.py b/napalm/base/utils/jinja_filters.py index fc1a1b95a..44b30447f 100644 --- a/napalm/base/utils/jinja_filters.py +++ b/napalm/base/utils/jinja_filters.py @@ -1,4 +1,5 @@ """Some common jinja filters.""" + from typing import Dict, Any diff --git a/napalm/base/utils/string_parsers.py b/napalm/base/utils/string_parsers.py index f14f10e8b..38ff4aa10 100644 --- a/napalm/base/utils/string_parsers.py +++ b/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 diff --git a/napalm/base/validate.py b/napalm/base/validate.py index 4e11d50e8..b02a151ca 100644 --- a/napalm/base/validate.py +++ b/napalm/base/validate.py @@ -3,6 +3,7 @@ See: https://napalm.readthedocs.io/en/latest/validate.html """ + import yaml import copy import re diff --git a/napalm/eos/eos.py b/napalm/eos/eos.py index 2a4c209df..9989e64b4 100644 --- a/napalm/eos/eos.py +++ b/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 } ) diff --git a/napalm/eos/utils/versions.py b/napalm/eos/utils/versions.py index 7e63cc0bc..79029e1dd 100644 --- a/napalm/eos/utils/versions.py +++ b/napalm/eos/utils/versions.py @@ -1,4 +1,5 @@ """Some functions to work with EOS version numbers""" + import re diff --git a/napalm/ios/ios.py b/napalm/ios/ios.py index 85f620090..56255af02 100644 --- a/napalm/ios/ios.py +++ b/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): diff --git a/napalm/iosxr/iosxr.py b/napalm/iosxr/iosxr.py index 2bcb19a0d..ff87716b6 100644 --- a/napalm/iosxr/iosxr.py +++ b/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: diff --git a/napalm/iosxr_netconf/iosxr_netconf.py b/napalm/iosxr_netconf/iosxr_netconf.py index 6f224e46a..7083da16e 100644 --- a/napalm/iosxr_netconf/iosxr_netconf.py +++ b/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 diff --git a/napalm/junos/junos.py b/napalm/junos/junos.py index 35dd7529e..02ae5eec9 100644 --- a/napalm/junos/junos.py +++ b/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} diff --git a/napalm/junos/utils/junos_views.py b/napalm/junos/utils/junos_views.py index 7e5ed1169..74fc01c68 100755 --- a/napalm/junos/utils/junos_views.py +++ b/napalm/junos/utils/junos_views.py @@ -1,6 +1,7 @@ """ Load tables/views """ + import yaml import re from jnpr.junos.factory import FactoryLoader diff --git a/napalm/nxapi_plumbing/__init__.py b/napalm/nxapi_plumbing/__init__.py index 91baba1d7..0480f8eee 100644 --- a/napalm/nxapi_plumbing/__init__.py +++ b/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 ( diff --git a/napalm/nxapi_plumbing/api_client.py b/napalm/nxapi_plumbing/api_client.py index 52e28357b..253c1f1ed 100644 --- a/napalm/nxapi_plumbing/api_client.py +++ b/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 diff --git a/napalm/nxos/nxos.py b/napalm/nxos/nxos.py index ea1d9fc66..b975029ef 100644 --- a/napalm/nxos/nxos.py +++ b/napalm/nxos/nxos.py @@ -669,15 +669,15 @@ def get_lldp_neighbors_detail( # Add field missing on IOS lldp_entry["parent_interface"] = "" # Translate the capability fields - lldp_entry[ - "remote_system_capab" - ] = napalm.base.helpers.transform_lldp_capab( - lldp_entry["remote_system_capab"] + lldp_entry["remote_system_capab"] = ( + napalm.base.helpers.transform_lldp_capab( + lldp_entry["remote_system_capab"] + ) ) - lldp_entry[ - "remote_system_enable_capab" - ] = napalm.base.helpers.transform_lldp_capab( - lldp_entry["remote_system_enable_capab"] + lldp_entry["remote_system_enable_capab"] = ( + napalm.base.helpers.transform_lldp_capab( + lldp_entry["remote_system_enable_capab"] + ) ) # Turn the interfaces into their long version local_intf = canonical_interface_name(local_intf) diff --git a/napalm/nxos_ssh/nxos_ssh.py b/napalm/nxos_ssh/nxos_ssh.py index 6fa051937..04896c9cc 100644 --- a/napalm/nxos_ssh/nxos_ssh.py +++ b/napalm/nxos_ssh/nxos_ssh.py @@ -1485,9 +1485,9 @@ def get_route_to(self, destination="", protocol="", longer=False): "preference": int(nh_metric), } if nh_source == "bgp": - route_entry[ - "protocol_attributes" - ] = self._get_bgp_route_attr(cur_prefix, curvrf, nh_ip) + route_entry["protocol_attributes"] = ( + self._get_bgp_route_attr(cur_prefix, curvrf, nh_ip) + ) else: route_entry["protocol_attributes"] = {} nh_list.append(route_entry) diff --git a/napalm/pyIOSXR/exceptions.py b/napalm/pyIOSXR/exceptions.py index 96de83d3e..4c7991f0b 100644 --- a/napalm/pyIOSXR/exceptions.py +++ b/napalm/pyIOSXR/exceptions.py @@ -43,7 +43,6 @@ def __init__(self, msg=None, dev=None): class CommitError(IOSXRException): - """Raised when unable to commit. Mostly due to ERROR 0x41866c00""" pass diff --git a/requirements-dev.txt b/requirements-dev.txt index 4249c702f..846e74c7d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,4 @@ -black==23.3.0 +black==24.3.0 coveralls==3.3.1 ddt==1.6.0 flake8-import-order==0.18.2 diff --git a/setup.py b/setup.py index 25bf112df..9dcd81059 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ """setup.py file.""" + from setuptools import setup, find_packages with open("requirements.txt", "r") as fs: diff --git a/test/base/test_get_network_driver.py b/test/base/test_get_network_driver.py index a12546f4c..0c24f259c 100644 --- a/test/base/test_get_network_driver.py +++ b/test/base/test_get_network_driver.py @@ -1,4 +1,5 @@ """Test the method get_network_driver.""" + import unittest from ddt import ddt, data diff --git a/test/base/validate/test_unit.py b/test/base/validate/test_unit.py index dbdda73fd..fdaaf57ad 100644 --- a/test/base/validate/test_unit.py +++ b/test/base/validate/test_unit.py @@ -1,4 +1,5 @@ """Tests for the validate methods.""" + import pytest import copy diff --git a/test/base/validate/test_validate.py b/test/base/validate/test_validate.py index 287f391e1..369f67809 100644 --- a/test/base/validate/test_validate.py +++ b/test/base/validate/test_validate.py @@ -1,4 +1,5 @@ """Tests for the validate operation.""" + import json import os import yaml diff --git a/test/eos/conftest.py b/test/eos/conftest.py index d35204fe9..0b12e197b 100644 --- a/test/eos/conftest.py +++ b/test/eos/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + from builtins import super import pytest diff --git a/test/eos/test_versions.py b/test/eos/test_versions.py index 8c284e7a1..caedc2033 100644 --- a/test/eos/test_versions.py +++ b/test/eos/test_versions.py @@ -1,4 +1,5 @@ """Tests for versions utils""" + from napalm.eos.utils.versions import EOSVersion diff --git a/test/ios/conftest.py b/test/ios/conftest.py index 948b986f3..7bf92a161 100644 --- a/test/ios/conftest.py +++ b/test/ios/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + from builtins import super import pytest diff --git a/test/ios/test_getters.py b/test/ios/test_getters.py index 5f87d9ecc..e4708887f 100644 --- a/test/ios/test_getters.py +++ b/test/ios/test_getters.py @@ -1,4 +1,5 @@ """Tests for getters.""" + from napalm.base.test.getters import BaseTestGetters import pytest diff --git a/test/iosxr/conftest.py b/test/iosxr/conftest.py index 7ef92f9d6..5e318ec69 100644 --- a/test/iosxr/conftest.py +++ b/test/iosxr/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + from builtins import super import pytest diff --git a/test/iosxr/test_getters.py b/test/iosxr/test_getters.py index 5f87d9ecc..e4708887f 100644 --- a/test/iosxr/test_getters.py +++ b/test/iosxr/test_getters.py @@ -1,4 +1,5 @@ """Tests for getters.""" + from napalm.base.test.getters import BaseTestGetters import pytest diff --git a/test/iosxr_netconf/conftest.py b/test/iosxr_netconf/conftest.py index f623ee649..f1c1f1537 100644 --- a/test/iosxr_netconf/conftest.py +++ b/test/iosxr_netconf/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + import pytest from lxml import etree from napalm.base.test import conftest as parent_conftest diff --git a/test/iosxr_netconf/test_getters.py b/test/iosxr_netconf/test_getters.py index 5f87d9ecc..e4708887f 100644 --- a/test/iosxr_netconf/test_getters.py +++ b/test/iosxr_netconf/test_getters.py @@ -1,4 +1,5 @@ """Tests for getters.""" + from napalm.base.test.getters import BaseTestGetters import pytest diff --git a/test/junos/TestJunOSDriver.py b/test/junos/TestJunOSDriver.py index fc1394803..99dfb89fa 100644 --- a/test/junos/TestJunOSDriver.py +++ b/test/junos/TestJunOSDriver.py @@ -95,7 +95,6 @@ def cli(self, command="", encoding="text"): class FakeRPCObject: - """ Fake RPC caller. """ @@ -144,7 +143,6 @@ def get_config(self, get_cmd=None, filter_xml=None, options={}): class FakeConnectionRPCObject: - """ Will make fake RPC requests that usually are directly made via netconf. """ diff --git a/test/junos/conftest.py b/test/junos/conftest.py index 31a7cad14..9ec79fc04 100644 --- a/test/junos/conftest.py +++ b/test/junos/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + import copy import lxml @@ -126,7 +127,6 @@ def cli(self, command="", encoding="text"): class FakeRPCObject: - """ Fake RPC caller. """ @@ -170,7 +170,6 @@ def get_config(self, get_cmd=None, filter_xml=None, options={}): class FakeConnectionRPCObject: - """ Will make fake RPC requests that usually are directly made via netconf. """ diff --git a/test/nxos/conftest.py b/test/nxos/conftest.py index 44ffe5656..931cd3c60 100644 --- a/test/nxos/conftest.py +++ b/test/nxos/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + from builtins import super import pytest diff --git a/test/nxos_ssh/conftest.py b/test/nxos_ssh/conftest.py index 8900e2608..a0e836e2b 100644 --- a/test/nxos_ssh/conftest.py +++ b/test/nxos_ssh/conftest.py @@ -1,4 +1,5 @@ """Test fixtures.""" + from builtins import super import pytest diff --git a/test/pyiosxr/test_iosxr.py b/test/pyiosxr/test_iosxr.py index 1eedaeeec..bc97b1ca7 100755 --- a/test/pyiosxr/test_iosxr.py +++ b/test/pyiosxr/test_iosxr.py @@ -24,7 +24,6 @@ class _MockedNetMikoDevice(object): - """ Defines the minimum attributes necessary to mock a SSH connection using netmiko. """ @@ -97,7 +96,6 @@ def send_command_expect( class _MockedIOSXRDevice(IOSXR): - """ Overrides only the very basic methods from the main device driver, that cannot be mocked. """ @@ -112,7 +110,6 @@ def is_alive(self): class TestIOSXRDevice(unittest.TestCase): - """ Tests IOS-XR basic functions. """