diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index 4688fa0035..839d07746f 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -453,10 +453,12 @@ files: $modules/network/bigswitch/: jayakody tedelhourani vuile $modules/network/citrix/netscaler.py: $team_ansible $modules/network/cloudengine/: QijunPan + $modules/network/cnos/: dkasberg amuraleedhar $modules/network/cumulus/: $team_cumulus $modules/network/dellos10/: skg-net $modules/network/dellos6/: abirami-n skg-net $modules/network/dellos9/: dhivyap skg-net + $modules/network/enos/: amuraleedhar $modules/network/eos/: privateip trishnaguha $modules/network/f5/: ignored: Etienne-Carriere mhite mryanlam perzizzle srvg wojtek0806 @@ -470,7 +472,7 @@ files: $modules/network/junos/: Qalthos ganeshrn $modules/network/layer2/: $team_networking $modules/network/layer3/: $team_networking - $modules/network/lenovo/: dkasberg amuraleedhar + $modules/network/mlnxos/: samerd $modules/network/netconf/netconf_config.py: ganeshrn lpenz userlerueda $modules/network/netscaler/: $team_netscaler $modules/network/netvisor/: $team_netvisor @@ -909,116 +911,86 @@ files: - core inventory - inventory - inventory parsing - $module_utils/a10.py: + $module_utils/network/a10: maintainers: ericchou1 mischapeters labels: networking - $module_utils/aci.py: + $module_utils/network/aci: maintainers: $team_aci - labels: - - aci - - networking - $module_utils/aireos.py: + labels: networking + $module_utils/network/aireos: maintainers: jmighion labels: networking + $module_utils/network/aos: + maintainers: dgarros jeremyschulman + labels: networking $module_utils/azure_rm_common.py: maintainers: $team_azure labels: - azure - cloud - $module_utils/eos.py: - maintainers: $team_networking - labels: networking - $module_utils/aruba.py: + $module_utils/network/aruba: maintainers: jmighion labels: networking - $module_utils/asa.py: + $module_utils/network/asa: maintainers: ogenstad labels: networking - $module_utils/avi.py: + $module_utils/network/avi: maintainers: $team_avi - labels: - - avi - - networking - $module_utils/bigswitch_utils.py: + labels: networking + $module_utils/network/bigswitch: maintainers: jayakody tedelhourani vuile labels: networking - $module_utils/cisco_usc.py: - maintainers: ragupta-git - labels: networking - $module_utils/cloudengine.py: + $module_utils/network/cloudengine: maintainers: QijunPan labels: networking $module_utils/cloudstack.py: maintainers: resmo labels: cloudstack - $module_utils/cnos_devicerules.py: - maintainers: dkasberg amuraleedhar - labels: networking - $module_utils/cnos_errorcodes.py: - maintainers: dkasberg amuraleedhar - labels: networking - $module_utils/cnos.py: + $module_utils/network/cnos: maintainers: dkasberg amuraleedhar labels: networking $module_utils/crypto.py: maintainers: Spredzy - $module_utils/dellos: + $module_utils/network/dellos6: maintainers: skg-net labels: networking + $module_utils/network/dellos9: + maintainers: skg-net + labels: networking + $module_utils/network/dellos10: + maintainers: skg-net + labels: networking + $module_utils/network/enos: + maintainers: amuraleedhar + labels: networking $module_utils/f5_utils.py: maintainers: caphrim007 labels: - f5 - networking - $module_utils/fortios.py: + $module_utils/network/fortios: maintainers: bjolivot labels: networking - $module_utils/ios.py: - maintainers: $team_networking - labels: networking - $module_utils/iosxr.py: - maintainers: $team_networking - labels: networking - $module_utils/ironware.py: + $module_utils/network/ironware: maintainers: paulquack labels: networking - $module_utils/junos.py: - maintainers: $team_networking + $module_utils/network/mlnxos: + maintainers: samerd labels: networking $module_utils/manageiq.py: maintainers: $team_manageiq - $module_utils/netcfg.py: - maintainers: $team_networking + $module_utils/network/netscaler: + maintainers: $team_netscaler labels: networking - $module_utils/netconf.py: - maintainers: $team_networking - labels: networking - $module_utils/netcli.py: - maintainers: $team_networking - labels: networking - $module_utils/netscaler.py: - maintainers: $team_networking - labels: networking - $module_utils/network_common.py: - maintainers: $team_networking - labels: networking - $module_utils/network.py: - maintainers: $team_networking - labels: networking - $module_utils/nso.py: + $module_utils/network/nso: maintainers: $team_nso labels: networking - $module_utils/nxos.py: - maintainers: $team_networking - labels: - - networking - - nxos $module_utils/openstack.py: maintainers: $team_openstack labels: - cloud - openstack - $module_utils/ordnance.py: + $module_utils/network/ordnance: maintainers: alexanderturner djh00t labels: networking $module_utils/ovirt.py: @@ -1029,14 +1001,11 @@ files: $module_utils/remote_management/ucs: maintainers: $team_ucs labels: ucs - $module_utils/sros.py: - maintainers: $team_networking - labels: networking $module_utils/vmware: maintainers: $team_vmware labels: vmware support: community - $module_utils/vyos: + $module_utils/network: maintainers: $team_networking labels: networking lib/ansible/playbook/handler.py: diff --git a/docs/docsite/rst/dev_guide/developing_module_utilities.rst b/docs/docsite/rst/dev_guide/developing_module_utilities.rst index 525d827e6d..8c67069330 100644 --- a/docs/docsite/rst/dev_guide/developing_module_utilities.rst +++ b/docs/docsite/rst/dev_guide/developing_module_utilities.rst @@ -8,38 +8,53 @@ Ansible provides a number of module utilities that provide helper functions that The following is a list of module_utils files and a general description. The module utility source code lives in the `./lib/module_utils` directory under your main Ansible path - for more details on any specific module utility, please see the source code. -- a10.py - Utilities used by the a10_server module to manage A10 Networks devices. -- aireos.py - Definitions and helper functions for modules that manage Cisco WLC devices. - api.py - Adds shared support for generic API modules. -- aos.py - Module support utilities for managing Apstra AOS Server. -- aruba.py - Helper functions for modules working with Aruba networking devices. -- asa.py - Module support utilities for managing Cisco ASA network devices. - azure_rm_common.py - Definitions and utilities for Microsoft Azure Resource Manager template deployments. - basic.py - General definitions and helper utilities for Ansible modules. - cloudstack.py - Utilities for CloudStack modules. - database.py - Miscellaneous helper functions for PostGRES and MySQL - docker_common.py - Definitions and helper utilities for modules working with Docker. - ec2.py - Definitions and utilities for modules working with Amazon EC2 -- eos.py - Helper functions for modules working with EOS networking devices. -- f5.py - Helper functions for modules working with F5 networking devices. - facts/- Folder containing helper functions for modules that return facts. See https://github.com/ansible/ansible/pull/23012 for more information. - gce.py - Definitions and helper functions for modules that work with Google Compute Engine resources. -- ios.py - Definitions and helper functions for modules that manage Cisco IOS networking devices -- iosxr.py - Definitions and helper functions for modules that manage Cisco IOS-XR networking devices - ismount.py - Contains single helper function that fixes os.path.ismount -- junos.py - Definitions and helper functions for modules that manage Junos networking devices - keycloak.py - Definitions and helper functions for modules working with the Keycloak API - known_hosts.py - utilities for working with known_hosts file - manageiq.py - Functions and utilities for modules that work with ManageIQ platform and its resources. -- mlnxos.py - Definitions and helper functions for modules that manage Mellanox MLNX-OS networking devices - mysql.py - Allows modules to connect to a MySQL instance - netapp.py - Functions and utilities for modules that work with the NetApp storage platforms. -- netcfg.py - Configuration utility functions for use by networking modules -- netcmd.py - Defines commands and comparison operators for use in networking modules -- netscaler.py - Utilities specifically for the netscaler network modules. -- network.py - Functions for running commands on networking devices -- nso.py - Utilities for modules that work with Cisco NSO. -- nxos.py - Contains definitions and helper functions specific to Cisco NXOS networking devices +- network/a10/a10.py - Utilities used by the a10_server module to manage A10 Networks devices. +- network/aci/aci.py - Definitions and helper functions for modules that manage Cisco ACI Fabrics. +- network/aireos/aireos.py - Definitions and helper functions for modules that manage Cisco WLC devices. +- network/aos/aos.py - Module support utilities for managing Apstra AOS Server. +- network/aruba/aruba.py - Helper functions for modules working with Aruba networking devices. +- network/asa/asa.py - Module support utilities for managing Cisco ASA network devices. +- network/avi/avi.py - Helper functions for modules working with AVI networking devices. +- network/bigswitch/bigswitch_utils.py - Utilities used by the bigswitch module to manage Big Switch Networks devices. +- network/cloudengine/ce.py - Module support utilities for managing Huawei Cloudengine switch. +- network/cnos/cnos.py - Helper functions for modules working on devices running Lenovo CNOS. +- network/common/config.py - Configuration utility functions for use by networking modules +- network/common/netconf.py - Definitions and helper functions for modules that use Netconf transport. +- network/common/parsing.py - Definitions and helper functions for Network modules. +- network/common/network.py - Functions for running commands on networking devices +- network/common/utils.py - Defines commands and comparison operators and other utilises for use in networking modules +- network/dellos6/dellos6.py - Module support utilities for managing device running Dell OS6. +- network/dellos9/dellos9.py - Module support utilities for managing device running Dell OS9. +- network/dellos10/dellos10.py - Module support utilities for managing device running Dell OS10. +- network/enos/enos.py - Helper functions for modules working with Lenovo ENOS devices. +- network/eos/eos.py - Helper functions for modules working with EOS networking devices. +- network/fortios/fortios.py - Module support utilities for managing FortiOS devices. +- network/ios/ios.py - Definitions and helper functions for modules that manage Cisco IOS networking devices +- network/iosxr/iosxr.py - Definitions and helper functions for modules that manage Cisco IOS-XR networking devices. +- network/ironware/ironware.py - Module support utilities for managing Brocade IronWare devices. +- network/junos/junos.py - Definitions and helper functions for modules that manage Junos networking devices. +- network/mlnxos/mlnxos.py - Definitions and helper functions for modules that manage Mellanox MLNX-OS networking devices. +- network/netscaler/netscaler.py - Utilities specifically for the netscaler network modules. +- network/nso/nso.py - Utilities for modules that work with Cisco NSO. +- network/nxos/nxos.py - Contains definitions and helper functions specific to Cisco NXOS networking devices. +- network/ordance/ordance.py - Module support utilities for managing Ordnance devices. +- network/sros/sros.py - Helper functions for modules working with Open vSwitch bridges. +- network/vyos/vyos.py - Definitions and functions for working with VyOS networking - openstack.py - Utilities for modules that work with Openstack instances. - openswitch.py - Definitions and helper functions for modules that manage OpenSwitch devices - powershell.ps1 - Utilities for working with Microsoft Windows clients @@ -54,4 +69,3 @@ The following is a list of module_utils files and a general description. The mod - urls.py - Utilities for working with http and https requests - vca.py - Contains utilities for modules that work with VMware vCloud Air - vmware.py - Contains utilities for modules that work with VMware vSphere VMs -- vyos.py - Definitions and functions for working with VyOS networking diff --git a/lib/ansible/module_utils/f5_utils.py b/lib/ansible/module_utils/f5_utils.py index d7a3a64bb4..4d6533baea 100644 --- a/lib/ansible/module_utils/f5_utils.py +++ b/lib/ansible/module_utils/f5_utils.py @@ -176,7 +176,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems, with_metaclass -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command from ansible.module_utils._text import to_text diff --git a/lib/ansible/module_utils/network/__init__.py b/lib/ansible/module_utils/network/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/network/a10/__init__.py b/lib/ansible/module_utils/network/a10/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/a10.py b/lib/ansible/module_utils/network/a10/a10.py similarity index 100% rename from lib/ansible/module_utils/a10.py rename to lib/ansible/module_utils/network/a10/a10.py diff --git a/lib/ansible/module_utils/network/aci/__init__.py b/lib/ansible/module_utils/network/aci/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/aci.py b/lib/ansible/module_utils/network/aci/aci.py similarity index 100% rename from lib/ansible/module_utils/aci.py rename to lib/ansible/module_utils/network/aci/aci.py diff --git a/lib/ansible/module_utils/network/aireos/__init__.py b/lib/ansible/module_utils/network/aireos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/aireos.py b/lib/ansible/module_utils/network/aireos/aireos.py similarity index 98% rename from lib/ansible/module_utils/aireos.py rename to lib/ansible/module_utils/network/aireos/aireos.py index 2244a72c40..e31a422110 100644 --- a/lib/ansible/module_utils/aireos.py +++ b/lib/ansible/module_utils/network/aireos/aireos.py @@ -27,7 +27,7 @@ # from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/aos/__init__.py b/lib/ansible/module_utils/network/aos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/aos.py b/lib/ansible/module_utils/network/aos/aos.py similarity index 98% rename from lib/ansible/module_utils/aos.py rename to lib/ansible/module_utils/network/aos/aos.py index 82439ff2e6..2eb0f44d96 100644 --- a/lib/ansible/module_utils/aos.py +++ b/lib/ansible/module_utils/network/aos/aos.py @@ -32,7 +32,7 @@ This module adds shared support for Apstra AOS modules In order to use this module, include it as part of your module -from ansible.module_utils.aos import (check_aos_version, get_aos_session, find_collection_item, +from ansible.module_utils.network.aos.aos import (check_aos_version, get_aos_session, find_collection_item, content_to_dict, do_load_resource) """ diff --git a/lib/ansible/module_utils/network/aruba/__init__.py b/lib/ansible/module_utils/network/aruba/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/aruba.py b/lib/ansible/module_utils/network/aruba/aruba.py similarity index 98% rename from lib/ansible/module_utils/aruba.py rename to lib/ansible/module_utils/network/aruba/aruba.py index 4c946502f9..97bb37f65b 100644 --- a/lib/ansible/module_utils/aruba.py +++ b/lib/ansible/module_utils/network/aruba/aruba.py @@ -27,7 +27,7 @@ # from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/asa/__init__.py b/lib/ansible/module_utils/network/asa/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/asa.py b/lib/ansible/module_utils/network/asa/asa.py similarity index 98% rename from lib/ansible/module_utils/asa.py rename to lib/ansible/module_utils/network/asa/asa.py index b13b4836ac..064f648275 100644 --- a/lib/ansible/module_utils/asa.py +++ b/lib/ansible/module_utils/network/asa/asa.py @@ -27,7 +27,7 @@ # from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, EntityCollection +from ansible.module_utils.network.common.utils import to_list, EntityCollection from ansible.module_utils.connection import exec_command from ansible.module_utils.connection import Connection, ConnectionError diff --git a/lib/ansible/module_utils/network/avi/__init__.py b/lib/ansible/module_utils/network/avi/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/avi.py b/lib/ansible/module_utils/network/avi/avi.py similarity index 100% rename from lib/ansible/module_utils/avi.py rename to lib/ansible/module_utils/network/avi/avi.py diff --git a/lib/ansible/module_utils/network/bigswitch/__init__.py b/lib/ansible/module_utils/network/bigswitch/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/bigswitch_utils.py b/lib/ansible/module_utils/network/bigswitch/bigswitch.py similarity index 100% rename from lib/ansible/module_utils/bigswitch_utils.py rename to lib/ansible/module_utils/network/bigswitch/bigswitch.py diff --git a/lib/ansible/module_utils/network/cloudengine/__init__.py b/lib/ansible/module_utils/network/cloudengine/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/ce.py b/lib/ansible/module_utils/network/cloudengine/ce.py similarity index 99% rename from lib/ansible/module_utils/ce.py rename to lib/ansible/module_utils/network/cloudengine/ce.py index d4bfccda82..beae8185f1 100644 --- a/lib/ansible/module_utils/ce.py +++ b/lib/ansible/module_utils/network/cloudengine/ce.py @@ -34,7 +34,7 @@ import sys import traceback from ansible.module_utils.basic import env_fallback -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command from ansible.module_utils.six import iteritems from ansible.module_utils._text import to_native diff --git a/lib/ansible/module_utils/network/cnos/__init__.py b/lib/ansible/module_utils/network/cnos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/cnos.py b/lib/ansible/module_utils/network/cnos/cnos.py similarity index 100% rename from lib/ansible/module_utils/cnos.py rename to lib/ansible/module_utils/network/cnos/cnos.py diff --git a/lib/ansible/module_utils/cnos_devicerules.py b/lib/ansible/module_utils/network/cnos/cnos_devicerules.py similarity index 100% rename from lib/ansible/module_utils/cnos_devicerules.py rename to lib/ansible/module_utils/network/cnos/cnos_devicerules.py diff --git a/lib/ansible/module_utils/cnos_errorcodes.py b/lib/ansible/module_utils/network/cnos/cnos_errorcodes.py similarity index 100% rename from lib/ansible/module_utils/cnos_errorcodes.py rename to lib/ansible/module_utils/network/cnos/cnos_errorcodes.py diff --git a/lib/ansible/module_utils/network/common/__init__.py b/lib/ansible/module_utils/network/common/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/netcfg.py b/lib/ansible/module_utils/network/common/config.py similarity index 99% rename from lib/ansible/module_utils/netcfg.py rename to lib/ansible/module_utils/network/common/config.py index 0b1742ef11..23b4df6a85 100644 --- a/lib/ansible/module_utils/netcfg.py +++ b/lib/ansible/module_utils/network/common/config.py @@ -30,7 +30,7 @@ import hashlib from ansible.module_utils.six.moves import zip from ansible.module_utils._text import to_bytes, to_native -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list DEFAULT_COMMENT_TOKENS = ['#', '!', '/*', '*/', 'echo'] diff --git a/lib/ansible/module_utils/netconf.py b/lib/ansible/module_utils/network/common/netconf.py similarity index 100% rename from lib/ansible/module_utils/netconf.py rename to lib/ansible/module_utils/network/common/netconf.py diff --git a/lib/ansible/module_utils/network.py b/lib/ansible/module_utils/network/common/network.py similarity index 99% rename from lib/ansible/module_utils/network.py rename to lib/ansible/module_utils/network/common/network.py index 108f215c76..057802d483 100644 --- a/lib/ansible/module_utils/network.py +++ b/lib/ansible/module_utils/network/common/network.py @@ -29,7 +29,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import env_fallback -from ansible.module_utils.netcli import Cli +from ansible.module_utils.network.common.parsing import Cli from ansible.module_utils._text import to_native from ansible.module_utils.six import iteritems diff --git a/lib/ansible/module_utils/netcli.py b/lib/ansible/module_utils/network/common/parsing.py similarity index 100% rename from lib/ansible/module_utils/netcli.py rename to lib/ansible/module_utils/network/common/parsing.py diff --git a/lib/ansible/module_utils/network_common.py b/lib/ansible/module_utils/network/common/utils.py similarity index 100% rename from lib/ansible/module_utils/network_common.py rename to lib/ansible/module_utils/network/common/utils.py diff --git a/lib/ansible/module_utils/network/dellos10/__init__.py b/lib/ansible/module_utils/network/dellos10/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/dellos10.py b/lib/ansible/module_utils/network/dellos10/dellos10.py similarity index 97% rename from lib/ansible/module_utils/dellos10.py rename to lib/ansible/module_utils/network/dellos10/dellos10.py index 2e9ab7f421..c6be27928c 100644 --- a/lib/ansible/module_utils/dellos10.py +++ b/lib/ansible/module_utils/network/dellos10/dellos10.py @@ -33,9 +33,9 @@ import re from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command -from ansible.module_utils.netcfg import NetworkConfig, ConfigLine +from ansible.module_utils.network.common.config import NetworkConfig, ConfigLine _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/dellos6/__init__.py b/lib/ansible/module_utils/network/dellos6/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/dellos6.py b/lib/ansible/module_utils/network/dellos6/dellos6.py similarity index 98% rename from lib/ansible/module_utils/dellos6.py rename to lib/ansible/module_utils/network/dellos6/dellos6.py index a47640e020..e668567736 100644 --- a/lib/ansible/module_utils/dellos6.py +++ b/lib/ansible/module_utils/network/dellos6/dellos6.py @@ -32,9 +32,9 @@ import re from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command -from ansible.module_utils.netcfg import NetworkConfig, ConfigLine, ignore_line, DEFAULT_COMMENT_TOKENS +from ansible.module_utils.network.common.config import NetworkConfig, ConfigLine, ignore_line, DEFAULT_COMMENT_TOKENS _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/dellos9/__init__.py b/lib/ansible/module_utils/network/dellos9/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/dellos9.py b/lib/ansible/module_utils/network/dellos9/dellos9.py similarity index 97% rename from lib/ansible/module_utils/dellos9.py rename to lib/ansible/module_utils/network/dellos9/dellos9.py index 74429b564d..c8c1d06da6 100644 --- a/lib/ansible/module_utils/dellos9.py +++ b/lib/ansible/module_utils/network/dellos9/dellos9.py @@ -33,9 +33,9 @@ import re from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command -from ansible.module_utils.netcfg import NetworkConfig, ConfigLine +from ansible.module_utils.network.common.config import NetworkConfig, ConfigLine _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/enos/__init__.py b/lib/ansible/module_utils/network/enos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/enos.py b/lib/ansible/module_utils/network/enos/enos.py similarity index 98% rename from lib/ansible/module_utils/enos.py rename to lib/ansible/module_utils/network/enos/enos.py index b432589c55..953922441f 100644 --- a/lib/ansible/module_utils/enos.py +++ b/lib/ansible/module_utils/network/enos/enos.py @@ -33,7 +33,7 @@ from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, EntityCollection +from ansible.module_utils.network.common.utils import to_list, EntityCollection from ansible.module_utils.connection import Connection, exec_command from ansible.module_utils.connection import ConnectionError diff --git a/lib/ansible/module_utils/network/eos/__init__.py b/lib/ansible/module_utils/network/eos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/eos.py b/lib/ansible/module_utils/network/eos/eos.py similarity index 99% rename from lib/ansible/module_utils/eos.py rename to lib/ansible/module_utils/network/eos/eos.py index a60219fe5b..a548f13934 100644 --- a/lib/ansible/module_utils/eos.py +++ b/lib/ansible/module_utils/network/eos/eos.py @@ -33,7 +33,7 @@ import time from ansible.module_utils._text import to_text, to_native from ansible.module_utils.basic import env_fallback, return_values from ansible.module_utils.connection import exec_command -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.six import iteritems from ansible.module_utils.urls import fetch_url diff --git a/lib/ansible/module_utils/network/fortios/__init__.py b/lib/ansible/module_utils/network/fortios/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/fortios.py b/lib/ansible/module_utils/network/fortios/fortios.py similarity index 100% rename from lib/ansible/module_utils/fortios.py rename to lib/ansible/module_utils/network/fortios/fortios.py diff --git a/lib/ansible/module_utils/network/ios/__init__.py b/lib/ansible/module_utils/network/ios/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/ios.py b/lib/ansible/module_utils/network/ios/ios.py similarity index 98% rename from lib/ansible/module_utils/ios.py rename to lib/ansible/module_utils/network/ios/ios.py index 3cd8f1a321..85ce640093 100644 --- a/lib/ansible/module_utils/ios.py +++ b/lib/ansible/module_utils/network/ios/ios.py @@ -27,7 +27,7 @@ # from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/iosxr/__init__.py b/lib/ansible/module_utils/network/iosxr/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/iosxr.py b/lib/ansible/module_utils/network/iosxr/iosxr.py similarity index 98% rename from lib/ansible/module_utils/iosxr.py rename to lib/ansible/module_utils/network/iosxr/iosxr.py index f4a5a394e8..5645475656 100644 --- a/lib/ansible/module_utils/iosxr.py +++ b/lib/ansible/module_utils/network/iosxr/iosxr.py @@ -28,7 +28,7 @@ # from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/ironware/__init__.py b/lib/ansible/module_utils/network/ironware/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/ironware.py b/lib/ansible/module_utils/network/ironware/ironware.py similarity index 97% rename from lib/ansible/module_utils/ironware.py rename to lib/ansible/module_utils/network/ironware/ironware.py index 2fbb6ac624..22a86b1218 100644 --- a/lib/ansible/module_utils/ironware.py +++ b/lib/ansible/module_utils/network/ironware/ironware.py @@ -21,7 +21,7 @@ __metaclass__ = type from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, EntityCollection +from ansible.module_utils.network.common.utils import to_list, EntityCollection from ansible.module_utils.connection import Connection, exec_command _DEVICE_CONFIG = None diff --git a/lib/ansible/module_utils/network/junos/__init__.py b/lib/ansible/module_utils/network/junos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/junos.py b/lib/ansible/module_utils/network/junos/junos.py similarity index 99% rename from lib/ansible/module_utils/junos.py rename to lib/ansible/module_utils/network/junos/junos.py index ca509b19af..2a1d085492 100644 --- a/lib/ansible/module_utils/junos.py +++ b/lib/ansible/module_utils/network/junos/junos.py @@ -23,7 +23,7 @@ from copy import deepcopy from ansible.module_utils.basic import env_fallback, return_values from ansible.module_utils.connection import Connection -from ansible.module_utils.netconf import NetconfConnection +from ansible.module_utils.network.common.netconf import NetconfConnection from ansible.module_utils._text import to_text try: diff --git a/lib/ansible/module_utils/network/mlnxos/__init__.py b/lib/ansible/module_utils/network/mlnxos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/mlnxos.py b/lib/ansible/module_utils/network/mlnxos/mlnxos.py similarity index 97% rename from lib/ansible/module_utils/mlnxos.py rename to lib/ansible/module_utils/network/mlnxos/mlnxos.py index 819eb904b2..b566f30320 100644 --- a/lib/ansible/module_utils/mlnxos.py +++ b/lib/ansible/module_utils/network/mlnxos/mlnxos.py @@ -21,7 +21,7 @@ from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback from ansible.module_utils.connection import Connection, ConnectionError -from ansible.module_utils.network_common import to_list, EntityCollection +from ansible.module_utils.network.common.utils import to_list, EntityCollection _DEVICE_CONFIGS = {} _CONNECTION = None diff --git a/lib/ansible/module_utils/network/netscaler/__init__.py b/lib/ansible/module_utils/network/netscaler/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/netscaler.py b/lib/ansible/module_utils/network/netscaler/netscaler.py similarity index 100% rename from lib/ansible/module_utils/netscaler.py rename to lib/ansible/module_utils/network/netscaler/netscaler.py diff --git a/lib/ansible/module_utils/network/nso/__init__.py b/lib/ansible/module_utils/network/nso/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/nso.py b/lib/ansible/module_utils/network/nso/nso.py similarity index 100% rename from lib/ansible/module_utils/nso.py rename to lib/ansible/module_utils/network/nso/nso.py diff --git a/lib/ansible/module_utils/network/nxos/__init__.py b/lib/ansible/module_utils/network/nxos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/nxos.py b/lib/ansible/module_utils/network/nxos/nxos.py similarity index 99% rename from lib/ansible/module_utils/nxos.py rename to lib/ansible/module_utils/network/nxos/nxos.py index a201e0b99a..4eaad230cd 100644 --- a/lib/ansible/module_utils/nxos.py +++ b/lib/ansible/module_utils/network/nxos/nxos.py @@ -32,7 +32,7 @@ import collections from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command from ansible.module_utils.six import iteritems, string_types from ansible.module_utils.urls import fetch_url diff --git a/lib/ansible/module_utils/network/ordnance/__init__.py b/lib/ansible/module_utils/network/ordnance/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/ordnance.py b/lib/ansible/module_utils/network/ordnance/ordnance.py similarity index 100% rename from lib/ansible/module_utils/ordnance.py rename to lib/ansible/module_utils/network/ordnance/ordnance.py diff --git a/lib/ansible/module_utils/network/sros/__init__.py b/lib/ansible/module_utils/network/sros/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/sros.py b/lib/ansible/module_utils/network/sros/sros.py similarity index 97% rename from lib/ansible/module_utils/sros.py rename to lib/ansible/module_utils/network/sros/sros.py index 968c7eee06..14914d29e5 100644 --- a/lib/ansible/module_utils/sros.py +++ b/lib/ansible/module_utils/network/sros/sros.py @@ -32,8 +32,7 @@ import re from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network import NetworkError -from ansible.module_utils.network_common import to_list, ComplexList +from ansible.module_utils.network.common.utils import to_list, ComplexList from ansible.module_utils.connection import exec_command _DEVICE_CONFIGS = {} diff --git a/lib/ansible/module_utils/network/vyos/__init__.py b/lib/ansible/module_utils/network/vyos/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/ansible/module_utils/vyos.py b/lib/ansible/module_utils/network/vyos/vyos.py similarity index 98% rename from lib/ansible/module_utils/vyos.py rename to lib/ansible/module_utils/network/vyos/vyos.py index ec5946b3f9..a545378db8 100644 --- a/lib/ansible/module_utils/vyos.py +++ b/lib/ansible/module_utils/network/vyos/vyos.py @@ -28,7 +28,7 @@ import json from ansible.module_utils._text import to_text from ansible.module_utils.basic import env_fallback, return_values -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.module_utils.connection import Connection _DEVICE_CONFIGS = {} diff --git a/lib/ansible/modules/network/a10/a10_server.py b/lib/ansible/modules/network/a10/a10_server.py index aeafdc138f..f7891cf8a2 100644 --- a/lib/ansible/modules/network/a10/a10_server.py +++ b/lib/ansible/modules/network/a10/a10_server.py @@ -102,8 +102,8 @@ content: ''' import json -from ansible.module_utils.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, - axapi_get_port_protocol, axapi_enabled_disabled, AXAPI_PORT_PROTOCOLS) +from ansible.module_utils.network.a10.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, axapi_get_port_protocol, + axapi_enabled_disabled, AXAPI_PORT_PROTOCOLS) from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import url_argument_spec diff --git a/lib/ansible/modules/network/a10/a10_server_axapi3.py b/lib/ansible/modules/network/a10/a10_server_axapi3.py index a539ac83f7..7fe6accbf2 100644 --- a/lib/ansible/modules/network/a10/a10_server_axapi3.py +++ b/lib/ansible/modules/network/a10/a10_server_axapi3.py @@ -91,8 +91,8 @@ EXAMPLES = ''' ''' import json -from ansible.module_utils.a10 import axapi_call_v3, a10_argument_spec, axapi_authenticate_v3, axapi_failure -from ansible.module_utils.a10 import AXAPI_PORT_PROTOCOLS +from ansible.module_utils.network.a10.a10 import axapi_call_v3, a10_argument_spec, axapi_authenticate_v3, axapi_failure +from ansible.module_utils.network.a10.a10 import AXAPI_PORT_PROTOCOLS from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import url_argument_spec diff --git a/lib/ansible/modules/network/a10/a10_service_group.py b/lib/ansible/modules/network/a10/a10_service_group.py index a9c12b2d6a..a63cd28a33 100644 --- a/lib/ansible/modules/network/a10/a10_service_group.py +++ b/lib/ansible/modules/network/a10/a10_service_group.py @@ -112,8 +112,7 @@ content: ''' import json -from ansible.module_utils.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, - axapi_enabled_disabled) +from ansible.module_utils.network.a10.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, axapi_enabled_disabled) from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import url_argument_spec diff --git a/lib/ansible/modules/network/a10/a10_virtual_server.py b/lib/ansible/modules/network/a10/a10_virtual_server.py index c83fe24c8f..560f16a8c2 100644 --- a/lib/ansible/modules/network/a10/a10_virtual_server.py +++ b/lib/ansible/modules/network/a10/a10_virtual_server.py @@ -101,7 +101,7 @@ content: ''' import json -from ansible.module_utils.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, +from ansible.module_utils.network.a10.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, axapi_enabled_disabled, axapi_get_vport_protocol, AXAPI_VPORT_PROTOCOLS) from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import url_argument_spec diff --git a/lib/ansible/modules/network/aci/aci_aep.py b/lib/ansible/modules/network/aci/aci_aep.py index 7bc9bb6cc2..5fd0e6aa63 100644 --- a/lib/ansible/modules/network/aci/aci_aep.py +++ b/lib/ansible/modules/network/aci/aci_aep.py @@ -82,7 +82,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_ap.py b/lib/ansible/modules/network/aci/aci_ap.py index c45146cdbe..99bf8d81eb 100644 --- a/lib/ansible/modules/network/aci/aci_ap.py +++ b/lib/ansible/modules/network/aci/aci_ap.py @@ -93,7 +93,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_bd.py b/lib/ansible/modules/network/aci/aci_bd.py index f53fe1486d..5e87915d74 100644 --- a/lib/ansible/modules/network/aci/aci_bd.py +++ b/lib/ansible/modules/network/aci/aci_bd.py @@ -204,7 +204,7 @@ EXAMPLES = r''' RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_bd_subnet.py b/lib/ansible/modules/network/aci/aci_bd_subnet.py index 647dace1fb..baf304c675 100644 --- a/lib/ansible/modules/network/aci/aci_bd_subnet.py +++ b/lib/ansible/modules/network/aci/aci_bd_subnet.py @@ -201,7 +201,7 @@ RETURN = r''' # ''' SUBNET_CONTROL_MAPPING = dict(nd_ra='nd', no_gw='no-default-gateway', querier_ip='querier', unspecified='') -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_bd_to_l3out.py b/lib/ansible/modules/network/aci/aci_bd_to_l3out.py index 963d267f0b..2483b369a9 100644 --- a/lib/ansible/modules/network/aci/aci_bd_to_l3out.py +++ b/lib/ansible/modules/network/aci/aci_bd_to_l3out.py @@ -55,7 +55,7 @@ RETURN = ''' # ''' SUBNET_CONTROL_MAPPING = dict(nd_ra='nd', no_gw='no-default-gateway', querier_ip='querier', unspecified='') -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_config_rollback.py b/lib/ansible/modules/network/aci/aci_config_rollback.py index a5bbea1f8f..8c1e20e647 100644 --- a/lib/ansible/modules/network/aci/aci_config_rollback.py +++ b/lib/ansible/modules/network/aci/aci_config_rollback.py @@ -134,7 +134,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule from ansible.module_utils._text import to_bytes from ansible.module_utils.urls import fetch_url diff --git a/lib/ansible/modules/network/aci/aci_config_snapshot.py b/lib/ansible/modules/network/aci/aci_config_snapshot.py index 2125911bf1..8cc3294b0d 100644 --- a/lib/ansible/modules/network/aci/aci_config_snapshot.py +++ b/lib/ansible/modules/network/aci/aci_config_snapshot.py @@ -109,7 +109,7 @@ EXAMPLES = r''' RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_contract.py b/lib/ansible/modules/network/aci/aci_contract.py index 365a49f5c1..bb005319b5 100644 --- a/lib/ansible/modules/network/aci/aci_contract.py +++ b/lib/ansible/modules/network/aci/aci_contract.py @@ -88,7 +88,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_contract_subject.py b/lib/ansible/modules/network/aci/aci_contract_subject.py index 905d771a56..a52a334757 100755 --- a/lib/ansible/modules/network/aci/aci_contract_subject.py +++ b/lib/ansible/modules/network/aci/aci_contract_subject.py @@ -133,7 +133,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule MATCH_MAPPING = dict(all='All', at_least_one='AtleastOne', at_most_one='AtmostOne', none='None') diff --git a/lib/ansible/modules/network/aci/aci_contract_subject_to_filter.py b/lib/ansible/modules/network/aci/aci_contract_subject_to_filter.py index 85c3d71a1a..b7d9c016ee 100644 --- a/lib/ansible/modules/network/aci/aci_contract_subject_to_filter.py +++ b/lib/ansible/modules/network/aci/aci_contract_subject_to_filter.py @@ -78,7 +78,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_epg.py b/lib/ansible/modules/network/aci/aci_epg.py index 8e2126660b..3184073760 100644 --- a/lib/ansible/modules/network/aci/aci_epg.py +++ b/lib/ansible/modules/network/aci/aci_epg.py @@ -158,7 +158,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_epg_monitoring_policy.py b/lib/ansible/modules/network/aci/aci_epg_monitoring_policy.py index 110963b37f..8545f8e525 100644 --- a/lib/ansible/modules/network/aci/aci_epg_monitoring_policy.py +++ b/lib/ansible/modules/network/aci/aci_epg_monitoring_policy.py @@ -67,7 +67,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_epg_to_contract.py b/lib/ansible/modules/network/aci/aci_epg_to_contract.py index 08a858f8fc..4097f4fb01 100644 --- a/lib/ansible/modules/network/aci/aci_epg_to_contract.py +++ b/lib/ansible/modules/network/aci/aci_epg_to_contract.py @@ -76,7 +76,7 @@ EXAMPLES = r''' # ''' RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule ACI_CLASS_MAPPING = {"consumer": {"class": "fvRsCons", "rn": "rscons-"}, "provider": {"class": "fvRsProv", "rn": "rsprov-"}} diff --git a/lib/ansible/modules/network/aci/aci_epg_to_domain.py b/lib/ansible/modules/network/aci/aci_epg_to_domain.py index 3459348f2d..3be4a61b49 100644 --- a/lib/ansible/modules/network/aci/aci_epg_to_domain.py +++ b/lib/ansible/modules/network/aci/aci_epg_to_domain.py @@ -106,7 +106,7 @@ EXAMPLES = r''' # ''' RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule VM_PROVIDER_MAPPING = dict(microsoft="uni/vmmp-Microsoft/dom-", openstack="uni/vmmp-OpenStack/dom-", vmware="uni/vmmp-VMware/dom-") diff --git a/lib/ansible/modules/network/aci/aci_filter.py b/lib/ansible/modules/network/aci/aci_filter.py index bb040c0e07..ac6abf920c 100644 --- a/lib/ansible/modules/network/aci/aci_filter.py +++ b/lib/ansible/modules/network/aci/aci_filter.py @@ -95,7 +95,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_filter_entry.py b/lib/ansible/modules/network/aci/aci_filter_entry.py index bb165f90c0..344336eca7 100644 --- a/lib/ansible/modules/network/aci/aci_filter_entry.py +++ b/lib/ansible/modules/network/aci/aci_filter_entry.py @@ -121,7 +121,7 @@ EXAMPLES = r''' RETURN = ''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule VALID_ARP_FLAGS = ['arp_reply', 'arp_request', 'unspecified'] diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_fc.py b/lib/ansible/modules/network/aci/aci_intf_policy_fc.py index bb346d3fde..105b209ecd 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_fc.py +++ b/lib/ansible/modules/network/aci/aci_intf_policy_fc.py @@ -64,7 +64,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_l2.py b/lib/ansible/modules/network/aci/aci_intf_policy_l2.py index 9744a7e499..bd3e4f6891 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_l2.py +++ b/lib/ansible/modules/network/aci/aci_intf_policy_l2.py @@ -73,7 +73,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule # Mapping dicts are used to normalize the proposed data to what the APIC expects, which will keep diffs accurate diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_lldp.py b/lib/ansible/modules/network/aci/aci_intf_policy_lldp.py index b95c75e84e..a8b92fbf3d 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_lldp.py +++ b/lib/ansible/modules/network/aci/aci_intf_policy_lldp.py @@ -71,7 +71,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_mcp.py b/lib/ansible/modules/network/aci/aci_intf_policy_mcp.py index 70c5ce9c9d..4451043715 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_mcp.py +++ b/lib/ansible/modules/network/aci/aci_intf_policy_mcp.py @@ -64,7 +64,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py b/lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py index eaac35b467..821a314ba6 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py +++ b/lib/ansible/modules/network/aci/aci_intf_policy_port_channel.py @@ -119,7 +119,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_intf_policy_port_security.py b/lib/ansible/modules/network/aci/aci_intf_policy_port_security.py index db94331304..0f70035ffd 100644 --- a/lib/ansible/modules/network/aci/aci_intf_policy_port_security.py +++ b/lib/ansible/modules/network/aci/aci_intf_policy_port_security.py @@ -63,7 +63,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_l3out_route_tag_policy.py b/lib/ansible/modules/network/aci/aci_l3out_route_tag_policy.py index e4b6583c58..2e7d0d103c 100644 --- a/lib/ansible/modules/network/aci/aci_l3out_route_tag_policy.py +++ b/lib/ansible/modules/network/aci/aci_l3out_route_tag_policy.py @@ -72,7 +72,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_rest.py b/lib/ansible/modules/network/aci/aci_rest.py index e17e5995d1..16ab182a9e 100644 --- a/lib/ansible/modules/network/aci/aci_rest.py +++ b/lib/ansible/modules/network/aci/aci_rest.py @@ -244,7 +244,7 @@ try: except: HAS_YAML = False -from ansible.module_utils.aci import ACIModule, aci_argument_spec, aci_response_json, aci_response_xml +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec, aci_response_json, aci_response_xml from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url from ansible.module_utils._text import to_text diff --git a/lib/ansible/modules/network/aci/aci_taboo_contract.py b/lib/ansible/modules/network/aci/aci_taboo_contract.py index 9254ea8a9e..90079f981f 100644 --- a/lib/ansible/modules/network/aci/aci_taboo_contract.py +++ b/lib/ansible/modules/network/aci/aci_taboo_contract.py @@ -73,7 +73,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_tenant.py b/lib/ansible/modules/network/aci/aci_tenant.py index 93da05803b..d4e9f0c195 100644 --- a/lib/ansible/modules/network/aci/aci_tenant.py +++ b/lib/ansible/modules/network/aci/aci_tenant.py @@ -82,7 +82,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_tenant_action_rule_profile.py b/lib/ansible/modules/network/aci/aci_tenant_action_rule_profile.py index 7e3ef9ec67..68d2f6cf61 100644 --- a/lib/ansible/modules/network/aci/aci_tenant_action_rule_profile.py +++ b/lib/ansible/modules/network/aci/aci_tenant_action_rule_profile.py @@ -65,7 +65,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_tenant_ep_retention_policy.py b/lib/ansible/modules/network/aci/aci_tenant_ep_retention_policy.py index afbfbcca1b..cfda339861 100755 --- a/lib/ansible/modules/network/aci/aci_tenant_ep_retention_policy.py +++ b/lib/ansible/modules/network/aci/aci_tenant_ep_retention_policy.py @@ -125,7 +125,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule BOUNCE_TRIG_MAPPING = dict(coop='protocol', rarp='rarp-flood') diff --git a/lib/ansible/modules/network/aci/aci_tenant_span_dst_group.py b/lib/ansible/modules/network/aci/aci_tenant_span_dst_group.py index 0a4788dd9f..4d0cf5a224 100644 --- a/lib/ansible/modules/network/aci/aci_tenant_span_dst_group.py +++ b/lib/ansible/modules/network/aci/aci_tenant_span_dst_group.py @@ -67,7 +67,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_tenant_span_src_group.py b/lib/ansible/modules/network/aci/aci_tenant_span_src_group.py index 1a328d9930..72d754e463 100755 --- a/lib/ansible/modules/network/aci/aci_tenant_span_src_group.py +++ b/lib/ansible/modules/network/aci/aci_tenant_span_src_group.py @@ -74,7 +74,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_tenant_span_src_group_to_dst_group.py b/lib/ansible/modules/network/aci/aci_tenant_span_src_group_to_dst_group.py index 2574f610b4..fa43231047 100755 --- a/lib/ansible/modules/network/aci/aci_tenant_span_src_group_to_dst_group.py +++ b/lib/ansible/modules/network/aci/aci_tenant_span_src_group_to_dst_group.py @@ -67,7 +67,7 @@ RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aci/aci_vrf.py b/lib/ansible/modules/network/aci/aci_vrf.py index dec63295ac..13fd546a61 100644 --- a/lib/ansible/modules/network/aci/aci_vrf.py +++ b/lib/ansible/modules/network/aci/aci_vrf.py @@ -99,7 +99,7 @@ EXAMPLES = r''' RETURN = r''' # ''' -from ansible.module_utils.aci import ACIModule, aci_argument_spec +from ansible.module_utils.network.aci.aci import ACIModule, aci_argument_spec from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/aireos/aireos_command.py b/lib/ansible/modules/network/aireos/aireos_command.py index b95db294a3..dd3fbdf962 100644 --- a/lib/ansible/modules/network/aireos/aireos_command.py +++ b/lib/ansible/modules/network/aireos/aireos_command.py @@ -119,11 +119,11 @@ failed_conditions: """ import time -from ansible.module_utils.aireos import run_commands -from ansible.module_utils.aireos import aireos_argument_spec, check_args +from ansible.module_utils.network.aireos.aireos import run_commands +from ansible.module_utils.network.aireos.aireos import aireos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/aireos/aireos_config.py b/lib/ansible/modules/network/aireos/aireos_config.py index 41e0684e68..2b62565e5f 100644 --- a/lib/ansible/modules/network/aireos/aireos_config.py +++ b/lib/ansible/modules/network/aireos/aireos_config.py @@ -167,11 +167,11 @@ backup_path: type: string sample: /playbooks/ansible/backup/aireos_config.2016-07-16@22:28:34 """ -from ansible.module_utils.aireos import run_commands, get_config, load_config -from ansible.module_utils.aireos import aireos_argument_spec -from ansible.module_utils.aireos import check_args as aireos_check_args +from ansible.module_utils.network.aireos.aireos import run_commands, get_config, load_config +from ansible.module_utils.network.aireos.aireos import aireos_argument_spec +from ansible.module_utils.network.aireos.aireos import check_args as aireos_check_args from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.common.config import NetworkConfig, dumps def get_running_config(module, config=None): diff --git a/lib/ansible/modules/network/aos/aos_asn_pool.py b/lib/ansible/modules/network/aos/aos_asn_pool.py index 8cc63f2570..d204292d2f 100644 --- a/lib/ansible/modules/network/aos/aos_asn_pool.py +++ b/lib/ansible/modules/network/aos/aos_asn_pool.py @@ -140,7 +140,7 @@ value: import json from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict def check_ranges_are_valid(module, ranges): diff --git a/lib/ansible/modules/network/aos/aos_blueprint.py b/lib/ansible/modules/network/aos/aos_blueprint.py index 1d3e550fdc..7ae32043c1 100644 --- a/lib/ansible/modules/network/aos/aos_blueprint.py +++ b/lib/ansible/modules/network/aos/aos_blueprint.py @@ -133,7 +133,7 @@ build_errors: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, check_aos_version, find_collection_item +from ansible.module_utils.network.aos.aos import get_aos_session, check_aos_version, find_collection_item from ansible.module_utils.pycompat24 import get_exception def create_blueprint(module, aos, name): diff --git a/lib/ansible/modules/network/aos/aos_blueprint_param.py b/lib/ansible/modules/network/aos/aos_blueprint_param.py index d8a0f076d1..a2417dbe0b 100644 --- a/lib/ansible/modules/network/aos/aos_blueprint_param.py +++ b/lib/ansible/modules/network/aos/aos_blueprint_param.py @@ -162,7 +162,7 @@ params_list: import json from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, check_aos_version +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, check_aos_version from ansible.module_utils.pycompat24 import get_exception try: diff --git a/lib/ansible/modules/network/aos/aos_blueprint_virtnet.py b/lib/ansible/modules/network/aos/aos_blueprint_virtnet.py index 6f9aee434d..12441494b9 100644 --- a/lib/ansible/modules/network/aos/aos_blueprint_virtnet.py +++ b/lib/ansible/modules/network/aos/aos_blueprint_virtnet.py @@ -86,7 +86,7 @@ import json from ansible.module_utils.pycompat24 import get_exception from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict def ensure_present(module, aos, blueprint, virtnet): diff --git a/lib/ansible/modules/network/aos/aos_device.py b/lib/ansible/modules/network/aos/aos_device.py index 0b9bb93f78..a527fe6921 100644 --- a/lib/ansible/modules/network/aos/aos_device.py +++ b/lib/ansible/modules/network/aos/aos_device.py @@ -101,7 +101,7 @@ value: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import HAS_AOS_PYEZ, get_aos_session, check_aos_version, find_collection_item +from ansible.module_utils.network.aos.aos import HAS_AOS_PYEZ, get_aos_session, check_aos_version, find_collection_item if HAS_AOS_PYEZ: from apstra.aosom.exc import SessionError, SessionRqstError diff --git a/lib/ansible/modules/network/aos/aos_external_router.py b/lib/ansible/modules/network/aos/aos_external_router.py index 9140c1ee80..fc0abeac5e 100644 --- a/lib/ansible/modules/network/aos/aos_external_router.py +++ b/lib/ansible/modules/network/aos/aos_external_router.py @@ -149,7 +149,7 @@ import json import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict def create_new_ext_router(module, my_ext_router, name, loopback, asn): diff --git a/lib/ansible/modules/network/aos/aos_ip_pool.py b/lib/ansible/modules/network/aos/aos_ip_pool.py index 1562ab07e3..8a8e35c681 100644 --- a/lib/ansible/modules/network/aos/aos_ip_pool.py +++ b/lib/ansible/modules/network/aos/aos_ip_pool.py @@ -165,7 +165,7 @@ value: import json from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict def get_list_of_subnets(ip_pool): subnets = [] diff --git a/lib/ansible/modules/network/aos/aos_logical_device.py b/lib/ansible/modules/network/aos/aos_logical_device.py index a57b5d4387..abcf99a333 100644 --- a/lib/ansible/modules/network/aos/aos_logical_device.py +++ b/lib/ansible/modules/network/aos/aos_logical_device.py @@ -129,7 +129,7 @@ import json import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict ######################################################### # State Processing diff --git a/lib/ansible/modules/network/aos/aos_logical_device_map.py b/lib/ansible/modules/network/aos/aos_logical_device_map.py index af53c66d8c..474feb6871 100644 --- a/lib/ansible/modules/network/aos/aos_logical_device_map.py +++ b/lib/ansible/modules/network/aos/aos_logical_device_map.py @@ -149,7 +149,7 @@ import json import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict ######################################################### # State Processing diff --git a/lib/ansible/modules/network/aos/aos_login.py b/lib/ansible/modules/network/aos/aos_login.py index 8b2e9d13bc..c9ec46f5de 100644 --- a/lib/ansible/modules/network/aos/aos_login.py +++ b/lib/ansible/modules/network/aos/aos_login.py @@ -81,7 +81,7 @@ aos_session: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import check_aos_version +from ansible.module_utils.network.aos.aos import check_aos_version try: from apstra.aosom.session import Session diff --git a/lib/ansible/modules/network/aos/aos_rack_type.py b/lib/ansible/modules/network/aos/aos_rack_type.py index b6f8a21141..e6b4963f32 100644 --- a/lib/ansible/modules/network/aos/aos_rack_type.py +++ b/lib/ansible/modules/network/aos/aos_rack_type.py @@ -128,7 +128,7 @@ value: import json from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict ######################################################### # State Processing diff --git a/lib/ansible/modules/network/aos/aos_template.py b/lib/ansible/modules/network/aos/aos_template.py index ed5492464d..26f19dc5f7 100644 --- a/lib/ansible/modules/network/aos/aos_template.py +++ b/lib/ansible/modules/network/aos/aos_template.py @@ -138,7 +138,7 @@ import time import json from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict +from ansible.module_utils.network.aos.aos import get_aos_session, find_collection_item, do_load_resource, check_aos_version, content_to_dict ######################################################### # State Processing diff --git a/lib/ansible/modules/network/aruba/aruba_command.py b/lib/ansible/modules/network/aruba/aruba_command.py index 985391159a..68b6e1f8ab 100644 --- a/lib/ansible/modules/network/aruba/aruba_command.py +++ b/lib/ansible/modules/network/aruba/aruba_command.py @@ -119,11 +119,11 @@ failed_conditions: """ import time -from ansible.module_utils.aruba import run_commands -from ansible.module_utils.aruba import aruba_argument_spec, check_args +from ansible.module_utils.network.aruba.aruba import run_commands +from ansible.module_utils.network.aruba.aruba import aruba_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/aruba/aruba_config.py b/lib/ansible/modules/network/aruba/aruba_config.py index f1d7123dcc..59595d9262 100644 --- a/lib/ansible/modules/network/aruba/aruba_config.py +++ b/lib/ansible/modules/network/aruba/aruba_config.py @@ -219,11 +219,11 @@ backup_path: """ -from ansible.module_utils.aruba import run_commands, get_config, load_config -from ansible.module_utils.aruba import aruba_argument_spec -from ansible.module_utils.aruba import check_args as aruba_check_args +from ansible.module_utils.network.aruba.aruba import run_commands, get_config, load_config +from ansible.module_utils.network.aruba.aruba import aruba_argument_spec +from ansible.module_utils.network.aruba.aruba import check_args as aruba_check_args from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.common.config import NetworkConfig, dumps def get_running_config(module, config=None): diff --git a/lib/ansible/modules/network/asa/asa_acl.py b/lib/ansible/modules/network/asa/asa_acl.py index 72730576ec..82ded9985a 100644 --- a/lib/ansible/modules/network/asa/asa_acl.py +++ b/lib/ansible/modules/network/asa/asa_acl.py @@ -133,10 +133,10 @@ updates: sample: ['access-list ACL-OUTSIDE extended permit tcp any any eq www'] """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.asa import asa_argument_spec, check_args -from ansible.module_utils.asa import get_config, load_config, run_commands +from ansible.module_utils.network.asa.asa import asa_argument_spec, check_args +from ansible.module_utils.network.asa.asa import get_config, load_config, run_commands -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.common.config import NetworkConfig, dumps def get_acl_config(module, acl_name): diff --git a/lib/ansible/modules/network/asa/asa_command.py b/lib/ansible/modules/network/asa/asa_command.py index cc600a52a6..9a79f5137e 100644 --- a/lib/ansible/modules/network/asa/asa_command.py +++ b/lib/ansible/modules/network/asa/asa_command.py @@ -126,9 +126,9 @@ failed_conditions: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.asa import asa_argument_spec, check_args -from ansible.module_utils.asa import run_commands -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.asa.asa import asa_argument_spec, check_args +from ansible.module_utils.network.asa.asa import run_commands +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/asa/asa_config.py b/lib/ansible/modules/network/asa/asa_config.py index 2c1f706d39..dca23567ca 100644 --- a/lib/ansible/modules/network/asa/asa_config.py +++ b/lib/ansible/modules/network/asa/asa_config.py @@ -195,9 +195,9 @@ backup_path: sample: /playbooks/ansible/backup/asa_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.asa import asa_argument_spec, check_args -from ansible.module_utils.asa import get_config, load_config, run_commands -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.asa.asa import asa_argument_spec, check_args +from ansible.module_utils.network.asa.asa import get_config, load_config, run_commands +from ansible.module_utils.network.common.config import NetworkConfig, dumps from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/avi/avi_actiongroupconfig.py b/lib/ansible/modules/network/avi/avi_actiongroupconfig.py index 892830b20c..995baa0f03 100644 --- a/lib/ansible/modules/network/avi/avi_actiongroupconfig.py +++ b/lib/ansible/modules/network/avi/avi_actiongroupconfig.py @@ -113,7 +113,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_alertconfig.py b/lib/ansible/modules/network/avi/avi_alertconfig.py index 95c7f6479e..64311a9141 100644 --- a/lib/ansible/modules/network/avi/avi_alertconfig.py +++ b/lib/ansible/modules/network/avi/avi_alertconfig.py @@ -174,7 +174,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_alertemailconfig.py b/lib/ansible/modules/network/avi/avi_alertemailconfig.py index da381f6997..a5b59dae77 100644 --- a/lib/ansible/modules/network/avi/avi_alertemailconfig.py +++ b/lib/ansible/modules/network/avi/avi_alertemailconfig.py @@ -89,7 +89,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_alertscriptconfig.py b/lib/ansible/modules/network/avi/avi_alertscriptconfig.py index ea32e7968a..1a1dc38937 100644 --- a/lib/ansible/modules/network/avi/avi_alertscriptconfig.py +++ b/lib/ansible/modules/network/avi/avi_alertscriptconfig.py @@ -84,7 +84,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_alertsyslogconfig.py b/lib/ansible/modules/network/avi/avi_alertsyslogconfig.py index 584feb518c..8f2195ad69 100644 --- a/lib/ansible/modules/network/avi/avi_alertsyslogconfig.py +++ b/lib/ansible/modules/network/avi/avi_alertsyslogconfig.py @@ -89,7 +89,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_analyticsprofile.py b/lib/ansible/modules/network/avi/avi_analyticsprofile.py index 62b6212c42..f62f45e36e 100644 --- a/lib/ansible/modules/network/avi/avi_analyticsprofile.py +++ b/lib/ansible/modules/network/avi/avi_analyticsprofile.py @@ -439,7 +439,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_api_session.py b/lib/ansible/modules/network/avi/avi_api_session.py index d2a28affae..d2f0e95a52 100644 --- a/lib/ansible/modules/network/avi/avi_api_session.py +++ b/lib/ansible/modules/network/avi/avi_api_session.py @@ -125,7 +125,7 @@ from ansible.module_utils.basic import AnsibleModule from copy import deepcopy try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, ansible_return, HAS_AVI) from avi.sdk.avi_api import ApiSession from avi.sdk.utils.ansible_utils import avi_obj_cmp, cleanup_absent_fields diff --git a/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py b/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py index b739f9b3c9..07723b0fd8 100644 --- a/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py +++ b/lib/ansible/modules/network/avi/avi_applicationpersistenceprofile.py @@ -128,7 +128,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_applicationprofile.py b/lib/ansible/modules/network/avi/avi_applicationprofile.py index 393a5434bf..fd8486b0b9 100644 --- a/lib/ansible/modules/network/avi/avi_applicationprofile.py +++ b/lib/ansible/modules/network/avi/avi_applicationprofile.py @@ -158,7 +158,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_authprofile.py b/lib/ansible/modules/network/avi/avi_authprofile.py index 8669d6c2be..6ec7430127 100644 --- a/lib/ansible/modules/network/avi/avi_authprofile.py +++ b/lib/ansible/modules/network/avi/avi_authprofile.py @@ -120,7 +120,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_backup.py b/lib/ansible/modules/network/avi/avi_backup.py index a88aa6bd73..b769c870f4 100644 --- a/lib/ansible/modules/network/avi/avi_backup.py +++ b/lib/ansible/modules/network/avi/avi_backup.py @@ -97,7 +97,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_backupconfiguration.py b/lib/ansible/modules/network/avi/avi_backupconfiguration.py index c4285eb96e..5b57b5811b 100644 --- a/lib/ansible/modules/network/avi/avi_backupconfiguration.py +++ b/lib/ansible/modules/network/avi/avi_backupconfiguration.py @@ -107,7 +107,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py b/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py index 531c537e44..944f7003aa 100644 --- a/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py +++ b/lib/ansible/modules/network/avi/avi_certificatemanagementprofile.py @@ -87,7 +87,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_cloud.py b/lib/ansible/modules/network/avi/avi_cloud.py index 782b681519..b82637fe82 100644 --- a/lib/ansible/modules/network/avi/avi_cloud.py +++ b/lib/ansible/modules/network/avi/avi_cloud.py @@ -189,7 +189,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py b/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py index 7aa74b9e8f..a0a69ee9a8 100644 --- a/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py +++ b/lib/ansible/modules/network/avi/avi_cloudconnectoruser.py @@ -90,7 +90,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_cloudproperties.py b/lib/ansible/modules/network/avi/avi_cloudproperties.py index 2c18390731..d27efbd015 100644 --- a/lib/ansible/modules/network/avi/avi_cloudproperties.py +++ b/lib/ansible/modules/network/avi/avi_cloudproperties.py @@ -87,7 +87,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_cluster.py b/lib/ansible/modules/network/avi/avi_cluster.py index 9b40abf20e..98c2bb141e 100644 --- a/lib/ansible/modules/network/avi/avi_cluster.py +++ b/lib/ansible/modules/network/avi/avi_cluster.py @@ -90,7 +90,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_controllerproperties.py b/lib/ansible/modules/network/avi/avi_controllerproperties.py index 456ac080ec..ec708a2c22 100644 --- a/lib/ansible/modules/network/avi/avi_controllerproperties.py +++ b/lib/ansible/modules/network/avi/avi_controllerproperties.py @@ -245,7 +245,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_dnspolicy.py b/lib/ansible/modules/network/avi/avi_dnspolicy.py index 81e0904a70..f9d6193634 100644 --- a/lib/ansible/modules/network/avi/avi_dnspolicy.py +++ b/lib/ansible/modules/network/avi/avi_dnspolicy.py @@ -93,7 +93,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_gslb.py b/lib/ansible/modules/network/avi/avi_gslb.py index a6ffee20b4..39118ec22b 100644 --- a/lib/ansible/modules/network/avi/avi_gslb.py +++ b/lib/ansible/modules/network/avi/avi_gslb.py @@ -125,7 +125,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_gslbapplicationpersistenceprofile.py b/lib/ansible/modules/network/avi/avi_gslbapplicationpersistenceprofile.py index 873f197402..2042a4290d 100644 --- a/lib/ansible/modules/network/avi/avi_gslbapplicationpersistenceprofile.py +++ b/lib/ansible/modules/network/avi/avi_gslbapplicationpersistenceprofile.py @@ -86,7 +86,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_gslbgeodbprofile.py b/lib/ansible/modules/network/avi/avi_gslbgeodbprofile.py index 64e91d8bf8..067f65c79a 100644 --- a/lib/ansible/modules/network/avi/avi_gslbgeodbprofile.py +++ b/lib/ansible/modules/network/avi/avi_gslbgeodbprofile.py @@ -96,7 +96,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_gslbhealthmonitor.py b/lib/ansible/modules/network/avi/avi_gslbhealthmonitor.py index 1d942244bc..f6ad0e2148 100644 --- a/lib/ansible/modules/network/avi/avi_gslbhealthmonitor.py +++ b/lib/ansible/modules/network/avi/avi_gslbhealthmonitor.py @@ -135,7 +135,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_gslbservice.py b/lib/ansible/modules/network/avi/avi_gslbservice.py index 8fbac8502c..238a4a87ec 100644 --- a/lib/ansible/modules/network/avi/avi_gslbservice.py +++ b/lib/ansible/modules/network/avi/avi_gslbservice.py @@ -148,7 +148,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_hardwaresecuritymodulegroup.py b/lib/ansible/modules/network/avi/avi_hardwaresecuritymodulegroup.py index be6aa73085..36c224e709 100644 --- a/lib/ansible/modules/network/avi/avi_hardwaresecuritymodulegroup.py +++ b/lib/ansible/modules/network/avi/avi_hardwaresecuritymodulegroup.py @@ -83,7 +83,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_healthmonitor.py b/lib/ansible/modules/network/avi/avi_healthmonitor.py index 93350c65fa..f71c4a2e12 100644 --- a/lib/ansible/modules/network/avi/avi_healthmonitor.py +++ b/lib/ansible/modules/network/avi/avi_healthmonitor.py @@ -152,7 +152,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_httppolicyset.py b/lib/ansible/modules/network/avi/avi_httppolicyset.py index 858bec47b7..6b88373a44 100644 --- a/lib/ansible/modules/network/avi/avi_httppolicyset.py +++ b/lib/ansible/modules/network/avi/avi_httppolicyset.py @@ -132,7 +132,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_ipaddrgroup.py b/lib/ansible/modules/network/avi/avi_ipaddrgroup.py index 77d23f9e3c..0a0ec23eb8 100644 --- a/lib/ansible/modules/network/avi/avi_ipaddrgroup.py +++ b/lib/ansible/modules/network/avi/avi_ipaddrgroup.py @@ -121,7 +121,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_ipamdnsproviderprofile.py b/lib/ansible/modules/network/avi/avi_ipamdnsproviderprofile.py index 514419f3ae..5ad0e24921 100644 --- a/lib/ansible/modules/network/avi/avi_ipamdnsproviderprofile.py +++ b/lib/ansible/modules/network/avi/avi_ipamdnsproviderprofile.py @@ -119,7 +119,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_microservicegroup.py b/lib/ansible/modules/network/avi/avi_microservicegroup.py index 013d570e66..3b17e0c838 100644 --- a/lib/ansible/modules/network/avi/avi_microservicegroup.py +++ b/lib/ansible/modules/network/avi/avi_microservicegroup.py @@ -90,7 +90,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_network.py b/lib/ansible/modules/network/avi/avi_network.py index 5358117fa3..73abc06abd 100644 --- a/lib/ansible/modules/network/avi/avi_network.py +++ b/lib/ansible/modules/network/avi/avi_network.py @@ -108,7 +108,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_networkprofile.py b/lib/ansible/modules/network/avi/avi_networkprofile.py index c712668556..4da66e2b5c 100644 --- a/lib/ansible/modules/network/avi/avi_networkprofile.py +++ b/lib/ansible/modules/network/avi/avi_networkprofile.py @@ -93,7 +93,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_networksecuritypolicy.py b/lib/ansible/modules/network/avi/avi_networksecuritypolicy.py index d7d7347fb6..a82e0d0718 100644 --- a/lib/ansible/modules/network/avi/avi_networksecuritypolicy.py +++ b/lib/ansible/modules/network/avi/avi_networksecuritypolicy.py @@ -104,7 +104,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_pkiprofile.py b/lib/ansible/modules/network/avi/avi_pkiprofile.py index 0ae92edddd..d0be9d788f 100644 --- a/lib/ansible/modules/network/avi/avi_pkiprofile.py +++ b/lib/ansible/modules/network/avi/avi_pkiprofile.py @@ -111,7 +111,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_pool.py b/lib/ansible/modules/network/avi/avi_pool.py index 992b2857f6..b88a178c79 100644 --- a/lib/ansible/modules/network/avi/avi_pool.py +++ b/lib/ansible/modules/network/avi/avi_pool.py @@ -324,7 +324,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_poolgroup.py b/lib/ansible/modules/network/avi/avi_poolgroup.py index 8d7cbf5b22..2a7af330c0 100644 --- a/lib/ansible/modules/network/avi/avi_poolgroup.py +++ b/lib/ansible/modules/network/avi/avi_poolgroup.py @@ -115,7 +115,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_poolgroupdeploymentpolicy.py b/lib/ansible/modules/network/avi/avi_poolgroupdeploymentpolicy.py index 27961195ff..5c07eac57a 100644 --- a/lib/ansible/modules/network/avi/avi_poolgroupdeploymentpolicy.py +++ b/lib/ansible/modules/network/avi/avi_poolgroupdeploymentpolicy.py @@ -119,7 +119,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_prioritylabels.py b/lib/ansible/modules/network/avi/avi_prioritylabels.py index 6a93898820..8a1cd771a3 100644 --- a/lib/ansible/modules/network/avi/avi_prioritylabels.py +++ b/lib/ansible/modules/network/avi/avi_prioritylabels.py @@ -88,7 +88,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_role.py b/lib/ansible/modules/network/avi/avi_role.py index 6b57853b22..29bac33b11 100644 --- a/lib/ansible/modules/network/avi/avi_role.py +++ b/lib/ansible/modules/network/avi/avi_role.py @@ -83,7 +83,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_scheduler.py b/lib/ansible/modules/network/avi/avi_scheduler.py index dcaaad4cd5..0bde8a71b1 100644 --- a/lib/ansible/modules/network/avi/avi_scheduler.py +++ b/lib/ansible/modules/network/avi/avi_scheduler.py @@ -115,7 +115,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_seproperties.py b/lib/ansible/modules/network/avi/avi_seproperties.py index 6ee4aee9e4..9cff4f08b7 100644 --- a/lib/ansible/modules/network/avi/avi_seproperties.py +++ b/lib/ansible/modules/network/avi/avi_seproperties.py @@ -83,7 +83,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_serverautoscalepolicy.py b/lib/ansible/modules/network/avi/avi_serverautoscalepolicy.py index 825610ffbd..cfe51db1eb 100644 --- a/lib/ansible/modules/network/avi/avi_serverautoscalepolicy.py +++ b/lib/ansible/modules/network/avi/avi_serverautoscalepolicy.py @@ -136,7 +136,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_serviceengine.py b/lib/ansible/modules/network/avi/avi_serviceengine.py index f7de1ba1cf..8ac4b9323c 100644 --- a/lib/ansible/modules/network/avi/avi_serviceengine.py +++ b/lib/ansible/modules/network/avi/avi_serviceengine.py @@ -126,7 +126,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_serviceenginegroup.py b/lib/ansible/modules/network/avi/avi_serviceenginegroup.py index be909bd844..01499e6ef4 100644 --- a/lib/ansible/modules/network/avi/avi_serviceenginegroup.py +++ b/lib/ansible/modules/network/avi/avi_serviceenginegroup.py @@ -469,7 +469,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_snmptrapprofile.py b/lib/ansible/modules/network/avi/avi_snmptrapprofile.py index 713913b35b..7f79411fc0 100644 --- a/lib/ansible/modules/network/avi/avi_snmptrapprofile.py +++ b/lib/ansible/modules/network/avi/avi_snmptrapprofile.py @@ -82,7 +82,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py b/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py index 7303fffcc3..681417d976 100644 --- a/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py +++ b/lib/ansible/modules/network/avi/avi_sslkeyandcertificate.py @@ -131,7 +131,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_sslprofile.py b/lib/ansible/modules/network/avi/avi_sslprofile.py index 0caf78a7ff..d0d7fabd4c 100644 --- a/lib/ansible/modules/network/avi/avi_sslprofile.py +++ b/lib/ansible/modules/network/avi/avi_sslprofile.py @@ -159,7 +159,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_stringgroup.py b/lib/ansible/modules/network/avi/avi_stringgroup.py index 66fc4c25f5..b57a3d311f 100644 --- a/lib/ansible/modules/network/avi/avi_stringgroup.py +++ b/lib/ansible/modules/network/avi/avi_stringgroup.py @@ -103,7 +103,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_systemconfiguration.py b/lib/ansible/modules/network/avi/avi_systemconfiguration.py index 1b216f2686..fd56048a87 100644 --- a/lib/ansible/modules/network/avi/avi_systemconfiguration.py +++ b/lib/ansible/modules/network/avi/avi_systemconfiguration.py @@ -123,7 +123,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_tenant.py b/lib/ansible/modules/network/avi/avi_tenant.py index 8d92e6ddf3..49a1ecbf37 100644 --- a/lib/ansible/modules/network/avi/avi_tenant.py +++ b/lib/ansible/modules/network/avi/avi_tenant.py @@ -95,7 +95,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_trafficcloneprofile.py b/lib/ansible/modules/network/avi/avi_trafficcloneprofile.py index 0e2db0c929..afd67e987a 100644 --- a/lib/ansible/modules/network/avi/avi_trafficcloneprofile.py +++ b/lib/ansible/modules/network/avi/avi_trafficcloneprofile.py @@ -94,7 +94,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_useraccountprofile.py b/lib/ansible/modules/network/avi/avi_useraccountprofile.py index 033069f5e3..8c81751601 100644 --- a/lib/ansible/modules/network/avi/avi_useraccountprofile.py +++ b/lib/ansible/modules/network/avi/avi_useraccountprofile.py @@ -102,7 +102,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_virtualservice.py b/lib/ansible/modules/network/avi/avi_virtualservice.py index 40119db44f..331d48a93c 100644 --- a/lib/ansible/modules/network/avi/avi_virtualservice.py +++ b/lib/ansible/modules/network/avi/avi_virtualservice.py @@ -417,7 +417,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_vrfcontext.py b/lib/ansible/modules/network/avi/avi_vrfcontext.py index 8adae80aa9..f7fcfe30fb 100644 --- a/lib/ansible/modules/network/avi/avi_vrfcontext.py +++ b/lib/ansible/modules/network/avi/avi_vrfcontext.py @@ -107,7 +107,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_vsdatascriptset.py b/lib/ansible/modules/network/avi/avi_vsdatascriptset.py index 2f2be63e95..f6cfbb8bd0 100644 --- a/lib/ansible/modules/network/avi/avi_vsdatascriptset.py +++ b/lib/ansible/modules/network/avi/avi_vsdatascriptset.py @@ -102,7 +102,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_vsvip.py b/lib/ansible/modules/network/avi/avi_vsvip.py index b513fb8633..3519d51cfa 100644 --- a/lib/ansible/modules/network/avi/avi_vsvip.py +++ b/lib/ansible/modules/network/avi/avi_vsvip.py @@ -106,7 +106,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/avi/avi_webhook.py b/lib/ansible/modules/network/avi/avi_webhook.py index 353302136c..81f7c1deb6 100644 --- a/lib/ansible/modules/network/avi/avi_webhook.py +++ b/lib/ansible/modules/network/avi/avi_webhook.py @@ -93,7 +93,7 @@ obj: from ansible.module_utils.basic import AnsibleModule try: - from ansible.module_utils.avi import ( + from ansible.module_utils.network.avi.avi import ( avi_common_argument_spec, HAS_AVI, avi_ansible_api) except ImportError: HAS_AVI = False diff --git a/lib/ansible/modules/network/bigswitch/bcf_switch.py b/lib/ansible/modules/network/bigswitch/bcf_switch.py index 9d2b1f36a0..67f634bd10 100755 --- a/lib/ansible/modules/network/bigswitch/bcf_switch.py +++ b/lib/ansible/modules/network/bigswitch/bcf_switch.py @@ -78,7 +78,7 @@ import os import traceback from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.bigswitch_utils import Rest +from ansible.module_utils.network.bigswitch.bigswitch import Rest from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/bigswitch/bigmon_chain.py b/lib/ansible/modules/network/bigswitch/bigmon_chain.py index 61202ba3ea..49157506f5 100755 --- a/lib/ansible/modules/network/bigswitch/bigmon_chain.py +++ b/lib/ansible/modules/network/bigswitch/bigmon_chain.py @@ -65,7 +65,7 @@ import os import traceback from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.bigswitch_utils import Rest +from ansible.module_utils.network.bigswitch.bigswitch import Rest from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/bigswitch/bigmon_policy.py b/lib/ansible/modules/network/bigswitch/bigmon_policy.py index 7cb0a0be9d..7b4f0303eb 100644 --- a/lib/ansible/modules/network/bigswitch/bigmon_policy.py +++ b/lib/ansible/modules/network/bigswitch/bigmon_policy.py @@ -92,7 +92,7 @@ import os import traceback from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.bigswitch_utils import Rest +from ansible.module_utils.network.bigswitch.bigswitch import Rest from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/cloudengine/ce_aaa_server.py b/lib/ansible/modules/network/cloudengine/ce_aaa_server.py index f06043578f..e2952501c1 100644 --- a/lib/ansible/modules/network/cloudengine/ce_aaa_server.py +++ b/lib/ansible/modules/network/cloudengine/ce_aaa_server.py @@ -183,7 +183,7 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec SUCCESS = """success""" diff --git a/lib/ansible/modules/network/cloudengine/ce_aaa_server_host.py b/lib/ansible/modules/network/cloudengine/ce_aaa_server_host.py index 62c4416ed4..2cba7cb4df 100644 --- a/lib/ansible/modules/network/cloudengine/ce_aaa_server_host.py +++ b/lib/ansible/modules/network/cloudengine/ce_aaa_server_host.py @@ -284,7 +284,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr SUCCESS = """success""" FAILED = """failed""" diff --git a/lib/ansible/modules/network/cloudengine/ce_acl.py b/lib/ansible/modules/network/cloudengine/ce_acl.py index 5860b8057c..433c31c762 100644 --- a/lib/ansible/modules/network/cloudengine/ce_acl.py +++ b/lib/ansible/modules/network/cloudengine/ce_acl.py @@ -212,7 +212,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr # get acl CE_GET_ACL_HEADER = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_acl_advance.py b/lib/ansible/modules/network/cloudengine/ce_acl_advance.py index d5b485494c..76678f347a 100644 --- a/lib/ansible/modules/network/cloudengine/ce_acl_advance.py +++ b/lib/ansible/modules/network/cloudengine/ce_acl_advance.py @@ -358,7 +358,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr # get acl diff --git a/lib/ansible/modules/network/cloudengine/ce_acl_interface.py b/lib/ansible/modules/network/cloudengine/ce_acl_interface.py index f342a5eff3..0737496548 100644 --- a/lib/ansible/modules/network/cloudengine/ce_acl_interface.py +++ b/lib/ansible/modules/network/cloudengine/ce_acl_interface.py @@ -122,8 +122,8 @@ updates: from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec class AclInterface(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_bfd_global.py b/lib/ansible/modules/network/cloudengine/ce_bfd_global.py index 46caf27d7b..b3a768ca1e 100644 --- a/lib/ansible/modules/network/cloudengine/ce_bfd_global.py +++ b/lib/ansible/modules/network/cloudengine/ce_bfd_global.py @@ -195,7 +195,7 @@ import sys import socket from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_BFD = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_bfd_session.py b/lib/ansible/modules/network/cloudengine/ce_bfd_session.py index cda07a9647..1f8757f50e 100644 --- a/lib/ansible/modules/network/cloudengine/ce_bfd_session.py +++ b/lib/ansible/modules/network/cloudengine/ce_bfd_session.py @@ -180,7 +180,7 @@ import sys import socket from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_BFD = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_bfd_view.py b/lib/ansible/modules/network/cloudengine/ce_bfd_view.py index 7baa9d7717..b7d1f3563d 100644 --- a/lib/ansible/modules/network/cloudengine/ce_bfd_view.py +++ b/lib/ansible/modules/network/cloudengine/ce_bfd_view.py @@ -205,7 +205,7 @@ changed: import sys from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_BFD = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_bgp.py b/lib/ansible/modules/network/cloudengine/ce_bgp.py index 08695de64d..9ae43ba34e 100644 --- a/lib/ansible/modules/network/cloudengine/ce_bgp.py +++ b/lib/ansible/modules/network/cloudengine/ce_bgp.py @@ -254,7 +254,7 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec SUCCESS = """success""" diff --git a/lib/ansible/modules/network/cloudengine/ce_bgp_af.py b/lib/ansible/modules/network/cloudengine/ce_bgp_af.py index 4922405ad7..01508ce929 100644 --- a/lib/ansible/modules/network/cloudengine/ce_bgp_af.py +++ b/lib/ansible/modules/network/cloudengine/ce_bgp_af.py @@ -498,7 +498,7 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr # get bgp address family CE_GET_BGP_ADDRESS_FAMILY_HEADER = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor.py b/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor.py index 92acf6e447..604eb9e5f6 100644 --- a/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor.py +++ b/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor.py @@ -294,7 +294,7 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr # get bgp peer diff --git a/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor_af.py b/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor_af.py index 4a54054774..e46419f11f 100644 --- a/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor_af.py +++ b/lib/ansible/modules/network/cloudengine/ce_bgp_neighbor_af.py @@ -461,7 +461,7 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr # get bgp peer af CE_GET_BGP_PEER_AF_HEADER = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_command.py b/lib/ansible/modules/network/cloudengine/ce_command.py index a5ddb1e3ee..fdf30577cd 100644 --- a/lib/ansible/modules/network/cloudengine/ce_command.py +++ b/lib/ansible/modules/network/cloudengine/ce_command.py @@ -153,10 +153,10 @@ import time import traceback from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, check_args -from ansible.module_utils.ce import run_commands -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.network_common import ComplexList +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, check_args +from ansible.module_utils.network.cloudengine.ce import run_commands +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.utils import ComplexList from ansible.module_utils.six import string_types from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/cloudengine/ce_config.py b/lib/ansible/modules/network/cloudengine/ce_config.py index 03d74aa739..3859ecf6f2 100644 --- a/lib/ansible/modules/network/cloudengine/ce_config.py +++ b/lib/ansible/modules/network/cloudengine/ce_config.py @@ -206,10 +206,10 @@ backup_path: sample: /playbooks/ansible/backup/ce_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps -from ansible.module_utils.ce import get_config, load_config, run_commands -from ansible.module_utils.ce import ce_argument_spec -from ansible.module_utils.ce import check_args as ce_check_args +from ansible.module_utils.network.common.config import NetworkConfig, dumps +from ansible.module_utils.network.cloudengine.ce import get_config, load_config, run_commands +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import check_args as ce_check_args def check_args(module, warnings): diff --git a/lib/ansible/modules/network/cloudengine/ce_dldp.py b/lib/ansible/modules/network/cloudengine/ce_dldp.py index 2992e51e76..899dcd8ace 100644 --- a/lib/ansible/modules/network/cloudengine/ce_dldp.py +++ b/lib/ansible/modules/network/cloudengine/ce_dldp.py @@ -176,7 +176,7 @@ changed: import copy from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, set_nc_config, get_nc_config, execute_nc_action +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, set_nc_config, get_nc_config, execute_nc_action CE_NC_ACTION_RESET_DLDP = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_dldp_interface.py b/lib/ansible/modules/network/cloudengine/ce_dldp_interface.py index e03a9e938f..409280f9f1 100644 --- a/lib/ansible/modules/network/cloudengine/ce_dldp_interface.py +++ b/lib/ansible/modules/network/cloudengine/ce_dldp_interface.py @@ -178,7 +178,7 @@ import copy import re from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, set_nc_config, get_nc_config, execute_nc_action +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, set_nc_config, get_nc_config, execute_nc_action CE_NC_ACTION_RESET_INTF_DLDP = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_eth_trunk.py b/lib/ansible/modules/network/cloudengine/ce_eth_trunk.py index 13b44e6e26..98a418fd30 100644 --- a/lib/ansible/modules/network/cloudengine/ce_eth_trunk.py +++ b/lib/ansible/modules/network/cloudengine/ce_eth_trunk.py @@ -144,7 +144,7 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_TRUNK = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_evpn_bd_vni.py b/lib/ansible/modules/network/cloudengine/ce_evpn_bd_vni.py index 6021234389..a26e8b3efd 100644 --- a/lib/ansible/modules/network/cloudengine/ce_evpn_bd_vni.py +++ b/lib/ansible/modules/network/cloudengine/ce_evpn_bd_vni.py @@ -259,7 +259,7 @@ changed: import copy from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_VNI_BD = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_evpn_bgp.py b/lib/ansible/modules/network/cloudengine/ce_evpn_bgp.py index 8860543b80..30dae0b05f 100644 --- a/lib/ansible/modules/network/cloudengine/ce_evpn_bgp.py +++ b/lib/ansible/modules/network/cloudengine/ce_evpn_bgp.py @@ -151,8 +151,8 @@ end_state: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec def is_config_exist(cmp_cfg, test_cfg): diff --git a/lib/ansible/modules/network/cloudengine/ce_evpn_bgp_rr.py b/lib/ansible/modules/network/cloudengine/ce_evpn_bgp_rr.py index 46f0728035..a94826fe5b 100644 --- a/lib/ansible/modules/network/cloudengine/ce_evpn_bgp_rr.py +++ b/lib/ansible/modules/network/cloudengine/ce_evpn_bgp_rr.py @@ -181,7 +181,7 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config, ce_argument_spec def is_config_exist(cmp_cfg, test_cfg): diff --git a/lib/ansible/modules/network/cloudengine/ce_evpn_global.py b/lib/ansible/modules/network/cloudengine/ce_evpn_global.py index 315509bcec..dd86a8bf46 100644 --- a/lib/ansible/modules/network/cloudengine/ce_evpn_global.py +++ b/lib/ansible/modules/network/cloudengine/ce_evpn_global.py @@ -102,8 +102,8 @@ changed: from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec class EvpnGlobal(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_facts.py b/lib/ansible/modules/network/cloudengine/ce_facts.py index 8766ebae7f..2b0c8e9803 100644 --- a/lib/ansible/modules/network/cloudengine/ce_facts.py +++ b/lib/ansible/modules/network/cloudengine/ce_facts.py @@ -170,8 +170,8 @@ neighbors: import re -from ansible.module_utils.ce import run_commands -from ansible.module_utils.ce import ce_argument_spec, check_args +from ansible.module_utils.network.cloudengine.ce import run_commands +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/cloudengine/ce_file_copy.py b/lib/ansible/modules/network/cloudengine/ce_file_copy.py index ac7efb8e38..18114553a0 100644 --- a/lib/ansible/modules/network/cloudengine/ce_file_copy.py +++ b/lib/ansible/modules/network/cloudengine/ce_file_copy.py @@ -113,7 +113,7 @@ import time from xml.etree import ElementTree import paramiko from ansible.module_utils.basic import get_exception, AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, run_commands, get_nc_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, run_commands, get_nc_config try: from scp import SCPClient diff --git a/lib/ansible/modules/network/cloudengine/ce_info_center_debug.py b/lib/ansible/modules/network/cloudengine/ce_info_center_debug.py index 9d302b877a..fbf64129e4 100644 --- a/lib/ansible/modules/network/cloudengine/ce_info_center_debug.py +++ b/lib/ansible/modules/network/cloudengine/ce_info_center_debug.py @@ -149,7 +149,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec # get info center debug global diff --git a/lib/ansible/modules/network/cloudengine/ce_info_center_global.py b/lib/ansible/modules/network/cloudengine/ce_info_center_global.py index 9e8dba61f9..8ad5a2615c 100644 --- a/lib/ansible/modules/network/cloudengine/ce_info_center_global.py +++ b/lib/ansible/modules/network/cloudengine/ce_info_center_global.py @@ -329,7 +329,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, get_nc_config, set_nc_config, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, get_nc_config, set_nc_config, check_ip_addr CE_NC_GET_CENTER_GLOBAL_INFO_HEADER = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_info_center_log.py b/lib/ansible/modules/network/cloudengine/ce_info_center_log.py index 9a79839406..d79740931c 100644 --- a/lib/ansible/modules/network/cloudengine/ce_info_center_log.py +++ b/lib/ansible/modules/network/cloudengine/ce_info_center_log.py @@ -154,7 +154,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_LOG = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_info_center_trap.py b/lib/ansible/modules/network/cloudengine/ce_info_center_trap.py index 8b890d9a57..c2a116895e 100644 --- a/lib/ansible/modules/network/cloudengine/ce_info_center_trap.py +++ b/lib/ansible/modules/network/cloudengine/ce_info_center_trap.py @@ -163,7 +163,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec # get info center trap global diff --git a/lib/ansible/modules/network/cloudengine/ce_interface.py b/lib/ansible/modules/network/cloudengine/ce_interface.py index f28ff8b50a..0e11df4b2c 100644 --- a/lib/ansible/modules/network/cloudengine/ce_interface.py +++ b/lib/ansible/modules/network/cloudengine/ce_interface.py @@ -161,7 +161,7 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_INTFS = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_interface_ospf.py b/lib/ansible/modules/network/cloudengine/ce_interface_ospf.py index 0fa1111648..00df70783e 100644 --- a/lib/ansible/modules/network/cloudengine/ce_interface_ospf.py +++ b/lib/ansible/modules/network/cloudengine/ce_interface_ospf.py @@ -183,7 +183,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_OSPF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_ip_interface.py b/lib/ansible/modules/network/cloudengine/ce_ip_interface.py index ae0c8f5805..e99b57fab5 100644 --- a/lib/ansible/modules/network/cloudengine/ce_ip_interface.py +++ b/lib/ansible/modules/network/cloudengine/ce_ip_interface.py @@ -154,7 +154,7 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_INTF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_link_status.py b/lib/ansible/modules/network/cloudengine/ce_link_status.py index 0c6098fb5e..c06103ff14 100644 --- a/lib/ansible/modules/network/cloudengine/ce_link_status.py +++ b/lib/ansible/modules/network/cloudengine/ce_link_status.py @@ -128,7 +128,7 @@ result: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, get_nc_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, get_nc_config CE_NC_GET_PORT_SPEED = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_mlag_config.py b/lib/ansible/modules/network/cloudengine/ce_mlag_config.py index 2aba479ad1..1aa4f7cf9f 100644 --- a/lib/ansible/modules/network/cloudengine/ce_mlag_config.py +++ b/lib/ansible/modules/network/cloudengine/ce_mlag_config.py @@ -165,8 +165,8 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import load_config -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import load_config +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_DFS_GROUP_INFO = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_mlag_interface.py b/lib/ansible/modules/network/cloudengine/ce_mlag_interface.py index 6af58d9421..b01c7b2965 100644 --- a/lib/ansible/modules/network/cloudengine/ce_mlag_interface.py +++ b/lib/ansible/modules/network/cloudengine/ce_mlag_interface.py @@ -158,8 +158,8 @@ updates: import re from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import load_config -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import load_config +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_MLAG_INFO = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_mtu.py b/lib/ansible/modules/network/cloudengine/ce_mtu.py index 65a8de7d28..9b695bf52f 100644 --- a/lib/ansible/modules/network/cloudengine/ce_mtu.py +++ b/lib/ansible/modules/network/cloudengine/ce_mtu.py @@ -144,7 +144,7 @@ changed: import re import copy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, get_config, load_config, get_nc_config, set_nc_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, get_config, load_config, get_nc_config, set_nc_config CE_NC_GET_INTF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_netconf.py b/lib/ansible/modules/network/cloudengine/ce_netconf.py index fd3b2fbf18..0e435bc800 100644 --- a/lib/ansible/modules/network/cloudengine/ce_netconf.py +++ b/lib/ansible/modules/network/cloudengine/ce_netconf.py @@ -119,8 +119,8 @@ end_state: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config -from ansible.module_utils.ce import execute_nc_action, ce_argument_spec, execute_nc_cli +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config +from ansible.module_utils.network.cloudengine.ce import execute_nc_action, ce_argument_spec, execute_nc_cli def main(): diff --git a/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py b/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py index 4707349644..a0453c33ad 100644 --- a/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py +++ b/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py @@ -200,8 +200,8 @@ changed: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec class NetStreamAging(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_netstream_export.py b/lib/ansible/modules/network/cloudengine/ce_netstream_export.py index 9635af3e27..076dea89a8 100644 --- a/lib/ansible/modules/network/cloudengine/ce_netstream_export.py +++ b/lib/ansible/modules/network/cloudengine/ce_netstream_export.py @@ -205,8 +205,8 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec def is_ipv4_addr(ip_addr): diff --git a/lib/ansible/modules/network/cloudengine/ce_netstream_global.py b/lib/ansible/modules/network/cloudengine/ce_netstream_global.py index 8aa99ece95..1dd799d61b 100644 --- a/lib/ansible/modules/network/cloudengine/ce_netstream_global.py +++ b/lib/ansible/modules/network/cloudengine/ce_netstream_global.py @@ -225,8 +225,8 @@ changed: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec def get_interface_type(interface): diff --git a/lib/ansible/modules/network/cloudengine/ce_netstream_template.py b/lib/ansible/modules/network/cloudengine/ce_netstream_template.py index 10d6f452c5..2abb5744d3 100644 --- a/lib/ansible/modules/network/cloudengine/ce_netstream_template.py +++ b/lib/ansible/modules/network/cloudengine/ce_netstream_template.py @@ -149,8 +149,8 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec class NetstreamTemplate(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_ntp.py b/lib/ansible/modules/network/cloudengine/ce_ntp.py index cc340f317e..03a922b325 100644 --- a/lib/ansible/modules/network/cloudengine/ce_ntp.py +++ b/lib/ansible/modules/network/cloudengine/ce_ntp.py @@ -144,7 +144,7 @@ changed: import re from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, get_nc_config, set_nc_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, get_nc_config, set_nc_config CE_NC_GET_NTP_CONFIG = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_ntp_auth.py b/lib/ansible/modules/network/cloudengine/ce_ntp_auth.py index 28a37880f7..b33fc0ca82 100644 --- a/lib/ansible/modules/network/cloudengine/ce_ntp_auth.py +++ b/lib/ansible/modules/network/cloudengine/ce_ntp_auth.py @@ -204,7 +204,7 @@ import copy import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, load_config, get_nc_config, set_nc_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, load_config, get_nc_config, set_nc_config CE_NC_GET_NTP_AUTH_CONFIG = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_ospf.py b/lib/ansible/modules/network/cloudengine/ce_ospf.py index 9dcb003b4a..b8c0ef51e1 100644 --- a/lib/ansible/modules/network/cloudengine/ce_ospf.py +++ b/lib/ansible/modules/network/cloudengine/ce_ospf.py @@ -159,7 +159,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_OSPF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_ospf_vrf.py b/lib/ansible/modules/network/cloudengine/ce_ospf_vrf.py index 94b91019f0..8e829622cf 100644 --- a/lib/ansible/modules/network/cloudengine/ce_ospf_vrf.py +++ b/lib/ansible/modules/network/cloudengine/ce_ospf_vrf.py @@ -291,7 +291,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_OSPF_VRF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_reboot.py b/lib/ansible/modules/network/cloudengine/ce_reboot.py index 4a738e8467..a7084685b6 100644 --- a/lib/ansible/modules/network/cloudengine/ce_reboot.py +++ b/lib/ansible/modules/network/cloudengine/ce_reboot.py @@ -74,7 +74,7 @@ rebooted: from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import execute_nc_action, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import execute_nc_action, ce_argument_spec try: from ncclient.operations.errors import TimeoutExpiredError diff --git a/lib/ansible/modules/network/cloudengine/ce_rollback.py b/lib/ansible/modules/network/cloudengine/ce_rollback.py index 1946d104cc..8c73f459f5 100644 --- a/lib/ansible/modules/network/cloudengine/ce_rollback.py +++ b/lib/ansible/modules/network/cloudengine/ce_rollback.py @@ -124,7 +124,7 @@ end_state: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, execute_nc_action, ce_argument_spec, run_commands +from ansible.module_utils.network.cloudengine.ce import get_nc_config, execute_nc_action, ce_argument_spec, run_commands CE_NC_GET_CHECKPOINT = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_sflow.py b/lib/ansible/modules/network/cloudengine/ce_sflow.py index 0be6cd0040..50d2fb788c 100644 --- a/lib/ansible/modules/network/cloudengine/ce_sflow.py +++ b/lib/ansible/modules/network/cloudengine/ce_sflow.py @@ -246,8 +246,8 @@ changed: import re from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr -from ansible.module_utils.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, check_ip_addr +from ansible.module_utils.network.cloudengine.ce import get_config, load_config CE_NC_GET_SFLOW = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_snmp_community.py b/lib/ansible/modules/network/cloudengine/ce_snmp_community.py index bf3faa4ed8..5b6142cc84 100644 --- a/lib/ansible/modules/network/cloudengine/ce_snmp_community.py +++ b/lib/ansible/modules/network/cloudengine/ce_snmp_community.py @@ -163,7 +163,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec # get snmp commutiny diff --git a/lib/ansible/modules/network/cloudengine/ce_snmp_contact.py b/lib/ansible/modules/network/cloudengine/ce_snmp_contact.py index a6c617b84a..77284a90ba 100644 --- a/lib/ansible/modules/network/cloudengine/ce_snmp_contact.py +++ b/lib/ansible/modules/network/cloudengine/ce_snmp_contact.py @@ -102,7 +102,7 @@ updates: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config, ce_argument_spec class SnmpContact(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_snmp_location.py b/lib/ansible/modules/network/cloudengine/ce_snmp_location.py index e2fb68ba46..1e09f1d59b 100644 --- a/lib/ansible/modules/network/cloudengine/ce_snmp_location.py +++ b/lib/ansible/modules/network/cloudengine/ce_snmp_location.py @@ -103,7 +103,7 @@ updates: from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config, ce_argument_spec class SnmpLocation(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_snmp_target_host.py b/lib/ansible/modules/network/cloudengine/ce_snmp_target_host.py index 4626a96f56..e2821f946e 100644 --- a/lib/ansible/modules/network/cloudengine/ce_snmp_target_host.py +++ b/lib/ansible/modules/network/cloudengine/ce_snmp_target_host.py @@ -172,7 +172,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, \ +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, \ ce_argument_spec, get_config, load_config, check_ip_addr # get snmp version diff --git a/lib/ansible/modules/network/cloudengine/ce_snmp_traps.py b/lib/ansible/modules/network/cloudengine/ce_snmp_traps.py index 459709aca9..0148cb6153 100644 --- a/lib/ansible/modules/network/cloudengine/ce_snmp_traps.py +++ b/lib/ansible/modules/network/cloudengine/ce_snmp_traps.py @@ -137,7 +137,7 @@ updates: from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config, ce_argument_spec, run_commands +from ansible.module_utils.network.cloudengine.ce import get_config, load_config, ce_argument_spec, run_commands class SnmpTraps(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_snmp_user.py b/lib/ansible/modules/network/cloudengine/ce_snmp_user.py index 9d6545a207..0c4493faa3 100644 --- a/lib/ansible/modules/network/cloudengine/ce_snmp_user.py +++ b/lib/ansible/modules/network/cloudengine/ce_snmp_user.py @@ -169,7 +169,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec, get_config +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec, get_config # get snmp v3 USM user diff --git a/lib/ansible/modules/network/cloudengine/ce_startup.py b/lib/ansible/modules/network/cloudengine/ce_startup.py index ddfc35fd9d..3191e4ba2d 100644 --- a/lib/ansible/modules/network/cloudengine/ce_startup.py +++ b/lib/ansible/modules/network/cloudengine/ce_startup.py @@ -141,7 +141,7 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, ce_argument_spec, run_commands +from ansible.module_utils.network.cloudengine.ce import get_nc_config, ce_argument_spec, run_commands CE_NC_GET_STARTUP_INFO = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_static_route.py b/lib/ansible/modules/network/cloudengine/ce_static_route.py index 1806a9ce32..7df26a4499 100644 --- a/lib/ansible/modules/network/cloudengine/ce_static_route.py +++ b/lib/ansible/modules/network/cloudengine/ce_static_route.py @@ -180,7 +180,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_STATIC_ROUTE = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_stp.py b/lib/ansible/modules/network/cloudengine/ce_stp.py index 6598393c2d..d208c90f90 100644 --- a/lib/ansible/modules/network/cloudengine/ce_stp.py +++ b/lib/ansible/modules/network/cloudengine/ce_stp.py @@ -194,7 +194,7 @@ updates: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config, ce_argument_spec class Stp(object): diff --git a/lib/ansible/modules/network/cloudengine/ce_switchport.py b/lib/ansible/modules/network/cloudengine/ce_switchport.py index 30c9c45a0b..aa9176b393 100644 --- a/lib/ansible/modules/network/cloudengine/ce_switchport.py +++ b/lib/ansible/modules/network/cloudengine/ce_switchport.py @@ -157,7 +157,7 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_INTF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vlan.py b/lib/ansible/modules/network/cloudengine/ce_vlan.py index 1cc71a96af..fef7202eb3 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vlan.py +++ b/lib/ansible/modules/network/cloudengine/ce_vlan.py @@ -140,7 +140,7 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, execute_nc_action, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, execute_nc_action, ce_argument_spec CE_NC_CREATE_VLAN = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vrf.py b/lib/ansible/modules/network/cloudengine/ce_vrf.py index 475d651ca5..82e04c8339 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vrf.py +++ b/lib/ansible/modules/network/cloudengine/ce_vrf.py @@ -111,7 +111,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_VRF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vrf_af.py b/lib/ansible/modules/network/cloudengine/ce_vrf_af.py index 87be00ed6d..39ed978b97 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vrf_af.py +++ b/lib/ansible/modules/network/cloudengine/ce_vrf_af.py @@ -193,7 +193,7 @@ changed: import re from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_VRF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vrf_interface.py b/lib/ansible/modules/network/cloudengine/ce_vrf_interface.py index bdafb00641..9e1dd54654 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vrf_interface.py +++ b/lib/ansible/modules/network/cloudengine/ce_vrf_interface.py @@ -122,7 +122,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import ce_argument_spec, get_nc_config, set_nc_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec, get_nc_config, set_nc_config CE_NC_GET_VRF = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vrrp.py b/lib/ansible/modules/network/cloudengine/ce_vrrp.py index e56107766f..3a5a71dbc0 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vrrp.py +++ b/lib/ansible/modules/network/cloudengine/ce_vrrp.py @@ -287,7 +287,7 @@ updates: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_VRRP_GROUP_INFO = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vxlan_arp.py b/lib/ansible/modules/network/cloudengine/ce_vxlan_arp.py index f81c26a206..b687a60312 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vxlan_arp.py +++ b/lib/ansible/modules/network/cloudengine/ce_vxlan_arp.py @@ -171,8 +171,8 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec def is_config_exist(cmp_cfg, test_cfg): diff --git a/lib/ansible/modules/network/cloudengine/ce_vxlan_gateway.py b/lib/ansible/modules/network/cloudengine/ce_vxlan_gateway.py index 8625b99056..e88d6bbb85 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vxlan_gateway.py +++ b/lib/ansible/modules/network/cloudengine/ce_vxlan_gateway.py @@ -205,8 +205,8 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec def is_config_exist(cmp_cfg, test_cfg): diff --git a/lib/ansible/modules/network/cloudengine/ce_vxlan_global.py b/lib/ansible/modules/network/cloudengine/ce_vxlan_global.py index ca8bc1d10a..d560d04bf7 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vxlan_global.py +++ b/lib/ansible/modules/network/cloudengine/ce_vxlan_global.py @@ -142,8 +142,8 @@ changed: import re from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_config, load_config, get_nc_config -from ansible.module_utils.ce import ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_config, load_config, get_nc_config +from ansible.module_utils.network.cloudengine.ce import ce_argument_spec CE_NC_GET_BRIDGE_DOMAIN = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vxlan_tunnel.py b/lib/ansible/modules/network/cloudengine/ce_vxlan_tunnel.py index d883d00ec0..879ee3477e 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vxlan_tunnel.py +++ b/lib/ansible/modules/network/cloudengine/ce_vxlan_tunnel.py @@ -133,7 +133,7 @@ end_state: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, get_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, get_config, ce_argument_spec CE_NC_GET_VNI_BD_INFO = """ diff --git a/lib/ansible/modules/network/cloudengine/ce_vxlan_vap.py b/lib/ansible/modules/network/cloudengine/ce_vxlan_vap.py index c48ed306a1..0db4d514ad 100644 --- a/lib/ansible/modules/network/cloudengine/ce_vxlan_vap.py +++ b/lib/ansible/modules/network/cloudengine/ce_vxlan_vap.py @@ -144,7 +144,7 @@ changed: from xml.etree import ElementTree from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ce import get_nc_config, set_nc_config, ce_argument_spec +from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec CE_NC_GET_BD_VAP = """ diff --git a/lib/ansible/modules/network/cnos/cnos_backup.py b/lib/ansible/modules/network/cnos/cnos_backup.py index e73ed5bbbc..a168ac7e84 100644 --- a/lib/ansible/modules/network/cnos/cnos_backup.py +++ b/lib/ansible/modules/network/cnos/cnos_backup.py @@ -182,7 +182,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_bgp.py b/lib/ansible/modules/network/cnos/cnos_bgp.py index d786af9bfd..f653724e36 100644 --- a/lib/ansible/modules/network/cnos/cnos_bgp.py +++ b/lib/ansible/modules/network/cnos/cnos_bgp.py @@ -379,7 +379,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_command.py b/lib/ansible/modules/network/cnos/cnos_command.py index d028ec0260..85646957f7 100644 --- a/lib/ansible/modules/network/cnos/cnos_command.py +++ b/lib/ansible/modules/network/cnos/cnos_command.py @@ -91,7 +91,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_conditional_command.py b/lib/ansible/modules/network/cnos/cnos_conditional_command.py index 9e6824f324..ad98f85218 100644 --- a/lib/ansible/modules/network/cnos/cnos_conditional_command.py +++ b/lib/ansible/modules/network/cnos/cnos_conditional_command.py @@ -111,7 +111,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_conditional_template.py b/lib/ansible/modules/network/cnos/cnos_conditional_template.py index a47e14543d..83b6a31571 100644 --- a/lib/ansible/modules/network/cnos/cnos_conditional_template.py +++ b/lib/ansible/modules/network/cnos/cnos_conditional_template.py @@ -118,7 +118,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_factory.py b/lib/ansible/modules/network/cnos/cnos_factory.py index 4a5f1bac0c..5205021907 100644 --- a/lib/ansible/modules/network/cnos/cnos_factory.py +++ b/lib/ansible/modules/network/cnos/cnos_factory.py @@ -80,7 +80,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_facts.py b/lib/ansible/modules/network/cnos/cnos_facts.py index a1d3655999..47b26483f1 100644 --- a/lib/ansible/modules/network/cnos/cnos_facts.py +++ b/lib/ansible/modules/network/cnos/cnos_facts.py @@ -78,7 +78,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_image.py b/lib/ansible/modules/network/cnos/cnos_image.py index fff09b6bf1..d17f2ef9e3 100644 --- a/lib/ansible/modules/network/cnos/cnos_image.py +++ b/lib/ansible/modules/network/cnos/cnos_image.py @@ -139,7 +139,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_interface.py b/lib/ansible/modules/network/cnos/cnos_interface.py index 3f32822cf0..8ee5fb619d 100644 --- a/lib/ansible/modules/network/cnos/cnos_interface.py +++ b/lib/ansible/modules/network/cnos/cnos_interface.py @@ -477,7 +477,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_portchannel.py b/lib/ansible/modules/network/cnos/cnos_portchannel.py index 294d34c905..883602b254 100644 --- a/lib/ansible/modules/network/cnos/cnos_portchannel.py +++ b/lib/ansible/modules/network/cnos/cnos_portchannel.py @@ -429,7 +429,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_reload.py b/lib/ansible/modules/network/cnos/cnos_reload.py index 4e911f7749..b1ebb0a519 100644 --- a/lib/ansible/modules/network/cnos/cnos_reload.py +++ b/lib/ansible/modules/network/cnos/cnos_reload.py @@ -79,7 +79,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_rollback.py b/lib/ansible/modules/network/cnos/cnos_rollback.py index 6f25287ed8..2ad78cd7f6 100644 --- a/lib/ansible/modules/network/cnos/cnos_rollback.py +++ b/lib/ansible/modules/network/cnos/cnos_rollback.py @@ -175,7 +175,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_save.py b/lib/ansible/modules/network/cnos/cnos_save.py index 8948b1d53e..109a803f40 100644 --- a/lib/ansible/modules/network/cnos/cnos_save.py +++ b/lib/ansible/modules/network/cnos/cnos_save.py @@ -80,7 +80,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_showrun.py b/lib/ansible/modules/network/cnos/cnos_showrun.py index a6581e0282..e26431ab14 100644 --- a/lib/ansible/modules/network/cnos/cnos_showrun.py +++ b/lib/ansible/modules/network/cnos/cnos_showrun.py @@ -81,7 +81,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_template.py b/lib/ansible/modules/network/cnos/cnos_template.py index 3713e25e27..f5b1b731ed 100644 --- a/lib/ansible/modules/network/cnos/cnos_template.py +++ b/lib/ansible/modules/network/cnos/cnos_template.py @@ -103,7 +103,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_vlag.py b/lib/ansible/modules/network/cnos/cnos_vlag.py index 9ee5ea641f..8cd02a6214 100644 --- a/lib/ansible/modules/network/cnos/cnos_vlag.py +++ b/lib/ansible/modules/network/cnos/cnos_vlag.py @@ -264,7 +264,7 @@ import json import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/cnos/cnos_vlan.py b/lib/ansible/modules/network/cnos/cnos_vlan.py index 22bd452b93..09ccaaf27a 100644 --- a/lib/ansible/modules/network/cnos/cnos_vlan.py +++ b/lib/ansible/modules/network/cnos/cnos_vlan.py @@ -204,7 +204,7 @@ import time import re try: - from ansible.module_utils import cnos + from ansible.module_utils.network.cnos import cnos HAS_LIB = True except: HAS_LIB = False diff --git a/lib/ansible/modules/network/dellos10/dellos10_command.py b/lib/ansible/modules/network/dellos10/dellos10_command.py index 0499fc83cb..0364b8f52e 100644 --- a/lib/ansible/modules/network/dellos10/dellos10_command.py +++ b/lib/ansible/modules/network/dellos10/dellos10_command.py @@ -131,10 +131,10 @@ warnings: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos10 import run_commands -from ansible.module_utils.dellos10 import dellos10_argument_spec, check_args -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.dellos10.dellos10 import run_commands +from ansible.module_utils.network.dellos10.dellos10 import dellos10_argument_spec, check_args +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/dellos10/dellos10_config.py b/lib/ansible/modules/network/dellos10/dellos10_config.py index 064d268fe4..a4736b5d9d 100644 --- a/lib/ansible/modules/network/dellos10/dellos10_config.py +++ b/lib/ansible/modules/network/dellos10/dellos10_config.py @@ -189,11 +189,11 @@ backup_path: sample: /playbooks/ansible/backup/dellos10_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos10 import get_config, get_sublevel_config -from ansible.module_utils.dellos10 import dellos10_argument_spec, check_args -from ansible.module_utils.dellos10 import load_config, run_commands -from ansible.module_utils.dellos10 import WARNING_PROMPTS_RE -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.dellos10.dellos10 import get_config, get_sublevel_config +from ansible.module_utils.network.dellos10.dellos10 import dellos10_argument_spec, check_args +from ansible.module_utils.network.dellos10.dellos10 import load_config, run_commands +from ansible.module_utils.network.dellos10.dellos10 import WARNING_PROMPTS_RE +from ansible.module_utils.network.common.config import NetworkConfig, dumps def get_candidate(module): diff --git a/lib/ansible/modules/network/dellos10/dellos10_facts.py b/lib/ansible/modules/network/dellos10/dellos10_facts.py index 33bad05ba2..9ccd34f73f 100644 --- a/lib/ansible/modules/network/dellos10/dellos10_facts.py +++ b/lib/ansible/modules/network/dellos10/dellos10_facts.py @@ -128,8 +128,8 @@ try: except ImportError: import xml.etree.ElementTree as ET -from ansible.module_utils.dellos10 import run_commands -from ansible.module_utils.dellos10 import dellos10_argument_spec, check_args +from ansible.module_utils.network.dellos10.dellos10 import run_commands +from ansible.module_utils.network.dellos10.dellos10 import dellos10_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/dellos6/dellos6_command.py b/lib/ansible/modules/network/dellos6/dellos6_command.py index 2077227b9a..ff01e75690 100644 --- a/lib/ansible/modules/network/dellos6/dellos6_command.py +++ b/lib/ansible/modules/network/dellos6/dellos6_command.py @@ -132,10 +132,10 @@ warnings: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos6 import run_commands -from ansible.module_utils.dellos6 import dellos6_argument_spec, check_args -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.dellos6.dellos6 import run_commands +from ansible.module_utils.network.dellos6.dellos6 import dellos6_argument_spec, check_args +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/dellos6/dellos6_config.py b/lib/ansible/modules/network/dellos6/dellos6_config.py index 30811da26e..9506138df8 100644 --- a/lib/ansible/modules/network/dellos6/dellos6_config.py +++ b/lib/ansible/modules/network/dellos6/dellos6_config.py @@ -188,11 +188,11 @@ backup_path: sample: /playbooks/ansible/backup/dellos6_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos6 import get_config, get_sublevel_config, Dellos6NetworkConfig -from ansible.module_utils.dellos6 import dellos6_argument_spec, check_args -from ansible.module_utils.dellos6 import load_config, run_commands -from ansible.module_utils.dellos6 import WARNING_PROMPTS_RE -from ansible.module_utils.netcfg import dumps +from ansible.module_utils.network.dellos6.dellos6 import get_config, get_sublevel_config, Dellos6NetworkConfig +from ansible.module_utils.network.dellos6.dellos6 import dellos6_argument_spec, check_args +from ansible.module_utils.network.dellos6.dellos6 import load_config, run_commands +from ansible.module_utils.network.dellos6.dellos6 import WARNING_PROMPTS_RE +from ansible.module_utils.network.common.config import dumps def get_candidate(module): diff --git a/lib/ansible/modules/network/dellos6/dellos6_facts.py b/lib/ansible/modules/network/dellos6/dellos6_facts.py index 94d29891ff..438fc46e5f 100644 --- a/lib/ansible/modules/network/dellos6/dellos6_facts.py +++ b/lib/ansible/modules/network/dellos6/dellos6_facts.py @@ -112,8 +112,8 @@ ansible_net_neighbors: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos6 import run_commands -from ansible.module_utils.dellos6 import dellos6_argument_spec, check_args +from ansible.module_utils.network.dellos6.dellos6 import run_commands +from ansible.module_utils.network.dellos6.dellos6 import dellos6_argument_spec, check_args from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/dellos9/dellos9_command.py b/lib/ansible/modules/network/dellos9/dellos9_command.py index 7433278218..380dc175c5 100644 --- a/lib/ansible/modules/network/dellos9/dellos9_command.py +++ b/lib/ansible/modules/network/dellos9/dellos9_command.py @@ -136,10 +136,10 @@ warnings: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos9 import run_commands -from ansible.module_utils.dellos9 import dellos9_argument_spec, check_args -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.dellos9.dellos9 import run_commands +from ansible.module_utils.network.dellos9.dellos9 import dellos9_argument_spec, check_args +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/dellos9/dellos9_config.py b/lib/ansible/modules/network/dellos9/dellos9_config.py index e90a4bb6f0..f7161ce3b7 100644 --- a/lib/ansible/modules/network/dellos9/dellos9_config.py +++ b/lib/ansible/modules/network/dellos9/dellos9_config.py @@ -194,11 +194,11 @@ backup_path: sample: /playbooks/ansible/backup/dellos9_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos9 import get_config, get_sublevel_config -from ansible.module_utils.dellos9 import dellos9_argument_spec, check_args -from ansible.module_utils.dellos9 import load_config, run_commands -from ansible.module_utils.dellos9 import WARNING_PROMPTS_RE -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.dellos9.dellos9 import get_config, get_sublevel_config +from ansible.module_utils.network.dellos9.dellos9 import dellos9_argument_spec, check_args +from ansible.module_utils.network.dellos9.dellos9 import load_config, run_commands +from ansible.module_utils.network.dellos9.dellos9 import WARNING_PROMPTS_RE +from ansible.module_utils.network.common.config import NetworkConfig, dumps def get_candidate(module): diff --git a/lib/ansible/modules/network/dellos9/dellos9_facts.py b/lib/ansible/modules/network/dellos9/dellos9_facts.py index 004ffc1d7f..409f79817e 100644 --- a/lib/ansible/modules/network/dellos9/dellos9_facts.py +++ b/lib/ansible/modules/network/dellos9/dellos9_facts.py @@ -131,8 +131,8 @@ import re import itertools from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.dellos9 import run_commands -from ansible.module_utils.dellos9 import dellos9_argument_spec, check_args +from ansible.module_utils.network.dellos9.dellos9 import run_commands +from ansible.module_utils.network.dellos9.dellos9 import dellos9_argument_spec, check_args from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/enos/enos_command.py b/lib/ansible/modules/network/enos/enos_command.py index 55904e5651..c559e6bc04 100644 --- a/lib/ansible/modules/network/enos/enos_command.py +++ b/lib/ansible/modules/network/enos/enos_command.py @@ -147,9 +147,9 @@ failed_conditions: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.enos import run_commands, check_args -from ansible.module_utils.enos import enos_argument_spec -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.enos.enos import run_commands, check_args +from ansible.module_utils.network.enos.enos import enos_argument_spec +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/enos/enos_config.py b/lib/ansible/modules/network/enos/enos_config.py index 2fdefd459a..31b066a3d8 100644 --- a/lib/ansible/modules/network/enos/enos_config.py +++ b/lib/ansible/modules/network/enos/enos_config.py @@ -164,10 +164,10 @@ backup_path: sample: /playbooks/ansible/backup/enos01.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.enos import load_config, get_config -from ansible.module_utils.enos import enos_argument_spec -from ansible.module_utils.enos import check_args as enos_check_args -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.enos.enos import load_config, get_config +from ansible.module_utils.network.enos.enos import enos_argument_spec +from ansible.module_utils.network.enos.enos import check_args as enos_check_args +from ansible.module_utils.network.common.config import NetworkConfig, dumps DEFAULT_COMMIT_COMMENT = 'configured by enos_config' diff --git a/lib/ansible/modules/network/enos/enos_facts.py b/lib/ansible/modules/network/enos/enos_facts.py index 27b4d6e60d..2c1146a341 100644 --- a/lib/ansible/modules/network/enos/enos_facts.py +++ b/lib/ansible/modules/network/enos/enos_facts.py @@ -151,7 +151,7 @@ RETURN = ''' import re -from ansible.module_utils.enos import run_commands, enos_argument_spec, check_args +from ansible.module_utils.network.enos.enos import run_commands, enos_argument_spec, check_args from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/eos/eos_banner.py b/lib/ansible/modules/network/eos/eos_banner.py index 588df2f89f..89e7507d9a 100644 --- a/lib/ansible/modules/network/eos/eos_banner.py +++ b/lib/ansible/modules/network/eos/eos_banner.py @@ -90,8 +90,8 @@ session_name: sample: ansible_1479315771 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.eos import load_config, run_commands -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.eos.eos import load_config, run_commands +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args from ansible.module_utils.six import string_types from ansible.module_utils._text import to_text diff --git a/lib/ansible/modules/network/eos/eos_command.py b/lib/ansible/modules/network/eos/eos_command.py index 52dc321dbe..3fe90bd72a 100644 --- a/lib/ansible/modules/network/eos/eos_command.py +++ b/lib/ansible/modules/network/eos/eos_command.py @@ -139,10 +139,10 @@ import time from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.pycompat24 import get_exception from ansible.module_utils.six import string_types -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.eos import run_commands -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.eos.eos import run_commands +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args VALID_KEYS = ['command', 'output', 'prompt', 'response'] diff --git a/lib/ansible/modules/network/eos/eos_config.py b/lib/ansible/modules/network/eos/eos_config.py index d8e5593a44..f34334e104 100644 --- a/lib/ansible/modules/network/eos/eos_config.py +++ b/lib/ansible/modules/network/eos/eos_config.py @@ -270,11 +270,11 @@ backup_path: sample: /playbooks/ansible/backup/eos_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps -from ansible.module_utils.eos import get_config, load_config -from ansible.module_utils.eos import run_commands -from ansible.module_utils.eos import eos_argument_spec -from ansible.module_utils.eos import check_args +from ansible.module_utils.network.common.config import NetworkConfig, dumps +from ansible.module_utils.network.eos.eos import get_config, load_config +from ansible.module_utils.network.eos.eos import run_commands +from ansible.module_utils.network.eos.eos import eos_argument_spec +from ansible.module_utils.network.eos.eos import check_args def get_candidate(module): diff --git a/lib/ansible/modules/network/eos/eos_eapi.py b/lib/ansible/modules/network/eos/eos_eapi.py index b0db9387fb..f65f4403c6 100644 --- a/lib/ansible/modules/network/eos/eos_eapi.py +++ b/lib/ansible/modules/network/eos/eos_eapi.py @@ -183,9 +183,9 @@ import re import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.eos import run_commands, load_config +from ansible.module_utils.network.eos.eos import run_commands, load_config from ansible.module_utils.six import iteritems -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args def check_transport(module): transport = module.params['transport'] diff --git a/lib/ansible/modules/network/eos/eos_facts.py b/lib/ansible/modules/network/eos/eos_facts.py index f81d985153..e0961abad0 100644 --- a/lib/ansible/modules/network/eos/eos_facts.py +++ b/lib/ansible/modules/network/eos/eos_facts.py @@ -139,8 +139,8 @@ import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems -from ansible.module_utils.eos import run_commands -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.eos.eos import run_commands +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args class FactsBase(object): diff --git a/lib/ansible/modules/network/eos/eos_logging.py b/lib/ansible/modules/network/eos/eos_logging.py index d769e45cc3..a9d7a04b81 100644 --- a/lib/ansible/modules/network/eos/eos_logging.py +++ b/lib/ansible/modules/network/eos/eos_logging.py @@ -116,9 +116,9 @@ import re from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.eos import get_config, load_config -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.eos.eos import get_config, load_config +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args DEST_GROUP = ['on', 'host', 'console', 'monitor', 'buffered'] diff --git a/lib/ansible/modules/network/eos/eos_static_route.py b/lib/ansible/modules/network/eos/eos_static_route.py index d0b99e783e..a6ed78bab7 100644 --- a/lib/ansible/modules/network/eos/eos_static_route.py +++ b/lib/ansible/modules/network/eos/eos_static_route.py @@ -82,10 +82,10 @@ commands: from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.network_common import validate_ip_address, validate_prefix -from ansible.module_utils.eos import load_config, run_commands -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.common.utils import validate_ip_address, validate_prefix +from ansible.module_utils.network.eos.eos import load_config, run_commands +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args def map_obj_to_commands(updates, module): diff --git a/lib/ansible/modules/network/eos/eos_system.py b/lib/ansible/modules/network/eos/eos_system.py index 3ae8d8627c..d8449e5fc2 100644 --- a/lib/ansible/modules/network/eos/eos_system.py +++ b/lib/ansible/modules/network/eos/eos_system.py @@ -129,9 +129,9 @@ session_name: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.eos import load_config, get_config -from ansible.module_utils.eos import eos_argument_spec +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.eos.eos import load_config, get_config +from ansible.module_utils.network.eos.eos import eos_argument_spec _CONFIGURED_VRFS = None diff --git a/lib/ansible/modules/network/eos/eos_user.py b/lib/ansible/modules/network/eos/eos_user.py index c4ece90ae7..9bdec10838 100644 --- a/lib/ansible/modules/network/eos/eos_user.py +++ b/lib/ansible/modules/network/eos/eos_user.py @@ -155,10 +155,10 @@ from copy import deepcopy from functools import partial from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.eos import get_config, load_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.eos.eos import get_config, load_config +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args from ansible.module_utils.six import iteritems -from ansible.module_utils.eos import eos_argument_spec, check_args def validate_privilege(value, module): diff --git a/lib/ansible/modules/network/eos/eos_vlan.py b/lib/ansible/modules/network/eos/eos_vlan.py index c1e7a3cfb3..41f613102d 100644 --- a/lib/ansible/modules/network/eos/eos_vlan.py +++ b/lib/ansible/modules/network/eos/eos_vlan.py @@ -110,9 +110,9 @@ import time from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.eos import load_config, run_commands -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.eos.eos import load_config, run_commands +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args def search_obj_in_list(vlan_id, lst): diff --git a/lib/ansible/modules/network/eos/eos_vrf.py b/lib/ansible/modules/network/eos/eos_vrf.py index 9c7798a95b..ab73451bd9 100644 --- a/lib/ansible/modules/network/eos/eos_vrf.py +++ b/lib/ansible/modules/network/eos/eos_vrf.py @@ -114,9 +114,9 @@ import time from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.eos import load_config, run_commands -from ansible.module_utils.eos import eos_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.eos.eos import load_config, run_commands +from ansible.module_utils.network.eos.eos import eos_argument_spec, check_args def search_obj_in_list(name, lst): diff --git a/lib/ansible/modules/network/f5/bigip_command.py b/lib/ansible/modules/network/f5/bigip_command.py index a7b9709355..058bf06601 100644 --- a/lib/ansible/modules/network/f5/bigip_command.py +++ b/lib/ansible/modules/network/f5/bigip_command.py @@ -178,11 +178,11 @@ try: except ImportError: HAS_CLI_TRANSPORT = False -from ansible.module_utils.netcli import FailedConditionsError from ansible.module_utils.six import string_types -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.parsing import FailedConditionsError +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.common.utils import to_list from collections import deque try: diff --git a/lib/ansible/modules/network/fortios/fortios_address.py b/lib/ansible/modules/network/fortios/fortios_address.py index 0e981f0c0f..f869230624 100644 --- a/lib/ansible/modules/network/fortios/fortios_address.py +++ b/lib/ansible/modules/network/fortios/fortios_address.py @@ -106,8 +106,8 @@ change_string: type: string """ -from ansible.module_utils.fortios import fortios_argument_spec, fortios_required_if -from ansible.module_utils.fortios import backup, AnsibleFortios +from ansible.module_utils.network.fortios.fortios import fortios_argument_spec, fortios_required_if +from ansible.module_utils.network.fortios.fortios import backup, AnsibleFortios from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.pycompat24 import get_exception diff --git a/lib/ansible/modules/network/fortios/fortios_config.py b/lib/ansible/modules/network/fortios/fortios_config.py index 97559a9d0d..4761c6c0bc 100644 --- a/lib/ansible/modules/network/fortios/fortios_config.py +++ b/lib/ansible/modules/network/fortios/fortios_config.py @@ -73,8 +73,8 @@ change_string: """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.fortios import fortios_argument_spec, fortios_required_if -from ansible.module_utils.fortios import backup +from ansible.module_utils.network.fortios.fortios import fortios_argument_spec, fortios_required_if +from ansible.module_utils.network.fortios.fortios import backup #check for pyFG lib try: diff --git a/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py b/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py index fab5c729cf..0f641c300a 100644 --- a/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py +++ b/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py @@ -196,8 +196,8 @@ msg_error_list: """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.fortios import fortios_argument_spec, fortios_required_if -from ansible.module_utils.fortios import backup, AnsibleFortios +from ansible.module_utils.network.fortios.fortios import fortios_argument_spec, fortios_required_if +from ansible.module_utils.network.fortios.fortios import backup, AnsibleFortios def main(): diff --git a/lib/ansible/modules/network/ios/ios_banner.py b/lib/ansible/modules/network/ios/ios_banner.py index a81e55dcf0..36882b5dea 100644 --- a/lib/ansible/modules/network/ios/ios_banner.py +++ b/lib/ansible/modules/network/ios/ios_banner.py @@ -92,8 +92,8 @@ commands: """ from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import exec_command -from ansible.module_utils.ios import load_config, run_commands -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.ios.ios import load_config, run_commands +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args import re def map_obj_to_commands(updates, module): diff --git a/lib/ansible/modules/network/ios/ios_command.py b/lib/ansible/modules/network/ios/ios_command.py index f875901f6f..43941e5fef 100644 --- a/lib/ansible/modules/network/ios/ios_command.py +++ b/lib/ansible/modules/network/ios/ios_command.py @@ -133,11 +133,11 @@ failed_conditions: """ import time -from ansible.module_utils.ios import run_commands -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.ios.ios import run_commands +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types def to_lines(stdout): diff --git a/lib/ansible/modules/network/ios/ios_config.py b/lib/ansible/modules/network/ios/ios_config.py index 80a0f19de8..a158efd818 100644 --- a/lib/ansible/modules/network/ios/ios_config.py +++ b/lib/ansible/modules/network/ios/ios_config.py @@ -282,13 +282,13 @@ backup_path: import re import time -from ansible.module_utils.ios import run_commands, get_config, load_config -from ansible.module_utils.ios import get_defaults_flag -from ansible.module_utils.ios import ios_argument_spec -from ansible.module_utils.ios import check_args as ios_check_args +from ansible.module_utils.network.ios.ios import run_commands, get_config, load_config +from ansible.module_utils.network.ios.ios import get_defaults_flag +from ansible.module_utils.network.ios.ios import ios_argument_spec +from ansible.module_utils.network.ios.ios import check_args as ios_check_args from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.config import NetworkConfig, dumps from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/ios/ios_facts.py b/lib/ansible/modules/network/ios/ios_facts.py index 37449a2788..f89c415ac8 100644 --- a/lib/ansible/modules/network/ios/ios_facts.py +++ b/lib/ansible/modules/network/ios/ios_facts.py @@ -146,8 +146,8 @@ ansible_net_neighbors: """ import re -from ansible.module_utils.ios import run_commands -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.ios.ios import run_commands +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems from ansible.module_utils.six.moves import zip diff --git a/lib/ansible/modules/network/ios/ios_interface.py b/lib/ansible/modules/network/ios/ios_interface.py index a7749b83a1..0f0a875a56 100644 --- a/lib/ansible/modules/network/ios/ios_interface.py +++ b/lib/ansible/modules/network/ios/ios_interface.py @@ -159,10 +159,10 @@ from time import sleep from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import exec_command -from ansible.module_utils.ios import get_config, load_config -from ansible.module_utils.ios import ios_argument_spec, check_args -from ansible.module_utils.netcfg import NetworkConfig -from ansible.module_utils.network_common import conditional, remove_default_spec +from ansible.module_utils.network.ios.ios import get_config, load_config +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args +from ansible.module_utils.network.common.config import NetworkConfig +from ansible.module_utils.network.common.utils import conditional, remove_default_spec def validate_mtu(value, module): diff --git a/lib/ansible/modules/network/ios/ios_logging.py b/lib/ansible/modules/network/ios/ios_logging.py index f162df3331..7515709be3 100644 --- a/lib/ansible/modules/network/ios/ios_logging.py +++ b/lib/ansible/modules/network/ios/ios_logging.py @@ -122,9 +122,9 @@ import re from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.ios import get_config, load_config -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.ios.ios import get_config, load_config +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args def validate_size(value, module): diff --git a/lib/ansible/modules/network/ios/ios_ping.py b/lib/ansible/modules/network/ios/ios_ping.py index e471339506..d24296a2f2 100644 --- a/lib/ansible/modules/network/ios/ios_ping.py +++ b/lib/ansible/modules/network/ios/ios_ping.py @@ -108,8 +108,8 @@ rtt: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ios import run_commands -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.ios.ios import run_commands +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args import re diff --git a/lib/ansible/modules/network/ios/ios_static_route.py b/lib/ansible/modules/network/ios/ios_static_route.py index d9ce02fb7b..9e6477aa6b 100644 --- a/lib/ansible/modules/network/ios/ios_static_route.py +++ b/lib/ansible/modules/network/ios/ios_static_route.py @@ -99,9 +99,9 @@ from copy import deepcopy from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import exec_command -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.ios import load_config, run_commands -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.ios.ios import load_config, run_commands +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args from ipaddress import ip_network import re diff --git a/lib/ansible/modules/network/ios/ios_system.py b/lib/ansible/modules/network/ios/ios_system.py index 260cf3b37a..ac1e6778ad 100644 --- a/lib/ansible/modules/network/ios/ios_system.py +++ b/lib/ansible/modules/network/ios/ios_system.py @@ -119,9 +119,9 @@ commands: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ios import get_config, load_config -from ansible.module_utils.ios import ios_argument_spec, check_args -from ansible.module_utils.network_common import ComplexList +from ansible.module_utils.network.ios.ios import get_config, load_config +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args +from ansible.module_utils.network.common.utils import ComplexList _CONFIGURED_VRFS = None diff --git a/lib/ansible/modules/network/ios/ios_user.py b/lib/ansible/modules/network/ios/ios_user.py index c0f4ec5988..da71361520 100644 --- a/lib/ansible/modules/network/ios/ios_user.py +++ b/lib/ansible/modules/network/ios/ios_user.py @@ -166,10 +166,10 @@ import json from functools import partial from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.ios import get_config, load_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.ios.ios import get_config, load_config from ansible.module_utils.six import iteritems -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args def validate_privilege(value, module): diff --git a/lib/ansible/modules/network/ios/ios_vlan.py b/lib/ansible/modules/network/ios/ios_vlan.py index 39137af0d7..2a44940d37 100644 --- a/lib/ansible/modules/network/ios/ios_vlan.py +++ b/lib/ansible/modules/network/ios/ios_vlan.py @@ -86,9 +86,9 @@ import time from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.ios import load_config, run_commands -from ansible.module_utils.ios import ios_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.ios.ios import load_config, run_commands +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args def search_obj_in_list(vlan_id, lst): diff --git a/lib/ansible/modules/network/ios/ios_vrf.py b/lib/ansible/modules/network/ios/ios_vrf.py index e9acb2b248..24c721efd3 100644 --- a/lib/ansible/modules/network/ios/ios_vrf.py +++ b/lib/ansible/modules/network/ios/ios_vrf.py @@ -140,9 +140,9 @@ from functools import partial from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import exec_command -from ansible.module_utils.ios import load_config, get_config -from ansible.module_utils.ios import ios_argument_spec, check_args -from ansible.module_utils.netcfg import NetworkConfig +from ansible.module_utils.network.ios.ios import load_config, get_config +from ansible.module_utils.network.ios.ios import ios_argument_spec, check_args +from ansible.module_utils.network.common.config import NetworkConfig from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/iosxr/iosxr_banner.py b/lib/ansible/modules/network/iosxr/iosxr_banner.py index 62537c5f3d..c97f2d0274 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_banner.py +++ b/lib/ansible/modules/network/iosxr/iosxr_banner.py @@ -81,8 +81,8 @@ commands: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.iosxr import get_config, load_config -from ansible.module_utils.iosxr import iosxr_argument_spec, check_args +from ansible.module_utils.network.iosxr.iosxr import get_config, load_config +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, check_args def map_obj_to_commands(updates, module): diff --git a/lib/ansible/modules/network/iosxr/iosxr_command.py b/lib/ansible/modules/network/iosxr/iosxr_command.py index 4dabee7093..33d4d4c845 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_command.py +++ b/lib/ansible/modules/network/iosxr/iosxr_command.py @@ -125,9 +125,9 @@ failed_conditions: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.iosxr import run_commands, iosxr_argument_spec, check_args -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.network_common import ComplexList +from ansible.module_utils.network.iosxr.iosxr import run_commands, iosxr_argument_spec, check_args +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.utils import ComplexList from ansible.module_utils.six import string_types from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/iosxr/iosxr_config.py b/lib/ansible/modules/network/iosxr/iosxr_config.py index a060a7e34f..9b34f02dc0 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_config.py +++ b/lib/ansible/modules/network/iosxr/iosxr_config.py @@ -180,10 +180,10 @@ backup_path: sample: /playbooks/ansible/backup/iosxr01.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.iosxr import load_config,get_config -from ansible.module_utils.iosxr import iosxr_argument_spec -from ansible.module_utils.iosxr import check_args as iosxr_check_args -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.iosxr.iosxr import load_config,get_config +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec +from ansible.module_utils.network.iosxr.iosxr import check_args as iosxr_check_args +from ansible.module_utils.network.common.config import NetworkConfig, dumps DEFAULT_COMMIT_COMMENT = 'configured by iosxr_config' diff --git a/lib/ansible/modules/network/iosxr/iosxr_facts.py b/lib/ansible/modules/network/iosxr/iosxr_facts.py index 8d89049957..cd37987fb5 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_facts.py +++ b/lib/ansible/modules/network/iosxr/iosxr_facts.py @@ -115,7 +115,7 @@ ansible_net_neighbors: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.iosxr import iosxr_argument_spec, check_args, run_commands +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, check_args, run_commands from ansible.module_utils.six import iteritems from ansible.module_utils.six.moves import zip diff --git a/lib/ansible/modules/network/iosxr/iosxr_interface.py b/lib/ansible/modules/network/iosxr/iosxr_interface.py index 68d7f91111..50aa0012cf 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_interface.py +++ b/lib/ansible/modules/network/iosxr/iosxr_interface.py @@ -141,9 +141,9 @@ from copy import deepcopy from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import exec_command -from ansible.module_utils.iosxr import get_config, load_config -from ansible.module_utils.iosxr import iosxr_argument_spec, check_args -from ansible.module_utils.network_common import conditional, remove_default_spec +from ansible.module_utils.network.iosxr.iosxr import get_config, load_config +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, check_args +from ansible.module_utils.network.common.utils import conditional, remove_default_spec def validate_mtu(value, module): diff --git a/lib/ansible/modules/network/iosxr/iosxr_logging.py b/lib/ansible/modules/network/iosxr/iosxr_logging.py index 083ca3097f..04f37d6a16 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_logging.py +++ b/lib/ansible/modules/network/iosxr/iosxr_logging.py @@ -113,9 +113,9 @@ import re from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.iosxr import get_config, load_config -from ansible.module_utils.iosxr import iosxr_argument_spec, check_args -from ansible.module_utils.network_common import remove_default_spec +from ansible.module_utils.network.iosxr.iosxr import get_config, load_config +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec def validate_size(value, module): diff --git a/lib/ansible/modules/network/iosxr/iosxr_netconf.py b/lib/ansible/modules/network/iosxr/iosxr_netconf.py index c3c8d01c18..3ecbcdf22e 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_netconf.py +++ b/lib/ansible/modules/network/iosxr/iosxr_netconf.py @@ -75,8 +75,8 @@ import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import exec_command -from ansible.module_utils.iosxr import iosxr_argument_spec, check_args -from ansible.module_utils.iosxr import get_config, load_config +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, check_args +from ansible.module_utils.network.iosxr.iosxr import get_config, load_config from ansible.module_utils.six import iteritems USE_PERSISTENT_CONNECTION = True diff --git a/lib/ansible/modules/network/iosxr/iosxr_system.py b/lib/ansible/modules/network/iosxr/iosxr_system.py index 32b981134f..4de4fa8b3a 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_system.py +++ b/lib/ansible/modules/network/iosxr/iosxr_system.py @@ -107,8 +107,8 @@ commands: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.iosxr import get_config, load_config -from ansible.module_utils.iosxr import iosxr_argument_spec, check_args +from ansible.module_utils.network.iosxr.iosxr import get_config, load_config +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, check_args def diff_list(want, have): adds = set(want).difference(have) diff --git a/lib/ansible/modules/network/iosxr/iosxr_user.py b/lib/ansible/modules/network/iosxr/iosxr_user.py index fd9cbca6b0..e4f0b16637 100644 --- a/lib/ansible/modules/network/iosxr/iosxr_user.py +++ b/lib/ansible/modules/network/iosxr/iosxr_user.py @@ -164,9 +164,9 @@ from functools import partial from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.iosxr import get_config, load_config -from ansible.module_utils.iosxr import iosxr_argument_spec, check_args +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.iosxr.iosxr import get_config, load_config +from ansible.module_utils.network.iosxr.iosxr import iosxr_argument_spec, check_args try: from base64 import b64decode diff --git a/lib/ansible/modules/network/ironware/ironware_command.py b/lib/ansible/modules/network/ironware/ironware_command.py index 5145a69510..eb50e2e324 100644 --- a/lib/ansible/modules/network/ironware/ironware_command.py +++ b/lib/ansible/modules/network/ironware/ironware_command.py @@ -103,9 +103,9 @@ failed_conditions: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ironware import ironware_argument_spec, check_args -from ansible.module_utils.ironware import run_commands -from ansible.module_utils.netcli import Conditional +from ansible.module_utils.network.ironware.ironware import ironware_argument_spec, check_args +from ansible.module_utils.network.ironware.ironware import run_commands +from ansible.module_utils.network.common.parsing import Conditional from ansible.module_utils.six import string_types diff --git a/lib/ansible/modules/network/ironware/ironware_config.py b/lib/ansible/modules/network/ironware/ironware_config.py index 4ecbe4ec62..583ec87fa1 100644 --- a/lib/ansible/modules/network/ironware/ironware_config.py +++ b/lib/ansible/modules/network/ironware/ironware_config.py @@ -174,9 +174,9 @@ backup_path: sample: /playbooks/ansible/backup/ironware_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.ironware import ironware_argument_spec, check_args -from ansible.module_utils.ironware import get_config, load_config, run_commands -from ansible.module_utils.netcfg import NetworkConfig, dumps, ConfigLine +from ansible.module_utils.network.ironware.ironware import ironware_argument_spec, check_args +from ansible.module_utils.network.ironware.ironware import get_config, load_config, run_commands +from ansible.module_utils.network.common.config import NetworkConfig, dumps, ConfigLine from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/ironware/ironware_facts.py b/lib/ansible/modules/network/ironware/ironware_facts.py index b05dbb85b3..6c993da27a 100644 --- a/lib/ansible/modules/network/ironware/ironware_facts.py +++ b/lib/ansible/modules/network/ironware/ironware_facts.py @@ -134,8 +134,8 @@ ansible_net_neighbors: """ import re -from ansible.module_utils.ironware import run_commands -from ansible.module_utils.ironware import ironware_argument_spec, check_args +from ansible.module_utils.network.ironware.ironware import run_commands +from ansible.module_utils.network.ironware.ironware import ironware_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems from ansible.module_utils.six.moves import zip diff --git a/lib/ansible/modules/network/junos/junos_banner.py b/lib/ansible/modules/network/junos/junos_banner.py index 3485da79f9..b4f1b14420 100644 --- a/lib/ansible/modules/network/junos/junos_banner.py +++ b/lib/ansible/modules/network/junos/junos_banner.py @@ -102,9 +102,9 @@ diff.prepared: import collections from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_command.py b/lib/ansible/modules/network/junos/junos_command.py index edd3b1f7c7..a3d1a4ca56 100644 --- a/lib/ansible/modules/network/junos/junos_command.py +++ b/lib/ansible/modules/network/junos/junos_command.py @@ -171,9 +171,9 @@ import re import shlex from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netconf import exec_rpc -from ansible.module_utils.junos import junos_argument_spec, get_configuration, get_connection, get_capabilities -from ansible.module_utils.netcli import Conditional, FailedConditionalError +from ansible.module_utils.network.common.netconf import exec_rpc +from ansible.module_utils.network.junos.junos import junos_argument_spec, get_configuration, get_connection, get_capabilities +from ansible.module_utils.network.common.parsing import Conditional, FailedConditionalError from ansible.module_utils.six import string_types, iteritems diff --git a/lib/ansible/modules/network/junos/junos_config.py b/lib/ansible/modules/network/junos/junos_config.py index d7cfc75660..7a73c6fd26 100644 --- a/lib/ansible/modules/network/junos/junos_config.py +++ b/lib/ansible/modules/network/junos/junos_config.py @@ -189,10 +189,10 @@ import re import json from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netconf import exec_rpc -from ansible.module_utils.junos import get_diff, load_config, get_configuration -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config -from ansible.module_utils.junos import junos_argument_spec, load_configuration, get_connection, tostring +from ansible.module_utils.network.common.netconf import exec_rpc +from ansible.module_utils.network.junos.junos import get_diff, load_config, get_configuration +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.junos.junos import junos_argument_spec, load_configuration, get_connection, tostring from ansible.module_utils.six import string_types from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/junos/junos_facts.py b/lib/ansible/modules/network/junos/junos_facts.py index e77cf3dd29..7992c4d831 100644 --- a/lib/ansible/modules/network/junos/junos_facts.py +++ b/lib/ansible/modules/network/junos/junos_facts.py @@ -78,9 +78,9 @@ ansible_facts: type: dict """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netconf import exec_rpc -from ansible.module_utils.junos import junos_argument_spec, get_param -from ansible.module_utils.junos import get_configuration, get_connection +from ansible.module_utils.network.common.netconf import exec_rpc +from ansible.module_utils.network.junos.junos import junos_argument_spec, get_param +from ansible.module_utils.network.junos.junos import get_configuration, get_connection from ansible.module_utils.pycompat24 import get_exception from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/junos/junos_interface.py b/lib/ansible/modules/network/junos/junos_interface.py index 54c5ba34d9..7344dccc8c 100644 --- a/lib/ansible/modules/network/junos/junos_interface.py +++ b/lib/ansible/modules/network/junos/junos_interface.py @@ -185,12 +185,12 @@ from copy import deepcopy from time import sleep from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netconf import exec_rpc -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.network_common import conditional -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config, to_param_list +from ansible.module_utils.network.common.netconf import exec_rpc +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.common.utils import conditional +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config, to_param_list try: from lxml.etree import Element, SubElement, tostring diff --git a/lib/ansible/modules/network/junos/junos_l3_interface.py b/lib/ansible/modules/network/junos/junos_l3_interface.py index 68f27c9ecb..46e3ca20a7 100644 --- a/lib/ansible/modules/network/junos/junos_l3_interface.py +++ b/lib/ansible/modules/network/junos/junos_l3_interface.py @@ -102,10 +102,10 @@ import collections from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config, to_param_list +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config, to_param_list try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_linkagg.py b/lib/ansible/modules/network/junos/junos_linkagg.py index f53ba729d6..9c3ad26476 100644 --- a/lib/ansible/modules/network/junos/junos_linkagg.py +++ b/lib/ansible/modules/network/junos/junos_linkagg.py @@ -160,10 +160,10 @@ import collections from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config, get_configuration +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config, get_configuration try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_lldp.py b/lib/ansible/modules/network/junos/junos_lldp.py index 4a067e0172..2b2e9c5adc 100644 --- a/lib/ansible/modules/network/junos/junos_lldp.py +++ b/lib/ansible/modules/network/junos/junos_lldp.py @@ -104,9 +104,9 @@ diff.prepared: import collections from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_lldp_interface.py b/lib/ansible/modules/network/junos/junos_lldp_interface.py index adb4f6289b..e8b8e847c8 100644 --- a/lib/ansible/modules/network/junos/junos_lldp_interface.py +++ b/lib/ansible/modules/network/junos/junos_lldp_interface.py @@ -93,9 +93,9 @@ diff.prepared: import collections from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_logging.py b/lib/ansible/modules/network/junos/junos_logging.py index b650605264..b214834ab2 100644 --- a/lib/ansible/modules/network/junos/junos_logging.py +++ b/lib/ansible/modules/network/junos/junos_logging.py @@ -138,10 +138,10 @@ import collections from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_netconf.py b/lib/ansible/modules/network/junos/junos_netconf.py index 8ee3fde011..6b085e4c57 100644 --- a/lib/ansible/modules/network/junos/junos_netconf.py +++ b/lib/ansible/modules/network/junos/junos_netconf.py @@ -71,9 +71,9 @@ commands: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.junos import junos_argument_spec, get_connection -from ansible.module_utils.junos import commit_configuration, discard_changes -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.junos.junos import junos_argument_spec, get_connection +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes +from ansible.module_utils.network.common.utils import to_list from ansible.module_utils.six import iteritems USE_PERSISTENT_CONNECTION = True diff --git a/lib/ansible/modules/network/junos/junos_package.py b/lib/ansible/modules/network/junos/junos_package.py index 8467ad4a5b..56ad185cbf 100644 --- a/lib/ansible/modules/network/junos/junos_package.py +++ b/lib/ansible/modules/network/junos/junos_package.py @@ -102,7 +102,7 @@ EXAMPLES = """ reboot: no """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.junos import junos_argument_spec, get_param +from ansible.module_utils.network.junos.junos import junos_argument_spec, get_param from ansible.module_utils.pycompat24 import get_exception try: diff --git a/lib/ansible/modules/network/junos/junos_rpc.py b/lib/ansible/modules/network/junos/junos_rpc.py index 96e98fd218..c231153f63 100644 --- a/lib/ansible/modules/network/junos/junos_rpc.py +++ b/lib/ansible/modules/network/junos/junos_rpc.py @@ -95,8 +95,8 @@ output_lines: type: list """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netconf import exec_rpc -from ansible.module_utils.junos import junos_argument_spec +from ansible.module_utils.network.common.netconf import exec_rpc +from ansible.module_utils.network.junos.junos import junos_argument_spec from ansible.module_utils.six import iteritems USE_PERSISTENT_CONNECTION = True diff --git a/lib/ansible/modules/network/junos/junos_static_route.py b/lib/ansible/modules/network/junos/junos_static_route.py index 6a10444c2b..6289ff25f2 100644 --- a/lib/ansible/modules/network/junos/junos_static_route.py +++ b/lib/ansible/modules/network/junos/junos_static_route.py @@ -134,10 +134,10 @@ import collections from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_system.py b/lib/ansible/modules/network/junos/junos_system.py index a284b8d936..d992c0d4c9 100644 --- a/lib/ansible/modules/network/junos/junos_system.py +++ b/lib/ansible/modules/network/junos/junos_system.py @@ -106,9 +106,9 @@ diff.prepared: import collections from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_user.py b/lib/ansible/modules/network/junos/junos_user.py index 114484105c..6c61839ec4 100644 --- a/lib/ansible/modules/network/junos/junos_user.py +++ b/lib/ansible/modules/network/junos/junos_user.py @@ -146,10 +146,10 @@ from functools import partial from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.junos import junos_argument_spec, get_connection -from ansible.module_utils.junos import commit_configuration, discard_changes -from ansible.module_utils.junos import load_config, locked_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.junos.junos import junos_argument_spec, get_connection +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes +from ansible.module_utils.network.junos.junos import load_config, locked_config from ansible.module_utils.six import iteritems try: diff --git a/lib/ansible/modules/network/junos/junos_vlan.py b/lib/ansible/modules/network/junos/junos_vlan.py index ecb003f41d..8b312f0276 100644 --- a/lib/ansible/modules/network/junos/junos_vlan.py +++ b/lib/ansible/modules/network/junos/junos_vlan.py @@ -111,10 +111,10 @@ import collections from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/junos/junos_vrf.py b/lib/ansible/modules/network/junos/junos_vrf.py index d5c51f0529..75663aecda 100644 --- a/lib/ansible/modules/network/junos/junos_vrf.py +++ b/lib/ansible/modules/network/junos/junos_vrf.py @@ -167,10 +167,10 @@ import collections from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.junos import junos_argument_spec -from ansible.module_utils.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list -from ansible.module_utils.junos import commit_configuration, discard_changes, locked_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.junos.junos import junos_argument_spec +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele, to_param_list +from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config try: from lxml.etree import tostring diff --git a/lib/ansible/modules/network/mlnxos/mlnxos_command.py b/lib/ansible/modules/network/mlnxos/mlnxos_command.py index bec68c36d8..cedb01785d 100644 --- a/lib/ansible/modules/network/mlnxos/mlnxos_command.py +++ b/lib/ansible/modules/network/mlnxos/mlnxos_command.py @@ -141,11 +141,11 @@ failed_conditions: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.network_common import ComplexList +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.utils import ComplexList from ansible.module_utils.six import string_types -from ansible.module_utils.mlnxos import mlnxos_argument_spec, run_commands +from ansible.module_utils.network.mlnxos.mlnxos import mlnxos_argument_spec, run_commands def to_lines(stdout): diff --git a/lib/ansible/modules/network/mlnxos/mlnxos_config.py b/lib/ansible/modules/network/mlnxos/mlnxos_config.py index 578e654d22..cf6f6820a7 100644 --- a/lib/ansible/modules/network/mlnxos/mlnxos_config.py +++ b/lib/ansible/modules/network/mlnxos/mlnxos_config.py @@ -152,9 +152,9 @@ backup_path: """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps +from ansible.module_utils.network.common.config import NetworkConfig, dumps -from ansible.module_utils.mlnxos import mlnxos_argument_spec, get_config, \ +from ansible.module_utils.network.mlnxos.mlnxos import mlnxos_argument_spec, get_config, \ load_config, run_commands diff --git a/lib/ansible/modules/network/netscaler/netscaler_cs_action.py b/lib/ansible/modules/network/netscaler/netscaler_cs_action.py index 6389c54fd2..415d24ddb6 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_cs_action.py +++ b/lib/ansible/modules/network/netscaler/netscaler_cs_action.py @@ -103,7 +103,7 @@ except ImportError as e: PYTHON_SDK_IMPORTED = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ( +from ansible.module_utils.network.netscaler.netscaler import ( ConfigProxy, get_nitro_client, netscaler_common_arguments, diff --git a/lib/ansible/modules/network/netscaler/netscaler_cs_policy.py b/lib/ansible/modules/network/netscaler/netscaler_cs_policy.py index a55acee73f..5f7d1323b6 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_cs_policy.py +++ b/lib/ansible/modules/network/netscaler/netscaler_cs_policy.py @@ -112,7 +112,7 @@ diff: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, ensure_feature_is_enabled +from ansible.module_utils.network.netscaler.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, ensure_feature_is_enabled try: from nssrc.com.citrix.netscaler.nitro.resource.config.cs.cspolicy import cspolicy from nssrc.com.citrix.netscaler.nitro.exception.nitro_exception import nitro_exception diff --git a/lib/ansible/modules/network/netscaler/netscaler_cs_vserver.py b/lib/ansible/modules/network/netscaler/netscaler_cs_vserver.py index 4dec52dc23..a105ce87a9 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_cs_vserver.py +++ b/lib/ansible/modules/network/netscaler/netscaler_cs_vserver.py @@ -559,7 +559,7 @@ diff: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ( +from ansible.module_utils.network.netscaler.netscaler import ( ConfigProxy, get_nitro_client, netscaler_common_arguments, diff --git a/lib/ansible/modules/network/netscaler/netscaler_gslb_service.py b/lib/ansible/modules/network/netscaler/netscaler_gslb_service.py index 1138506810..acf9ff6f0e 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_gslb_service.py +++ b/lib/ansible/modules/network/netscaler/netscaler_gslb_service.py @@ -268,7 +268,7 @@ import copy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ( +from ansible.module_utils.network.netscaler.netscaler import ( ConfigProxy, get_nitro_client, netscaler_common_arguments, diff --git a/lib/ansible/modules/network/netscaler/netscaler_gslb_site.py b/lib/ansible/modules/network/netscaler/netscaler_gslb_site.py index 39a8f1c0a4..93de56b3ea 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_gslb_site.py +++ b/lib/ansible/modules/network/netscaler/netscaler_gslb_site.py @@ -187,7 +187,7 @@ except ImportError as e: PYTHON_SDK_IMPORTED = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ( +from ansible.module_utils.network.netscaler.netscaler import ( ConfigProxy, get_nitro_client, netscaler_common_arguments, diff --git a/lib/ansible/modules/network/netscaler/netscaler_gslb_vserver.py b/lib/ansible/modules/network/netscaler/netscaler_gslb_vserver.py index bc3eff6a79..2369720648 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_gslb_vserver.py +++ b/lib/ansible/modules/network/netscaler/netscaler_gslb_vserver.py @@ -358,7 +358,7 @@ except ImportError as e: PYTHON_SDK_IMPORTED = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ( +from ansible.module_utils.network.netscaler.netscaler import ( ConfigProxy, get_nitro_client, netscaler_common_arguments, diff --git a/lib/ansible/modules/network/netscaler/netscaler_lb_monitor.py b/lib/ansible/modules/network/netscaler/netscaler_lb_monitor.py index 98559fafe8..fa6a9ae0b4 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_lb_monitor.py +++ b/lib/ansible/modules/network/netscaler/netscaler_lb_monitor.py @@ -827,7 +827,7 @@ diff: from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ( +from ansible.module_utils.network.netscaler.netscaler import ( ConfigProxy, get_nitro_client, netscaler_common_arguments, diff --git a/lib/ansible/modules/network/netscaler/netscaler_lb_vserver.py b/lib/ansible/modules/network/netscaler/netscaler_lb_vserver.py index 1d12189ac3..c5b26b5e69 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_lb_vserver.py +++ b/lib/ansible/modules/network/netscaler/netscaler_lb_vserver.py @@ -973,7 +973,7 @@ diff: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ( +from ansible.module_utils.network.netscaler.netscaler import ( ConfigProxy, get_nitro_client, netscaler_common_arguments, diff --git a/lib/ansible/modules/network/netscaler/netscaler_save_config.py b/lib/ansible/modules/network/netscaler/netscaler_save_config.py index 988456a5e5..5b90847735 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_save_config.py +++ b/lib/ansible/modules/network/netscaler/netscaler_save_config.py @@ -120,7 +120,7 @@ except ImportError as e: PYTHON_SDK_IMPORTED = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import get_nitro_client, log, loglines, netscaler_common_arguments +from ansible.module_utils.network.netscaler.netscaler import get_nitro_client, log, loglines, netscaler_common_arguments def main(): diff --git a/lib/ansible/modules/network/netscaler/netscaler_server.py b/lib/ansible/modules/network/netscaler/netscaler_server.py index fd0f7f2034..7e07c1661a 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_server.py +++ b/lib/ansible/modules/network/netscaler/netscaler_server.py @@ -144,7 +144,8 @@ except ImportError as e: PYTHON_SDK_IMPORTED = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, get_immutables_intersection +from ansible.module_utils.network.netscaler.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, \ + get_immutables_intersection def server_exists(client, module): diff --git a/lib/ansible/modules/network/netscaler/netscaler_service.py b/lib/ansible/modules/network/netscaler/netscaler_service.py index 8f224c7950..fe0b18310d 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_service.py +++ b/lib/ansible/modules/network/netscaler/netscaler_service.py @@ -416,8 +416,8 @@ except ImportError as e: PYTHON_SDK_IMPORTED = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import (ConfigProxy, get_nitro_client, netscaler_common_arguments, - log, loglines, get_immutables_intersection) +from ansible.module_utils.network.netscaler.netscaler import (ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, + get_immutables_intersection) def service_exists(client, module): diff --git a/lib/ansible/modules/network/netscaler/netscaler_servicegroup.py b/lib/ansible/modules/network/netscaler/netscaler_servicegroup.py index 9a71ff2658..f913d3bc21 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_servicegroup.py +++ b/lib/ansible/modules/network/netscaler/netscaler_servicegroup.py @@ -388,7 +388,8 @@ diff: from ansible.module_utils.basic import AnsibleModule import copy -from ansible.module_utils.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, get_immutables_intersection +from ansible.module_utils.network.netscaler.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, \ + loglines, get_immutables_intersection try: from nssrc.com.citrix.netscaler.nitro.resource.config.basic.servicegroup import servicegroup from nssrc.com.citrix.netscaler.nitro.resource.config.basic.servicegroup_servicegroupmember_binding import servicegroup_servicegroupmember_binding diff --git a/lib/ansible/modules/network/netscaler/netscaler_ssl_certkey.py b/lib/ansible/modules/network/netscaler/netscaler_ssl_certkey.py index 3b5c8e0bee..735147f1a1 100644 --- a/lib/ansible/modules/network/netscaler/netscaler_ssl_certkey.py +++ b/lib/ansible/modules/network/netscaler/netscaler_ssl_certkey.py @@ -151,7 +151,8 @@ except ImportError as e: PYTHON_SDK_IMPORTED = False from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, get_immutables_intersection +from ansible.module_utils.network.netscaler.netscaler import ConfigProxy, get_nitro_client, netscaler_common_arguments, log, loglines, \ + get_immutables_intersection def key_exists(client, module): diff --git a/lib/ansible/modules/network/nso/nso_config.py b/lib/ansible/modules/network/nso/nso_config.py index f60ceaf8bb..dc0296ad3b 100644 --- a/lib/ansible/modules/network/nso/nso_config.py +++ b/lib/ansible/modules/network/nso/nso_config.py @@ -135,9 +135,9 @@ diffs: type: string ''' -from ansible.module_utils.nso import connect, verify_version, nso_argument_spec -from ansible.module_utils.nso import State, ValueBuilder -from ansible.module_utils.nso import ModuleFailException, NsoException +from ansible.module_utils.network.nso.nso import connect, verify_version, nso_argument_spec +from ansible.module_utils.network.nso.nso import State, ValueBuilder +from ansible.module_utils.network.nso.nso import ModuleFailException, NsoException from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/_nxos_mtu.py b/lib/ansible/modules/network/nxos/_nxos_mtu.py index 53bc28074b..50fbdcb283 100644 --- a/lib/ansible/modules/network/nxos/_nxos_mtu.py +++ b/lib/ansible/modules/network/nxos/_nxos_mtu.py @@ -121,8 +121,8 @@ changed: type: boolean sample: true ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule def execute_show_command(command, module): diff --git a/lib/ansible/modules/network/nxos/nxos_aaa_server.py b/lib/ansible/modules/network/nxos/nxos_aaa_server.py index 4213a26da1..e95fd4283c 100644 --- a/lib/ansible/modules/network/nxos/nxos_aaa_server.py +++ b/lib/ansible/modules/network/nxos/nxos_aaa_server.py @@ -122,8 +122,8 @@ commands: ''' import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_aaa_server_host.py b/lib/ansible/modules/network/nxos/nxos_aaa_server_host.py index e2e33079c9..f12a6f91aa 100644 --- a/lib/ansible/modules/network/nxos/nxos_aaa_server_host.py +++ b/lib/ansible/modules/network/nxos/nxos_aaa_server_host.py @@ -155,8 +155,8 @@ changed: ''' import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_acl.py b/lib/ansible/modules/network/nxos/nxos_acl.py index 33f6a7c49f..10750b275b 100644 --- a/lib/ansible/modules/network/nxos/nxos_acl.py +++ b/lib/ansible/modules/network/nxos/nxos_acl.py @@ -220,8 +220,8 @@ commands: type: list sample: ["ip access-list ANSIBLE", "10 permit tcp 1.1.1.1/24 any"] ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_acl_interface.py b/lib/ansible/modules/network/nxos/nxos_acl_interface.py index 7f5da194c0..50ee2e5f06 100644 --- a/lib/ansible/modules/network/nxos/nxos_acl_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_acl_interface.py @@ -78,8 +78,8 @@ commands: ''' import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_banner.py b/lib/ansible/modules/network/nxos/nxos_banner.py index 5b0ee84804..40530e0662 100644 --- a/lib/ansible/modules/network/nxos/nxos_banner.py +++ b/lib/ansible/modules/network/nxos/nxos_banner.py @@ -88,8 +88,8 @@ commands: """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args import re diff --git a/lib/ansible/modules/network/nxos/nxos_bgp.py b/lib/ansible/modules/network/nxos/nxos_bgp.py index e2b1b58c66..7aa8f51011 100644 --- a/lib/ansible/modules/network/nxos/nxos_bgp.py +++ b/lib/ansible/modules/network/nxos/nxos_bgp.py @@ -310,10 +310,10 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ diff --git a/lib/ansible/modules/network/nxos/nxos_bgp_af.py b/lib/ansible/modules/network/nxos/nxos_bgp_af.py index 7ebe018cff..1327fe5f4d 100644 --- a/lib/ansible/modules/network/nxos/nxos_bgp_af.py +++ b/lib/ansible/modules/network/nxos/nxos_bgp_af.py @@ -267,10 +267,10 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ diff --git a/lib/ansible/modules/network/nxos/nxos_bgp_neighbor.py b/lib/ansible/modules/network/nxos/nxos_bgp_neighbor.py index 5eec02d3d8..eff32a9412 100644 --- a/lib/ansible/modules/network/nxos/nxos_bgp_neighbor.py +++ b/lib/ansible/modules/network/nxos/nxos_bgp_neighbor.py @@ -212,10 +212,10 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ diff --git a/lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py b/lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py index e8b159ae3a..2a2f71b6a4 100644 --- a/lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py +++ b/lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py @@ -290,10 +290,10 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ diff --git a/lib/ansible/modules/network/nxos/nxos_command.py b/lib/ansible/modules/network/nxos/nxos_command.py index a11026a0a6..8ebc0e9578 100644 --- a/lib/ansible/modules/network/nxos/nxos_command.py +++ b/lib/ansible/modules/network/nxos/nxos_command.py @@ -146,9 +146,9 @@ failed_conditions: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcli import Conditional, FailedConditionalError -from ansible.module_utils.network_common import ComplexList -from ansible.module_utils.nxos import check_args, nxos_argument_spec, run_commands +from ansible.module_utils.network.common.parsing import Conditional, FailedConditionalError +from ansible.module_utils.network.common.utils import ComplexList +from ansible.module_utils.network.nxos.nxos import check_args, nxos_argument_spec, run_commands from ansible.module_utils.six import string_types from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/nxos/nxos_config.py b/lib/ansible/modules/network/nxos/nxos_config.py index b6b23b2bfa..a8a9e9ff7f 100644 --- a/lib/ansible/modules/network/nxos/nxos_config.py +++ b/lib/ansible/modules/network/nxos/nxos_config.py @@ -269,11 +269,11 @@ backup_path: sample: /playbooks/ansible/backup/nxos_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec -from ansible.module_utils.nxos import check_args as nxos_check_args -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.config import NetworkConfig, dumps +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 check_args as nxos_check_args +from ansible.module_utils.network.common.utils import to_list def get_running_config(module, config=None): diff --git a/lib/ansible/modules/network/nxos/nxos_evpn_global.py b/lib/ansible/modules/network/nxos/nxos_evpn_global.py index ab088f3b35..1966b61f9e 100644 --- a/lib/ansible/modules/network/nxos/nxos_evpn_global.py +++ b/lib/ansible/modules/network/nxos/nxos_evpn_global.py @@ -51,9 +51,9 @@ commands: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec -from ansible.module_utils.nxos import check_args as nxos_check_args +from ansible.module_utils.network.nxos.nxos import get_config, load_config +from ansible.module_utils.network.nxos.nxos import nxos_argument_spec +from ansible.module_utils.network.nxos.nxos import check_args as nxos_check_args def check_args(module, warnings): diff --git a/lib/ansible/modules/network/nxos/nxos_evpn_vni.py b/lib/ansible/modules/network/nxos/nxos_evpn_vni.py index 8a06e11c71..8e31ca5a45 100644 --- a/lib/ansible/modules/network/nxos/nxos_evpn_vni.py +++ b/lib/ansible/modules/network/nxos/nxos_evpn_vni.py @@ -105,10 +105,10 @@ commands: import re import time -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule -from ansible.module_utils.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig PARAM_TO_COMMAND_KEYMAP = { diff --git a/lib/ansible/modules/network/nxos/nxos_facts.py b/lib/ansible/modules/network/nxos/nxos_facts.py index ec12ce3d9b..443dc1f469 100644 --- a/lib/ansible/modules/network/nxos/nxos_facts.py +++ b/lib/ansible/modules/network/nxos/nxos_facts.py @@ -168,8 +168,8 @@ vlan_list: """ import re -from ansible.module_utils.nxos import run_commands, get_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +from ansible.module_utils.network.nxos.nxos import run_commands, get_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.six import string_types, iteritems diff --git a/lib/ansible/modules/network/nxos/nxos_feature.py b/lib/ansible/modules/network/nxos/nxos_feature.py index c513cb7987..1cf4ff978b 100644 --- a/lib/ansible/modules/network/nxos/nxos_feature.py +++ b/lib/ansible/modules/network/nxos/nxos_feature.py @@ -72,9 +72,9 @@ commands: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec -from ansible.module_utils.nxos import check_args as nxos_check_args +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 check_args as nxos_check_args def check_args(module, warnings): diff --git a/lib/ansible/modules/network/nxos/nxos_file_copy.py b/lib/ansible/modules/network/nxos/nxos_file_copy.py index 533dbec73a..c8c163aa10 100644 --- a/lib/ansible/modules/network/nxos/nxos_file_copy.py +++ b/lib/ansible/modules/network/nxos/nxos_file_copy.py @@ -94,8 +94,8 @@ import os import re import time import paramiko -from ansible.module_utils.nxos import run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +from ansible.module_utils.network.nxos.nxos import run_commands +from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule try: diff --git a/lib/ansible/modules/network/nxos/nxos_gir.py b/lib/ansible/modules/network/nxos/nxos_gir.py index 1ead82a336..549d83e73e 100644 --- a/lib/ansible/modules/network/nxos/nxos_gir.py +++ b/lib/ansible/modules/network/nxos/nxos_gir.py @@ -164,8 +164,8 @@ changed: ''' import re -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule def execute_show_command(command, module, command_type='cli_show_ascii'): diff --git a/lib/ansible/modules/network/nxos/nxos_gir_profile_management.py b/lib/ansible/modules/network/nxos/nxos_gir_profile_management.py index a1b0b3cf2a..a1058cfc79 100644 --- a/lib/ansible/modules/network/nxos/nxos_gir_profile_management.py +++ b/lib/ansible/modules/network/nxos/nxos_gir_profile_management.py @@ -119,10 +119,10 @@ changed: import re -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule -from ansible.module_utils.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig def get_existing(module): diff --git a/lib/ansible/modules/network/nxos/nxos_hsrp.py b/lib/ansible/modules/network/nxos/nxos_hsrp.py index 7375a9ebd2..6776ba49b1 100644 --- a/lib/ansible/modules/network/nxos/nxos_hsrp.py +++ b/lib/ansible/modules/network/nxos/nxos_hsrp.py @@ -123,8 +123,8 @@ commands: sample: ["interface vlan10", "hsrp version 2", "hsrp 30", "ip 10.30.1.1"] ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_igmp.py b/lib/ansible/modules/network/nxos/nxos_igmp.py index 5a4d5100ec..e0c89e828b 100644 --- a/lib/ansible/modules/network/nxos/nxos_igmp.py +++ b/lib/ansible/modules/network/nxos/nxos_igmp.py @@ -91,8 +91,8 @@ updates: type: list sample: ["ip igmp flush-routes"] ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule def get_current(module): diff --git a/lib/ansible/modules/network/nxos/nxos_igmp_interface.py b/lib/ansible/modules/network/nxos/nxos_igmp_interface.py index 3d626e93e0..ec32eec561 100644 --- a/lib/ansible/modules/network/nxos/nxos_igmp_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_igmp_interface.py @@ -236,8 +236,8 @@ changed: sample: true ''' -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule import re diff --git a/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py b/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py index 4c459d3a13..9ebe7ea1e2 100644 --- a/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py +++ b/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py @@ -105,8 +105,8 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_install_os.py b/lib/ansible/modules/network/nxos/nxos_install_os.py index 84269e5433..d17f75df61 100644 --- a/lib/ansible/modules/network/nxos/nxos_install_os.py +++ b/lib/ansible/modules/network/nxos/nxos_install_os.py @@ -126,8 +126,8 @@ install_state: import re from time import sleep -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_interface.py b/lib/ansible/modules/network/nxos/nxos_interface.py index 5523efe744..3c33dd2c29 100644 --- a/lib/ansible/modules/network/nxos/nxos_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_interface.py @@ -145,8 +145,8 @@ commands: type: list sample: ["interface port-channel101", "shutdown"] ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_interface_ospf.py b/lib/ansible/modules/network/nxos/nxos_interface_ospf.py index f415be3f73..6aa0e1bf22 100644 --- a/lib/ansible/modules/network/nxos/nxos_interface_ospf.py +++ b/lib/ansible/modules/network/nxos/nxos_interface_ospf.py @@ -137,10 +137,10 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ 'passive_interface', diff --git a/lib/ansible/modules/network/nxos/nxos_ip_interface.py b/lib/ansible/modules/network/nxos/nxos_ip_interface.py index e5c721d8b2..e4da09acf4 100644 --- a/lib/ansible/modules/network/nxos/nxos_ip_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_ip_interface.py @@ -175,8 +175,8 @@ try: except ImportError: HAS_IPADDRESS = False -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_logging.py b/lib/ansible/modules/network/nxos/nxos_logging.py index 2ade821795..f0821bb739 100644 --- a/lib/ansible/modules/network/nxos/nxos_logging.py +++ b/lib/ansible/modules/network/nxos/nxos_logging.py @@ -104,8 +104,8 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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 diff --git a/lib/ansible/modules/network/nxos/nxos_ntp.py b/lib/ansible/modules/network/nxos/nxos_ntp.py index 248e0ba3e0..119c48e539 100644 --- a/lib/ansible/modules/network/nxos/nxos_ntp.py +++ b/lib/ansible/modules/network/nxos/nxos_ntp.py @@ -120,7 +120,7 @@ changed: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.nxos import check_args, load_config, nxos_argument_spec, run_commands +from ansible.module_utils.network.nxos.nxos import check_args, load_config, nxos_argument_spec, run_commands def execute_show_command(command, module, command_type='cli_show'): diff --git a/lib/ansible/modules/network/nxos/nxos_ntp_auth.py b/lib/ansible/modules/network/nxos/nxos_ntp_auth.py index b8157d8e3a..b8cce10b34 100644 --- a/lib/ansible/modules/network/nxos/nxos_ntp_auth.py +++ b/lib/ansible/modules/network/nxos/nxos_ntp_auth.py @@ -96,8 +96,8 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_ntp_options.py b/lib/ansible/modules/network/nxos/nxos_ntp_options.py index 2bd56fe6df..d412413898 100644 --- a/lib/ansible/modules/network/nxos/nxos_ntp_options.py +++ b/lib/ansible/modules/network/nxos/nxos_ntp_options.py @@ -86,8 +86,8 @@ updates: ''' import re -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_nxapi.py b/lib/ansible/modules/network/nxos/nxos_nxapi.py index de1bd7d7d1..1e2cfcc01f 100644 --- a/lib/ansible/modules/network/nxos/nxos_nxapi.py +++ b/lib/ansible/modules/network/nxos/nxos_nxapi.py @@ -124,9 +124,9 @@ updates: """ import re -from ansible.module_utils.nxos import run_commands, load_config -from ansible.module_utils.nxos import nxos_argument_spec -from ansible.module_utils.nxos import check_args as nxos_check_args +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 check_args as nxos_check_args from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems diff --git a/lib/ansible/modules/network/nxos/nxos_ospf.py b/lib/ansible/modules/network/nxos/nxos_ospf.py index f709da0f87..54d4353e11 100644 --- a/lib/ansible/modules/network/nxos/nxos_ospf.py +++ b/lib/ansible/modules/network/nxos/nxos_ospf.py @@ -58,10 +58,10 @@ commands: ''' import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig PARAM_TO_COMMAND_KEYMAP = { diff --git a/lib/ansible/modules/network/nxos/nxos_ospf_vrf.py b/lib/ansible/modules/network/nxos/nxos_ospf_vrf.py index 70acc5d985..64ea711d00 100644 --- a/lib/ansible/modules/network/nxos/nxos_ospf_vrf.py +++ b/lib/ansible/modules/network/nxos/nxos_ospf_vrf.py @@ -145,10 +145,10 @@ commands: ''' import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ diff --git a/lib/ansible/modules/network/nxos/nxos_overlay_global.py b/lib/ansible/modules/network/nxos/nxos_overlay_global.py index 2fa3b4b9ed..32e8415d6c 100644 --- a/lib/ansible/modules/network/nxos/nxos_overlay_global.py +++ b/lib/ansible/modules/network/nxos/nxos_overlay_global.py @@ -56,10 +56,10 @@ commands: ''' import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig PARAM_TO_COMMAND_KEYMAP = { 'anycast_gateway_mac': 'fabric forwarding anycast-gateway-mac', diff --git a/lib/ansible/modules/network/nxos/nxos_pim.py b/lib/ansible/modules/network/nxos/nxos_pim.py index cea61c5584..076db417f8 100644 --- a/lib/ansible/modules/network/nxos/nxos_pim.py +++ b/lib/ansible/modules/network/nxos/nxos_pim.py @@ -53,10 +53,10 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig PARAM_TO_COMMAND_KEYMAP = { diff --git a/lib/ansible/modules/network/nxos/nxos_pim_interface.py b/lib/ansible/modules/network/nxos/nxos_pim_interface.py index fcabed93aa..6b05860278 100644 --- a/lib/ansible/modules/network/nxos/nxos_pim_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_pim_interface.py @@ -149,8 +149,8 @@ commands: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.six import string_types diff --git a/lib/ansible/modules/network/nxos/nxos_pim_rp_address.py b/lib/ansible/modules/network/nxos/nxos_pim_rp_address.py index dba519c02d..4a13e5bba7 100644 --- a/lib/ansible/modules/network/nxos/nxos_pim_rp_address.py +++ b/lib/ansible/modules/network/nxos/nxos_pim_rp_address.py @@ -82,10 +82,10 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig def get_existing(module, args): diff --git a/lib/ansible/modules/network/nxos/nxos_ping.py b/lib/ansible/modules/network/nxos/nxos_ping.py index d1113f2166..ee24a5fba4 100644 --- a/lib/ansible/modules/network/nxos/nxos_ping.py +++ b/lib/ansible/modules/network/nxos/nxos_ping.py @@ -104,8 +104,8 @@ packet_loss: type: string sample: "0.00%" ''' -from ansible.module_utils.nxos import run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +from ansible.module_utils.network.nxos.nxos import run_commands +from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_portchannel.py b/lib/ansible/modules/network/nxos/nxos_portchannel.py index b781a066a1..11d3a2492e 100644 --- a/lib/ansible/modules/network/nxos/nxos_portchannel.py +++ b/lib/ansible/modules/network/nxos/nxos_portchannel.py @@ -98,10 +98,10 @@ commands: import collections import re -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule -from ansible.module_utils.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig def get_value(arg, config, module): diff --git a/lib/ansible/modules/network/nxos/nxos_reboot.py b/lib/ansible/modules/network/nxos/nxos_reboot.py index 8f1c2464e8..4e4e74c55e 100644 --- a/lib/ansible/modules/network/nxos/nxos_reboot.py +++ b/lib/ansible/modules/network/nxos/nxos_reboot.py @@ -60,8 +60,8 @@ rebooted: sample: true ''' -from ansible.module_utils.nxos import run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +from ansible.module_utils.network.nxos.nxos import run_commands +from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_rollback.py b/lib/ansible/modules/network/nxos/nxos_rollback.py index fa58504824..82ba28f494 100644 --- a/lib/ansible/modules/network/nxos/nxos_rollback.py +++ b/lib/ansible/modules/network/nxos/nxos_rollback.py @@ -79,7 +79,7 @@ status: ''' -from ansible.module_utils.nxos import nxos_argument_spec, run_commands +from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, run_commands from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_smu.py b/lib/ansible/modules/network/nxos/nxos_smu.py index 1f6fffc827..427819377d 100644 --- a/lib/ansible/modules/network/nxos/nxos_smu.py +++ b/lib/ansible/modules/network/nxos/nxos_smu.py @@ -69,8 +69,8 @@ import collections import re import time -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_snapshot.py b/lib/ansible/modules/network/nxos/nxos_snapshot.py index 7f79e8647b..07b50e6475 100644 --- a/lib/ansible/modules/network/nxos/nxos_snapshot.py +++ b/lib/ansible/modules/network/nxos/nxos_snapshot.py @@ -171,8 +171,8 @@ import os import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args def execute_show_command(command, module): diff --git a/lib/ansible/modules/network/nxos/nxos_snmp_community.py b/lib/ansible/modules/network/nxos/nxos_snmp_community.py index 341fb8aa34..afaba96a54 100644 --- a/lib/ansible/modules/network/nxos/nxos_snmp_community.py +++ b/lib/ansible/modules/network/nxos/nxos_snmp_community.py @@ -80,8 +80,8 @@ commands: ''' import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_snmp_contact.py b/lib/ansible/modules/network/nxos/nxos_snmp_contact.py index badba043a5..69a1829db5 100644 --- a/lib/ansible/modules/network/nxos/nxos_snmp_contact.py +++ b/lib/ansible/modules/network/nxos/nxos_snmp_contact.py @@ -66,8 +66,8 @@ commands: import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_snmp_host.py b/lib/ansible/modules/network/nxos/nxos_snmp_host.py index 9e6f3cc8f8..36b6a0590f 100644 --- a/lib/ansible/modules/network/nxos/nxos_snmp_host.py +++ b/lib/ansible/modules/network/nxos/nxos_snmp_host.py @@ -103,8 +103,8 @@ commands: import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_snmp_location.py b/lib/ansible/modules/network/nxos/nxos_snmp_location.py index ca23d8cb01..f5cf9eb6cd 100644 --- a/lib/ansible/modules/network/nxos/nxos_snmp_location.py +++ b/lib/ansible/modules/network/nxos/nxos_snmp_location.py @@ -70,8 +70,8 @@ commands: import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_snmp_traps.py b/lib/ansible/modules/network/nxos/nxos_snmp_traps.py index b6ed201043..146614be7e 100644 --- a/lib/ansible/modules/network/nxos/nxos_snmp_traps.py +++ b/lib/ansible/modules/network/nxos/nxos_snmp_traps.py @@ -75,8 +75,8 @@ commands: ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_snmp_user.py b/lib/ansible/modules/network/nxos/nxos_snmp_user.py index a748d4b607..093d57c597 100644 --- a/lib/ansible/modules/network/nxos/nxos_snmp_user.py +++ b/lib/ansible/modules/network/nxos/nxos_snmp_user.py @@ -90,8 +90,8 @@ commands: ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_static_route.py b/lib/ansible/modules/network/nxos/nxos_static_route.py index d146d7c99a..1e44755d71 100644 --- a/lib/ansible/modules/network/nxos/nxos_static_route.py +++ b/lib/ansible/modules/network/nxos/nxos_static_route.py @@ -88,10 +88,10 @@ commands: ''' import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig def reconcile_candidate(module, candidate, prefix): diff --git a/lib/ansible/modules/network/nxos/nxos_switchport.py b/lib/ansible/modules/network/nxos/nxos_switchport.py index 969e2b11b2..0aaae80bd4 100644 --- a/lib/ansible/modules/network/nxos/nxos_switchport.py +++ b/lib/ansible/modules/network/nxos/nxos_switchport.py @@ -126,8 +126,8 @@ commands: sample: ["interface eth1/5", "switchport access vlan 20"] ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_system.py b/lib/ansible/modules/network/nxos/nxos_system.py index 1e22098352..bf1909c61b 100644 --- a/lib/ansible/modules/network/nxos/nxos_system.py +++ b/lib/ansible/modules/network/nxos/nxos_system.py @@ -111,12 +111,12 @@ commands: """ import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.six import iteritems -from ansible.module_utils.netcfg import NetworkConfig -from ansible.module_utils.network_common import ComplexList +from ansible.module_utils.network.common.config import NetworkConfig +from ansible.module_utils.network.common.utils import ComplexList _CONFIGURED_VRFS = None diff --git a/lib/ansible/modules/network/nxos/nxos_udld.py b/lib/ansible/modules/network/nxos/nxos_udld.py index fce27c728c..c0f364b86a 100644 --- a/lib/ansible/modules/network/nxos/nxos_udld.py +++ b/lib/ansible/modules/network/nxos/nxos_udld.py @@ -111,8 +111,8 @@ changed: ''' -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_udld_interface.py b/lib/ansible/modules/network/nxos/nxos_udld_interface.py index 116b8b4ee6..08e4b4b3f9 100644 --- a/lib/ansible/modules/network/nxos/nxos_udld_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_udld_interface.py @@ -110,8 +110,8 @@ changed: ''' -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_user.py b/lib/ansible/modules/network/nxos/nxos_user.py index 2137bf9c67..c75c5439b8 100644 --- a/lib/ansible/modules/network/nxos/nxos_user.py +++ b/lib/ansible/modules/network/nxos/nxos_user.py @@ -149,11 +149,11 @@ import re from functools import partial -from ansible.module_utils.nxos import run_commands, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +from ansible.module_utils.network.nxos.nxos import run_commands, 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.six import string_types, iteritems -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list VALID_ROLES = ['network-admin', 'network-operator', 'vdc-admin', 'vdc-operator', 'priv-15', 'priv-14', 'priv-13', 'priv-12', 'priv-11', 'priv-10', diff --git a/lib/ansible/modules/network/nxos/nxos_vlan.py b/lib/ansible/modules/network/nxos/nxos_vlan.py index 75f8dfc513..f75c445553 100644 --- a/lib/ansible/modules/network/nxos/nxos_vlan.py +++ b/lib/ansible/modules/network/nxos/nxos_vlan.py @@ -113,8 +113,8 @@ commands: import re -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_vpc.py b/lib/ansible/modules/network/nxos/nxos_vpc.py index 823efd3ef4..1051e995dc 100644 --- a/lib/ansible/modules/network/nxos/nxos_vpc.py +++ b/lib/ansible/modules/network/nxos/nxos_vpc.py @@ -125,8 +125,8 @@ commands: "auto-recovery", "peer-gateway"] ''' -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_vpc_interface.py b/lib/ansible/modules/network/nxos/nxos_vpc_interface.py index 5910a9c58c..cbf445d110 100644 --- a/lib/ansible/modules/network/nxos/nxos_vpc_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_vpc_interface.py @@ -75,8 +75,8 @@ commands: sample: ["interface port-channel100", "vpc 10"] ''' -from ansible.module_utils.nxos import get_config, load_config, run_commands -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_vrf.py b/lib/ansible/modules/network/nxos/nxos_vrf.py index 86c31be580..a4c7e747eb 100644 --- a/lib/ansible/modules/network/nxos/nxos_vrf.py +++ b/lib/ansible/modules/network/nxos/nxos_vrf.py @@ -97,8 +97,8 @@ commands: ''' import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_vrf_af.py b/lib/ansible/modules/network/nxos/nxos_vrf_af.py index 208330216c..b70602cce9 100644 --- a/lib/ansible/modules/network/nxos/nxos_vrf_af.py +++ b/lib/ansible/modules/network/nxos/nxos_vrf_af.py @@ -81,10 +81,10 @@ commands: type: list sample: ["vrf context ntc", "address-family ipv4 unicast"] ''' -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import NetworkConfig +from ansible.module_utils.network.common.config import NetworkConfig def main(): diff --git a/lib/ansible/modules/network/nxos/nxos_vrf_interface.py b/lib/ansible/modules/network/nxos/nxos_vrf_interface.py index 74b9b207e6..c989f58091 100644 --- a/lib/ansible/modules/network/nxos/nxos_vrf_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_vrf_interface.py @@ -80,8 +80,8 @@ commands: ''' import re -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_vrrp.py b/lib/ansible/modules/network/nxos/nxos_vrrp.py index 35706020a2..74e01c6f8d 100644 --- a/lib/ansible/modules/network/nxos/nxos_vrrp.py +++ b/lib/ansible/modules/network/nxos/nxos_vrrp.py @@ -113,8 +113,8 @@ commands: "authentication text testing", "no shutdown"] ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_vtp_domain.py b/lib/ansible/modules/network/nxos/nxos_vtp_domain.py index 97d6720718..7a9fbde556 100644 --- a/lib/ansible/modules/network/nxos/nxos_vtp_domain.py +++ b/lib/ansible/modules/network/nxos/nxos_vtp_domain.py @@ -87,8 +87,8 @@ changed: ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule import re diff --git a/lib/ansible/modules/network/nxos/nxos_vtp_password.py b/lib/ansible/modules/network/nxos/nxos_vtp_password.py index d5e8ba099f..e484d95ca5 100644 --- a/lib/ansible/modules/network/nxos/nxos_vtp_password.py +++ b/lib/ansible/modules/network/nxos/nxos_vtp_password.py @@ -104,8 +104,8 @@ changed: sample: true ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule import re diff --git a/lib/ansible/modules/network/nxos/nxos_vtp_version.py b/lib/ansible/modules/network/nxos/nxos_vtp_version.py index 9a4dacc274..f25866174f 100644 --- a/lib/ansible/modules/network/nxos/nxos_vtp_version.py +++ b/lib/ansible/modules/network/nxos/nxos_vtp_version.py @@ -82,8 +82,8 @@ changed: type: boolean sample: true ''' -from ansible.module_utils.nxos import load_config, run_commands -from ansible.module_utils.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 nxos_argument_spec, check_args from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/network/nxos/nxos_vxlan_vtep.py b/lib/ansible/modules/network/nxos/nxos_vxlan_vtep.py index fc8ed747b9..6f8046492e 100644 --- a/lib/ansible/modules/network/nxos/nxos_vxlan_vtep.py +++ b/lib/ansible/modules/network/nxos/nxos_vxlan_vtep.py @@ -100,10 +100,10 @@ commands: ''' import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ 'shutdown', diff --git a/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py b/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py index 67363dc92f..c08009a9a6 100644 --- a/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py +++ b/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py @@ -101,10 +101,10 @@ commands: ''' import re -from ansible.module_utils.nxos import get_config, load_config -from ansible.module_utils.nxos import nxos_argument_spec, check_args +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.netcfg import CustomNetworkConfig +from ansible.module_utils.network.common.config import CustomNetworkConfig BOOL_PARAMS = [ 'assoc_vrf', diff --git a/lib/ansible/modules/network/ordnance/ordnance_config.py b/lib/ansible/modules/network/ordnance/ordnance_config.py index 2293f03e19..a123b0d998 100644 --- a/lib/ansible/modules/network/ordnance/ordnance_config.py +++ b/lib/ansible/modules/network/ordnance/ordnance_config.py @@ -188,10 +188,10 @@ import re import time import traceback -from ansible.module_utils.network import NetworkModule, NetworkError -from ansible.module_utils.netcfg import NetworkConfig, dumps -from ansible.module_utils.netcli import Command -from ansible.module_utils.ordnance import get_config +from ansible.module_utils.network.common.network import NetworkModule, NetworkError +from ansible.module_utils.network.common.config import NetworkConfig, dumps +from ansible.module_utils.network.common.parsing import Command +from ansible.module_utils.network.ordnance.ordnance import get_config from ansible.module_utils.six import iteritems from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/ordnance/ordnance_facts.py b/lib/ansible/modules/network/ordnance/ordnance_facts.py index 5d6a015773..eccfc5d7a7 100644 --- a/lib/ansible/modules/network/ordnance/ordnance_facts.py +++ b/lib/ansible/modules/network/ordnance/ordnance_facts.py @@ -96,7 +96,7 @@ ansible_net_interfaces: import re import traceback -from ansible.module_utils.network import NetworkModule +from ansible.module_utils.network.common.network import NetworkModule from ansible.module_utils.six import iteritems from ansible.module_utils.six.moves import zip from ansible.module_utils._text import to_native diff --git a/lib/ansible/modules/network/sros/sros_command.py b/lib/ansible/modules/network/sros/sros_command.py index 46fcb512dc..b647955af6 100644 --- a/lib/ansible/modules/network/sros/sros_command.py +++ b/lib/ansible/modules/network/sros/sros_command.py @@ -136,10 +136,10 @@ failed_conditions: import time from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.network_common import ComplexList +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.utils import ComplexList from ansible.module_utils.six import string_types -from ansible.module_utils.sros import run_commands, sros_argument_spec, check_args +from ansible.module_utils.network.sros.sros import run_commands, sros_argument_spec, check_args def to_lines(stdout): diff --git a/lib/ansible/modules/network/sros/sros_config.py b/lib/ansible/modules/network/sros/sros_config.py index 01fcbd093c..6a59e25398 100644 --- a/lib/ansible/modules/network/sros/sros_config.py +++ b/lib/ansible/modules/network/sros/sros_config.py @@ -225,9 +225,9 @@ backup_path: sample: /playbooks/ansible/backup/sros_config.2016-07-16@22:28:34 """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps -from ansible.module_utils.sros import sros_argument_spec, check_args -from ansible.module_utils.sros import load_config, run_commands, get_config +from ansible.module_utils.network.common.config import NetworkConfig, dumps +from ansible.module_utils.network.sros.sros import sros_argument_spec, check_args +from ansible.module_utils.network.sros.sros import load_config, run_commands, get_config def get_active_config(module): diff --git a/lib/ansible/modules/network/sros/sros_rollback.py b/lib/ansible/modules/network/sros/sros_rollback.py index e4618c827c..e85192d086 100644 --- a/lib/ansible/modules/network/sros/sros_rollback.py +++ b/lib/ansible/modules/network/sros/sros_rollback.py @@ -99,8 +99,8 @@ updates: sample: ['...', '...'] """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig, dumps -from ansible.module_utils.sros import load_config, get_config, sros_argument_spec, check_args +from ansible.module_utils.network.common.config import NetworkConfig, dumps +from ansible.module_utils.network.sros.sros import load_config, get_config, sros_argument_spec, check_args def invoke(name, *args, **kwargs): diff --git a/lib/ansible/modules/network/vyos/vyos_banner.py b/lib/ansible/modules/network/vyos/vyos_banner.py index 552273732e..43197dbb8d 100644 --- a/lib/ansible/modules/network/vyos/vyos_banner.py +++ b/lib/ansible/modules/network/vyos/vyos_banner.py @@ -87,8 +87,8 @@ commands: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.vyos import get_config, load_config -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.vyos.vyos import get_config, load_config +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def spec_to_commands(updates, module): diff --git a/lib/ansible/modules/network/vyos/vyos_command.py b/lib/ansible/modules/network/vyos/vyos_command.py index b998fd59ac..f46532dc49 100644 --- a/lib/ansible/modules/network/vyos/vyos_command.py +++ b/lib/ansible/modules/network/vyos/vyos_command.py @@ -136,11 +136,11 @@ import time from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.pycompat24 import get_exception -from ansible.module_utils.netcli import Conditional -from ansible.module_utils.network_common import ComplexList +from ansible.module_utils.network.common.parsing import Conditional +from ansible.module_utils.network.common.utils import ComplexList from ansible.module_utils.six import string_types -from ansible.module_utils.vyos import run_commands -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.vyos.vyos import run_commands +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def to_lines(stdout): for item in stdout: diff --git a/lib/ansible/modules/network/vyos/vyos_config.py b/lib/ansible/modules/network/vyos/vyos_config.py index 109a194d98..79621858e3 100644 --- a/lib/ansible/modules/network/vyos/vyos_config.py +++ b/lib/ansible/modules/network/vyos/vyos_config.py @@ -132,9 +132,9 @@ backup_path: import re from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.netcfg import NetworkConfig -from ansible.module_utils.vyos import load_config, get_config, run_commands -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.config import NetworkConfig +from ansible.module_utils.network.vyos.vyos import load_config, get_config, run_commands +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec DEFAULT_COMMENT = 'configured by vyos_config' diff --git a/lib/ansible/modules/network/vyos/vyos_facts.py b/lib/ansible/modules/network/vyos/vyos_facts.py index 5a9637c892..1d50f415ea 100644 --- a/lib/ansible/modules/network/vyos/vyos_facts.py +++ b/lib/ansible/modules/network/vyos/vyos_facts.py @@ -100,8 +100,8 @@ import re from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems -from ansible.module_utils.vyos import run_commands -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.vyos.vyos import run_commands +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec class FactsBase(object): diff --git a/lib/ansible/modules/network/vyos/vyos_interface.py b/lib/ansible/modules/network/vyos/vyos_interface.py index 23b00e41ad..0b574b194f 100644 --- a/lib/ansible/modules/network/vyos/vyos_interface.py +++ b/lib/ansible/modules/network/vyos/vyos_interface.py @@ -167,9 +167,9 @@ from time import sleep from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import exec_command -from ansible.module_utils.network_common import conditional, remove_default_spec -from ansible.module_utils.vyos import load_config, get_config -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.utils import conditional, remove_default_spec +from ansible.module_utils.network.vyos.vyos import load_config, get_config +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def search_obj_in_list(name, lst): diff --git a/lib/ansible/modules/network/vyos/vyos_l3_interface.py b/lib/ansible/modules/network/vyos/vyos_l3_interface.py index 8188d22e03..71ee1ba241 100644 --- a/lib/ansible/modules/network/vyos/vyos_l3_interface.py +++ b/lib/ansible/modules/network/vyos/vyos_l3_interface.py @@ -90,9 +90,9 @@ commands: from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.vyos import load_config, run_commands -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.vyos.vyos import load_config, run_commands +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def search_obj_in_list(name, lst): diff --git a/lib/ansible/modules/network/vyos/vyos_linkagg.py b/lib/ansible/modules/network/vyos/vyos_linkagg.py index ed5e391bd6..28b78c2201 100644 --- a/lib/ansible/modules/network/vyos/vyos_linkagg.py +++ b/lib/ansible/modules/network/vyos/vyos_linkagg.py @@ -98,9 +98,9 @@ commands: from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.vyos import load_config, run_commands -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.vyos.vyos import load_config, run_commands +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def search_obj_in_list(name, lst): diff --git a/lib/ansible/modules/network/vyos/vyos_lldp.py b/lib/ansible/modules/network/vyos/vyos_lldp.py index df90a7db33..dee5453c42 100644 --- a/lib/ansible/modules/network/vyos/vyos_lldp.py +++ b/lib/ansible/modules/network/vyos/vyos_lldp.py @@ -62,8 +62,8 @@ commands: - set service lldp """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.vyos import get_config, load_config -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.vyos.vyos import get_config, load_config +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def has_lldp(module): diff --git a/lib/ansible/modules/network/vyos/vyos_lldp_interface.py b/lib/ansible/modules/network/vyos/vyos_lldp_interface.py index 05fc02b489..892505bb23 100644 --- a/lib/ansible/modules/network/vyos/vyos_lldp_interface.py +++ b/lib/ansible/modules/network/vyos/vyos_lldp_interface.py @@ -91,9 +91,9 @@ commands: from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.vyos import get_config, load_config -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.vyos.vyos import get_config, load_config +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def search_obj_in_list(name, lst): diff --git a/lib/ansible/modules/network/vyos/vyos_logging.py b/lib/ansible/modules/network/vyos/vyos_logging.py index d544d1be33..3c338603c9 100644 --- a/lib/ansible/modules/network/vyos/vyos_logging.py +++ b/lib/ansible/modules/network/vyos/vyos_logging.py @@ -108,9 +108,9 @@ import re from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.vyos import get_config, load_config -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.vyos.vyos import get_config, load_config +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def spec_to_commands(updates, module): diff --git a/lib/ansible/modules/network/vyos/vyos_static_route.py b/lib/ansible/modules/network/vyos/vyos_static_route.py index ea71deecdd..15ab350027 100644 --- a/lib/ansible/modules/network/vyos/vyos_static_route.py +++ b/lib/ansible/modules/network/vyos/vyos_static_route.py @@ -106,9 +106,9 @@ import re from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.vyos import get_config, load_config -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.vyos.vyos import get_config, load_config +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def spec_to_commands(updates, module): diff --git a/lib/ansible/modules/network/vyos/vyos_system.py b/lib/ansible/modules/network/vyos/vyos_system.py index 2311750c09..40b520de5a 100644 --- a/lib/ansible/modules/network/vyos/vyos_system.py +++ b/lib/ansible/modules/network/vyos/vyos_system.py @@ -93,8 +93,8 @@ EXAMPLES = """ """ from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.vyos import get_config, load_config -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.vyos.vyos import get_config, load_config +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def spec_key_to_device_key(key): diff --git a/lib/ansible/modules/network/vyos/vyos_user.py b/lib/ansible/modules/network/vyos/vyos_user.py index 8ff4705bc1..6dcdcc2286 100644 --- a/lib/ansible/modules/network/vyos/vyos_user.py +++ b/lib/ansible/modules/network/vyos/vyos_user.py @@ -133,10 +133,10 @@ from copy import deepcopy from functools import partial from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.vyos import get_config, load_config +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.vyos.vyos import get_config, load_config from ansible.module_utils.six import iteritems -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def validate_level(value, module): diff --git a/lib/ansible/modules/network/vyos/vyos_vlan.py b/lib/ansible/modules/network/vyos/vyos_vlan.py index 43aba384a8..278f5a3708 100644 --- a/lib/ansible/modules/network/vyos/vyos_vlan.py +++ b/lib/ansible/modules/network/vyos/vyos_vlan.py @@ -99,9 +99,9 @@ import time from copy import deepcopy from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network_common import remove_default_spec -from ansible.module_utils.vyos import load_config, run_commands -from ansible.module_utils.vyos import vyos_argument_spec +from ansible.module_utils.network.common.utils import remove_default_spec +from ansible.module_utils.network.vyos.vyos import load_config, run_commands +from ansible.module_utils.network.vyos.vyos import vyos_argument_spec def search_obj_in_list(vlan_id, lst): diff --git a/lib/ansible/plugins/action/aireos.py b/lib/ansible/plugins/action/aireos.py index 2cb3b2ae12..12aa550714 100644 --- a/lib/ansible/plugins/action/aireos.py +++ b/lib/ansible/plugins/action/aireos.py @@ -26,8 +26,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.aireos import aireos_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.aireos.aireos import aireos_provider_spec +from ansible.module_utils.network.common.utils import load_provider try: diff --git a/lib/ansible/plugins/action/aruba.py b/lib/ansible/plugins/action/aruba.py index 4a5a530d53..299df9a879 100644 --- a/lib/ansible/plugins/action/aruba.py +++ b/lib/ansible/plugins/action/aruba.py @@ -26,8 +26,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.aruba import aruba_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.aruba.aruba import aruba_provider_spec +from ansible.module_utils.network.common.utils import load_provider try: from __main__ import display diff --git a/lib/ansible/plugins/action/asa.py b/lib/ansible/plugins/action/asa.py index 58c958ceff..323a01779b 100644 --- a/lib/ansible/plugins/action/asa.py +++ b/lib/ansible/plugins/action/asa.py @@ -25,8 +25,8 @@ import json from ansible import constants as C from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.asa import asa_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.asa.asa import asa_provider_spec +from ansible.module_utils.network.common.utils import load_provider from ansible.module_utils.connection import request_builder diff --git a/lib/ansible/plugins/action/bigip.py b/lib/ansible/plugins/action/bigip.py index e95806f0a1..5725193e8a 100644 --- a/lib/ansible/plugins/action/bigip.py +++ b/lib/ansible/plugins/action/bigip.py @@ -26,7 +26,7 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.module_utils.f5_utils import F5_COMMON_ARGS -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.common.utils import load_provider from ansible.plugins.action.normal import ActionModule as _ActionModule try: diff --git a/lib/ansible/plugins/action/ce.py b/lib/ansible/plugins/action/ce.py index 76e99b2c26..1d8889786d 100644 --- a/lib/ansible/plugins/action/ce.py +++ b/lib/ansible/plugins/action/ce.py @@ -26,8 +26,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.ce import ce_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.cloudengine.ce import ce_provider_spec +from ansible.module_utils.network.common.utils import load_provider try: diff --git a/lib/ansible/plugins/action/dellos10.py b/lib/ansible/plugins/action/dellos10.py index 910584ecb1..35f001f000 100644 --- a/lib/ansible/plugins/action/dellos10.py +++ b/lib/ansible/plugins/action/dellos10.py @@ -28,8 +28,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.dellos10 import dellos10_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.dellos10.dellos10 import dellos10_provider_spec +from ansible.module_utils.network.common.utils import load_provider try: from __main__ import display diff --git a/lib/ansible/plugins/action/dellos6.py b/lib/ansible/plugins/action/dellos6.py index 948e05e971..e3da8ef35f 100644 --- a/lib/ansible/plugins/action/dellos6.py +++ b/lib/ansible/plugins/action/dellos6.py @@ -25,8 +25,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.dellos6 import dellos6_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.dellos6.dellos6 import dellos6_provider_spec +from ansible.module_utils.network.common.utils import load_provider try: from __main__ import display diff --git a/lib/ansible/plugins/action/dellos9.py b/lib/ansible/plugins/action/dellos9.py index ef62941112..f06dc7023f 100644 --- a/lib/ansible/plugins/action/dellos9.py +++ b/lib/ansible/plugins/action/dellos9.py @@ -28,8 +28,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.dellos9 import dellos9_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.dellos9.dellos9 import dellos9_provider_spec +from ansible.module_utils.network.common.utils import load_provider try: from __main__ import display diff --git a/lib/ansible/plugins/action/enos.py b/lib/ansible/plugins/action/enos.py index 5753505b4f..1f1693cd7b 100644 --- a/lib/ansible/plugins/action/enos.py +++ b/lib/ansible/plugins/action/enos.py @@ -39,8 +39,8 @@ import copy from ansible import constants as C from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.enos import enos_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.enos.enos import enos_provider_spec +from ansible.module_utils.network.common.utils import load_provider from ansible.module_utils.connection import Connection from ansible.module_utils._text import to_text diff --git a/lib/ansible/plugins/action/eos.py b/lib/ansible/plugins/action/eos.py index 7a8db31ca7..af33036036 100644 --- a/lib/ansible/plugins/action/eos.py +++ b/lib/ansible/plugins/action/eos.py @@ -25,9 +25,9 @@ import copy from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection -from ansible.module_utils.eos import eos_provider_spec +from ansible.module_utils.network.eos.eos import eos_provider_spec from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.common.utils import load_provider try: from __main__ import display diff --git a/lib/ansible/plugins/action/ios.py b/lib/ansible/plugins/action/ios.py index 1ccf20628c..8486e9c9c6 100644 --- a/lib/ansible/plugins/action/ios.py +++ b/lib/ansible/plugins/action/ios.py @@ -26,8 +26,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.network_common import load_provider -from ansible.module_utils.ios import ios_provider_spec +from ansible.module_utils.network.common.utils import load_provider +from ansible.module_utils.network.ios.ios import ios_provider_spec try: from __main__ import display diff --git a/lib/ansible/plugins/action/iosxr.py b/lib/ansible/plugins/action/iosxr.py index bdd1919840..77c865e922 100644 --- a/lib/ansible/plugins/action/iosxr.py +++ b/lib/ansible/plugins/action/iosxr.py @@ -25,9 +25,9 @@ import copy from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection -from ansible.module_utils.iosxr import iosxr_provider_spec +from ansible.module_utils.network.iosxr.iosxr import iosxr_provider_spec from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.common.utils import load_provider try: from __main__ import display diff --git a/lib/ansible/plugins/action/ironware.py b/lib/ansible/plugins/action/ironware.py index 74f626c670..3a8029d8d9 100644 --- a/lib/ansible/plugins/action/ironware.py +++ b/lib/ansible/plugins/action/ironware.py @@ -27,8 +27,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.network_common import load_provider -from ansible.module_utils.ironware import ironware_provider_spec +from ansible.module_utils.network.common.utils import load_provider +from ansible.module_utils.network.ironware.ironware import ironware_provider_spec try: from __main__ import display diff --git a/lib/ansible/plugins/action/junos.py b/lib/ansible/plugins/action/junos.py index bfc667678e..63c1568054 100644 --- a/lib/ansible/plugins/action/junos.py +++ b/lib/ansible/plugins/action/junos.py @@ -25,8 +25,8 @@ import copy from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection -from ansible.module_utils.network_common import load_provider -from ansible.module_utils.junos import junos_provider_spec +from ansible.module_utils.network.common.utils import load_provider +from ansible.module_utils.network.junos.junos import junos_provider_spec from ansible.plugins.loader import connection_loader, module_loader from ansible.plugins.action.normal import ActionModule as _ActionModule diff --git a/lib/ansible/plugins/action/mlnxos.py b/lib/ansible/plugins/action/mlnxos.py index da4b800ea4..61db00292e 100644 --- a/lib/ansible/plugins/action/mlnxos.py +++ b/lib/ansible/plugins/action/mlnxos.py @@ -23,11 +23,11 @@ import copy import sys from ansible import constants as C -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.common.utils import load_provider from ansible.plugins.action.normal import ActionModule as _ActionModule from ansible.utils.display import Display -from ansible.module_utils.mlnxos import mlnxos_provider_spec +from ansible.module_utils.network.mlnxos.mlnxos import mlnxos_provider_spec try: from __main__ import display diff --git a/lib/ansible/plugins/action/net_base.py b/lib/ansible/plugins/action/net_base.py index 270983407d..e5c1804dc9 100644 --- a/lib/ansible/plugins/action/net_base.py +++ b/lib/ansible/plugins/action/net_base.py @@ -25,7 +25,7 @@ from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.errors import AnsibleError from ansible.plugins.action import ActionBase -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.common.utils import load_provider from imp import find_module, load_module @@ -44,13 +44,13 @@ class ActionModule(ActionBase): play_context.network_os = self._get_network_os(task_vars) # we should be able to stream line this a bit by creating a common - # provider argument spec in module_utils/network_common.py or another + # provider argument spec in module_utils/network/common/utils.py or another # option is that there isn't a need to push provider into the module # since the connection is started in the action handler. f, p, d = find_module('ansible') f2, p2, d2 = find_module('module_utils', [p]) f3, p3, d3 = find_module(play_context.network_os, [p2]) - module = load_module('ansible.module_utils.' + play_context.network_os, f3, p3, d3) + module = load_module('ansible.module_utils.{0}.{1}'.format(play_context.network_os, play_context.network_os), f3, p3, d3) if play_context.connection == 'local': diff --git a/lib/ansible/plugins/action/nxos.py b/lib/ansible/plugins/action/nxos.py index bda32c66fc..b725f03eaa 100644 --- a/lib/ansible/plugins/action/nxos.py +++ b/lib/ansible/plugins/action/nxos.py @@ -26,8 +26,8 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.network_common import load_provider -from ansible.module_utils.nxos import nxos_provider_spec +from ansible.module_utils.network.common.utils import load_provider +from ansible.module_utils.network.nxos.nxos import nxos_provider_spec try: from __main__ import display diff --git a/lib/ansible/plugins/action/sros.py b/lib/ansible/plugins/action/sros.py index 015f5ee42a..8a1e745d98 100644 --- a/lib/ansible/plugins/action/sros.py +++ b/lib/ansible/plugins/action/sros.py @@ -24,8 +24,8 @@ import copy from ansible import constants as C from ansible.plugins.action.normal import ActionModule as _ActionModule -from ansible.module_utils.sros import sros_provider_spec -from ansible.module_utils.network_common import load_provider +from ansible.module_utils.network.sros.sros import sros_provider_spec +from ansible.module_utils.network.common.utils import load_provider try: from __main__ import display diff --git a/lib/ansible/plugins/action/vyos.py b/lib/ansible/plugins/action/vyos.py index e14bc92e15..d64456c755 100644 --- a/lib/ansible/plugins/action/vyos.py +++ b/lib/ansible/plugins/action/vyos.py @@ -26,8 +26,8 @@ from ansible import constants as C from ansible.plugins.action.normal import ActionModule as _ActionModule from ansible.module_utils._text import to_text from ansible.module_utils.connection import Connection -from ansible.module_utils.network_common import load_provider -from ansible.module_utils.vyos import vyos_provider_spec +from ansible.module_utils.network.common.utils import load_provider +from ansible.module_utils.network.vyos.vyos import vyos_provider_spec try: from __main__ import display diff --git a/lib/ansible/plugins/cliconf/aireos.py b/lib/ansible/plugins/cliconf/aireos.py index ad7511bd8d..46df3b33bb 100644 --- a/lib/ansible/plugins/cliconf/aireos.py +++ b/lib/ansible/plugins/cliconf/aireos.py @@ -25,7 +25,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/aruba.py b/lib/ansible/plugins/cliconf/aruba.py index 6229d1482a..89fe8f4901 100644 --- a/lib/ansible/plugins/cliconf/aruba.py +++ b/lib/ansible/plugins/cliconf/aruba.py @@ -25,7 +25,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/asa.py b/lib/ansible/plugins/cliconf/asa.py index 5c49e31059..e8de50b931 100644 --- a/lib/ansible/plugins/cliconf/asa.py +++ b/lib/ansible/plugins/cliconf/asa.py @@ -25,7 +25,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/enos.py b/lib/ansible/plugins/cliconf/enos.py index 751052e3e0..ebfdf52726 100644 --- a/lib/ansible/plugins/cliconf/enos.py +++ b/lib/ansible/plugins/cliconf/enos.py @@ -40,7 +40,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/eos.py b/lib/ansible/plugins/cliconf/eos.py index 0dfb3d35b8..5c91e67381 100644 --- a/lib/ansible/plugins/cliconf/eos.py +++ b/lib/ansible/plugins/cliconf/eos.py @@ -23,7 +23,7 @@ import json from itertools import chain -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/ios.py b/lib/ansible/plugins/cliconf/ios.py index 578e8f405c..9f53126f2b 100644 --- a/lib/ansible/plugins/cliconf/ios.py +++ b/lib/ansible/plugins/cliconf/ios.py @@ -25,7 +25,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/iosxr.py b/lib/ansible/plugins/cliconf/iosxr.py index 2d487bb239..f4196867ed 100644 --- a/lib/ansible/plugins/cliconf/iosxr.py +++ b/lib/ansible/plugins/cliconf/iosxr.py @@ -25,7 +25,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase diff --git a/lib/ansible/plugins/cliconf/ironware.py b/lib/ansible/plugins/cliconf/ironware.py index 4506a64849..66c52e2572 100644 --- a/lib/ansible/plugins/cliconf/ironware.py +++ b/lib/ansible/plugins/cliconf/ironware.py @@ -25,7 +25,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/junos.py b/lib/ansible/plugins/cliconf/junos.py index 5a5e38a754..2b1c581f2e 100644 --- a/lib/ansible/plugins/cliconf/junos.py +++ b/lib/ansible/plugins/cliconf/junos.py @@ -24,7 +24,7 @@ import re from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/mlnxos.py b/lib/ansible/plugins/cliconf/mlnxos.py index 36680709da..b487254db4 100644 --- a/lib/ansible/plugins/cliconf/mlnxos.py +++ b/lib/ansible/plugins/cliconf/mlnxos.py @@ -24,7 +24,7 @@ import json from itertools import chain from ansible.module_utils._text import to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/cliconf/nxos.py b/lib/ansible/plugins/cliconf/nxos.py index abab932f63..60372126bc 100644 --- a/lib/ansible/plugins/cliconf/nxos.py +++ b/lib/ansible/plugins/cliconf/nxos.py @@ -23,7 +23,7 @@ import json from itertools import chain -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase diff --git a/lib/ansible/plugins/cliconf/vyos.py b/lib/ansible/plugins/cliconf/vyos.py index 7feacad36e..84c137f9cf 100644 --- a/lib/ansible/plugins/cliconf/vyos.py +++ b/lib/ansible/plugins/cliconf/vyos.py @@ -25,7 +25,7 @@ import json from itertools import chain from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.network_common import to_list +from ansible.module_utils.network.common.utils import to_list from ansible.plugins.cliconf import CliconfBase, enable_mode diff --git a/lib/ansible/plugins/filter/network.py b/lib/ansible/plugins/filter/network.py index a8f998b5da..2a794a7336 100644 --- a/lib/ansible/plugins/filter/network.py +++ b/lib/ansible/plugins/filter/network.py @@ -27,7 +27,7 @@ import traceback from collections import Mapping from xml.etree.ElementTree import fromstring -from ansible.module_utils.network_common import Template +from ansible.module_utils.network.common.utils import Template from ansible.module_utils.six import iteritems, string_types from ansible.errors import AnsibleError diff --git a/test/sanity/validate-modules/module_args.py b/test/sanity/validate-modules/module_args.py index 2d8a6909b5..d25d7b906d 100644 --- a/test/sanity/validate-modules/module_args.py +++ b/test/sanity/validate-modules/module_args.py @@ -27,11 +27,11 @@ import mock MODULE_CLASSES = [ 'ansible.module_utils.basic.AnsibleModule', 'ansible.module_utils.vca.VcaAnsibleModule', - 'ansible.module_utils.nxos.NetworkModule', - 'ansible.module_utils.eos.NetworkModule', - 'ansible.module_utils.ios.NetworkModule', - 'ansible.module_utils.iosxr.NetworkModule', - 'ansible.module_utils.junos.NetworkModule', + 'ansible.module_utils.network.nxos.nxos.NetworkModule', + 'ansible.module_utils.network.eos.eos.NetworkModule', + 'ansible.module_utils.network.ios.ios.NetworkModule', + 'ansible.module_utils.network.iosxr.iosxr.NetworkModule', + 'ansible.module_utils.network.junos.junos.NetworkModule', 'ansible.module_utils.openswitch.NetworkModule', ] diff --git a/test/units/module_utils/network/__init__.py b/test/units/module_utils/network/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/units/module_utils/network/aci/__init__.py b/test/units/module_utils/network/aci/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/units/module_utils/test_aci.py b/test/units/module_utils/network/aci/test_aci.py similarity index 99% rename from test/units/module_utils/test_aci.py rename to test/units/module_utils/network/aci/test_aci.py index f822c743a8..5cfff81aeb 100644 --- a/test/units/module_utils/test_aci.py +++ b/test/units/module_utils/network/aci/test_aci.py @@ -21,7 +21,7 @@ import sys from ansible.compat.tests import unittest -from ansible.module_utils.aci import aci_response_json, aci_response_xml +from ansible.module_utils.network.aci.aci import aci_response_json, aci_response_xml from ansible.module_utils.six import PY2, PY3 from ansible.module_utils._text import to_native diff --git a/test/units/module_utils/network/common/__init__.py b/test/units/module_utils/network/common/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/units/module_utils/test_network_common.py b/test/units/module_utils/network/common/test_utils.py similarity index 95% rename from test/units/module_utils/test_network_common.py rename to test/units/module_utils/network/common/test_utils.py index 00facbba44..734d81ac79 100644 --- a/test/units/module_utils/test_network_common.py +++ b/test/units/module_utils/network/common/test_utils.py @@ -23,9 +23,9 @@ __metaclass__ = type from ansible.compat.tests import unittest -from ansible.module_utils.network_common import to_list, sort_list -from ansible.module_utils.network_common import dict_diff, dict_merge -from ansible.module_utils.network_common import conditional, Template +from ansible.module_utils.network.common.utils import to_list, sort_list +from ansible.module_utils.network.common.utils import dict_diff, dict_merge +from ansible.module_utils.network.common.utils import conditional, Template class TestModuleUtilsNetworkCommon(unittest.TestCase): diff --git a/test/units/module_utils/network/nso/__init__.py b/test/units/module_utils/network/nso/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/units/module_utils/test_nso.py b/test/units/module_utils/network/nso/test_nso.py similarity index 97% rename from test/units/module_utils/test_nso.py rename to test/units/module_utils/network/nso/test_nso.py index 7b7c74a6f4..bccc9185a9 100644 --- a/test/units/module_utils/test_nso.py +++ b/test/units/module_utils/network/nso/test_nso.py @@ -22,7 +22,7 @@ import json from ansible.compat.tests.mock import patch from ansible.compat.tests import unittest -from ansible.module_utils import nso +from ansible.module_utils.network.nso import nso MODULE_PREFIX_MAP = ''' @@ -195,7 +195,7 @@ def get_schema_response(path): class TestValueBuilder(unittest.TestCase): - @patch('ansible.module_utils.nso.open_url') + @patch('ansible.module_utils.network.nso.nso.open_url') def test_identityref_leaf(self, open_url_mock): calls = [ MockResponse('new_trans', {}, 200, '{"result": {"th": 1}}'), @@ -219,7 +219,7 @@ class TestValueBuilder(unittest.TestCase): self.assertEqual(0, len(calls)) - @patch('ansible.module_utils.nso.open_url') + @patch('ansible.module_utils.network.nso.nso.open_url') def test_identityref_key(self, open_url_mock): calls = [ MockResponse('new_trans', {}, 200, '{"result": {"th": 1}}'), diff --git a/test/units/modules/network/junos/test_junos_command.py b/test/units/modules/network/junos/test_junos_command.py index 3972cfa621..d1e3232227 100644 --- a/test/units/modules/network/junos/test_junos_command.py +++ b/test/units/modules/network/junos/test_junos_command.py @@ -41,16 +41,16 @@ class TestJunosCommandModule(TestJunosModule): def setUp(self): super(TestJunosCommandModule, self).setUp() - self.mock_conn = patch('ansible.module_utils.junos.Connection') + self.mock_conn = patch('ansible.module_utils.network.junos.junos.Connection') self.conn = self.mock_conn.start() - self.mock_netconf = patch('ansible.module_utils.junos.NetconfConnection') + self.mock_netconf = patch('ansible.module_utils.network.junos.junos.NetconfConnection') self.netconf_conn = self.mock_netconf.start() self.mock_exec_rpc = patch('ansible.modules.network.junos.junos_command.exec_rpc') self.exec_rpc = self.mock_exec_rpc.start() - self.mock_netconf_rpc = patch('ansible.module_utils.netconf.NetconfConnection') + self.mock_netconf_rpc = patch('ansible.module_utils.network.common.netconf.NetconfConnection') self.netconf_rpc = self.mock_netconf_rpc.start() self.mock_get_connection = patch('ansible.modules.network.junos.junos_command.get_connection') diff --git a/test/units/modules/network/junos/test_junos_config.py b/test/units/modules/network/junos/test_junos_config.py index a39a060a7e..7d1a751d8f 100644 --- a/test/units/modules/network/junos/test_junos_config.py +++ b/test/units/modules/network/junos/test_junos_config.py @@ -42,10 +42,10 @@ class TestJunosConfigModule(TestJunosModule): self.mock_load_configuration = patch('ansible.modules.network.junos.junos_config.load_configuration') self.load_configuration = self.mock_load_configuration.start() - self.mock_lock_configuration = patch('ansible.module_utils.junos.lock_configuration') + self.mock_lock_configuration = patch('ansible.module_utils.network.junos.junos.lock_configuration') self.lock_configuration = self.mock_lock_configuration.start() - self.mock_unlock_configuration = patch('ansible.module_utils.junos.unlock_configuration') + self.mock_unlock_configuration = patch('ansible.module_utils.network.junos.junos.unlock_configuration') self.unlock_configuration = self.mock_unlock_configuration.start() self.mock_commit_configuration = patch('ansible.modules.network.junos.junos_config.commit_configuration') @@ -57,13 +57,13 @@ class TestJunosConfigModule(TestJunosModule): self.mock_conn = patch('ansible.module_utils.connection.Connection') self.conn = self.mock_conn.start() - self.mock_netconf = patch('ansible.module_utils.junos.NetconfConnection') + self.mock_netconf = patch('ansible.module_utils.network.junos.junos.NetconfConnection') self.netconf_conn = self.mock_netconf.start() self.mock_exec_rpc = patch('ansible.modules.network.junos.junos_config.exec_rpc') self.exec_rpc = self.mock_exec_rpc.start() - self.mock_netconf_rpc = patch('ansible.module_utils.netconf.NetconfConnection') + self.mock_netconf_rpc = patch('ansible.module_utils.network.common.netconf.NetconfConnection') self.netconf_rpc = self.mock_netconf_rpc.start() def tearDown(self): diff --git a/test/units/modules/network/junos/test_junos_facts.py b/test/units/modules/network/junos/test_junos_facts.py index 6db7f45956..512ad18a37 100644 --- a/test/units/modules/network/junos/test_junos_facts.py +++ b/test/units/modules/network/junos/test_junos_facts.py @@ -52,16 +52,16 @@ class TestJunosCommandModule(TestJunosModule): self.mock_conn = patch('ansible.module_utils.connection.Connection') self.conn = self.mock_conn.start() - self.mock_netconf = patch('ansible.module_utils.junos.NetconfConnection') + self.mock_netconf = patch('ansible.module_utils.network.junos.junos.NetconfConnection') self.netconf_conn = self.mock_netconf.start() self.mock_exec_rpc = patch('ansible.modules.network.junos.junos_facts.exec_rpc') self.exec_rpc = self.mock_exec_rpc.start() - self.mock_netconf_rpc = patch('ansible.module_utils.netconf.NetconfConnection') + self.mock_netconf_rpc = patch('ansible.module_utils.network.common.netconf.NetconfConnection') self.netconf_rpc = self.mock_netconf_rpc.start() - self.mock_get_capabilities = patch('ansible.module_utils.junos.get_capabilities') + self.mock_get_capabilities = patch('ansible.module_utils.network.junos.junos.get_capabilities') self.get_capabilities = self.mock_get_capabilities.start() self.get_capabilities.return_value = {'network_api': 'netconf'} diff --git a/test/units/modules/network/junos/test_junos_netconf.py b/test/units/modules/network/junos/test_junos_netconf.py index b020628190..405a44b598 100644 --- a/test/units/modules/network/junos/test_junos_netconf.py +++ b/test/units/modules/network/junos/test_junos_netconf.py @@ -32,10 +32,10 @@ class TestJunosCommandModule(TestJunosModule): def setUp(self): super(TestJunosCommandModule, self).setUp() - self.mock_lock_configuration = patch('ansible.module_utils.junos.lock_configuration') + self.mock_lock_configuration = patch('ansible.module_utils.network.junos.junos.lock_configuration') self.lock_configuration = self.mock_lock_configuration.start() - self.mock_unlock_configuration = patch('ansible.module_utils.junos.unlock_configuration') + self.mock_unlock_configuration = patch('ansible.module_utils.network.junos.junos.unlock_configuration') self.unlock_configuration = self.mock_unlock_configuration.start() self.mock_commit_configuration = patch('ansible.modules.network.junos.junos_netconf.commit_configuration') @@ -44,13 +44,13 @@ class TestJunosCommandModule(TestJunosModule): self.mock_conn = patch('ansible.module_utils.connection.Connection') self.conn = self.mock_conn.start() - self.mock_netconf = patch('ansible.module_utils.junos.NetconfConnection') + self.mock_netconf = patch('ansible.module_utils.network.junos.junos.NetconfConnection') self.netconf_conn = self.mock_netconf.start() - self.mock_netconf_rpc = patch('ansible.module_utils.netconf.NetconfConnection') + self.mock_netconf_rpc = patch('ansible.module_utils.network.common.netconf.NetconfConnection') self.netconf_rpc = self.mock_netconf_rpc.start() - self.mock_get_capabilities = patch('ansible.module_utils.junos.get_capabilities') + self.mock_get_capabilities = patch('ansible.module_utils.network.junos.junos.get_capabilities') self.get_capabilities = self.mock_get_capabilities.start() self.get_capabilities.return_value = {'network_api': 'netconf'} diff --git a/test/units/modules/network/junos/test_junos_rpc.py b/test/units/modules/network/junos/test_junos_rpc.py index 40f2c42de8..5887f7f817 100644 --- a/test/units/modules/network/junos/test_junos_rpc.py +++ b/test/units/modules/network/junos/test_junos_rpc.py @@ -49,10 +49,10 @@ class TestJunosCommandModule(TestJunosModule): self.mock_conn = patch('ansible.module_utils.connection.Connection') self.conn = self.mock_conn.start() - self.mock_netconf = patch('ansible.module_utils.junos.NetconfConnection') + self.mock_netconf = patch('ansible.module_utils.network.junos.junos.NetconfConnection') self.netconf_conn = self.mock_netconf.start() - self.mock_netconf_rpc = patch('ansible.module_utils.netconf.NetconfConnection') + self.mock_netconf_rpc = patch('ansible.module_utils.network.common.netconf.NetconfConnection') self.netconf_rpc = self.mock_netconf_rpc.start() self.mock_exec_rpc = patch('ansible.modules.network.junos.junos_rpc.exec_rpc') diff --git a/test/units/modules/network/netscaler/test_netscaler_module_utils.py b/test/units/modules/network/netscaler/test_netscaler_module_utils.py index 2a2d62113b..0883c6490a 100644 --- a/test/units/modules/network/netscaler/test_netscaler_module_utils.py +++ b/test/units/modules/network/netscaler/test_netscaler_module_utils.py @@ -21,7 +21,7 @@ from ansible.compat.tests import unittest from ansible.compat.tests.mock import Mock -from ansible.module_utils.netscaler import ConfigProxy, get_immutables_intersection, ensure_feature_is_enabled, log, loglines +from ansible.module_utils.network.netscaler.netscaler import ConfigProxy, get_immutables_intersection, ensure_feature_is_enabled, log, loglines class TestNetscalerConfigProxy(unittest.TestCase): diff --git a/test/units/modules/network/nso/test_nso_config.py b/test/units/modules/network/nso/test_nso_config.py index b0eb6d66f9..6795769ecd 100644 --- a/test/units/modules/network/nso/test_nso_config.py +++ b/test/units/modules/network/nso/test_nso_config.py @@ -30,11 +30,11 @@ from .nso_module import MockResponse class TestNsoConfig(nso_module.TestNsoModule): module = nso_config - @patch('ansible.module_utils.nso.open_url') + @patch('ansible.module_utils.network.nso.nso.open_url') def test_nso_config_invalid_version_short(self, open_url_mock): self._test_invalid_version(open_url_mock, '4.4') - @patch('ansible.module_utils.nso.open_url') + @patch('ansible.module_utils.network.nso.nso.open_url') def test_nso_config_invalid_version_long(self, open_url_mock): self._test_invalid_version(open_url_mock, '4.4.2') @@ -56,11 +56,11 @@ class TestNsoConfig(nso_module.TestNsoModule): self.assertEqual(0, len(calls)) - @patch('ansible.module_utils.nso.open_url') + @patch('ansible.module_utils.network.nso.nso.open_url') def test_nso_config_valid_version_short(self, open_url_mock): self._test_valid_version(open_url_mock, '4.5') - @patch('ansible.module_utils.nso.open_url') + @patch('ansible.module_utils.network.nso.nso.open_url') def test_nso_config_valid_version_long(self, open_url_mock): self._test_valid_version(open_url_mock, '4.4.3') @@ -84,7 +84,7 @@ class TestNsoConfig(nso_module.TestNsoModule): self.assertEqual(0, len(calls)) - @patch('ansible.module_utils.nso.open_url') + @patch('ansible.module_utils.network.nso.nso.open_url') def test_nso_config_changed(self, open_url_mock): vpn_schema = nso_module.load_fixture('l3vpn_schema.json') l3vpn_schema = nso_module.load_fixture('l3vpn_l3vpn_schema.json')