argument spec updates

nutanix · Jan 28, 2022 · 4e838de · 4e838de
1 parent 9ab92d4
commit 4e838de
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/plugins/module_utils/base_module.py b/plugins/module_utils/base_module.py
@@ -3,6 +3,7 @@
 from __future__ import absolute_import, division, print_function
 
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.basic import env_fallback
 
 __metaclass__ = type
 
@@ -11,10 +12,24 @@ class BaseModule(AnsibleModule):
     """Basic module with common arguments"""
 
     argument_spec = dict(
-        action=dict(type="str", required=True, aliases=["state"]),
-        wait=dict(type="bool", required=False, default=True),
-        wait_timeout=dict(type="int", required=False, default=300),
-        validate_certs=dict(type="bool", required=False, default=False),
+        nutanix_host=dict(
+            type="str", required=True, fallback=(env_fallback, ["NUTANIX_HOST"])
+        ),
+        nutanix_port=dict(default="9440", type="str"),
+        nutanix_username=dict(
+            type="str", required=True, fallback=(env_fallback, ["NUTANIX_USERNAME"])
+        ),
+        nutanix_password=dict(
+            type="str",
+            required=True,
+            no_log=True,
+            fallback=(env_fallback, ["NUTANIX_PASSWORD"]),
+        ),
+        validate_certs=dict(
+            type="bool", default=True, fallback=(env_fallback, ["VALIDATE_CERTS"])
+        ),
+        state=dict(type="str", choices=["present", "absent"], default="present"),
+        wait=dict(type="bool", default=True),
     )
 
     def __init__(self, **kwargs):

diff --git a/plugins/modules/ntnx_vms.py b/plugins/modules/ntnx_vms.py
@@ -281,8 +281,6 @@
 # TODO
 """
 
-from ansible.module_utils.basic import env_fallback
-
 from ..module_utils.base_module import BaseModule
 from ..module_utils.prism.vms import VM
 from ..module_utils.prism.tasks import Task
@@ -329,24 +327,6 @@ def get_module_spec():
     )
 
     module_args = dict(
-        nutanix_host=dict(
-            type="str", required=True, fallback=(env_fallback, ["NUTANIX_HOST"])
-        ),
-        nutanix_port=dict(default="9440", type="str"),
-        nutanix_username=dict(
-            type="str", required=True, fallback=(env_fallback, ["NUTANIX_USERNAME"])
-        ),
-        nutanix_password=dict(
-            type="str",
-            required=True,
-            no_log=True,
-            fallback=(env_fallback, ["NUTANIX_PASSWORD"]),
-        ),
-        validate_certs=dict(
-            type="bool", default=True, fallback=(env_fallback, ["VALIDATE_CERTS"])
-        ),
-        state=dict(type="str", choices=["present", "absent"], default="present"),
-        wait=dict(type="bool", default=True),
         name=dict(type="str", required=True),
         vm_uuid=dict(type="str"),
         desc=dict(type="str"),