REST stuff and removing old docs fragments

plugins/module_utils/vmware_rest_client.py

@@ -54,7 +54,7 @@
     except ImportError:
         HAS_URLLIB3 = False
 
-from ansible.module_utils.basic import env_fallback, missing_required_lib
+from ansible.module_utils.basic import missing_required_lib
 from ansible.module_utils._text import to_native
 
 
@@ -102,37 +102,6 @@ def check_required_library(self):
                                          url='https://code.vmware.com/web/sdk/7.0/vsphere-automation-python'),
                 exception=VSPHERE_IMP_ERR)
 
-    @staticmethod
-    def vmware_client_argument_spec():
-        return dict(
-            hostname=dict(type='str',
-                          fallback=(env_fallback, ['VMWARE_HOST'])),
-            username=dict(type='str',
-                          fallback=(env_fallback, ['VMWARE_USER']),
-                          aliases=['user', 'admin']),
-            password=dict(type='str',
-                          fallback=(env_fallback, ['VMWARE_PASSWORD']),
-                          aliases=['pass', 'pwd'],
-                          no_log=True),
-            port=dict(type='int',
-                      default=443,
-                      fallback=(env_fallback, ['VMWARE_PORT'])),
-            protocol=dict(type='str',
-                          default='https',
-                          choices=['https', 'http']),
-            validate_certs=dict(type='bool',
-                                fallback=(env_fallback, ['VMWARE_VALIDATE_CERTS']),
-                                default=True),
-            proxy_host=dict(type='str',
-                            required=False,
-                            default=None,
-                            fallback=(env_fallback, ['VMWARE_PROXY_HOST'])),
-            proxy_port=dict(type='int',
-                            required=False,
-                            default=None,
-                            fallback=(env_fallback, ['VMWARE_PROXY_PORT'])),
-        )
-
     def connect_to_vsphere_client(self):
         """
         Connect to vSphere API Client with Username and Password

plugins/modules/vmware_category.py

@@ -87,7 +87,8 @@
       type: list
       elements: str
 extends_documentation_fragment:
-- community.vmware.vmware_rest_client.documentation
+- community.vmware.base_options
+- community.vmware.additional_rest_options
 
 '''
 
@@ -157,6 +158,7 @@
 from ansible.module_utils.compat.version import LooseVersion
 from ansible_collections.community.vmware.plugins.module_utils.vmware import connect_to_api
 from ansible_collections.community.vmware.plugins.module_utils.vmware_rest_client import VmwareRestClient
+from ansible_collections.community.vmware.plugins.module_utils.vmware_argument_spec import rest_compatible_argument_spec
 
 try:
     from pyVmomi.VmomiSupport import XMLNS_VMODL_BASE
@@ -354,7 +356,7 @@ def get_all_categories(self):
 
 
 def main():
-    argument_spec = VmwareRestClient.vmware_client_argument_spec()
+    argument_spec = rest_compatible_argument_spec()
     argument_spec.update(
         category_name=dict(type='str', required=True),
         category_description=dict(type='str', default='', required=False),

plugins/modules/vmware_category_info.py

@@ -22,7 +22,8 @@
 requirements:
 - vSphere Automation SDK
 extends_documentation_fragment:
-- community.vmware.vmware_rest_client.documentation
+- community.vmware.base_options
+- community.vmware.additional_rest_options
 
 '''
 
@@ -81,6 +82,7 @@
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.vmware.plugins.module_utils.vmware_rest_client import VmwareRestClient
+from ansible_collections.community.vmware.plugins.module_utils.vmware_argument_spec import rest_compatible_argument_spec
 
 
 class VmwareCategoryInfoManager(VmwareRestClient):
@@ -108,7 +110,7 @@ def get_all_tag_categories(self):
 
 
 def main():
-    argument_spec = VmwareRestClient.vmware_client_argument_spec()
+    argument_spec = rest_compatible_argument_spec()
     module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
     vmware_category_info = VmwareCategoryInfoManager(module)

plugins/modules/vmware_content_deploy_ovf_template.py

@@ -87,7 +87,9 @@
       type: str
       default: 'thin'
       choices: [ thin, thick, eagerZeroedThick, eagerzeroedthick ]
-extends_documentation_fragment: community.vmware.vmware_rest_client.documentation
+extends_documentation_fragment:
+- community.vmware.base_options
+- community.vmware.additional_rest_options
 '''
 
 EXAMPLES = r'''
@@ -133,6 +135,7 @@
 from ansible.module_utils.basic import AnsibleModule, env_fallback
 from ansible.module_utils._text import to_native
 from ansible_collections.community.vmware.plugins.module_utils.vmware_rest_client import VmwareRestClient
+from ansible_collections.community.vmware.plugins.module_utils.vmware_argument_spec import rest_compatible_argument_spec
 from ansible_collections.community.vmware.plugins.module_utils.vmware import PyVmomi
 
 HAS_VAUTOMATION = False
@@ -337,7 +340,7 @@ def _exit(self):
 
 
 def main():
-    argument_spec = VmwareRestClient.vmware_client_argument_spec()
+    argument_spec = rest_compatible_argument_spec()
     argument_spec.update(
         log_level=dict(
             type='str',

plugins/modules/vmware_content_deploy_template.py

@@ -107,7 +107,8 @@
       default: 'present'
       choices: [ 'present', 'poweredon' ]
 extends_documentation_fragment:
-- community.vmware.vmware_rest_client.documentation
+- community.vmware.base_options
+- community.vmware.additional_rest_options
 
 '''
 
@@ -155,6 +156,7 @@
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.vmware.plugins.module_utils.vmware_rest_client import VmwareRestClient
+from ansible_collections.community.vmware.plugins.module_utils.vmware_argument_spec import rest_compatible_argument_spec
 from ansible_collections.community.vmware.plugins.module_utils.vmware import PyVmomi
 from ansible.module_utils._text import to_native
 
@@ -347,7 +349,7 @@ def _exit(self):
 
 
 def main():
-    argument_spec = VmwareRestClient.vmware_client_argument_spec()
+    argument_spec = rest_compatible_argument_spec()
     argument_spec.update(
         log_level=dict(
             type='str',

plugins/modules/vmware_content_library_info.py

@@ -29,7 +29,8 @@
       type: str
       required: false
 extends_documentation_fragment:
-- community.vmware.vmware_rest_client.documentation
+- community.vmware.base_options
+- community.vmware.additional_rest_options
 
 '''
 
@@ -85,6 +86,7 @@
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.vmware.plugins.module_utils.vmware_rest_client import VmwareRestClient
+from ansible_collections.community.vmware.plugins.module_utils.vmware_argument_spec import rest_compatible_argument_spec
 
 
 class VmwareContentLibInfo(VmwareRestClient):
@@ -149,7 +151,7 @@ def get_content_lib_details(self, library_id):
 
 
 def main():
-    argument_spec = VmwareRestClient.vmware_client_argument_spec()
+    argument_spec = rest_compatible_argument_spec()
     argument_spec.update(
         library_id=dict(type='str', required=False),
     )

plugins/modules/vmware_content_library_manager.py

@@ -92,7 +92,8 @@
       default: 'present'
       choices: [ 'present', 'absent' ]
 extends_documentation_fragment:
-- community.vmware.vmware_rest_client.documentation
+- community.vmware.base_options
+- community.vmware.additional_rest_options
 
 '''
 EXAMPLES = r'''
@@ -159,6 +160,7 @@
 import uuid
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.community.vmware.plugins.module_utils.vmware_rest_client import VmwareRestClient
+from ansible_collections.community.vmware.plugins.module_utils.vmware_argument_spec import rest_compatible_argument_spec
 from ansible_collections.community.vmware.plugins.module_utils.vmware import PyVmomi
 
 HAS_VAUTOMATION_PYTHON_SDK = False
@@ -410,7 +412,7 @@ def state_destroy_library(self):
 
 
 def main():
-    argument_spec = VmwareRestClient.vmware_client_argument_spec()
+    argument_spec = rest_compatible_argument_spec()
     argument_spec.update(
         library_name=dict(type='str', required=True),
         library_description=dict(type='str', required=False),