revert some test changes

ansible-collections · Dec 16, 2024 · 48ed5e7 · 48ed5e7
1 parent 337d9ab
commit 48ed5e7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 333 deletions.
diff --git a/plugins/inventory_utils/base.py b/plugins/inventory_utils/base.py
@@ -11,8 +11,8 @@
 from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode
 from ansible.module_utils.common.text.converters import to_native
 
-from ansible_collections.vmware.vmware.plugins.module_utils.clients.pyvmomi import PyvmomiClient
-from ansible_collections.vmware.vmware.plugins.module_utils.clients.rest import VmwareRestClient
+from ansible_collections.vmware.vmware.plugins.module_utils.clients._pyvmomi import PyvmomiClient
+from ansible_collections.vmware.vmware.plugins.module_utils.clients._rest import VmwareRestClient
 
 
 class VmwareInventoryBase(BaseInventoryPlugin, Constructable, Cacheable):

diff --git a/plugins/module_utils/base.py b/plugins/module_utils/base.py
diff --git a/plugins/module_utils/clients/errors.py → plugins/module_utils/clients/_errors.py b/plugins/module_utils/clients/errors.py → plugins/module_utils/clients/_errors.py
diff --git a/plugins/module_utils/clients/pyvmomi.py → plugins/module_utils/clients/_pyvmomi.py b/plugins/module_utils/clients/pyvmomi.py → plugins/module_utils/clients/_pyvmomi.py
@@ -24,7 +24,7 @@
 except ImportError:
     PYVMOMI_IMP_ERR = traceback.format_exc()
 
-from ansible_collections.vmware.vmware.plugins.module_utils.clients.errors import (
+from ansible_collections.vmware.vmware.plugins.module_utils.clients._errors import (
     ApiAccessError,
     MissingLibError
 )

diff --git a/plugins/module_utils/clients/rest.py → plugins/module_utils/clients/_rest.py b/plugins/module_utils/clients/rest.py → plugins/module_utils/clients/_rest.py
@@ -37,7 +37,7 @@
         HAS_URLLIB3 = False
 
 from ansible.module_utils._text import to_native
-from ansible_collections.vmware.vmware.plugins.module_utils.clients.errors import (
+from ansible_collections.vmware.vmware.plugins.module_utils.clients._errors import (
     ApiAccessError,
     MissingLibError
 )

diff --git a/plugins/modules/cluster_info.py b/plugins/modules/cluster_info.py
@@ -156,10 +156,7 @@
 except ImportError:
     pass
 from ansible.module_utils.basic import AnsibleModule
-# from ansible_collections.vmware.vmware.plugins.module_utils._vmware import (
-#     PyVmomi
-# )
-from ansible_collections.vmware.vmware.plugins.module_utils.base import (
+from ansible_collections.vmware.vmware.plugins.module_utils._vmware import (
     PyVmomi
 )
 from ansible_collections.vmware.vmware.plugins.module_utils._vmware_argument_spec import (