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

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

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

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

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

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

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 = """
     <filter type="subtree">

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

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

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

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

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

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

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
 

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

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 = """
 <action>

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

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 = """
 <filter type="subtree">

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

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

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

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

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
 

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

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

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

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

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

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

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 = """
     <filter type="subtree">

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

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 = """
 <filter type="subtree">

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

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 = """
 <filter type="subtree">

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 = """
 <filter type="subtree">

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():

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

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

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

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

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 = """
 <filter type="subtree">

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 = """
 <filter type="subtree">

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 = """
     <filter type="subtree">

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 = """
     <filter type="subtree">

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

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

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 = """
 <filter type="subtree">

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

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

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

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

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

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

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

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 = """
 <filter type="subtree">

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

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 = """
 <filter type="subtree">

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 = """
 <config>

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

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 = """
 <filter type="subtree">

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 = """
 <filter type="subtree">

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

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

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

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

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 = """
 <filter type="subtree">

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 = """
     <filter type="subtree">