Refactor common network shared and platform utils code into package (#33452)

* Refactor common network shared and platform specific code into package (part-1)

As per proposal #76 refactor common network shared and platform specific
code into sub-package.
https://github.com/ansible/proposals/issues/76

*  ansible.module_utils.network.common - command shared functions
*  ansible.module_utils.network.{{ platform }} - where platform is platform specific shared functions

*  Fix review comments

* Fix review comments

.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:
+    labels: networking
-    - aci
+  $module_utils/network/aireos:
-    - networking
-  $module_utils/aireos.py:
     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:
+  $module_utils/network/aruba:
-    maintainers: $team_networking
-    labels: networking
-  $module_utils/aruba.py:
     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:
+    labels: networking
-    - avi
+  $module_utils/network/bigswitch:
-    - networking
-  $module_utils/bigswitch_utils.py:
     maintainers: jayakody tedelhourani vuile
     labels: networking
-  $module_utils/cisco_usc.py:
+  $module_utils/network/cloudengine:
-    maintainers: ragupta-git
-    labels: networking
-  $module_utils/cloudengine.py:
     maintainers: QijunPan
     labels: networking
   $module_utils/cloudstack.py:
     maintainers: resmo
     labels: cloudstack
-  $module_utils/cnos_devicerules.py:
+  $module_utils/network/cnos:
-    maintainers: dkasberg amuraleedhar
-    labels: networking
-  $module_utils/cnos_errorcodes.py:
-    maintainers: dkasberg amuraleedhar
-    labels: networking
-  $module_utils/cnos.py:
     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:
+  $module_utils/network/ironware:
-    maintainers: $team_networking
-    labels: networking
-  $module_utils/iosxr.py:
-    maintainers: $team_networking
-    labels: networking
-  $module_utils/ironware.py:
     maintainers: paulquack
     labels: networking
-  $module_utils/junos.py:
+  $module_utils/network/mlnxos:
-    maintainers: $team_networking
+    maintainers: samerd
     labels: networking
   $module_utils/manageiq.py:
     maintainers: $team_manageiq
-  $module_utils/netcfg.py:
+  $module_utils/network/netscaler:
-    maintainers: $team_networking
+    maintainers: $team_netscaler
     labels: networking
-  $module_utils/netconf.py:
+  $module_utils/network/nso:
-    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:
     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:

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
+- network/a10/a10.py - Utilities used by the a10_server module to manage A10 Networks devices.
-- netcmd.py - Defines commands and comparison operators for use in networking modules
+- network/aci/aci.py - Definitions and helper functions for modules that manage Cisco ACI Fabrics.
-- netscaler.py - Utilities specifically for the netscaler network modules.
+- network/aireos/aireos.py - Definitions and helper functions for modules that manage Cisco WLC devices.
-- network.py - Functions for running commands on networking devices
+- network/aos/aos.py - Module support utilities for managing Apstra AOS Server.
-- nso.py - Utilities for modules that work with Cisco NSO.
+- network/aruba/aruba.py - Helper functions for modules working with Aruba networking devices.
-- nxos.py - Contains definitions and helper functions specific to Cisco NXOS 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

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
 

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 = {}

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)
 
 """

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 = {}

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
 

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

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']
 

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
 

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 = {}
 

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 = {}
 

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 = {}
 

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
 

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
 

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 = {}

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 = {}

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

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:

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

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

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.utils import to_list, ComplexList
-from ansible.module_utils.network_common import to_list, ComplexList
 from ansible.module_utils.connection import exec_command
 
 _DEVICE_CONFIGS = {}

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 = {}

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,
+from ansible.module_utils.network.a10.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, axapi_get_port_protocol,
-                                      axapi_get_port_protocol, axapi_enabled_disabled, AXAPI_PORT_PROTOCOLS)
+                                                  axapi_enabled_disabled, AXAPI_PORT_PROTOCOLS)
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.urls import url_argument_spec
 

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.network.a10.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_PORT_PROTOCOLS
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.urls import url_argument_spec
 

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,
+from ansible.module_utils.network.a10.a10 import (axapi_call, a10_argument_spec, axapi_authenticate, axapi_failure, axapi_enabled_disabled)
-                                      axapi_enabled_disabled)
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.urls import url_argument_spec
 

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

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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

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
 
 

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
 
 

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')

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
 
 

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
 
 

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
 
 

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-"}}

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-")

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
 
 

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']

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
 
 

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

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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

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
 
 

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
 
 

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
 
 

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')

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
 
 

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