Clean up unused imports for nxos related code (#61856)

Signed-off-by: Paul Belanger <pabelanger@redhat.com>

lib/ansible/module_utils/network/nxos/config/bfd_interfaces/bfd_interfaces.py

@@ -14,9 +14,9 @@ __metaclass__ = type
 
 import re
 from ansible.module_utils.network.common.cfg.base import ConfigBase
-from ansible.module_utils.network.common.utils import dict_diff, to_list, remove_empties
+from ansible.module_utils.network.common.utils import dict_diff, to_list
 from ansible.module_utils.network.nxos.facts.facts import Facts
-from ansible.module_utils.network.nxos.utils.utils import flatten_dict, get_interface_type, normalize_interface, search_obj_in_list, vlan_range_to_list
+from ansible.module_utils.network.nxos.utils.utils import flatten_dict, search_obj_in_list
 
 
 class Bfd_interfaces(ConfigBase):

lib/ansible/module_utils/network/nxos/config/interfaces/interfaces.py

@@ -17,7 +17,7 @@ __metaclass__ = type
 from ansible.module_utils.network.common.cfg.base import ConfigBase
 from ansible.module_utils.network.common.utils import dict_diff, to_list, remove_empties
 from ansible.module_utils.network.nxos.facts.facts import Facts
-from ansible.module_utils.network.nxos.utils.utils import get_interface_type, normalize_interface, search_obj_in_list
+from ansible.module_utils.network.nxos.utils.utils import normalize_interface, search_obj_in_list
 
 
 class Interfaces(ConfigBase):

lib/ansible/module_utils/network/nxos/config/l2_interfaces/l2_interfaces.py

@@ -17,7 +17,7 @@ __metaclass__ = type
 from ansible.module_utils.network.common.cfg.base import ConfigBase
 from ansible.module_utils.network.common.utils import dict_diff, to_list, remove_empties
 from ansible.module_utils.network.nxos.facts.facts import Facts
-from ansible.module_utils.network.nxos.utils.utils import flatten_dict, get_interface_type, normalize_interface, search_obj_in_list, vlan_range_to_list
+from ansible.module_utils.network.nxos.utils.utils import flatten_dict, normalize_interface, search_obj_in_list, vlan_range_to_list
 
 
 class L2_interfaces(ConfigBase):

lib/ansible/module_utils/network/nxos/config/l3_interfaces/l3_interfaces.py

@@ -15,9 +15,9 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 from ansible.module_utils.network.common.cfg.base import ConfigBase
-from ansible.module_utils.network.common.utils import dict_diff, to_list, remove_empties
+from ansible.module_utils.network.common.utils import to_list, remove_empties
 from ansible.module_utils.network.nxos.facts.facts import Facts
-from ansible.module_utils.network.nxos.utils.utils import get_interface_type, normalize_interface, search_obj_in_list, validate_ipv4_addr, validate_ipv6_addr
+from ansible.module_utils.network.nxos.utils.utils import normalize_interface, search_obj_in_list
 
 
 class L3_interfaces(ConfigBase):

lib/ansible/module_utils/network/nxos/config/lag_interfaces/lag_interfaces.py

@@ -16,7 +16,7 @@ __metaclass__ = type
 from ansible.module_utils.network.common.cfg.base import ConfigBase
 from ansible.module_utils.network.common.utils import to_list, remove_empties
 from ansible.module_utils.network.nxos.facts.facts import Facts
-from ansible.module_utils.network.nxos.utils.utils import get_interface_type, normalize_interface, search_obj_in_list
+from ansible.module_utils.network.nxos.utils.utils import normalize_interface, search_obj_in_list
 
 
 class Lag_interfaces(ConfigBase):

lib/ansible/module_utils/network/nxos/config/lldp_global/lldp_global.py

@@ -14,7 +14,7 @@ from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from ansible.module_utils.network.common.cfg.base import ConfigBase
-from ansible.module_utils.network.common.utils import to_list, remove_empties, dict_diff, dict_merge
+from ansible.module_utils.network.common.utils import remove_empties, dict_diff
 from ansible.module_utils.network.nxos.facts.facts import Facts
 
 

lib/ansible/module_utils/network/nxos/config/telemetry/telemetry.py

@@ -13,9 +13,6 @@ created
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-import re
-from copy import deepcopy
-
 from ansible.module_utils.network.common.cfg.base import ConfigBase
 from ansible.module_utils.network.common.utils import to_list
 from ansible.module_utils.network.nxos.facts.facts import Facts

lib/ansible/module_utils/network/nxos/config/vlans/vlans.py

@@ -17,7 +17,7 @@ __metaclass__ = type
 from ansible.module_utils.network.common.cfg.base import ConfigBase
 from ansible.module_utils.network.common.utils import dict_diff, to_list, remove_empties
 from ansible.module_utils.network.nxos.facts.facts import Facts
-from ansible.module_utils.network.nxos.utils.utils import get_interface_type, normalize_interface, search_obj_in_list
+from ansible.module_utils.network.nxos.utils.utils import search_obj_in_list
 
 
 class Vlans(ConfigBase):

lib/ansible/module_utils/network/nxos/facts/facts.py

@@ -9,7 +9,6 @@ this file validates each subset of facts and selectively
 calls the appropriate facts gathering function
 """
 
-from ansible.module_utils.network.nxos.argspec.facts.facts import FactsArgs
 from ansible.module_utils.network.common.facts.facts import FactsBase
 from ansible.module_utils.network.nxos.facts.legacy.base import Default, Legacy, Hardware, Config, Interfaces, Features
 from ansible.module_utils.network.nxos.facts.bfd_interfaces.bfd_interfaces import Bfd_interfacesFacts

lib/ansible/module_utils/network/nxos/facts/telemetry/telemetry.py

@@ -20,7 +20,7 @@ from ansible.module_utils.network.nxos.argspec.telemetry.telemetry import Teleme
 from ansible.module_utils.network.nxos.cmdref.telemetry.telemetry import TMS_GLOBAL, TMS_DESTGROUP, TMS_SENSORGROUP, TMS_SUBSCRIPTION
 from ansible.module_utils.network.nxos.utils.telemetry.telemetry import get_instance_data, cr_key_lookup
 from ansible.module_utils.network.nxos.utils.telemetry.telemetry import normalize_data
-from ansible.module_utils.network.nxos.nxos import NxosCmdRef, normalize_interface
+from ansible.module_utils.network.nxos.nxos import NxosCmdRef
 
 
 class TelemetryFacts(object):

lib/ansible/module_utils/network/nxos/nxos.py

@@ -41,7 +41,7 @@ from ansible.module_utils.connection import Connection, ConnectionError
 from ansible.module_utils.common._collections_compat import Mapping
 from ansible.module_utils.network.common.config import NetworkConfig, dumps
 from ansible.module_utils.network.common.config import CustomNetworkConfig
-from ansible.module_utils.six import iteritems, string_types, PY2, PY3
+from ansible.module_utils.six import iteritems, PY2, PY3
 from ansible.module_utils.urls import fetch_url
 
 try:

lib/ansible/modules/network/nxos/_nxos_l2_interface.py

@@ -120,10 +120,9 @@ commands:
     - switchport access vlan 20
 """
 
-import re
 from copy import deepcopy
 
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, get_interface_type
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec

lib/ansible/modules/network/nxos/_nxos_linkagg.py

@@ -137,7 +137,7 @@ import re
 from copy import deepcopy
 
 from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
-from ansible.module_utils.network.nxos.nxos import get_capabilities, nxos_argument_spec
+from ansible.module_utils.network.nxos.nxos import nxos_argument_spec
 from ansible.module_utils.network.nxos.nxos import normalize_interface
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec

lib/ansible/modules/network/nxos/_nxos_vlan.py

@@ -179,7 +179,6 @@ from ansible.module_utils.network.nxos.nxos import get_capabilities
 from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import normalize_interface, nxos_argument_spec
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.connection import ConnectionError
 from ansible.module_utils.network.common.config import CustomNetworkConfig
 from ansible.module_utils.network.common.utils import remove_default_spec
 

lib/ansible/modules/network/nxos/nxos_bfd_global.py

@@ -139,12 +139,10 @@ cmds:
 '''
 
 
-import re
 from ansible.module_utils.network.nxos.nxos import NxosCmdRef
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
-from ansible.module_utils.network.nxos.nxos import load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import load_config
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.network.common.config import CustomNetworkConfig
 
 BFD_CMD_REF = """
 # The cmd_ref is a yaml formatted list of module commands.

lib/ansible/modules/network/nxos/nxos_evpn_vni.py

@@ -95,7 +95,7 @@ commands:
 '''
 
 import re
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import get_config, load_config
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.config import CustomNetworkConfig

lib/ansible/modules/network/nxos/nxos_gir.py

@@ -158,9 +158,8 @@ changed:
     sample: true
 '''
 
-import re
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import nxos_argument_spec
-from ansible.module_utils.network.nxos.nxos import get_capabilities, nxos_argument_spec
 from ansible.module_utils.basic import AnsibleModule
 
 

lib/ansible/modules/network/nxos/nxos_gir_profile_management.py

@@ -98,8 +98,7 @@ changed:
 '''
 
 
-import re
+from ansible.module_utils.network.nxos.nxos import get_config, load_config
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.config import CustomNetworkConfig

lib/ansible/modules/network/nxos/nxos_igmp_interface.py

@@ -189,7 +189,7 @@ changed:
     sample: true
 '''
 
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.network.nxos.nxos import get_interface_type
 from ansible.module_utils.basic import AnsibleModule

lib/ansible/modules/network/nxos/nxos_igmp_snooping.py

@@ -95,7 +95,7 @@ commands:
 
 import re
 
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 

lib/ansible/modules/network/nxos/nxos_ntp_auth.py

@@ -86,7 +86,7 @@ commands:
 
 import re
 
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 

lib/ansible/modules/network/nxos/nxos_ntp_options.py

@@ -75,7 +75,7 @@ updates:
 '''
 import re
 
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 

lib/ansible/modules/network/nxos/nxos_nxapi.py

@@ -166,7 +166,6 @@ from ansible.module_utils.network.nxos.nxos import run_commands, load_config
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec
 from ansible.module_utils.network.nxos.nxos import get_capabilities
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
 
 
 def check_args(module, warnings, capabilities):

lib/ansible/modules/network/nxos/nxos_pim_interface.py

@@ -148,7 +148,6 @@ from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.network.nxos.nxos import get_interface_type
-from ansible.module_utils.six import string_types
 
 
 PARAM_TO_COMMAND_KEYMAP = {

lib/ansible/modules/network/nxos/nxos_rpm.py

@@ -82,7 +82,7 @@ import time
 from copy import deepcopy
 
 from ansible.module_utils.network.nxos.nxos import load_config, run_commands
-from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
+from ansible.module_utils.network.nxos.nxos import nxos_argument_spec
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec
 

lib/ansible/modules/network/nxos/nxos_smu.py

@@ -63,11 +63,9 @@ commands:
 '''
 
 
-import collections
-import re
 import time
 
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 

lib/ansible/modules/network/nxos/nxos_udld.py

@@ -103,10 +103,8 @@ changed:
     sample: true
 '''
 
-import re
+from ansible.module_utils.network.nxos.nxos import load_config, run_commands
-
+from ansible.module_utils.network.nxos.nxos import nxos_argument_spec
-from ansible.module_utils.network.nxos.nxos import get_config, load_config, run_commands
-from ansible.module_utils.network.nxos.nxos import get_capabilities, nxos_argument_spec
 from ansible.module_utils.basic import AnsibleModule
 
 

lib/ansible/modules/network/nxos/nxos_user.py

@@ -137,15 +137,13 @@ delta:
   type: str
   sample: "0:00:10.469466"
 """
-import re
-
 from copy import deepcopy
 from functools import partial
 
 from ansible.module_utils.network.nxos.nxos import run_commands, load_config
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import string_types, iteritems
+from ansible.module_utils.six import iteritems
 from ansible.module_utils.network.common.utils import remove_default_spec, to_list
 
 VALID_ROLES = ['network-admin', 'network-operator', 'vdc-admin', 'vdc-operator',

lib/ansible/plugins/action/nxos_file_copy.py

@@ -21,21 +21,13 @@ import copy
 import hashlib
 import os
 import re
-import sys
-import time
-import traceback
-import uuid
 
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_text, to_bytes
 from ansible.module_utils.connection import Connection
 from ansible.plugins.action import ActionBase
-from ansible.module_utils.six.moves.urllib.parse import urlsplit
 from ansible.utils.display import Display
 from ansible.module_utils.compat.paramiko import paramiko
-from ansible.module_utils.network.nxos.nxos import run_commands
-from ansible.module_utils._text import to_native, to_text, to_bytes
-from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils import six
 
 try:

test/units/modules/network/nxos/test_nxos_evpn_vni.py

@@ -31,9 +31,6 @@ class TestNxosEvpnVniModule(TestNxosModule):
     def setUp(self):
         super(TestNxosEvpnVniModule, self).setUp()
 
-        self.mock_run_commands = patch('ansible.modules.network.nxos.nxos_evpn_vni.run_commands')
-        self.run_commands = self.mock_run_commands.start()
-
         self.mock_load_config = patch('ansible.modules.network.nxos.nxos_evpn_vni.load_config')
         self.load_config = self.mock_load_config.start()
 
@@ -42,7 +39,6 @@ class TestNxosEvpnVniModule(TestNxosModule):
 
     def tearDown(self):
         super(TestNxosEvpnVniModule, self).tearDown()
-        self.mock_run_commands.stop()
         self.mock_load_config.stop()
         self.mock_get_config.stop()