diff --git a/galaxy.yml b/galaxy.yml index b272e5b94..a7540e149 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -16,8 +16,7 @@ tags: - collection - networking - sdn -dependencies: - ansible.utils: ">=2.0.0,<6.0" +dependencies: {} repository: https://github.com/CiscoISE/ansible-ise documentation: https://ciscoise.github.io/ansible-ise/ homepage: https://github.com/CiscoISE/ansible-ise diff --git a/plugins/action/aci_bindings_info.py b/plugins/action/aci_bindings_info.py index 9fb6f582d..effcd3159 100644 --- a/plugins/action/aci_bindings_info.py +++ b/plugins/action/aci_bindings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -44,33 +34,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -87,20 +51,27 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: responses = [] generator = ise.exec( family="aci_bindings", function="get_aci_bindings_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/aci_settings.py b/plugins/action/aci_settings.py index 49698b4a9..d801b8c93 100644 --- a/plugins/action/aci_settings.py +++ b/plugins/action/aci_settings.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -193,44 +183,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = AciSettings(self._task.args, ise) + ise = ISESDK(params=params) + obj = AciSettings(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/aci_settings_info.py b/plugins/action/aci_settings_info.py index ebd6c655d..d25f925f4 100644 --- a/plugins/action/aci_settings_info.py +++ b/plugins/action/aci_settings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="aci_settings", function="get_aci_settings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["AciSettings"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/aci_test_connectivity.py b/plugins/action/aci_test_connectivity.py index d73b4f553..036df33e5 100644 --- a/plugins/action/aci_test_connectivity.py +++ b/plugins/action/aci_test_connectivity.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="aci_settings", function="test_aci_connectivity", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/active_directories_info.py b/plugins/action/active_directories_info.py index e5b41754a..bad5c1098 100644 --- a/plugins/action/active_directories_info.py +++ b/plugins/action/active_directories_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="active_directories", function="get_active_directories", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/active_directory.py b/plugins/action/active_directory.py index 2f37a058e..575314fcf 100644 --- a/plugins/action/active_directory.py +++ b/plugins/action/active_directory.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -172,44 +162,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = ActiveDirectory(self._task.args, ise) + ise = ISESDK(params=params) + obj = ActiveDirectory(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/active_directory_add_groups.py b/plugins/action/active_directory_add_groups.py index 1eac8ff6f..f182ba33b 100644 --- a/plugins/action/active_directory_add_groups.py +++ b/plugins/action/active_directory_add_groups.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -47,33 +37,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -93,14 +57,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="active_directory", function="load_groups_from_domain", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/active_directory_groups_by_domain_info.py b/plugins/action/active_directory_groups_by_domain_info.py index 15a4e010a..b05f72de4 100644 --- a/plugins/action/active_directory_groups_by_domain_info.py +++ b/plugins/action/active_directory_groups_by_domain_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,15 +43,22 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="active_directory", function="get_groups_by_domain", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSActiveDirectoryGroups"] self._result.update(dict(ise_response=response)) diff --git a/plugins/action/active_directory_info.py b/plugins/action/active_directory_info.py index f73a46da2..d3e029dd5 100644 --- a/plugins/action/active_directory_info.py +++ b/plugins/action/active_directory_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="active_directory", function="get_active_directory_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSActiveDirectory"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="active_directory", function="get_active_directory_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSActiveDirectory"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="active_directory", function="get_active_directory_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/active_directory_is_user_member_of_group_info.py b/plugins/action/active_directory_is_user_member_of_group_info.py index e6cb49432..5219de9e0 100644 --- a/plugins/action/active_directory_is_user_member_of_group_info.py +++ b/plugins/action/active_directory_is_user_member_of_group_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="active_directory", function="is_user_member_of_groups", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSActiveDirectoryGroups"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/active_directory_join_domain.py b/plugins/action/active_directory_join_domain.py index c78cbf6a4..595418197 100644 --- a/plugins/action/active_directory_join_domain.py +++ b/plugins/action/active_directory_join_domain.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="active_directory", function="join_domain", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/active_directory_join_domain_with_all_nodes.py b/plugins/action/active_directory_join_domain_with_all_nodes.py index 33533a22a..fb3f9b81a 100644 --- a/plugins/action/active_directory_join_domain_with_all_nodes.py +++ b/plugins/action/active_directory_join_domain_with_all_nodes.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="active_directory", function="join_domain_with_all_nodes", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/active_directory_leave_domain.py b/plugins/action/active_directory_leave_domain.py index 1cbf0dc7e..f5e63d06f 100644 --- a/plugins/action/active_directory_leave_domain.py +++ b/plugins/action/active_directory_leave_domain.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="active_directory", function="leave_domain", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/active_directory_leave_domain_with_all_nodes.py b/plugins/action/active_directory_leave_domain_with_all_nodes.py index 78f96bf4f..013eaf940 100644 --- a/plugins/action/active_directory_leave_domain_with_all_nodes.py +++ b/plugins/action/active_directory_leave_domain_with_all_nodes.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="active_directory", function="leave_domain_with_all_nodes", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/active_directory_trusted_domains_info.py b/plugins/action/active_directory_trusted_domains_info.py index 0237ad915..21aa4065b 100644 --- a/plugins/action/active_directory_trusted_domains_info.py +++ b/plugins/action/active_directory_trusted_domains_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="active_directory", function="get_trusted_domains", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSActiveDirectoryDomains"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/active_directory_user_groups_info.py b/plugins/action/active_directory_user_groups_info.py index e9dc3c451..972b4b34f 100644 --- a/plugins/action/active_directory_user_groups_info.py +++ b/plugins/action/active_directory_user_groups_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="active_directory", function="get_user_groups", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSActiveDirectoryGroups"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/ad_groups_info.py b/plugins/action/ad_groups_info.py index 008fccd9f..c3c5985c5 100644 --- a/plugins/action/ad_groups_info.py +++ b/plugins/action/ad_groups_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("activeDirectory") - name = self._task.args.get("name") + id = params.get("activeDirectory") + name = params.get("name") if id: response = ise.exec( family="ad_groups", function="get_adgroups", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/admin_user_info.py b/plugins/action/admin_user_info.py index 3c4cf5755..d1b5c9f0b 100644 --- a/plugins/action/admin_user_info.py +++ b/plugins/action/admin_user_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="admin_user", function="get_admin_user_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["AdminUser"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="admin_user", function="get_admin_users_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/allowed_protocols.py b/plugins/action/allowed_protocols.py index 7be61b1ca..238c270bf 100644 --- a/plugins/action/allowed_protocols.py +++ b/plugins/action/allowed_protocols.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -234,44 +224,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = AllowedProtocols(self._task.args, ise) + ise = ISESDK(params=params) + obj = AllowedProtocols(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/allowed_protocols_info.py b/plugins/action/allowed_protocols_info.py index 72489a2ce..ca8088cfc 100644 --- a/plugins/action/allowed_protocols_info.py +++ b/plugins/action/allowed_protocols_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="allowed_protocols", function="get_allowed_protocol_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["AllowedProtocols"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="allowed_protocols", function="get_allowed_protocol_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["AllowedProtocols"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="allowed_protocols", function="get_allowed_protocols_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/anc_endpoint_apply.py b/plugins/action/anc_endpoint_apply.py index 83129d34d..1386253e6 100644 --- a/plugins/action/anc_endpoint_apply.py +++ b/plugins/action/anc_endpoint_apply.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="anc_endpoint", function="apply_anc_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/anc_endpoint_bulk_monitor_status_info.py b/plugins/action/anc_endpoint_bulk_monitor_status_info.py index 3d49fe243..2910c335e 100644 --- a/plugins/action/anc_endpoint_bulk_monitor_status_info.py +++ b/plugins/action/anc_endpoint_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="anc_endpoint", function="monitor_bulk_status_anc_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/anc_endpoint_bulk_request.py b/plugins/action/anc_endpoint_bulk_request.py index f3abcd562..db931c363 100644 --- a/plugins/action/anc_endpoint_bulk_request.py +++ b/plugins/action/anc_endpoint_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="anc_endpoint", function="bulk_request_for_anc_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/anc_endpoint_clear.py b/plugins/action/anc_endpoint_clear.py index 3ad0bddaa..227eb8687 100644 --- a/plugins/action/anc_endpoint_clear.py +++ b/plugins/action/anc_endpoint_clear.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="anc_endpoint", function="clear_anc_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/anc_endpoint_info.py b/plugins/action/anc_endpoint_info.py index 1bfae5008..bdb2fc8cd 100644 --- a/plugins/action/anc_endpoint_info.py +++ b/plugins/action/anc_endpoint_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="anc_endpoint", function="get_anc_endpoint_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ErsAncEndpoint"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="anc_endpoint", function="get_anc_endpoint_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/anc_policy.py b/plugins/action/anc_policy.py index 0421c700c..b01a7e641 100644 --- a/plugins/action/anc_policy.py +++ b/plugins/action/anc_policy.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -168,44 +158,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = AncPolicy(self._task.args, ise) + ise = ISESDK(params=params) + obj = AncPolicy(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/anc_policy_bulk_monitor_status_info.py b/plugins/action/anc_policy_bulk_monitor_status_info.py index f6789d227..466f7ccce 100644 --- a/plugins/action/anc_policy_bulk_monitor_status_info.py +++ b/plugins/action/anc_policy_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="anc_policy", function="monitor_bulk_status_anc_policy", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/anc_policy_bulk_request.py b/plugins/action/anc_policy_bulk_request.py index 880a1f0e7..4db3cb1f4 100644 --- a/plugins/action/anc_policy_bulk_request.py +++ b/plugins/action/anc_policy_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="anc_policy", function="bulk_request_for_anc_policy", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/anc_policy_info.py b/plugins/action/anc_policy_info.py index c7eb95957..0d2f29839 100644 --- a/plugins/action/anc_policy_info.py +++ b/plugins/action/anc_policy_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="anc_policy", function="get_anc_policy_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ErsAncPolicy"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="anc_policy", function="get_anc_policy_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ErsAncPolicy"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="anc_policy", function="get_anc_policy_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/authorization_profile.py b/plugins/action/authorization_profile.py index 8f2511cd5..03a1ae52c 100644 --- a/plugins/action/authorization_profile.py +++ b/plugins/action/authorization_profile.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -243,44 +233,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = AuthorizationProfile(self._task.args, ise) + ise = ISESDK(params=params) + obj = AuthorizationProfile(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/authorization_profile_info.py b/plugins/action/authorization_profile_info.py index b1b2d6778..fd1bbc4c2 100644 --- a/plugins/action/authorization_profile_info.py +++ b/plugins/action/authorization_profile_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="authorization_profile", function="get_authorization_profile_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["AuthorizationProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="authorization_profile", function="get_authorization_profile_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["AuthorizationProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="authorization_profile", function="get_authorization_profiles_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/backup_cancel.py b/plugins/action/backup_cancel.py index 301c3ade2..101ee2f49 100644 --- a/plugins/action/backup_cancel.py +++ b/plugins/action/backup_cancel.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="backup_and_restore", function="cancel_backup", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/backup_config.py b/plugins/action/backup_config.py index 7458ae5a3..25821212c 100644 --- a/plugins/action/backup_config.py +++ b/plugins/action/backup_config.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="backup_and_restore", function="config_backup", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/backup_last_status_info.py b/plugins/action/backup_last_status_info.py index 51202b572..47cd9b621 100644 --- a/plugins/action/backup_last_status_info.py +++ b/plugins/action/backup_last_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="backup_and_restore", function="get_last_config_backup_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/backup_restore.py b/plugins/action/backup_restore.py index b6844441c..692cf5bad 100644 --- a/plugins/action/backup_restore.py +++ b/plugins/action/backup_restore.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -83,14 +47,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="backup_and_restore", function="restore_config_backup", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/backup_schedule_config.py b/plugins/action/backup_schedule_config.py index b5990fea7..fa9472504 100644 --- a/plugins/action/backup_schedule_config.py +++ b/plugins/action/backup_schedule_config.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -49,33 +39,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -97,14 +61,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="backup_and_restore", function="create_scheduled_config_backup", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/backup_schedule_config_update.py b/plugins/action/backup_schedule_config_update.py index 87e8f5415..9eaaf1b92 100644 --- a/plugins/action/backup_schedule_config_update.py +++ b/plugins/action/backup_schedule_config_update.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -49,33 +39,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -97,14 +61,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="backup_and_restore", function="update_scheduled_config_backup", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/bind_signed_certificate.py b/plugins/action/bind_signed_certificate.py index adc59221e..69a497187 100644 --- a/plugins/action/bind_signed_certificate.py +++ b/plugins/action/bind_signed_certificate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -55,33 +45,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -113,14 +77,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="bind_csr", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/byod_portal.py b/plugins/action/byod_portal.py index f8967eb44..9263aad65 100644 --- a/plugins/action/byod_portal.py +++ b/plugins/action/byod_portal.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -197,44 +187,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = ByodPortal(self._task.args, ise) + ise = ISESDK(params=params) + obj = ByodPortal(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/byod_portal_info.py b/plugins/action/byod_portal_info.py index 2d6be6091..c4a8154af 100644 --- a/plugins/action/byod_portal_info.py +++ b/plugins/action/byod_portal_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="byod_portal", function="get_byod_portal_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BYODPortal"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="byod_portal", function="get_byod_portal_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/certificate_profile.py b/plugins/action/certificate_profile.py index 43273ee4b..22752f5cc 100644 --- a/plugins/action/certificate_profile.py +++ b/plugins/action/certificate_profile.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -168,44 +158,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = CertificateProfile(self._task.args, ise) + ise = ISESDK(params=params) + obj = CertificateProfile(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/certificate_profile_info.py b/plugins/action/certificate_profile_info.py index a94d88886..e5debc755 100644 --- a/plugins/action/certificate_profile_info.py +++ b/plugins/action/certificate_profile_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="certificate_profile", function="get_certificate_profile_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["CertificateProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="certificate_profile", function="get_certificate_profile_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["CertificateProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="certificate_profile", function="get_certificate_profile_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/certificate_template_info.py b/plugins/action/certificate_template_info.py index d4caa9643..b9faba475 100644 --- a/plugins/action/certificate_template_info.py +++ b/plugins/action/certificate_template_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="certificate_template", function="get_certificate_template_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSCertificateTemplate"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="certificate_template", function="get_certificate_template_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSCertificateTemplate"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="certificate_template", function="get_certificate_template_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/configuration.py b/plugins/action/configuration.py index 44700ef58..4e8772c17 100644 --- a/plugins/action/configuration.py +++ b/plugins/action/configuration.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -119,44 +109,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Configuration(self._task.args, ise) + ise = ISESDK(params=params) + obj = Configuration(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/configuration_info.py b/plugins/action/configuration_info.py index 7b43f2135..14f8f19bb 100644 --- a/plugins/action/configuration_info.py +++ b/plugins/action/configuration_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="configuration", function="get_configuration", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/csr_delete.py b/plugins/action/csr_delete.py index a48fa32ac..a33a14045 100644 --- a/plugins/action/csr_delete.py +++ b/plugins/action/csr_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="delete_csr_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/csr_export_info.py b/plugins/action/csr_export_info.py index 67cee6a98..01a783e8f 100644 --- a/plugins/action/csr_export_info.py +++ b/plugins/action/csr_export_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -43,33 +33,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -85,19 +49,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("filename") + id = params.get("id") + name = params.get("filename") if id: download_response = ise.exec( family="certificates", function="export_csr", - params=self.get_object(self._task.args), + params=self.get_object(params), ) response = dict( data=download_response.data.decode(encoding="utf-8"), diff --git a/plugins/action/csr_generate.py b/plugins/action/csr_generate.py index a4d352111..ce19a9205 100644 --- a/plugins/action/csr_generate.py +++ b/plugins/action/csr_generate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -56,33 +46,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -111,14 +75,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="generate_csr", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/csr_generate_intermediate_ca.py b/plugins/action/csr_generate_intermediate_ca.py index 0410aea10..f84ad3b81 100644 --- a/plugins/action/csr_generate_intermediate_ca.py +++ b/plugins/action/csr_generate_intermediate_ca.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="generate_intermediate_ca_csr", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/csr_info.py b/plugins/action/csr_info.py index d3424e023..4c223e662 100644 --- a/plugins/action/csr_info.py +++ b/plugins/action/csr_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostName") + id = params.get("id") + name = params.get("hostName") if id: response = ise.exec( family="certificates", function="get_csr_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -113,7 +84,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="certificates", function="get_csrs_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/custom_attributes.py b/plugins/action/custom_attributes.py index 823c2ccc7..5d8651a7c 100644 --- a/plugins/action/custom_attributes.py +++ b/plugins/action/custom_attributes.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -146,44 +136,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = CustomAttributes(self._task.args, ise) + ise = ISESDK(params=params) + obj = CustomAttributes(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/custom_attributes_info.py b/plugins/action/custom_attributes_info.py index f5b5534ac..bb7def1aa 100644 --- a/plugins/action/custom_attributes_info.py +++ b/plugins/action/custom_attributes_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if name: response = ise.exec( family="customattributes", function="get", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="customattributes", function="list", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/custom_attributes_rename.py b/plugins/action/custom_attributes_rename.py index 375da1f13..aa2223ebf 100644 --- a/plugins/action/custom_attributes_rename.py +++ b/plugins/action/custom_attributes_rename.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="customattributes", function="rename", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/dataconnect_info.py b/plugins/action/dataconnect_info.py index f6742f017..30e4b669b 100644 --- a/plugins/action/dataconnect_info.py +++ b/plugins/action/dataconnect_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="dataconnect_services", function="get_odbc_detail", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/dataconnect_settings_info.py b/plugins/action/dataconnect_settings_info.py index 0ecffe525..7ac4e4170 100644 --- a/plugins/action/dataconnect_settings_info.py +++ b/plugins/action/dataconnect_settings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="dataconnect_services", function="get_dataconnect_service", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/dataconnect_settings_password.py b/plugins/action/dataconnect_settings_password.py index 13bcc0159..0577a29f0 100644 --- a/plugins/action/dataconnect_settings_password.py +++ b/plugins/action/dataconnect_settings_password.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="dataconnect_services", function="update_dataconnect_password", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/dataconnect_settings_password_expiry.py b/plugins/action/dataconnect_settings_password_expiry.py index 2f5889726..c24a206d8 100644 --- a/plugins/action/dataconnect_settings_password_expiry.py +++ b/plugins/action/dataconnect_settings_password_expiry.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="dataconnect_services", function="update_dataconnect_password_expiry", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/dataconnect_settings_status.py b/plugins/action/dataconnect_settings_status.py index c8ea01d3c..b42cbaaa9 100644 --- a/plugins/action/dataconnect_settings_status.py +++ b/plugins/action/dataconnect_settings_status.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="dataconnect_services", function="set_data_connect_service", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/deployment_info.py b/plugins/action/deployment_info.py index 12fc56e92..4328b7fcd 100644 --- a/plugins/action/deployment_info.py +++ b/plugins/action/deployment_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="pull_deployment_info", function="get_deployment_info", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSDeploymentInfo"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_authentication_reset_hitcount.py b/plugins/action/device_administration_authentication_reset_hitcount.py index a2a938477..2710656da 100644 --- a/plugins/action/device_administration_authentication_reset_hitcount.py +++ b/plugins/action/device_administration_authentication_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="device_administration_authentication_rules", function="reset_hit_counts_device_admin_authentication_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/device_administration_authentication_rules.py b/plugins/action/device_administration_authentication_rules.py index ef3c7db1e..c6e8e1055 100644 --- a/plugins/action/device_administration_authentication_rules.py +++ b/plugins/action/device_administration_authentication_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -214,44 +204,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationAuthenticationRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationAuthenticationRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_authentication_rules_info.py b/plugins/action/device_administration_authentication_rules_info.py index 1b6fc720e..82fce62d9 100644 --- a/plugins/action/device_administration_authentication_rules_info.py +++ b/plugins/action/device_administration_authentication_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_authentication_rules", function="get_device_admin_authentication_rule_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_authentication_rules", function="get_device_admin_authentication_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_authorization_reset_hitcount.py b/plugins/action/device_administration_authorization_reset_hitcount.py index 3d16ef97b..a37019a78 100644 --- a/plugins/action/device_administration_authorization_reset_hitcount.py +++ b/plugins/action/device_administration_authorization_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="device_administration_authorization_rules", function="reset_hit_counts_device_admin_authorization_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/device_administration_authorization_rules.py b/plugins/action/device_administration_authorization_rules.py index eb4a1d9a6..58d952479 100644 --- a/plugins/action/device_administration_authorization_rules.py +++ b/plugins/action/device_administration_authorization_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -205,44 +195,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationAuthorizationRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationAuthorizationRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_authorization_rules_info.py b/plugins/action/device_administration_authorization_rules_info.py index da5912881..94fc4cb8c 100644 --- a/plugins/action/device_administration_authorization_rules_info.py +++ b/plugins/action/device_administration_authorization_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_authorization_rules", function="get_device_admin_authorization_rule_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_authorization_rules", function="get_device_admin_authorization_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_command_set_info.py b/plugins/action/device_administration_command_set_info.py index 708d1386f..3709dc774 100644 --- a/plugins/action/device_administration_command_set_info.py +++ b/plugins/action/device_administration_command_set_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_command_set", function="get_device_admin_command_sets", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_conditions.py b/plugins/action/device_administration_conditions.py index f46cb885e..c8ef0ca44 100644 --- a/plugins/action/device_administration_conditions.py +++ b/plugins/action/device_administration_conditions.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -224,44 +214,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationConditions(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationConditions(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_conditions_for_authentication_rule_info.py b/plugins/action/device_administration_conditions_for_authentication_rule_info.py index a26d56169..b42e134b6 100644 --- a/plugins/action/device_administration_conditions_for_authentication_rule_info.py +++ b/plugins/action/device_administration_conditions_for_authentication_rule_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_conditions", function="get_device_admin_conditions_for_authentication_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_conditions_for_authorization_rule_info.py b/plugins/action/device_administration_conditions_for_authorization_rule_info.py index 28efe29d7..be994b775 100644 --- a/plugins/action/device_administration_conditions_for_authorization_rule_info.py +++ b/plugins/action/device_administration_conditions_for_authorization_rule_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_conditions", function="get_device_admin_conditions_for_authorization_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_conditions_for_policy_set_info.py b/plugins/action/device_administration_conditions_for_policy_set_info.py index 66365d784..7ab9f2cb3 100644 --- a/plugins/action/device_administration_conditions_for_policy_set_info.py +++ b/plugins/action/device_administration_conditions_for_policy_set_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_conditions", function="get_device_admin_conditions_for_policy_sets", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_conditions_info.py b/plugins/action/device_administration_conditions_info.py index 2c3f6b794..a058f5d68 100644 --- a/plugins/action/device_administration_conditions_info.py +++ b/plugins/action/device_administration_conditions_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_conditions", function="get_device_admin_condition_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_conditions", function="get_device_admin_condition_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -109,7 +80,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_conditions", function="get_device_admin_conditions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_dictionary_attributes_authentication_info.py b/plugins/action/device_administration_dictionary_attributes_authentication_info.py index 3c82b917e..44f6fdecc 100644 --- a/plugins/action/device_administration_dictionary_attributes_authentication_info.py +++ b/plugins/action/device_administration_dictionary_attributes_authentication_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_dictionary_attributes_list", function="get_device_admin_dictionaries_authentication", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_dictionary_attributes_authorization_info.py b/plugins/action/device_administration_dictionary_attributes_authorization_info.py index bce41d719..122c258aa 100644 --- a/plugins/action/device_administration_dictionary_attributes_authorization_info.py +++ b/plugins/action/device_administration_dictionary_attributes_authorization_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_dictionary_attributes_list", function="get_device_admin_dictionaries_authorization", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_dictionary_attributes_policy_set_info.py b/plugins/action/device_administration_dictionary_attributes_policy_set_info.py index 36939dbbc..4c11cf0d0 100644 --- a/plugins/action/device_administration_dictionary_attributes_policy_set_info.py +++ b/plugins/action/device_administration_dictionary_attributes_policy_set_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_dictionary_attributes_list", function="get_device_admin_dictionaries_policy_set", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_global_exception_rules.py b/plugins/action/device_administration_global_exception_rules.py index 89caf432d..476a82ad9 100644 --- a/plugins/action/device_administration_global_exception_rules.py +++ b/plugins/action/device_administration_global_exception_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -196,44 +186,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationGlobalExceptionRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationGlobalExceptionRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_global_exception_rules_info.py b/plugins/action/device_administration_global_exception_rules_info.py index 3f9f3d224..848e74c78 100644 --- a/plugins/action/device_administration_global_exception_rules_info.py +++ b/plugins/action/device_administration_global_exception_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_authorization_global_exception_rules", function="get_device_admin_policy_set_global_exception_by_rule_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_authorization_global_exception_rules", function="get_device_admin_policy_set_global_exception_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_global_exception_rules_reset_hitcount.py b/plugins/action/device_administration_global_exception_rules_reset_hitcount.py index b6ffd7c5a..72b9d413e 100644 --- a/plugins/action/device_administration_global_exception_rules_reset_hitcount.py +++ b/plugins/action/device_administration_global_exception_rules_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="device_administration_authorization_global_exception_rules", function="reset_hit_counts_device_admin_global_exceptions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/device_administration_identity_stores_info.py b/plugins/action/device_administration_identity_stores_info.py index fee69d908..771d07eee 100644 --- a/plugins/action/device_administration_identity_stores_info.py +++ b/plugins/action/device_administration_identity_stores_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_identity_stores", function="get_device_admin_identity_stores", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_local_exception_rules.py b/plugins/action/device_administration_local_exception_rules.py index 826fe1cbe..5cabb275b 100644 --- a/plugins/action/device_administration_local_exception_rules.py +++ b/plugins/action/device_administration_local_exception_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -205,44 +195,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationLocalExceptionRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationLocalExceptionRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_local_exception_rules_info.py b/plugins/action/device_administration_local_exception_rules_info.py index 65aed0b3c..68ebf1bab 100644 --- a/plugins/action/device_administration_local_exception_rules_info.py +++ b/plugins/action/device_administration_local_exception_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_authorization_exception_rules", function="get_device_admin_local_exception_rule_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_authorization_exception_rules", function="get_device_admin_local_exception_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_local_exception_rules_reset_hitcount.py b/plugins/action/device_administration_local_exception_rules_reset_hitcount.py index efc416ef3..d49b33bcd 100644 --- a/plugins/action/device_administration_local_exception_rules_reset_hitcount.py +++ b/plugins/action/device_administration_local_exception_rules_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="device_administration_authorization_exception_rules", function="reset_hit_counts_device_admin_local_exceptions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/device_administration_network_conditions.py b/plugins/action/device_administration_network_conditions.py index 8e684da98..98f402492 100644 --- a/plugins/action/device_administration_network_conditions.py +++ b/plugins/action/device_administration_network_conditions.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -192,44 +182,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationNetworkConditions(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationNetworkConditions(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_network_conditions_info.py b/plugins/action/device_administration_network_conditions_info.py index 4bae7f366..2fd3c45fa 100644 --- a/plugins/action/device_administration_network_conditions_info.py +++ b/plugins/action/device_administration_network_conditions_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_network_conditions", function="get_device_admin_network_condition_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_network_conditions", function="get_device_admin_network_conditions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_policy_set.py b/plugins/action/device_administration_policy_set.py index 156baceff..69fbb08e8 100644 --- a/plugins/action/device_administration_policy_set.py +++ b/plugins/action/device_administration_policy_set.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -195,44 +185,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationPolicySet(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationPolicySet(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_policy_set_info.py b/plugins/action/device_administration_policy_set_info.py index 47bc2dad9..9a7a01e77 100644 --- a/plugins/action/device_administration_policy_set_info.py +++ b/plugins/action/device_administration_policy_set_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_policy_set", function="get_device_admin_policy_set_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_policy_set", function="get_device_admin_policy_sets", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_policy_set_reset_hitcount.py b/plugins/action/device_administration_policy_set_reset_hitcount.py index bbcff4c37..d556308d9 100644 --- a/plugins/action/device_administration_policy_set_reset_hitcount.py +++ b/plugins/action/device_administration_policy_set_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="device_administration_policy_set", function="reset_hit_counts_device_admin_policy_sets", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/device_administration_profiles_info.py b/plugins/action/device_administration_profiles_info.py index 971a535a0..08606210e 100644 --- a/plugins/action/device_administration_profiles_info.py +++ b/plugins/action/device_administration_profiles_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_profiles", function="get_device_admin_profiles", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_service_names_info.py b/plugins/action/device_administration_service_names_info.py index b0b1730ac..ae0449360 100644 --- a/plugins/action/device_administration_service_names_info.py +++ b/plugins/action/device_administration_service_names_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="device_administration_service_names", function="get_device_admin_service_names", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/device_administration_time_date_conditions.py b/plugins/action/device_administration_time_date_conditions.py index dc568034f..0d20b99b5 100644 --- a/plugins/action/device_administration_time_date_conditions.py +++ b/plugins/action/device_administration_time_date_conditions.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -219,44 +209,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DeviceAdministrationTimeDateConditions(self._task.args, ise) + ise = ISESDK(params=params) + obj = DeviceAdministrationTimeDateConditions(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/device_administration_time_date_conditions_info.py b/plugins/action/device_administration_time_date_conditions_info.py index 4ca441504..5b3a11fd0 100644 --- a/plugins/action/device_administration_time_date_conditions_info.py +++ b/plugins/action/device_administration_time_date_conditions_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="device_administration_time_date_conditions", function="get_device_admin_time_condition_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="device_administration_time_date_conditions", function="get_device_admin_time_conditions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/downloadable_acl.py b/plugins/action/downloadable_acl.py index 7429a4d9c..c8ffec39a 100644 --- a/plugins/action/downloadable_acl.py +++ b/plugins/action/downloadable_acl.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -191,44 +181,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DownloadableAcl(self._task.args, ise) + ise = ISESDK(params=params) + obj = DownloadableAcl(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/downloadable_acl_info.py b/plugins/action/downloadable_acl_info.py index 3fc742d94..d5b787331 100644 --- a/plugins/action/downloadable_acl_info.py +++ b/plugins/action/downloadable_acl_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="downloadable_acl", function="get_downloadable_acl_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["DownloadableAcl"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -103,7 +74,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="downloadable_acl", function="get_downloadable_acl_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/duo_identity_sync.py b/plugins/action/duo_identity_sync.py index 177646514..3dff20aa0 100644 --- a/plugins/action/duo_identity_sync.py +++ b/plugins/action/duo_identity_sync.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -171,44 +161,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DuoIdentitySync(self._task.args, ise) + ise = ISESDK(params=params) + obj = DuoIdentitySync(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/duo_identity_sync_cancel_info.py b/plugins/action/duo_identity_sync_cancel_info.py index a207971a9..d1b5334a1 100644 --- a/plugins/action/duo_identity_sync_cancel_info.py +++ b/plugins/action/duo_identity_sync_cancel_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("syncName") + id = params.get("id") + name = params.get("syncName") if name: response = ise.exec( family="duo_identity_sync", function="cancel_sync", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/duo_identity_sync_info.py b/plugins/action/duo_identity_sync_info.py index bf34ceb87..afa983624 100644 --- a/plugins/action/duo_identity_sync_info.py +++ b/plugins/action/duo_identity_sync_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("syncName") + id = params.get("id") + name = params.get("syncName") if name: response = ise.exec( family="duo_identity_sync", function="get_identitysync_by_sync_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="duo_identity_sync", function="get_identitysync", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/duo_identity_sync_status.py b/plugins/action/duo_identity_sync_status.py index 48495ccc5..1ef76bf84 100644 --- a/plugins/action/duo_identity_sync_status.py +++ b/plugins/action/duo_identity_sync_status.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="duo_identity_sync", function="update_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/duo_identitysync_sync_info.py b/plugins/action/duo_identitysync_sync_info.py index ae2e2482e..60fc7a80b 100644 --- a/plugins/action/duo_identitysync_sync_info.py +++ b/plugins/action/duo_identitysync_sync_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("syncName") + id = params.get("id") + name = params.get("syncName") if name: response = ise.exec( family="duo_identity_sync", function="sync", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/duo_mfa.py b/plugins/action/duo_mfa.py index a92c8dbcb..ad97d2604 100644 --- a/plugins/action/duo_mfa.py +++ b/plugins/action/duo_mfa.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -168,44 +158,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = DuoMfa(self._task.args, ise) + ise = ISESDK(params=params) + obj = DuoMfa(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/duo_mfa_info.py b/plugins/action/duo_mfa_info.py index 3c3eb2e28..d0959b558 100644 --- a/plugins/action/duo_mfa_info.py +++ b/plugins/action/duo_mfa_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("connectionName") + id = params.get("id") + name = params.get("connectionName") if name: response = ise.exec( family="duo_mfa", function="get_mfa_byconnection_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="duo_mfa", function="get_mfa", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/duo_mfa_testconnection.py b/plugins/action/duo_mfa_testconnection.py index 64997f534..336fdcaa0 100644 --- a/plugins/action/duo_mfa_testconnection.py +++ b/plugins/action/duo_mfa_testconnection.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -83,14 +47,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="duo_mfa", function="test_connection", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/egress_matrix_cell.py b/plugins/action/egress_matrix_cell.py index 672c258bb..5d8e4850e 100644 --- a/plugins/action/egress_matrix_cell.py +++ b/plugins/action/egress_matrix_cell.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -200,44 +190,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = EgressMatrixCell(self._task.args, ise) + ise = ISESDK(params=params) + obj = EgressMatrixCell(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/egress_matrix_cell_bulk_monitor_status_info.py b/plugins/action/egress_matrix_cell_bulk_monitor_status_info.py index 4aa6fcf12..54dc1fa61 100644 --- a/plugins/action/egress_matrix_cell_bulk_monitor_status_info.py +++ b/plugins/action/egress_matrix_cell_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="egress_matrix_cell", function="monitor_bulk_status_egress_matrix_cell", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/egress_matrix_cell_bulk_request.py b/plugins/action/egress_matrix_cell_bulk_request.py index cd3105881..409f89f6e 100644 --- a/plugins/action/egress_matrix_cell_bulk_request.py +++ b/plugins/action/egress_matrix_cell_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="egress_matrix_cell", function="bulk_request_for_egress_matrix_cell", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/egress_matrix_cell_clear_all.py b/plugins/action/egress_matrix_cell_clear_all.py index 24eeaa318..3508e3fb4 100644 --- a/plugins/action/egress_matrix_cell_clear_all.py +++ b/plugins/action/egress_matrix_cell_clear_all.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="egress_matrix_cell", function="clear_all_matrix_cells", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/egress_matrix_cell_clone.py b/plugins/action/egress_matrix_cell_clone.py index 134b97cd6..4f036a504 100644 --- a/plugins/action/egress_matrix_cell_clone.py +++ b/plugins/action/egress_matrix_cell_clone.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="egress_matrix_cell", function="clone_matrix_cell", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/egress_matrix_cell_info.py b/plugins/action/egress_matrix_cell_info.py index d8c8646b5..d46f75752 100644 --- a/plugins/action/egress_matrix_cell_info.py +++ b/plugins/action/egress_matrix_cell_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="egress_matrix_cell", function="get_egress_matrix_cell_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["EgressMatrixCell"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="egress_matrix_cell", function="get_egress_matrix_cell_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/egress_matrix_cell_set_all_status.py b/plugins/action/egress_matrix_cell_set_all_status.py index 9d04e9345..165225140 100644 --- a/plugins/action/egress_matrix_cell_set_all_status.py +++ b/plugins/action/egress_matrix_cell_set_all_status.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="egress_matrix_cell", function="set_all_cells_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/endpoint.py b/plugins/action/endpoint.py index 9f7f85f49..1bec1c5e4 100644 --- a/plugins/action/endpoint.py +++ b/plugins/action/endpoint.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase import re from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, @@ -197,44 +187,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Endpoint(self._task.args, ise) + ise = ISESDK(params=params) + obj = Endpoint(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/endpoint_bulk_monitor_status_info.py b/plugins/action/endpoint_bulk_monitor_status_info.py index 46c001f7a..7ddba627f 100644 --- a/plugins/action/endpoint_bulk_monitor_status_info.py +++ b/plugins/action/endpoint_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="endpoint", function="monitor_bulk_status_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/endpoint_bulk_request.py b/plugins/action/endpoint_bulk_request.py index 58cccdd07..0ca273dfc 100644 --- a/plugins/action/endpoint_bulk_request.py +++ b/plugins/action/endpoint_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="endpoint", function="bulk_request_for_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/endpoint_certificate.py b/plugins/action/endpoint_certificate.py index 929b7f4cf..a8cb934a7 100644 --- a/plugins/action/endpoint_certificate.py +++ b/plugins/action/endpoint_certificate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -89,14 +53,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) download_response = ise.exec( family="endpoint_certificate", function="create_endpoint_certificate", - params=self.get_object(self._task.args), + params=self.get_object(params), ) response = dict( data=download_response.data.decode(encoding="utf-8"), diff --git a/plugins/action/endpoint_deregister.py b/plugins/action/endpoint_deregister.py index 26de82cc0..02564087a 100644 --- a/plugins/action/endpoint_deregister.py +++ b/plugins/action/endpoint_deregister.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="endpoint", function="deregister_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/endpoint_get_rejected_endpoints_info.py b/plugins/action/endpoint_get_rejected_endpoints_info.py index 3d7b12946..3229c27c0 100644 --- a/plugins/action/endpoint_get_rejected_endpoints_info.py +++ b/plugins/action/endpoint_get_rejected_endpoints_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="endpoint", function="get_rejected_endpoints", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["OperationResult"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/endpoint_group.py b/plugins/action/endpoint_group.py index 28a5463ca..7a2593b2b 100644 --- a/plugins/action/endpoint_group.py +++ b/plugins/action/endpoint_group.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -174,44 +164,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = EndpointGroup(self._task.args, ise) + ise = ISESDK(params=params) + obj = EndpointGroup(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/endpoint_group_info.py b/plugins/action/endpoint_group_info.py index 6c119e1bf..988dfe2ea 100644 --- a/plugins/action/endpoint_group_info.py +++ b/plugins/action/endpoint_group_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="endpoint_identity_group", function="get_endpoint_group_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["EndPointGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="endpoint_identity_group", function="get_endpoint_group_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["EndPointGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="endpoint_identity_group", function="get_endpoint_groups_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/endpoint_info.py b/plugins/action/endpoint_info.py index f2bd39254..5625d95da 100644 --- a/plugins/action/endpoint_info.py +++ b/plugins/action/endpoint_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="endpoint", function="get_endpoint_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSEndPoint"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="endpoint", function="get_endpoint_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSEndPoint"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="endpoint", function="get_endpoints_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/endpoint_register.py b/plugins/action/endpoint_register.py index da0e31dd8..2f59cd0d5 100644 --- a/plugins/action/endpoint_register.py +++ b/plugins/action/endpoint_register.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -51,33 +41,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -101,14 +65,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="endpoint", function="register_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/endpoint_release_rejected_endpoint.py b/plugins/action/endpoint_release_rejected_endpoint.py index 8af6f993a..de1ef0237 100644 --- a/plugins/action/endpoint_release_rejected_endpoint.py +++ b/plugins/action/endpoint_release_rejected_endpoint.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="endpoint", function="release_rejected_endpoint", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/endpoints.py b/plugins/action/endpoints.py index c67316894..65352ad5e 100644 --- a/plugins/action/endpoints.py +++ b/plugins/action/endpoints.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -241,44 +231,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Endpoints(self._task.args, ise) + ise = ISESDK(params=params) + obj = Endpoints(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/endpoints_bulk.py b/plugins/action/endpoints_bulk.py index c5d4c9da5..2168795eb 100644 --- a/plugins/action/endpoints_bulk.py +++ b/plugins/action/endpoints_bulk.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -244,44 +234,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = EndpointsBulk(self._task.args, ise) + ise = ISESDK(params=params) + obj = EndpointsBulk(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/endpoints_bulk_info.py b/plugins/action/endpoints_bulk_info.py index 9cbae9545..4d4d99286 100644 --- a/plugins/action/endpoints_bulk_info.py +++ b/plugins/action/endpoints_bulk_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("value") - name = self._task.args.get("name") + id = params.get("value") + name = params.get("name") if id: response = ise.exec( family="endpoints", function="get_1", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="endpoints", function="list_1_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/endpoints_device_type_info.py b/plugins/action/endpoints_device_type_info.py index c132fb307..ccd87145f 100644 --- a/plugins/action/endpoints_device_type_info.py +++ b/plugins/action/endpoints_device_type_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="endpoints", function="get_device_type_summary", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/endpoints_info.py b/plugins/action/endpoints_info.py index 9cbae9545..4d4d99286 100644 --- a/plugins/action/endpoints_info.py +++ b/plugins/action/endpoints_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("value") - name = self._task.args.get("name") + id = params.get("value") + name = params.get("name") if id: response = ise.exec( family="endpoints", function="get_1", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="endpoints", function="list_1_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/endpoints_task.py b/plugins/action/endpoints_task.py index 55bc830e5..0fccaeb21 100644 --- a/plugins/action/endpoints_task.py +++ b/plugins/action/endpoints_task.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -60,33 +50,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -119,14 +83,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="endpoints", function="create_end_point_task", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/external_radius_server.py b/plugins/action/external_radius_server.py index 09ee6e999..8eafdd9d5 100644 --- a/plugins/action/external_radius_server.py +++ b/plugins/action/external_radius_server.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -201,44 +191,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = ExternalRadiusServer(self._task.args, ise) + ise = ISESDK(params=params) + obj = ExternalRadiusServer(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/external_radius_server_info.py b/plugins/action/external_radius_server_info.py index b055752e1..fd85d5598 100644 --- a/plugins/action/external_radius_server_info.py +++ b/plugins/action/external_radius_server_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="external_radius_server", function="get_external_radius_server_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ExternalRadiusServer"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="external_radius_server", function="get_external_radius_server_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ExternalRadiusServer"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="external_radius_server", function="get_external_radius_server_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/filter_policy.py b/plugins/action/filter_policy.py index 6a5b4c85e..4e45bf4b2 100644 --- a/plugins/action/filter_policy.py +++ b/plugins/action/filter_policy.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase import re try: @@ -291,44 +281,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = FilterPolicy(self._task.args, ise) + ise = ISESDK(params=params) + obj = FilterPolicy(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/filter_policy_info.py b/plugins/action/filter_policy_info.py index eaca35771..807db1713 100644 --- a/plugins/action/filter_policy_info.py +++ b/plugins/action/filter_policy_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="filter_policy", function="get_filter_policy_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSFilterPolicy"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -103,7 +74,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="filter_policy", function="get_filter_policy_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/guest_location_info.py b/plugins/action/guest_location_info.py index e6aa951ef..ab3f082ba 100644 --- a/plugins/action/guest_location_info.py +++ b/plugins/action/guest_location_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="guest_location", function="get_guest_location_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["LocationIdentification"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="guest_location", function="get_guest_location_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/guest_smtp_notification_settings.py b/plugins/action/guest_smtp_notification_settings.py index 36e60d1a2..301c1146a 100644 --- a/plugins/action/guest_smtp_notification_settings.py +++ b/plugins/action/guest_smtp_notification_settings.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -193,44 +183,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = GuestSmtpNotificationSettings(self._task.args, ise) + ise = ISESDK(params=params) + obj = GuestSmtpNotificationSettings(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/guest_smtp_notification_settings_info.py b/plugins/action/guest_smtp_notification_settings_info.py index bf619de2f..a133b4f1f 100644 --- a/plugins/action/guest_smtp_notification_settings_info.py +++ b/plugins/action/guest_smtp_notification_settings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="guest_smtp_notification_configuration", function="get_guest_smtp_notification_settings_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSGuestSmtpNotificationSettings"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="guest_smtp_notification_configuration", function="get_guest_smtp_notification_settings_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/guest_ssid.py b/plugins/action/guest_ssid.py index a7ece7ffa..a2b71f7a7 100644 --- a/plugins/action/guest_ssid.py +++ b/plugins/action/guest_ssid.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -182,44 +172,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = GuestSsid(self._task.args, ise) + ise = ISESDK(params=params) + obj = GuestSsid(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/guest_ssid_info.py b/plugins/action/guest_ssid_info.py index 8a34cdccc..e9dddcb03 100644 --- a/plugins/action/guest_ssid_info.py +++ b/plugins/action/guest_ssid_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="guest_ssid", function="get_guest_ssid_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["GuestSSID"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="guest_ssid", function="get_guest_ssid_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/guest_type.py b/plugins/action/guest_type.py index bd5569f07..ae2c0573f 100644 --- a/plugins/action/guest_type.py +++ b/plugins/action/guest_type.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -200,44 +190,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = GuestType(self._task.args, ise) + ise = ISESDK(params=params) + obj = GuestType(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/guest_type_email.py b/plugins/action/guest_type_email.py index f63674f88..932785e0a 100644 --- a/plugins/action/guest_type_email.py +++ b/plugins/action/guest_type_email.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_type", function="update_guest_type_email", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_type_info.py b/plugins/action/guest_type_info.py index 81e3db179..67f05c5ae 100644 --- a/plugins/action/guest_type_info.py +++ b/plugins/action/guest_type_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="guest_type", function="get_guest_type_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["GuestType"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="guest_type", function="get_guest_type_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/guest_type_sms.py b/plugins/action/guest_type_sms.py index 02947ddd7..cfb075cd4 100644 --- a/plugins/action/guest_type_sms.py +++ b/plugins/action/guest_type_sms.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_type", function="update_guest_type_sms", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user.py b/plugins/action/guest_user.py index 9f9e10dc0..958e4912c 100644 --- a/plugins/action/guest_user.py +++ b/plugins/action/guest_user.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -206,44 +196,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = GuestUser(self._task.args, ise) + ise = ISESDK(params=params) + obj = GuestUser(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/guest_user_approve.py b/plugins/action/guest_user_approve.py index 9bb1ad1e7..cb0a50c62 100644 --- a/plugins/action/guest_user_approve.py +++ b/plugins/action/guest_user_approve.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="approve_guest_user_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_bulk_monitor_status_info.py b/plugins/action/guest_user_bulk_monitor_status_info.py index 4f13d3117..275b8bd9b 100644 --- a/plugins/action/guest_user_bulk_monitor_status_info.py +++ b/plugins/action/guest_user_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="guest_user", function="monitor_bulk_status_guest_user", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/guest_user_bulk_request.py b/plugins/action/guest_user_bulk_request.py index 8baef062a..75860f7ea 100644 --- a/plugins/action/guest_user_bulk_request.py +++ b/plugins/action/guest_user_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="bulk_request_for_guest_user", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_change_sponsor_password.py b/plugins/action/guest_user_change_sponsor_password.py index 7eac00606..e5b5e545c 100644 --- a/plugins/action/guest_user_change_sponsor_password.py +++ b/plugins/action/guest_user_change_sponsor_password.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="change_sponsor_password", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_deny.py b/plugins/action/guest_user_deny.py index 2e578e11d..98dbe44cf 100644 --- a/plugins/action/guest_user_deny.py +++ b/plugins/action/guest_user_deny.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="deny_guest_user_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_email.py b/plugins/action/guest_user_email.py index 7e28ebbce..f29d42d4f 100644 --- a/plugins/action/guest_user_email.py +++ b/plugins/action/guest_user_email.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="update_guest_user_email", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_info.py b/plugins/action/guest_user_info.py index d40c1e47b..628dfbf92 100644 --- a/plugins/action/guest_user_info.py +++ b/plugins/action/guest_user_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="guest_user", function="get_guest_user_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["GuestUser"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="guest_user", function="get_guest_user_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["GuestUser"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="guest_user", function="get_guest_users_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/guest_user_reinstate.py b/plugins/action/guest_user_reinstate.py index 3329be9cf..6d5025aed 100644 --- a/plugins/action/guest_user_reinstate.py +++ b/plugins/action/guest_user_reinstate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="reinstate_guest_user_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_reset_password.py b/plugins/action/guest_user_reset_password.py index ace43020e..7d6cbd934 100644 --- a/plugins/action/guest_user_reset_password.py +++ b/plugins/action/guest_user_reset_password.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="reset_guest_user_password_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_sms.py b/plugins/action/guest_user_sms.py index 160beb049..559423c42 100644 --- a/plugins/action/guest_user_sms.py +++ b/plugins/action/guest_user_sms.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="update_guest_user_sms", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/guest_user_suspend.py b/plugins/action/guest_user_suspend.py index 8dcdd7209..512e622a3 100644 --- a/plugins/action/guest_user_suspend.py +++ b/plugins/action/guest_user_suspend.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="guest_user", function="suspend_guest_user_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/hotpatch_info.py b/plugins/action/hotpatch_info.py index 75b212bfc..805a725db 100644 --- a/plugins/action/hotpatch_info.py +++ b/plugins/action/hotpatch_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="patching", function="list_installed_hotpatches", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/hotpatch_install.py b/plugins/action/hotpatch_install.py index bddbe54fa..20abc7c94 100644 --- a/plugins/action/hotpatch_install.py +++ b/plugins/action/hotpatch_install.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="patching", function="install_hotpatch", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/hotpatch_rollback.py b/plugins/action/hotpatch_rollback.py index ee347cc2f..6644fbbeb 100644 --- a/plugins/action/hotpatch_rollback.py +++ b/plugins/action/hotpatch_rollback.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="patching", function="rollback_hotpatch", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/hotspot_portal.py b/plugins/action/hotspot_portal.py index 7aeacc523..af521f9a4 100644 --- a/plugins/action/hotspot_portal.py +++ b/plugins/action/hotspot_portal.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -197,44 +187,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = HotspotPortal(self._task.args, ise) + ise = ISESDK(params=params) + obj = HotspotPortal(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/hotspot_portal_info.py b/plugins/action/hotspot_portal_info.py index 783b9a068..2d33558c8 100644 --- a/plugins/action/hotspot_portal_info.py +++ b/plugins/action/hotspot_portal_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="hotspot_portal", function="get_hotspot_portal_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["HotspotPortal"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="hotspot_portal", function="get_hotspot_portal_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/id_store_sequence.py b/plugins/action/id_store_sequence.py index b41b45c01..a37ca7444 100644 --- a/plugins/action/id_store_sequence.py +++ b/plugins/action/id_store_sequence.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -182,44 +172,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = IdStoreSequence(self._task.args, ise) + ise = ISESDK(params=params) + obj = IdStoreSequence(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/id_store_sequence_info.py b/plugins/action/id_store_sequence_info.py index 1f79501f2..22b4b7931 100644 --- a/plugins/action/id_store_sequence_info.py +++ b/plugins/action/id_store_sequence_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="identity_sequence", function="get_identity_sequence_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["IdStoreSequence"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="identity_sequence", function="get_identity_sequence_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["IdStoreSequence"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="identity_sequence", function="get_identity_sequence_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/identity_group.py b/plugins/action/identity_group.py index d8d18cb8a..b4c2cbb17 100644 --- a/plugins/action/identity_group.py +++ b/plugins/action/identity_group.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -156,44 +146,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = IdentityGroup(self._task.args, ise) + ise = ISESDK(params=params) + obj = IdentityGroup(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/identity_group_info.py b/plugins/action/identity_group_info.py index 56aee6c5f..30709ff8d 100644 --- a/plugins/action/identity_group_info.py +++ b/plugins/action/identity_group_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="identity_groups", function="get_identity_group_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["IdentityGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="identity_groups", function="get_identity_group_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["IdentityGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="identity_groups", function="get_identity_groups_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/internal_user.py b/plugins/action/internal_user.py index 0a5fb76e6..b3f1d6e6f 100644 --- a/plugins/action/internal_user.py +++ b/plugins/action/internal_user.py @@ -7,23 +7,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True try: from ciscoisesdk import exceptions except ImportError: ISE_SDK_IS_INSTALLED = False else: ISE_SDK_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -282,44 +273,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = InternalUser(self._task.args, ise) + ise = ISESDK(params=params) + obj = InternalUser(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/internal_user_info.py b/plugins/action/internal_user_info.py index 8556184f3..d9b7b04e9 100644 --- a/plugins/action/internal_user_info.py +++ b/plugins/action/internal_user_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="internal_user", function="get_internal_user_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["InternalUser"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="internal_user", function="get_internal_user_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["InternalUser"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="internal_user", function="get_internal_user_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/ipsec.py b/plugins/action/ipsec.py index d3e1789ea..482e01a1a 100644 --- a/plugins/action/ipsec.py +++ b/plugins/action/ipsec.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -202,44 +192,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Ipsec(self._task.args, ise) + ise = ISESDK(params=params) + obj = Ipsec(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/ipsec_bulk.py b/plugins/action/ipsec_bulk.py index 369f1933e..a58a5e350 100644 --- a/plugins/action/ipsec_bulk.py +++ b/plugins/action/ipsec_bulk.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="native_ipsec", function="bulk_ip_sec_operation", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/ipsec_certificates_info.py b/plugins/action/ipsec_certificates_info.py index 5288fbd29..bdaa45186 100644 --- a/plugins/action/ipsec_certificates_info.py +++ b/plugins/action/ipsec_certificates_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="native_ipsec", function="get_ip_sec_certificates", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/ipsec_delete.py b/plugins/action/ipsec_delete.py index 5043ce3c4..c90c69603 100644 --- a/plugins/action/ipsec_delete.py +++ b/plugins/action/ipsec_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -142,44 +132,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = IpsecDelete(self._task.args, ise) + ise = ISESDK(params=params) + obj = IpsecDelete(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "absent": diff --git a/plugins/action/ipsec_delete_info.py b/plugins/action/ipsec_delete_info.py index 7d6d49c4e..2b06a3b62 100644 --- a/plugins/action/ipsec_delete_info.py +++ b/plugins/action/ipsec_delete_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostName") + id = params.get("id") + name = params.get("hostName") if id: response = ise.exec( family="native_ipsec", function="get_ipsec_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/ipsec_disable.py b/plugins/action/ipsec_disable.py index 25d2904ca..317bf310a 100644 --- a/plugins/action/ipsec_disable.py +++ b/plugins/action/ipsec_disable.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -141,44 +131,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = IpsecDisable(self._task.args, ise) + ise = ISESDK(params=params) + obj = IpsecDisable(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/ipsec_disable_info.py b/plugins/action/ipsec_disable_info.py index 7d6d49c4e..2b06a3b62 100644 --- a/plugins/action/ipsec_disable_info.py +++ b/plugins/action/ipsec_disable_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostName") + id = params.get("id") + name = params.get("hostName") if id: response = ise.exec( family="native_ipsec", function="get_ipsec_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/ipsec_enable.py b/plugins/action/ipsec_enable.py index 5ca5e88cc..875cf610d 100644 --- a/plugins/action/ipsec_enable.py +++ b/plugins/action/ipsec_enable.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -141,44 +131,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = IpsecEnable(self._task.args, ise) + ise = ISESDK(params=params) + obj = IpsecEnable(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/ipsec_enable_info.py b/plugins/action/ipsec_enable_info.py index 7d6d49c4e..2b06a3b62 100644 --- a/plugins/action/ipsec_enable_info.py +++ b/plugins/action/ipsec_enable_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostName") + id = params.get("id") + name = params.get("hostName") if id: response = ise.exec( family="native_ipsec", function="get_ipsec_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/ipsec_info.py b/plugins/action/ipsec_info.py index 26e0cd2e4..096e98c39 100644 --- a/plugins/action/ipsec_info.py +++ b/plugins/action/ipsec_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostName") + id = params.get("id") + name = params.get("hostName") if id: response = ise.exec( family="native_ipsec", function="get_ipsec_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -113,7 +84,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="native_ipsec", function="get_ipsec_enabled_nodes_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/ise_root_ca_regenerate.py b/plugins/action/ise_root_ca_regenerate.py index b5b5d6b30..933c143ee 100644 --- a/plugins/action/ise_root_ca_regenerate.py +++ b/plugins/action/ise_root_ca_regenerate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="regenerate_ise_root_ca", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/licensing_connection_type_info.py b/plugins/action/licensing_connection_type_info.py index db60576f2..167edf65b 100644 --- a/plugins/action/licensing_connection_type_info.py +++ b/plugins/action/licensing_connection_type_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="licensing", function="get_connection_type", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/licensing_eval_license_info.py b/plugins/action/licensing_eval_license_info.py index c4c2ac3c7..39e567530 100644 --- a/plugins/action/licensing_eval_license_info.py +++ b/plugins/action/licensing_eval_license_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="licensing", function="get_eval_license_info", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/licensing_feature_to_tier_mapping_info.py b/plugins/action/licensing_feature_to_tier_mapping_info.py index 3486c689d..f85f446ab 100644 --- a/plugins/action/licensing_feature_to_tier_mapping_info.py +++ b/plugins/action/licensing_feature_to_tier_mapping_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="licensing", function="get_feature_to_tier_mapping", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/licensing_registration_create.py b/plugins/action/licensing_registration_create.py index 3485e1959..17ac92e06 100644 --- a/plugins/action/licensing_registration_create.py +++ b/plugins/action/licensing_registration_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -43,33 +33,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -85,14 +49,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="licensing", function="create_registration_info", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/licensing_registration_info.py b/plugins/action/licensing_registration_info.py index 815c5f072..5386e7d1a 100644 --- a/plugins/action/licensing_registration_info.py +++ b/plugins/action/licensing_registration_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="licensing", function="get_registration_info", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/licensing_smart_state_create.py b/plugins/action/licensing_smart_state_create.py index 6ba18e84d..b7dbd5971 100644 --- a/plugins/action/licensing_smart_state_create.py +++ b/plugins/action/licensing_smart_state_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="licensing", function="configure_smart_state", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/licensing_smart_state_info.py b/plugins/action/licensing_smart_state_info.py index b67951fdd..7b3e31c16 100644 --- a/plugins/action/licensing_smart_state_info.py +++ b/plugins/action/licensing_smart_state_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="licensing", function="get_smart_state", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/licensing_tier_state_create.py b/plugins/action/licensing_tier_state_create.py index edfba5de4..6c332c530 100644 --- a/plugins/action/licensing_tier_state_create.py +++ b/plugins/action/licensing_tier_state_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="licensing", function="update_tier_state_info", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/licensing_tier_state_info.py b/plugins/action/licensing_tier_state_info.py index 516ad76ac..ee40e6728 100644 --- a/plugins/action/licensing_tier_state_info.py +++ b/plugins/action/licensing_tier_state_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="licensing", function="get_tier_state_info", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_account_status_info.py b/plugins/action/mnt_account_status_info.py index ad4f57630..4272354dd 100644 --- a/plugins/action/mnt_account_status_info.py +++ b/plugins/action/mnt_account_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="misc", function="get_account_status_by_mac", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_athentication_status_info.py b/plugins/action/mnt_athentication_status_info.py index b982cc369..ccb386ed6 100644 --- a/plugins/action/mnt_athentication_status_info.py +++ b/plugins/action/mnt_athentication_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_authentication_status_by_mac", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_authentication_status_info.py b/plugins/action/mnt_authentication_status_info.py index b982cc369..ccb386ed6 100644 --- a/plugins/action/mnt_authentication_status_info.py +++ b/plugins/action/mnt_authentication_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_authentication_status_by_mac", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_failure_reasons_info.py b/plugins/action/mnt_failure_reasons_info.py index 13bc22fc8..38c60edb3 100644 --- a/plugins/action/mnt_failure_reasons_info.py +++ b/plugins/action/mnt_failure_reasons_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_failure_reasons", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_active_count_info.py b/plugins/action/mnt_session_active_count_info.py index a70330b14..35ef4822e 100644 --- a/plugins/action/mnt_session_active_count_info.py +++ b/plugins/action/mnt_session_active_count_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_active_count", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["sessionCount"]["count"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_active_list_info.py b/plugins/action/mnt_session_active_list_info.py index 23a131366..cd7216132 100644 --- a/plugins/action/mnt_session_active_list_info.py +++ b/plugins/action/mnt_session_active_list_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_active_list", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["activeList"]["@noOfActiveSession"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_auth_list_info.py b/plugins/action/mnt_session_auth_list_info.py index 937ffdde7..3735dfa90 100644 --- a/plugins/action/mnt_session_auth_list_info.py +++ b/plugins/action/mnt_session_auth_list_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_session_auth_list", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["noOfActiveSession"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_by_ip_info.py b/plugins/action/mnt_session_by_ip_info.py index 81f8e4d0d..3947005f1 100644 --- a/plugins/action/mnt_session_by_ip_info.py +++ b/plugins/action/mnt_session_by_ip_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("endpoint_ipv4") - name = self._task.args.get("name") + id = params.get("endpoint_ipv4") + name = params.get("name") if id: response = ise.exec( family="misc", function="get_sessions_by_endpoint_ip", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_by_mac_info.py b/plugins/action/mnt_session_by_mac_info.py index e68b02f5f..15f3f69cb 100644 --- a/plugins/action/mnt_session_by_mac_info.py +++ b/plugins/action/mnt_session_by_mac_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("mac") - name = self._task.args.get("name") + id = params.get("mac") + name = params.get("name") if id: response = ise.exec( family="misc", function="get_sessions_by_mac", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_by_nas_ip_info.py b/plugins/action/mnt_session_by_nas_ip_info.py index 9448cfb09..f6169a151 100644 --- a/plugins/action/mnt_session_by_nas_ip_info.py +++ b/plugins/action/mnt_session_by_nas_ip_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("nas_ipv4") - name = self._task.args.get("name") + id = params.get("nas_ipv4") + name = params.get("name") if id: response = ise.exec( family="misc", function="get_sessions_by_nas_ip", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_by_username_info.py b/plugins/action/mnt_session_by_username_info.py index d3babdd31..6af926f7d 100644 --- a/plugins/action/mnt_session_by_username_info.py +++ b/plugins/action/mnt_session_by_username_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("username") + id = params.get("id") + name = params.get("username") if name: response = ise.exec( family="misc", function="get_sessions_by_username", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_delete_all.py b/plugins/action/mnt_session_delete_all.py index ca89037bf..bc3508a88 100644 --- a/plugins/action/mnt_session_delete_all.py +++ b/plugins/action/mnt_session_delete_all.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="misc", function="delete_all_sessions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/mnt_session_disconnect_info.py b/plugins/action/mnt_session_disconnect_info.py index 2bf6d0591..a6a1c21e7 100644 --- a/plugins/action/mnt_session_disconnect_info.py +++ b/plugins/action/mnt_session_disconnect_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -43,33 +33,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -85,19 +49,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="misc", function="session_disconnect", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_posture_count_info.py b/plugins/action/mnt_session_posture_count_info.py index 2235f2aeb..7f7552f9f 100644 --- a/plugins/action/mnt_session_posture_count_info.py +++ b/plugins/action/mnt_session_posture_count_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_posture_count", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["count"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_profiler_count_info.py b/plugins/action/mnt_session_profiler_count_info.py index 2ae425d46..3138d37c3 100644 --- a/plugins/action/mnt_session_profiler_count_info.py +++ b/plugins/action/mnt_session_profiler_count_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_profiler_count", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["count"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_session_reauthentication_info.py b/plugins/action/mnt_session_reauthentication_info.py index ce2bd9527..7b5676a05 100644 --- a/plugins/action/mnt_session_reauthentication_info.py +++ b/plugins/action/mnt_session_reauthentication_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="misc", function="session_reauthentication_by_mac", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_sessions_by_session_id_info.py b/plugins/action/mnt_sessions_by_session_id_info.py index a4ba1c589..b5e2de44b 100644 --- a/plugins/action/mnt_sessions_by_session_id_info.py +++ b/plugins/action/mnt_sessions_by_session_id_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_sessions_by_session_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/mnt_version_info.py b/plugins/action/mnt_version_info.py index 9debb8197..052d91451 100644 --- a/plugins/action/mnt_version_info.py +++ b/plugins/action/mnt_version_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="misc", function="get_mnt_version", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/my_device_portal.py b/plugins/action/my_device_portal.py index 5320c868b..3bac82d21 100644 --- a/plugins/action/my_device_portal.py +++ b/plugins/action/my_device_portal.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -197,44 +187,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = MyDevicePortal(self._task.args, ise) + ise = ISESDK(params=params) + obj = MyDevicePortal(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/my_device_portal_info.py b/plugins/action/my_device_portal_info.py index f9d81ec28..3f938d947 100644 --- a/plugins/action/my_device_portal_info.py +++ b/plugins/action/my_device_portal_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="my_device_portal", function="get_my_device_portal_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["MyDevicePortal"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="my_device_portal", function="get_my_device_portal_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/native_supplicant_profile.py b/plugins/action/native_supplicant_profile.py index 29ad5c499..d83bd6991 100644 --- a/plugins/action/native_supplicant_profile.py +++ b/plugins/action/native_supplicant_profile.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -181,44 +171,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NativeSupplicantProfile(self._task.args, ise) + ise = ISESDK(params=params) + obj = NativeSupplicantProfile(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/native_supplicant_profile_info.py b/plugins/action/native_supplicant_profile_info.py index 70c66e8ce..e3d10bf74 100644 --- a/plugins/action/native_supplicant_profile_info.py +++ b/plugins/action/native_supplicant_profile_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="native_supplicant_profile", function="get_native_supplicant_profile_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSNSPProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -103,7 +74,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="native_supplicant_profile", function="get_native_supplicant_profile_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/network_access_authentication_rules.py b/plugins/action/network_access_authentication_rules.py index 456cd027c..5d04634c2 100644 --- a/plugins/action/network_access_authentication_rules.py +++ b/plugins/action/network_access_authentication_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -214,44 +204,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessAuthenticationRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessAuthenticationRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_authentication_rules_info.py b/plugins/action/network_access_authentication_rules_info.py index 537549a9e..12993b3b2 100644 --- a/plugins/action/network_access_authentication_rules_info.py +++ b/plugins/action/network_access_authentication_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_authentication_rules", function="get_network_access_authentication_rule_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_authentication_rules", function="get_network_access_authentication_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_authentication_rules_reset_hitcount.py b/plugins/action/network_access_authentication_rules_reset_hitcount.py index 376cd72a2..0e8072e7d 100644 --- a/plugins/action/network_access_authentication_rules_reset_hitcount.py +++ b/plugins/action/network_access_authentication_rules_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="network_access_authentication_rules", function="reset_hit_counts_network_access_authentication_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/network_access_authorization_rules.py b/plugins/action/network_access_authorization_rules.py index 77f51a2a8..8dc714143 100644 --- a/plugins/action/network_access_authorization_rules.py +++ b/plugins/action/network_access_authorization_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -207,44 +197,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessAuthorizationRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessAuthorizationRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_authorization_rules_info.py b/plugins/action/network_access_authorization_rules_info.py index a0494a8f2..168039722 100644 --- a/plugins/action/network_access_authorization_rules_info.py +++ b/plugins/action/network_access_authorization_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_authorization_rules", function="get_network_access_authorization_rule_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_authorization_rules", function="get_network_access_authorization_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_authorization_rules_reset_hitcount.py b/plugins/action/network_access_authorization_rules_reset_hitcount.py index ded045974..515d14c47 100644 --- a/plugins/action/network_access_authorization_rules_reset_hitcount.py +++ b/plugins/action/network_access_authorization_rules_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="network_access_authorization_rules", function="reset_hit_counts_network_access_authorization_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/network_access_conditions.py b/plugins/action/network_access_conditions.py index f890e7839..cfb82f7e8 100644 --- a/plugins/action/network_access_conditions.py +++ b/plugins/action/network_access_conditions.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -224,44 +214,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessConditions(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessConditions(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_conditions_for_authentication_rule_info.py b/plugins/action/network_access_conditions_for_authentication_rule_info.py index f9f20ab6e..996d89273 100644 --- a/plugins/action/network_access_conditions_for_authentication_rule_info.py +++ b/plugins/action/network_access_conditions_for_authentication_rule_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_conditions", function="get_network_access_conditions_for_authentication_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_conditions_for_authorization_rule_info.py b/plugins/action/network_access_conditions_for_authorization_rule_info.py index 1550322e0..072ae6b1f 100644 --- a/plugins/action/network_access_conditions_for_authorization_rule_info.py +++ b/plugins/action/network_access_conditions_for_authorization_rule_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_conditions", function="get_network_access_conditions_for_authorization_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_conditions_for_policy_set_info.py b/plugins/action/network_access_conditions_for_policy_set_info.py index 6c711242b..fad5cf3c9 100644 --- a/plugins/action/network_access_conditions_for_policy_set_info.py +++ b/plugins/action/network_access_conditions_for_policy_set_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_conditions", function="get_network_access_conditions_for_policy_sets", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_conditions_info.py b/plugins/action/network_access_conditions_info.py index 9847d47d1..d87a191e1 100644 --- a/plugins/action/network_access_conditions_info.py +++ b/plugins/action/network_access_conditions_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_conditions", function="get_network_access_condition_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_conditions", function="get_network_access_condition_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -109,7 +80,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_conditions", function="get_network_access_conditions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_dictionary.py b/plugins/action/network_access_dictionary.py index 2b26508bf..01381189f 100644 --- a/plugins/action/network_access_dictionary.py +++ b/plugins/action/network_access_dictionary.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -171,44 +161,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessDictionary(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessDictionary(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_dictionary_attribute.py b/plugins/action/network_access_dictionary_attribute.py index 17dda22fb..dc4df4901 100644 --- a/plugins/action/network_access_dictionary_attribute.py +++ b/plugins/action/network_access_dictionary_attribute.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -168,44 +158,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessDictionaryAttribute(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessDictionaryAttribute(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_dictionary_attribute_info.py b/plugins/action/network_access_dictionary_attribute_info.py index afffd4b6b..6476d4938 100644 --- a/plugins/action/network_access_dictionary_attribute_info.py +++ b/plugins/action/network_access_dictionary_attribute_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if name: response = ise.exec( family="network_access_dictionary_attribute", function="get_network_access_dictionary_attribute_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_dictionary_attribute", function="get_network_access_dictionary_attributes_by_dictionary_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_dictionary_attributes_authentication_info.py b/plugins/action/network_access_dictionary_attributes_authentication_info.py index 33758d17b..6a7b6ea81 100644 --- a/plugins/action/network_access_dictionary_attributes_authentication_info.py +++ b/plugins/action/network_access_dictionary_attributes_authentication_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_dictionary_attributes_list", function="get_network_access_dictionaries_authentication", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_dictionary_attributes_authorization_info.py b/plugins/action/network_access_dictionary_attributes_authorization_info.py index 5e9ed61b1..7275f84a3 100644 --- a/plugins/action/network_access_dictionary_attributes_authorization_info.py +++ b/plugins/action/network_access_dictionary_attributes_authorization_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_dictionary_attributes_list", function="get_network_access_dictionaries_authorization", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_dictionary_attributes_policy_set_info.py b/plugins/action/network_access_dictionary_attributes_policy_set_info.py index c7bf7cfa6..160c9d395 100644 --- a/plugins/action/network_access_dictionary_attributes_policy_set_info.py +++ b/plugins/action/network_access_dictionary_attributes_policy_set_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_dictionary_attributes_list", function="get_network_access_dictionaries_policy_set", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_dictionary_info.py b/plugins/action/network_access_dictionary_info.py index 59790f84b..e2fda25ca 100644 --- a/plugins/action/network_access_dictionary_info.py +++ b/plugins/action/network_access_dictionary_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if name: response = ise.exec( family="network_access_dictionary", function="get_network_access_dictionary_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_dictionary", function="get_network_access_dictionaries", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_global_exception_rules.py b/plugins/action/network_access_global_exception_rules.py index 75feb7283..bddf21510 100644 --- a/plugins/action/network_access_global_exception_rules.py +++ b/plugins/action/network_access_global_exception_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -196,44 +186,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessGlobalExceptionRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessGlobalExceptionRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_global_exception_rules_info.py b/plugins/action/network_access_global_exception_rules_info.py index 490623bb1..b600d56a1 100644 --- a/plugins/action/network_access_global_exception_rules_info.py +++ b/plugins/action/network_access_global_exception_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_authorization_global_exception_rules", function="get_network_access_policy_set_global_exception_rule_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_authorization_global_exception_rules", function="get_network_access_policy_set_global_exception_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_global_exception_rules_reset_hitcount.py b/plugins/action/network_access_global_exception_rules_reset_hitcount.py index cf1bc583c..cf82159a1 100644 --- a/plugins/action/network_access_global_exception_rules_reset_hitcount.py +++ b/plugins/action/network_access_global_exception_rules_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="network_access_authorization_global_exception_rules", function="reset_hit_counts_network_access_global_exceptions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/network_access_identity_stores_info.py b/plugins/action/network_access_identity_stores_info.py index 5ffa4cae5..6de86d6a7 100644 --- a/plugins/action/network_access_identity_stores_info.py +++ b/plugins/action/network_access_identity_stores_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_identity_stores", function="get_network_access_identity_stores", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_local_exception_rules.py b/plugins/action/network_access_local_exception_rules.py index c694351f5..7af32fb28 100644 --- a/plugins/action/network_access_local_exception_rules.py +++ b/plugins/action/network_access_local_exception_rules.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -205,44 +195,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessLocalExceptionRules(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessLocalExceptionRules(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_local_exception_rules_info.py b/plugins/action/network_access_local_exception_rules_info.py index fde072d62..57dc6a55b 100644 --- a/plugins/action/network_access_local_exception_rules_info.py +++ b/plugins/action/network_access_local_exception_rules_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -79,19 +43,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_authorization_exception_rules", function="get_network_access_local_exception_rule_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -100,7 +71,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_authorization_exception_rules", function="get_network_access_local_exception_rules", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_local_exception_rules_reset_hitcounts.py b/plugins/action/network_access_local_exception_rules_reset_hitcounts.py index 66b79b37b..468b96008 100644 --- a/plugins/action/network_access_local_exception_rules_reset_hitcounts.py +++ b/plugins/action/network_access_local_exception_rules_reset_hitcounts.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="network_access_authorization_exception_rules", function="reset_hit_counts_network_access_local_exceptions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/network_access_network_condition.py b/plugins/action/network_access_network_condition.py index a13c07c2f..ad7de056f 100644 --- a/plugins/action/network_access_network_condition.py +++ b/plugins/action/network_access_network_condition.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -192,44 +182,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessNetworkCondition(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessNetworkCondition(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_network_condition_info.py b/plugins/action/network_access_network_condition_info.py index 3995cc3f8..1a8a408c6 100644 --- a/plugins/action/network_access_network_condition_info.py +++ b/plugins/action/network_access_network_condition_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_network_conditions", function="get_network_access_network_condition_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_network_conditions", function="get_network_access_network_conditions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_policy_set.py b/plugins/action/network_access_policy_set.py index 0eba57fed..3eabf13ed 100644 --- a/plugins/action/network_access_policy_set.py +++ b/plugins/action/network_access_policy_set.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -195,44 +185,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessPolicySet(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessPolicySet(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_policy_set_info.py b/plugins/action/network_access_policy_set_info.py index 9b520c365..8c237d2f8 100644 --- a/plugins/action/network_access_policy_set_info.py +++ b/plugins/action/network_access_policy_set_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_policy_set", function="get_network_access_policy_set_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_policy_set", function="get_network_access_policy_sets", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_policy_set_reset_hitcount.py b/plugins/action/network_access_policy_set_reset_hitcount.py index bebf1bc0e..0b6d877ef 100644 --- a/plugins/action/network_access_policy_set_reset_hitcount.py +++ b/plugins/action/network_access_policy_set_reset_hitcount.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="network_access_policy_set", function="reset_hit_counts_network_access_policy_sets", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/network_access_profiles_info.py b/plugins/action/network_access_profiles_info.py index 491945d9a..9b1ee896f 100644 --- a/plugins/action/network_access_profiles_info.py +++ b/plugins/action/network_access_profiles_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_profiles", function="get_network_access_profiles", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_security_groups_info.py b/plugins/action/network_access_security_groups_info.py index adaf2c8ee..c456863c6 100644 --- a/plugins/action/network_access_security_groups_info.py +++ b/plugins/action/network_access_security_groups_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_security_groups", function="get_network_access_security_groups", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_service_name_info.py b/plugins/action/network_access_service_name_info.py index 129559c6c..5246bacf3 100644 --- a/plugins/action/network_access_service_name_info.py +++ b/plugins/action/network_access_service_name_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="network_access_service_names", function="get_network_access_service_names", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_access_time_date_conditions.py b/plugins/action/network_access_time_date_conditions.py index 39b73c588..deb016ca9 100644 --- a/plugins/action/network_access_time_date_conditions.py +++ b/plugins/action/network_access_time_date_conditions.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -219,44 +209,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkAccessTimeDateConditions(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkAccessTimeDateConditions(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_access_time_date_conditions_info.py b/plugins/action/network_access_time_date_conditions_info.py index 76801eebc..404a557e0 100644 --- a/plugins/action/network_access_time_date_conditions_info.py +++ b/plugins/action/network_access_time_date_conditions_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_access_time_date_conditions", function="get_network_access_time_condition_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_access_time_date_conditions", function="get_network_access_time_conditions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_device.py b/plugins/action/network_device.py index fc74e6b8a..ad763f83b 100644 --- a/plugins/action/network_device.py +++ b/plugins/action/network_device.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -223,44 +213,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkDevice(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkDevice(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_device_bulk_monitor_status_info.py b/plugins/action/network_device_bulk_monitor_status_info.py index 054c50bba..7f05a84f9 100644 --- a/plugins/action/network_device_bulk_monitor_status_info.py +++ b/plugins/action/network_device_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="network_device", function="monitor_bulk_status_network_device", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/network_device_bulk_request.py b/plugins/action/network_device_bulk_request.py index b1260ec27..b39d54de6 100644 --- a/plugins/action/network_device_bulk_request.py +++ b/plugins/action/network_device_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="network_device", function="bulk_request_for_network_device", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/network_device_group.py b/plugins/action/network_device_group.py index 512832009..c52f41903 100644 --- a/plugins/action/network_device_group.py +++ b/plugins/action/network_device_group.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -174,44 +164,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NetworkDeviceGroup(self._task.args, ise) + ise = ISESDK(params=params) + obj = NetworkDeviceGroup(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/network_device_group_info.py b/plugins/action/network_device_group_info.py index 5eb5c38b0..ecf4f9d4c 100644 --- a/plugins/action/network_device_group_info.py +++ b/plugins/action/network_device_group_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): if params.get("name"): @@ -93,19 +57,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_device_group", function="get_network_device_group_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["NetworkDeviceGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_device_group", function="get_network_device_group_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["NetworkDeviceGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -124,7 +95,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="network_device_group", function="get_network_device_group_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/network_device_info.py b/plugins/action/network_device_info.py index 61c6a438e..07af7f378 100644 --- a/plugins/action/network_device_info.py +++ b/plugins/action/network_device_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="network_device", function="get_network_device_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["NetworkDevice"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="network_device", function="get_network_device_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["NetworkDevice"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="network_device", function="get_network_device_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/node_deployment.py b/plugins/action/node_deployment.py index 77b781e1d..91e66e886 100644 --- a/plugins/action/node_deployment.py +++ b/plugins/action/node_deployment.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -158,44 +148,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NodeDeployment(self._task.args, ise) + ise = ISESDK(params=params) + obj = NodeDeployment(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/node_deployment_info.py b/plugins/action/node_deployment_info.py index e4d268b7b..3e7e54872 100644 --- a/plugins/action/node_deployment_info.py +++ b/plugins/action/node_deployment_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostname") + id = params.get("id") + name = params.get("hostname") if name: response = ise.exec( family="node_deployment", function="get_node_details", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -102,7 +73,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="node_deployment", function="get_deployment_nodes", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/node_deployment_sync.py b/plugins/action/node_deployment_sync.py index 01905e7ff..35d283c20 100644 --- a/plugins/action/node_deployment_sync.py +++ b/plugins/action/node_deployment_sync.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="node_deployment", function="sync_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/node_group.py b/plugins/action/node_group.py index 2248bf489..387d01be6 100644 --- a/plugins/action/node_group.py +++ b/plugins/action/node_group.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -152,44 +142,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NodeGroup(self._task.args, ise) + ise = ISESDK(params=params) + obj = NodeGroup(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/node_group_info.py b/plugins/action/node_group_info.py index e9cb2418e..54a268de7 100644 --- a/plugins/action/node_group_info.py +++ b/plugins/action/node_group_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("nodeGroupName") + id = params.get("id") + name = params.get("nodeGroupName") if name: response = ise.exec( family="node_group", function="get_node_group", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="node_group", function="get_node_groups", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/node_group_node_create.py b/plugins/action/node_group_node_create.py index c7cdacda8..aabc5d00d 100644 --- a/plugins/action/node_group_node_create.py +++ b/plugins/action/node_group_node_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="node_group", function="add_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/node_group_node_delete.py b/plugins/action/node_group_node_delete.py index 5afb32ca6..78f4f200c 100644 --- a/plugins/action/node_group_node_delete.py +++ b/plugins/action/node_group_node_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="node_group", function="remove_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/node_group_node_info.py b/plugins/action/node_group_node_info.py index aa65d631a..66627c3d0 100644 --- a/plugins/action/node_group_node_info.py +++ b/plugins/action/node_group_node_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("nodeGroupName") + id = params.get("id") + name = params.get("nodeGroupName") if name and not id: response = ise.exec( family="node_group", function="get_nodes", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/node_info.py b/plugins/action/node_info.py index 7f60b3de3..fadd83897 100644 --- a/plugins/action/node_info.py +++ b/plugins/action/node_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -44,33 +34,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -87,19 +51,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="node_details", function="get_node_detail_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["Node"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -108,7 +79,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="node_details", function="get_node_detail_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["Node"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -118,7 +89,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="node_details", function="get_node_details_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/node_primary_to_standalone.py b/plugins/action/node_primary_to_standalone.py index 8cd81acc8..7d6fccd60 100644 --- a/plugins/action/node_primary_to_standalone.py +++ b/plugins/action/node_primary_to_standalone.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -107,33 +97,7 @@ def requires_update(self, current_obj): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -143,12 +107,19 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NodePrimaryToStandalone(self._task.args, ise) + ise = ISESDK(params=params) + obj = NodePrimaryToStandalone(params, ise) - name = self._task.args.get("hostname") + name = params.get("hostname") response = None (obj_exists, prev_obj) = obj.exists() @@ -157,7 +128,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="node_deployment", function="make_standalone", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response ise.object_updated() else: diff --git a/plugins/action/node_promotion.py b/plugins/action/node_promotion.py index fc03191f5..220d911c9 100644 --- a/plugins/action/node_promotion.py +++ b/plugins/action/node_promotion.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="node_deployment", function="promote_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/node_replication_status_info.py b/plugins/action/node_replication_status_info.py index bb56afa54..f6ee89d21 100644 --- a/plugins/action/node_replication_status_info.py +++ b/plugins/action/node_replication_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("node") - name = self._task.args.get("name") + id = params.get("node") + name = params.get("name") if id: response = ise.exec( family="replication_status", function="get_node_replication_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["NodeStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/node_secondary_to_primary.py b/plugins/action/node_secondary_to_primary.py index aa6710340..e081f782f 100644 --- a/plugins/action/node_secondary_to_primary.py +++ b/plugins/action/node_secondary_to_primary.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -107,33 +97,7 @@ def requires_update(self, current_obj): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -143,12 +107,19 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NodeSecondaryToPrimary(self._task.args, ise) + ise = ISESDK(params=params) + obj = NodeSecondaryToPrimary(params, ise) - name = self._task.args.get("hostname") + name = params.get("hostname") response = None (obj_exists, prev_obj) = obj.exists() @@ -157,7 +128,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="node_deployment", function="promote_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response ise.object_updated() else: diff --git a/plugins/action/node_services_interfaces_info.py b/plugins/action/node_services_interfaces_info.py index a18019275..39fa7e3af 100644 --- a/plugins/action/node_services_interfaces_info.py +++ b/plugins/action/node_services_interfaces_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostname") + id = params.get("id") + name = params.get("hostname") if name: response = ise.exec( family="node_services", function="get_interfaces", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/node_services_profiler_probe_config.py b/plugins/action/node_services_profiler_probe_config.py index f5584686b..064e587fb 100644 --- a/plugins/action/node_services_profiler_probe_config.py +++ b/plugins/action/node_services_profiler_probe_config.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -168,44 +158,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NodeServicesProfilerProbeConfig(self._task.args, ise) + ise = ISESDK(params=params) + obj = NodeServicesProfilerProbeConfig(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/node_services_profiler_probe_config_info.py b/plugins/action/node_services_profiler_probe_config_info.py index 9e47d4249..3b2322c34 100644 --- a/plugins/action/node_services_profiler_probe_config_info.py +++ b/plugins/action/node_services_profiler_probe_config_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostname") + id = params.get("id") + name = params.get("hostname") if name: response = ise.exec( family="node_services", function="get_profiler_probe_config", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/node_services_sxp_interfaces.py b/plugins/action/node_services_sxp_interfaces.py index 774a53eff..851599b99 100644 --- a/plugins/action/node_services_sxp_interfaces.py +++ b/plugins/action/node_services_sxp_interfaces.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -119,44 +109,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NodeServicesSxpInterfaces(self._task.args, ise) + ise = ISESDK(params=params) + obj = NodeServicesSxpInterfaces(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/node_services_sxp_interfaces_info.py b/plugins/action/node_services_sxp_interfaces_info.py index 76b814c5b..36772f262 100644 --- a/plugins/action/node_services_sxp_interfaces_info.py +++ b/plugins/action/node_services_sxp_interfaces_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostname") + id = params.get("id") + name = params.get("hostname") if not name and not id: response = ise.exec( family="node_services", function="get_sxp_interface", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/node_standalone_to_primary.py b/plugins/action/node_standalone_to_primary.py index 8bf652b00..0be4b7c12 100644 --- a/plugins/action/node_standalone_to_primary.py +++ b/plugins/action/node_standalone_to_primary.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -106,33 +96,7 @@ def requires_update(self, current_obj): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -142,12 +106,19 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = NodeStandaloneToPrimary(self._task.args, ise) + ise = ISESDK(params=params) + obj = NodeStandaloneToPrimary(params, ise) - name = self._task.args.get("hostname") + name = params.get("hostname") response = None (obj_exists, prev_obj) = obj.exists() @@ -156,7 +127,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="node_deployment", function="make_primary", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response ise.object_updated() else: diff --git a/plugins/action/node_sync.py b/plugins/action/node_sync.py index e591ad05d..14c18dc36 100644 --- a/plugins/action/node_sync.py +++ b/plugins/action/node_sync.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="sync_ise_node", function="sync_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pan_ha.py b/plugins/action/pan_ha.py index 5f3757a6b..678fa6565 100644 --- a/plugins/action/pan_ha.py +++ b/plugins/action/pan_ha.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -135,44 +125,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = PanHa(self._task.args, ise) + ise = ISESDK(params=params) + obj = PanHa(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/pan_ha_info.py b/plugins/action/pan_ha_info.py index d8127044e..d9e788b5f 100644 --- a/plugins/action/pan_ha_info.py +++ b/plugins/action/pan_ha_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="pan_ha", function="get_pan_ha_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/pan_ha_update.py b/plugins/action/pan_ha_update.py index 8ff5db241..35b0e64e0 100644 --- a/plugins/action/pan_ha_update.py +++ b/plugins/action/pan_ha_update.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -43,33 +33,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -85,14 +49,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="pan_ha", function="update_pan_ha", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/patch_info.py b/plugins/action/patch_info.py index d0e6874b8..7ce9f3426 100644 --- a/plugins/action/patch_info.py +++ b/plugins/action/patch_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="patching", function="list_installed_patches", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/patch_install.py b/plugins/action/patch_install.py index 033cd8c87..f8455ff43 100644 --- a/plugins/action/patch_install.py +++ b/plugins/action/patch_install.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -81,14 +45,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="patching", function="install_patch", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/patch_rollback.py b/plugins/action/patch_rollback.py index bafbf83af..1d134ed64 100644 --- a/plugins/action/patch_rollback.py +++ b/plugins/action/patch_rollback.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="patching", function="rollback_patch", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/personas_check_standalone.py b/plugins/action/personas_check_standalone.py index 22b3a6c6c..eed1dded2 100644 --- a/plugins/action/personas_check_standalone.py +++ b/plugins/action/personas_check_standalone.py @@ -7,17 +7,8 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.personas_utils import Node argument_spec = dict( @@ -37,46 +28,27 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} node = Node( dict( - ip=self._task.args.get("ip"), - username=self._task.args.get("username"), - password=self._task.args.get("password"), - hostname=self._task.args.get("hostname"), + ip=params.get("ip"), + username=params.get("username"), + password=params.get("password"), + hostname=params.get("hostname"), ) ) @@ -88,7 +60,7 @@ def run(self, tmp=None, task_vars=None): ) response = "Node {hostname} is in STANDALONE mode".format( - hostname=self._task.args.get("hostname") + hostname=params.get("hostname") ) self._result.update(dict(ise_response=response)) diff --git a/plugins/action/personas_export_certs.py b/plugins/action/personas_export_certs.py index fbf138b49..a53667724 100644 --- a/plugins/action/personas_export_certs.py +++ b/plugins/action/personas_export_certs.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.personas_utils import Node argument_spec = dict( @@ -41,55 +31,36 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} primary_node = Node( dict( - ip=self._task.args.get("primary_ip"), - username=self._task.args.get("primary_username"), - password=self._task.args.get("primary_password"), + ip=params.get("primary_ip"), + username=params.get("primary_username"), + password=params.get("primary_password"), ) ) this_node = Node( dict( - name=self._task.args.get("name"), - ip=self._task.args.get("ip"), - hostname=self._task.args.get("hostname"), - username=self._task.args.get("username"), - password=self._task.args.get("password"), + name=params.get("name"), + ip=params.get("ip"), + hostname=params.get("hostname"), + username=params.get("username"), + password=params.get("password"), ) ) diff --git a/plugins/action/personas_promote_primary.py b/plugins/action/personas_promote_primary.py index 8232a9dbb..fa58c8692 100644 --- a/plugins/action/personas_promote_primary.py +++ b/plugins/action/personas_promote_primary.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.personas_utils import Node argument_spec = dict( @@ -39,51 +29,32 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} node = Node( dict( - ip=self._task.args.get("ip"), - hostname=self._task.args.get("hostname"), - username=self._task.args.get("username"), - password=self._task.args.get("password"), - roles=self._task.args.get("roles"), + ip=params.get("ip"), + hostname=params.get("hostname"), + username=params.get("username"), + password=params.get("password"), + roles=params.get("roles"), ) ) - timeout = self._task.args.get("timeout") + timeout = params.get("timeout") if node.is_primary(timeout=timeout): response = "Node is already primary" self._result.update(dict(result="Object already present")) diff --git a/plugins/action/personas_register_node.py b/plugins/action/personas_register_node.py index fa0163172..ad4f24e76 100644 --- a/plugins/action/personas_register_node.py +++ b/plugins/action/personas_register_node.py @@ -7,17 +7,8 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.personas_utils import Node argument_spec = dict( @@ -41,56 +32,37 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} primary_node = Node( dict( - ip=self._task.args.get("primary_ip"), - username=self._task.args.get("primary_username"), - password=self._task.args.get("primary_password"), + ip=params.get("primary_ip"), + username=params.get("primary_username"), + password=params.get("primary_password"), ) ) this_node = Node( dict( - name=self._task.args.get("name"), - fqdn=self._task.args.get("fqdn"), - username=self._task.args.get("username"), - password=self._task.args.get("password"), - roles=self._task.args.get("roles"), - services=self._task.args.get("services"), + name=params.get("name"), + fqdn=params.get("fqdn"), + username=params.get("username"), + password=params.get("password"), + roles=params.get("roles"), + services=params.get("services"), ) ) @@ -100,7 +72,7 @@ def run(self, tmp=None, task_vars=None): raise AnsibleActionFail("Application server is not running.") response = "Node {fqdn} updated successfully".format( - fqdn=self._task.args.get("fqdn") + fqdn=params.get("fqdn") ) self._result.update(dict(ise_response=response)) diff --git a/plugins/action/personas_update_roles_services.py b/plugins/action/personas_update_roles_services.py index 3edb27f86..892a6b3de 100644 --- a/plugins/action/personas_update_roles_services.py +++ b/plugins/action/personas_update_roles_services.py @@ -1,17 +1,8 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.personas_utils import Node from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ise_compare_equality, @@ -54,47 +45,28 @@ def requires_update(self, current_obj, requested_obj): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} obj = NodeDeployment() request_obj = dict( - ip=self._task.args.get("ip"), - username=self._task.args.get("username"), - password=self._task.args.get("password"), - hostname=self._task.args.get("hostname"), - roles=self._task.args.get("roles"), - services=self._task.args.get("services"), + ip=params.get("ip"), + username=params.get("username"), + password=params.get("password"), + hostname=params.get("hostname"), + roles=params.get("roles"), + services=params.get("services"), ) node = Node(request_obj) prev_obj = False diff --git a/plugins/action/portal_global_setting.py b/plugins/action/portal_global_setting.py index 3c950dd19..f923eb2b6 100644 --- a/plugins/action/portal_global_setting.py +++ b/plugins/action/portal_global_setting.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -160,44 +150,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = PortalGlobalSetting(self._task.args, ise) + ise = ISESDK(params=params) + obj = PortalGlobalSetting(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/portal_global_setting_info.py b/plugins/action/portal_global_setting_info.py index 4aca574aa..82045da97 100644 --- a/plugins/action/portal_global_setting_info.py +++ b/plugins/action/portal_global_setting_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="portal_global_setting", function="get_portal_global_setting_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["PortalCustomizationGlobalSetting"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="portal_global_setting", function="get_portal_global_settings_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/portal_info.py b/plugins/action/portal_info.py index b66b17044..0b18f6973 100644 --- a/plugins/action/portal_info.py +++ b/plugins/action/portal_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="portal", function="get_portal_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSPortal"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="portal", function="get_portals_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/portal_theme.py b/plugins/action/portal_theme.py index ca38a0b29..7f1f706cd 100644 --- a/plugins/action/portal_theme.py +++ b/plugins/action/portal_theme.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -188,44 +178,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = PortalTheme(self._task.args, ise) + ise = ISESDK(params=params) + obj = PortalTheme(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/portal_theme_info.py b/plugins/action/portal_theme_info.py index 02bc52c74..04f76b125 100644 --- a/plugins/action/portal_theme_info.py +++ b/plugins/action/portal_theme_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="portal_theme", function="get_portal_theme_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["PortalTheme"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="portal_theme", function="get_portal_themes_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/profiler_profile_info.py b/plugins/action/profiler_profile_info.py index 0a98544c7..cfcdb695d 100644 --- a/plugins/action/profiler_profile_info.py +++ b/plugins/action/profiler_profile_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="profiler_profile", function="get_profiler_profile_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ProfilerProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="profiler_profile", function="get_profiler_profiles_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/proxy_connection_settings.py b/plugins/action/proxy_connection_settings.py index 2ad02d125..989d8d747 100644 --- a/plugins/action/proxy_connection_settings.py +++ b/plugins/action/proxy_connection_settings.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -129,44 +119,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = ProxyConnectionSettings(self._task.args, ise) + ise = ISESDK(params=params) + obj = ProxyConnectionSettings(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/proxy_connection_settings_info.py b/plugins/action/proxy_connection_settings_info.py index 9f0ab1f40..2aa588794 100644 --- a/plugins/action/proxy_connection_settings_info.py +++ b/plugins/action/proxy_connection_settings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="proxy", function="get_proxy_connection", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/px_grid_direct.py b/plugins/action/px_grid_direct.py index 43fdbbd40..ab4aeea43 100644 --- a/plugins/action/px_grid_direct.py +++ b/plugins/action/px_grid_direct.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -186,44 +176,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = PxGridDirect(self._task.args, ise) + ise = ISESDK(params=params) + obj = PxGridDirect(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/px_grid_direct_dictionary_info.py b/plugins/action/px_grid_direct_dictionary_info.py index a99f3b943..eed94323a 100644 --- a/plugins/action/px_grid_direct_dictionary_info.py +++ b/plugins/action/px_grid_direct_dictionary_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="px_grid_direct", function="getpxgrid_direct_dictionary_references", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/px_grid_direct_info.py b/plugins/action/px_grid_direct_info.py index 634ec7d55..1f1b9813f 100644 --- a/plugins/action/px_grid_direct_info.py +++ b/plugins/action/px_grid_direct_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("connectorName") + id = params.get("id") + name = params.get("connectorName") if name: response = ise.exec( family="px_grid_direct", function="get_connector_config_by_connector_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="px_grid_direct", function="get_connector_config", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/px_grid_direct_sync.py b/plugins/action/px_grid_direct_sync.py index 85f5364bb..41bc2c386 100644 --- a/plugins/action/px_grid_direct_sync.py +++ b/plugins/action/px_grid_direct_sync.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -133,44 +123,25 @@ def create(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = PxGridDirectSync(self._task.args, ise) + ise = ISESDK(params=params) + obj = PxGridDirectSync(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/px_grid_direct_sync_info.py b/plugins/action/px_grid_direct_sync_info.py index c3ae6fc6e..060cba2a3 100644 --- a/plugins/action/px_grid_direct_sync_info.py +++ b/plugins/action/px_grid_direct_sync_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("connectorName") + id = params.get("id") + name = params.get("connectorName") if name: response = ise.exec( family="px_grid_direct", function="get_connector_config_sync_now_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/px_grid_direct_test_connector.py b/plugins/action/px_grid_direct_test_connector.py index 0c03027d8..93ba35039 100644 --- a/plugins/action/px_grid_direct_test_connector.py +++ b/plugins/action/px_grid_direct_test_connector.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -89,14 +53,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="px_grid_direct", function="test_connector", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/px_grid_node_approve.py b/plugins/action/px_grid_node_approve.py index 6aae0caff..1e1576890 100644 --- a/plugins/action/px_grid_node_approve.py +++ b/plugins/action/px_grid_node_approve.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="px_grid_node", function="approve_px_grid_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/px_grid_node_delete.py b/plugins/action/px_grid_node_delete.py index e5f8394fd..a09e91240 100644 --- a/plugins/action/px_grid_node_delete.py +++ b/plugins/action/px_grid_node_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="px_grid_node", function="delete_px_grid_node_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/px_grid_node_info.py b/plugins/action/px_grid_node_info.py index cc607e5b5..e697feb58 100644 --- a/plugins/action/px_grid_node_info.py +++ b/plugins/action/px_grid_node_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="px_grid_node", function="get_px_grid_node_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["PxgridNode"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="px_grid_node", function="get_px_grid_node_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["PxgridNode"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="px_grid_node", function="get_px_grid_node_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/px_grid_settings_auto_approve.py b/plugins/action/px_grid_settings_auto_approve.py index 95aad2337..bfda3f4ba 100644 --- a/plugins/action/px_grid_settings_auto_approve.py +++ b/plugins/action/px_grid_settings_auto_approve.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="px_grid_settings", function="autoapprove_px_grid_settings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_access_secret.py b/plugins/action/pxgrid_access_secret.py index 108ab89f1..1c1274e02 100644 --- a/plugins/action/pxgrid_access_secret.py +++ b/plugins/action/pxgrid_access_secret.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="consumer", function="access_secret", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_account_activate.py b/plugins/action/pxgrid_account_activate.py index e9be39d19..8fec6631e 100644 --- a/plugins/action/pxgrid_account_activate.py +++ b/plugins/action/pxgrid_account_activate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="consumer", function="activate_account", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_account_create.py b/plugins/action/pxgrid_account_create.py index b11ac51d6..b56c4b71a 100644 --- a/plugins/action/pxgrid_account_create.py +++ b/plugins/action/pxgrid_account_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="consumer", function="create_account", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_authorization.py b/plugins/action/pxgrid_authorization.py index 0c81294a1..dd185e624 100644 --- a/plugins/action/pxgrid_authorization.py +++ b/plugins/action/pxgrid_authorization.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="provider", function="authorization", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_bindings_info.py b/plugins/action/pxgrid_bindings_info.py index 430ac7104..e3b41c221 100644 --- a/plugins/action/pxgrid_bindings_info.py +++ b/plugins/action/pxgrid_bindings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="trust_sec_sxp", function="get_bindings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_egress_matrices_info.py b/plugins/action/pxgrid_egress_matrices_info.py index 300ff3fd9..996c687ba 100644 --- a/plugins/action/pxgrid_egress_matrices_info.py +++ b/plugins/action/pxgrid_egress_matrices_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="trust_sec_configuration", function="get_egress_matrices", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_egress_policies_info.py b/plugins/action/pxgrid_egress_policies_info.py index 6ef9f3445..28f6118ff 100644 --- a/plugins/action/pxgrid_egress_policies_info.py +++ b/plugins/action/pxgrid_egress_policies_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="trust_sec_configuration", function="get_egress_policies", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_endpoint_by_mac_info.py b/plugins/action/pxgrid_endpoint_by_mac_info.py index 5c505bc06..c34a5f95b 100644 --- a/plugins/action/pxgrid_endpoint_by_mac_info.py +++ b/plugins/action/pxgrid_endpoint_by_mac_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="mdm", function="get_endpoint_by_mac_address", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_endpoints_by_os_type_info.py b/plugins/action/pxgrid_endpoints_by_os_type_info.py index 5a46956d0..379902823 100644 --- a/plugins/action/pxgrid_endpoints_by_os_type_info.py +++ b/plugins/action/pxgrid_endpoints_by_os_type_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="mdm", function="get_endpoints_by_os_type", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_endpoints_by_type_info.py b/plugins/action/pxgrid_endpoints_by_type_info.py index a58091b49..4154852c8 100644 --- a/plugins/action/pxgrid_endpoints_by_type_info.py +++ b/plugins/action/pxgrid_endpoints_by_type_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="mdm", function="get_endpoints_by_type", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_endpoints_info.py b/plugins/action/pxgrid_endpoints_info.py index e0bfc3ddf..057d78f16 100644 --- a/plugins/action/pxgrid_endpoints_info.py +++ b/plugins/action/pxgrid_endpoints_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="mdm", function="get_endpoints", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_failures_info.py b/plugins/action/pxgrid_failures_info.py index 03d82fdac..34b162b07 100644 --- a/plugins/action/pxgrid_failures_info.py +++ b/plugins/action/pxgrid_failures_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="radius_failure", function="get_failures", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/pxgrid_healths_info.py b/plugins/action/pxgrid_healths_info.py index 0cf5b848a..506e89d03 100644 --- a/plugins/action/pxgrid_healths_info.py +++ b/plugins/action/pxgrid_healths_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="system_health", function="get_healths", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_node_approve.py b/plugins/action/pxgrid_node_approve.py index 6aae0caff..1e1576890 100644 --- a/plugins/action/pxgrid_node_approve.py +++ b/plugins/action/pxgrid_node_approve.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="px_grid_node", function="approve_px_grid_node", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_node_delete.py b/plugins/action/pxgrid_node_delete.py index e5f8394fd..a09e91240 100644 --- a/plugins/action/pxgrid_node_delete.py +++ b/plugins/action/pxgrid_node_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="px_grid_node", function="delete_px_grid_node_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_node_info.py b/plugins/action/pxgrid_node_info.py index cc607e5b5..e697feb58 100644 --- a/plugins/action/pxgrid_node_info.py +++ b/plugins/action/pxgrid_node_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="px_grid_node", function="get_px_grid_node_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["PxgridNode"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="px_grid_node", function="get_px_grid_node_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["PxgridNode"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="px_grid_node", function="get_px_grid_node_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/pxgrid_performances_info.py b/plugins/action/pxgrid_performances_info.py index 868276b40..296809235 100644 --- a/plugins/action/pxgrid_performances_info.py +++ b/plugins/action/pxgrid_performances_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="system_health", function="get_performances", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_profiles_info.py b/plugins/action/pxgrid_profiles_info.py index 9e04370eb..f7d7f8609 100644 --- a/plugins/action/pxgrid_profiles_info.py +++ b/plugins/action/pxgrid_profiles_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="profiler", function="get_profiles", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_security_group_acls_info.py b/plugins/action/pxgrid_security_group_acls_info.py index 804652448..5c8427fd3 100644 --- a/plugins/action/pxgrid_security_group_acls_info.py +++ b/plugins/action/pxgrid_security_group_acls_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="trust_sec_configuration", function="get_security_group_acls", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_security_groups_info.py b/plugins/action/pxgrid_security_groups_info.py index e3ffe317c..4a20507c2 100644 --- a/plugins/action/pxgrid_security_groups_info.py +++ b/plugins/action/pxgrid_security_groups_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="trust_sec_configuration", function="get_security_groups", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_service_lookup.py b/plugins/action/pxgrid_service_lookup.py index 7b6d84694..8de28fdd2 100644 --- a/plugins/action/pxgrid_service_lookup.py +++ b/plugins/action/pxgrid_service_lookup.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="consumer", function="lookup_service", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_service_register.py b/plugins/action/pxgrid_service_register.py index 4ab9613ad..470788350 100644 --- a/plugins/action/pxgrid_service_register.py +++ b/plugins/action/pxgrid_service_register.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="provider", function="register_service", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_service_reregister.py b/plugins/action/pxgrid_service_reregister.py index 4fe14dd3f..6ec479333 100644 --- a/plugins/action/pxgrid_service_reregister.py +++ b/plugins/action/pxgrid_service_reregister.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="provider", function="reregister_service", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_service_unregister.py b/plugins/action/pxgrid_service_unregister.py index 8ed9122ce..13f2153f6 100644 --- a/plugins/action/pxgrid_service_unregister.py +++ b/plugins/action/pxgrid_service_unregister.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="provider", function="unregister_service", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_session_by_ip_info.py b/plugins/action/pxgrid_session_by_ip_info.py index 03aad6f83..8802f1375 100644 --- a/plugins/action/pxgrid_session_by_ip_info.py +++ b/plugins/action/pxgrid_session_by_ip_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="session_directory", function="get_session_by_ip_address", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_session_by_mac_info.py b/plugins/action/pxgrid_session_by_mac_info.py index 6d3cedc7e..9de56b498 100644 --- a/plugins/action/pxgrid_session_by_mac_info.py +++ b/plugins/action/pxgrid_session_by_mac_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="session_directory", function="get_session_by_mac_address", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_session_for_recovery_info.py b/plugins/action/pxgrid_session_for_recovery_info.py index c8f788932..b699fa02b 100644 --- a/plugins/action/pxgrid_session_for_recovery_info.py +++ b/plugins/action/pxgrid_session_for_recovery_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="session_directory", function="get_sessions_for_recovery", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_sessions_info.py b/plugins/action/pxgrid_sessions_info.py index 288ec5f1b..c403630bf 100644 --- a/plugins/action/pxgrid_sessions_info.py +++ b/plugins/action/pxgrid_sessions_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="session_directory", function="get_sessions", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_settings_auto_approve.py b/plugins/action/pxgrid_settings_auto_approve.py index 95aad2337..bfda3f4ba 100644 --- a/plugins/action/pxgrid_settings_auto_approve.py +++ b/plugins/action/pxgrid_settings_auto_approve.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="px_grid_settings", function="autoapprove_px_grid_settings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_user_group_by_username_info.py b/plugins/action/pxgrid_user_group_by_username_info.py index 2cbbd03a8..54623e822 100644 --- a/plugins/action/pxgrid_user_group_by_username_info.py +++ b/plugins/action/pxgrid_user_group_by_username_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="session_directory", function="get_user_group_by_user_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/pxgrid_user_groups_info.py b/plugins/action/pxgrid_user_groups_info.py index 00f99ccf6..45d572287 100644 --- a/plugins/action/pxgrid_user_groups_info.py +++ b/plugins/action/pxgrid_user_groups_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,16 +35,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="session_directory", function="get_user_groups", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/radius_server_sequence.py b/plugins/action/radius_server_sequence.py index 42cb09c2b..fb83a7705 100644 --- a/plugins/action/radius_server_sequence.py +++ b/plugins/action/radius_server_sequence.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -227,44 +217,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = RadiusServerSequence(self._task.args, ise) + ise = ISESDK(params=params) + obj = RadiusServerSequence(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/radius_server_sequence_info.py b/plugins/action/radius_server_sequence_info.py index 7d6d75408..31ce26751 100644 --- a/plugins/action/radius_server_sequence_info.py +++ b/plugins/action/radius_server_sequence_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="radius_server_sequence", function="get_radius_server_sequence_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["RadiusServerSequence"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -103,7 +74,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="radius_server_sequence", function="get_radius_server_sequence_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/renew_certificate.py b/plugins/action/renew_certificate.py index 0ef102475..94e0bc7ab 100644 --- a/plugins/action/renew_certificate.py +++ b/plugins/action/renew_certificate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="renew_certificates", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/repository.py b/plugins/action/repository.py index 243a40098..03a203736 100644 --- a/plugins/action/repository.py +++ b/plugins/action/repository.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -173,44 +163,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Repository(self._task.args, ise) + ise = ISESDK(params=params) + obj = Repository(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/repository_files_info.py b/plugins/action/repository_files_info.py index 46cc6608f..8479da488 100644 --- a/plugins/action/repository_files_info.py +++ b/plugins/action/repository_files_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("repositoryName") + id = params.get("id") + name = params.get("repositoryName") if name: response = ise.exec( family="repository", function="get_repository_files", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="repository", function="get_repository_files", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/repository_info.py b/plugins/action/repository_info.py index b386fac72..525af2eeb 100644 --- a/plugins/action/repository_info.py +++ b/plugins/action/repository_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("repositoryName") + id = params.get("id") + name = params.get("repositoryName") if name: response = ise.exec( family="repository", function="get_repository", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="repository", function="get_repositories", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/reservation.py b/plugins/action/reservation.py index 3c11b9e6e..9237c59b5 100644 --- a/plugins/action/reservation.py +++ b/plugins/action/reservation.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -190,44 +180,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Reservation(self._task.args, ise) + ise = ISESDK(params=params) + obj = Reservation(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/reservation_info.py b/plugins/action/reservation_info.py index 71a3deb17..c8218c39c 100644 --- a/plugins/action/reservation_info.py +++ b/plugins/action/reservation_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("clientID") - name = self._task.args.get("name") + id = params.get("clientID") + name = params.get("name") if id: response = ise.exec( family="sgt_range_reservation", function="get_sgt_reserved_range", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -103,7 +74,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sgt_range_reservation", function="get_sgt_reserved_ranges_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/resource_version_info.py b/plugins/action/resource_version_info.py index e39fdf286..cf0793d6e 100644 --- a/plugins/action/resource_version_info.py +++ b/plugins/action/resource_version_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="version_info", function="get_version_info", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["VersionInfo"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/rest_id_store.py b/plugins/action/rest_id_store.py index a63f0f83a..7da67c588 100644 --- a/plugins/action/rest_id_store.py +++ b/plugins/action/rest_id_store.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -183,44 +173,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = RestIdStore(self._task.args, ise) + ise = ISESDK(params=params) + obj = RestIdStore(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/rest_id_store_info.py b/plugins/action/rest_id_store_info.py index 7c3c391b4..9923ffb9f 100644 --- a/plugins/action/rest_id_store_info.py +++ b/plugins/action/rest_id_store_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="restid_store", function="get_rest_id_store_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSRestIDStore"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="restid_store", function="get_rest_id_store_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSRestIDStore"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="restid_store", function="get_rest_id_store_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/self_registered_portal.py b/plugins/action/self_registered_portal.py index 69530ae90..4975ce979 100644 --- a/plugins/action/self_registered_portal.py +++ b/plugins/action/self_registered_portal.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -198,44 +188,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SelfRegisteredPortal(self._task.args, ise) + ise = ISESDK(params=params) + obj = SelfRegisteredPortal(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/self_registered_portal_info.py b/plugins/action/self_registered_portal_info.py index d5c7fe308..82195a4af 100644 --- a/plugins/action/self_registered_portal_info.py +++ b/plugins/action/self_registered_portal_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="self_registered_portal", function="get_self_registered_portal_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SelfRegPortal"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="self_registered_portal", function="get_self_registered_portals_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/selfsigned_certificate_generate.py b/plugins/action/selfsigned_certificate_generate.py index f4ecd77fa..b2e1ccd1b 100644 --- a/plugins/action/selfsigned_certificate_generate.py +++ b/plugins/action/selfsigned_certificate_generate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -70,33 +60,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -147,14 +111,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="generate_self_signed_certificate", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/session_service_node_info.py b/plugins/action/session_service_node_info.py index 27bc976d7..6b4773ea3 100644 --- a/plugins/action/session_service_node_info.py +++ b/plugins/action/session_service_node_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="psn_node_details_with_radius_service", function="get_session_service_node_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SessionServiceNode"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="psn_node_details_with_radius_service", function="get_session_service_node_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SessionServiceNode"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="psn_node_details_with_radius_service", function="get_session_service_node_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sg_acl.py b/plugins/action/sg_acl.py index 0e7d92017..3629834da 100644 --- a/plugins/action/sg_acl.py +++ b/plugins/action/sg_acl.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -200,44 +190,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SgAcl(self._task.args, ise) + ise = ISESDK(params=params) + obj = SgAcl(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sg_acl_bulk_monitor_status_info.py b/plugins/action/sg_acl_bulk_monitor_status_info.py index 1da0fad90..3de1e8793 100644 --- a/plugins/action/sg_acl_bulk_monitor_status_info.py +++ b/plugins/action/sg_acl_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="security_groups_acls", function="monitor_bulk_status_security_groups_acl", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sg_acl_bulk_request.py b/plugins/action/sg_acl_bulk_request.py index be36c1bac..e055782db 100644 --- a/plugins/action/sg_acl_bulk_request.py +++ b/plugins/action/sg_acl_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="security_groups_acls", function="bulk_request_for_security_groups_acl", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_acl_info.py b/plugins/action/sg_acl_info.py index 267081396..5db4bbc8e 100644 --- a/plugins/action/sg_acl_info.py +++ b/plugins/action/sg_acl_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="security_groups_acls", function="get_security_groups_acl_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["Sgacl"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="security_groups_acls", function="get_security_groups_acl_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sg_mapping.py b/plugins/action/sg_mapping.py index e4b5c8e1c..4f425a1de 100644 --- a/plugins/action/sg_mapping.py +++ b/plugins/action/sg_mapping.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -200,44 +190,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SgMapping(self._task.args, ise) + ise = ISESDK(params=params) + obj = SgMapping(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sg_mapping_bulk_monitor_status_info.py b/plugins/action/sg_mapping_bulk_monitor_status_info.py index 10c681248..2eafeb0f6 100644 --- a/plugins/action/sg_mapping_bulk_monitor_status_info.py +++ b/plugins/action/sg_mapping_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="ip_to_sgt_mapping", function="monitor_bulk_status_ip_to_sgt_mapping", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sg_mapping_bulk_request.py b/plugins/action/sg_mapping_bulk_request.py index 51c491f26..4a4466427 100644 --- a/plugins/action/sg_mapping_bulk_request.py +++ b/plugins/action/sg_mapping_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="ip_to_sgt_mapping", function="bulk_request_for_ip_to_sgt_mapping", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_mapping_deploy.py b/plugins/action/sg_mapping_deploy.py index 2f6634009..c774d7902 100644 --- a/plugins/action/sg_mapping_deploy.py +++ b/plugins/action/sg_mapping_deploy.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="ip_to_sgt_mapping", function="deploy_ip_to_sgt_mapping_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_mapping_deploy_all.py b/plugins/action/sg_mapping_deploy_all.py index b69a8ccee..22d95c9de 100644 --- a/plugins/action/sg_mapping_deploy_all.py +++ b/plugins/action/sg_mapping_deploy_all.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="ip_to_sgt_mapping", function="deploy_all_ip_to_sgt_mapping", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_mapping_deploy_status_info.py b/plugins/action/sg_mapping_deploy_status_info.py index 55c3996b5..487647615 100644 --- a/plugins/action/sg_mapping_deploy_status_info.py +++ b/plugins/action/sg_mapping_deploy_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="ip_to_sgt_mapping", function="get_deploy_status_ip_to_sgt_mapping", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["OperationResult"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sg_mapping_group.py b/plugins/action/sg_mapping_group.py index 53555eee3..36f7bafa9 100644 --- a/plugins/action/sg_mapping_group.py +++ b/plugins/action/sg_mapping_group.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -192,44 +182,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SgMappingGroup(self._task.args, ise) + ise = ISESDK(params=params) + obj = SgMappingGroup(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sg_mapping_group_bulk_monitor_status_info.py b/plugins/action/sg_mapping_group_bulk_monitor_status_info.py index 4980ceb8e..b461e2437 100644 --- a/plugins/action/sg_mapping_group_bulk_monitor_status_info.py +++ b/plugins/action/sg_mapping_group_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="ip_to_sgt_mapping_group", function="monitor_bulk_status_ip_to_sgt_mapping_group", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sg_mapping_group_bulk_request.py b/plugins/action/sg_mapping_group_bulk_request.py index 688ccc0a3..cdad3d7f0 100644 --- a/plugins/action/sg_mapping_group_bulk_request.py +++ b/plugins/action/sg_mapping_group_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="ip_to_sgt_mapping_group", function="bulk_request_for_ip_to_sgt_mapping_group", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_mapping_group_deploy.py b/plugins/action/sg_mapping_group_deploy.py index fb9335f99..37f2e0151 100644 --- a/plugins/action/sg_mapping_group_deploy.py +++ b/plugins/action/sg_mapping_group_deploy.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="ip_to_sgt_mapping_group", function="deploy_ip_to_sgt_mapping_group_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_mapping_group_deploy_all.py b/plugins/action/sg_mapping_group_deploy_all.py index f90e5727d..d6f7ba3ad 100644 --- a/plugins/action/sg_mapping_group_deploy_all.py +++ b/plugins/action/sg_mapping_group_deploy_all.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="ip_to_sgt_mapping_group", function="deploy_all_ip_to_sgt_mapping_group", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_mapping_group_deploy_status_info.py b/plugins/action/sg_mapping_group_deploy_status_info.py index 8e36560dd..eb842bc75 100644 --- a/plugins/action/sg_mapping_group_deploy_status_info.py +++ b/plugins/action/sg_mapping_group_deploy_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="ip_to_sgt_mapping_group", function="get_deploy_status_ip_to_sgt_mapping_group", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["OperationResult"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sg_mapping_group_info.py b/plugins/action/sg_mapping_group_info.py index c41f3312f..d4cf300b2 100644 --- a/plugins/action/sg_mapping_group_info.py +++ b/plugins/action/sg_mapping_group_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="ip_to_sgt_mapping_group", function="get_ip_to_sgt_mapping_group_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SGMappingGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="ip_to_sgt_mapping_group", function="get_ip_to_sgt_mapping_group_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sg_mapping_info.py b/plugins/action/sg_mapping_info.py index 1b545c60e..ed4cc1772 100644 --- a/plugins/action/sg_mapping_info.py +++ b/plugins/action/sg_mapping_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="ip_to_sgt_mapping", function="get_ip_to_sgt_mapping_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SGMapping"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="ip_to_sgt_mapping", function="get_ip_to_sgt_mapping_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sg_to_vn_to_vlan.py b/plugins/action/sg_to_vn_to_vlan.py index 054e65a9d..e7ef48dbb 100644 --- a/plugins/action/sg_to_vn_to_vlan.py +++ b/plugins/action/sg_to_vn_to_vlan.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -192,44 +182,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SgToVnToVlan(self._task.args, ise) + ise = ISESDK(params=params) + obj = SgToVnToVlan(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sg_to_vn_to_vlan_bulk_monitor_status_info.py b/plugins/action/sg_to_vn_to_vlan_bulk_monitor_status_info.py index 82d71b9e2..4559960e1 100644 --- a/plugins/action/sg_to_vn_to_vlan_bulk_monitor_status_info.py +++ b/plugins/action/sg_to_vn_to_vlan_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="security_group_to_virtual_network", function="monitor_bulk_status_security_groups_to_vn_to_vlan", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sg_to_vn_to_vlan_bulk_request.py b/plugins/action/sg_to_vn_to_vlan_bulk_request.py index ff9a74879..60091f7a3 100644 --- a/plugins/action/sg_to_vn_to_vlan_bulk_request.py +++ b/plugins/action/sg_to_vn_to_vlan_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="security_group_to_virtual_network", function="bulk_request_for_security_groups_to_vn_to_vlan", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sg_to_vn_to_vlan_info.py b/plugins/action/sg_to_vn_to_vlan_info.py index 799d16b13..ee197fb83 100644 --- a/plugins/action/sg_to_vn_to_vlan_info.py +++ b/plugins/action/sg_to_vn_to_vlan_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -43,33 +33,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -85,19 +49,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="security_group_to_virtual_network", function="get_security_groups_to_vn_to_vlan_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SgtVNVlanContainer"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -107,7 +78,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="security_group_to_virtual_network", function="get_security_groups_to_vn_to_vlan_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sgt.py b/plugins/action/sgt.py index 0d141c818..7a7e3f64e 100644 --- a/plugins/action/sgt.py +++ b/plugins/action/sgt.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -201,44 +191,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Sgt(self._task.args, ise) + ise = ISESDK(params=params) + obj = Sgt(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sgt_bulk_monitor_status_info.py b/plugins/action/sgt_bulk_monitor_status_info.py index 8983b4ca1..fd2ac71cc 100644 --- a/plugins/action/sgt_bulk_monitor_status_info.py +++ b/plugins/action/sgt_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="security_groups", function="monitor_bulk_status_security_group", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sgt_bulk_request.py b/plugins/action/sgt_bulk_request.py index 13cba7780..f549a4912 100644 --- a/plugins/action/sgt_bulk_request.py +++ b/plugins/action/sgt_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="security_groups", function="bulk_request_for_security_group", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sgt_info.py b/plugins/action/sgt_info.py index bca813d42..544837853 100644 --- a/plugins/action/sgt_info.py +++ b/plugins/action/sgt_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="security_groups", function="get_security_group_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["Sgt"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="security_groups", function="get_security_groups_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sms_provider_info.py b/plugins/action/sms_provider_info.py index a22b4c8a7..0856750a4 100644 --- a/plugins/action/sms_provider_info.py +++ b/plugins/action/sms_provider_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -44,33 +34,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -87,20 +51,27 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: responses = [] generator = ise.exec( family="sms_provider", function="get_sms_provider_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sponsor_group.py b/plugins/action/sponsor_group.py index 93ff2911f..d2446b930 100644 --- a/plugins/action/sponsor_group.py +++ b/plugins/action/sponsor_group.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -212,44 +202,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SponsorGroup(self._task.args, ise) + ise = ISESDK(params=params) + obj = SponsorGroup(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sponsor_group_info.py b/plugins/action/sponsor_group_info.py index 32b19b8c8..c3f9b14e2 100644 --- a/plugins/action/sponsor_group_info.py +++ b/plugins/action/sponsor_group_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="sponsor_group", function="get_sponsor_group_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SponsorGroup"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sponsor_group", function="get_sponsor_group_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sponsor_group_member_info.py b/plugins/action/sponsor_group_member_info.py index 939f5491d..85de3985a 100644 --- a/plugins/action/sponsor_group_member_info.py +++ b/plugins/action/sponsor_group_member_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -44,33 +34,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -87,20 +51,27 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: responses = [] generator = ise.exec( family="sponsor_group_member", function="get_sponsor_group_member_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sponsor_portal.py b/plugins/action/sponsor_portal.py index 267065294..1da8c51a9 100644 --- a/plugins/action/sponsor_portal.py +++ b/plugins/action/sponsor_portal.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -197,44 +187,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SponsorPortal(self._task.args, ise) + ise = ISESDK(params=params) + obj = SponsorPortal(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sponsor_portal_info.py b/plugins/action/sponsor_portal_info.py index 2d4f9390c..7b542bd93 100644 --- a/plugins/action/sponsor_portal_info.py +++ b/plugins/action/sponsor_portal_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="sponsor_portal", function="get_sponsor_portal_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SponsorPortal"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sponsor_portal", function="get_sponsor_portal_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sponsored_guest_portal.py b/plugins/action/sponsored_guest_portal.py index d0dad7833..99bd824fc 100644 --- a/plugins/action/sponsored_guest_portal.py +++ b/plugins/action/sponsored_guest_portal.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -198,44 +188,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SponsoredGuestPortal(self._task.args, ise) + ise = ISESDK(params=params) + obj = SponsoredGuestPortal(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sponsored_guest_portal_info.py b/plugins/action/sponsored_guest_portal_info.py index ca14267b5..74700a76a 100644 --- a/plugins/action/sponsored_guest_portal_info.py +++ b/plugins/action/sponsored_guest_portal_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="sponsored_guest_portal", function="get_sponsored_guest_portal_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SponsoredGuestPortal"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sponsored_guest_portal", function="get_sponsored_guest_portals_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/stop_replication.py b/plugins/action/stop_replication.py index fa0fb01ad..621494e59 100644 --- a/plugins/action/stop_replication.py +++ b/plugins/action/stop_replication.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -117,44 +107,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = StopReplication(self._task.args, ise) + ise = ISESDK(params=params) + obj = StopReplication(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/stop_replication_info.py b/plugins/action/stop_replication_info.py index 970ec6632..3d5c23efd 100644 --- a/plugins/action/stop_replication_info.py +++ b/plugins/action/stop_replication_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="endpoint_stop_replication_service", function="get_stop_replication_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/subscriber.py b/plugins/action/subscriber.py index 3c84a0eab..e9af0f9b3 100644 --- a/plugins/action/subscriber.py +++ b/plugins/action/subscriber.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -193,44 +183,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = Subscriber(self._task.args, ise) + ise = ISESDK(params=params) + obj = Subscriber(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/subscriber_bulk.py b/plugins/action/subscriber_bulk.py index b8a38815f..3e59041fc 100644 --- a/plugins/action/subscriber_bulk.py +++ b/plugins/action/subscriber_bulk.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="subscriber", function="bulk_subscriber_operation", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/subscriber_imsi_info.py b/plugins/action/subscriber_imsi_info.py index d4ca46ad3..3b0ebabc5 100644 --- a/plugins/action/subscriber_imsi_info.py +++ b/plugins/action/subscriber_imsi_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("imsi") - name = self._task.args.get("name") + id = params.get("imsi") + name = params.get("name") if id: response = ise.exec( family="subscriber", function="get_subscriber_by_i_m_s_i", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/subscriber_info.py b/plugins/action/subscriber_info.py index 6bd429ec1..542d97217 100644 --- a/plugins/action/subscriber_info.py +++ b/plugins/action/subscriber_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("subscriberId") - name = self._task.args.get("name") + id = params.get("subscriberId") + name = params.get("name") if id: response = ise.exec( family="subscriber", function="get_subscriber_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="subscriber", function="get_all_subscribers_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/support_bundle.py b/plugins/action/support_bundle.py index 90a8f62e2..edd643d4c 100644 --- a/plugins/action/support_bundle.py +++ b/plugins/action/support_bundle.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -83,14 +47,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="support_bundle_trigger_configuration", function="create_support_bundle", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/support_bundle_download.py b/plugins/action/support_bundle_download.py index 32afcd6b9..f164f1463 100644 --- a/plugins/action/support_bundle_download.py +++ b/plugins/action/support_bundle_download.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -43,33 +33,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -83,14 +47,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) download_response = ise.exec( family="support_bundle_download", function="download_support_bundle", - params=self.get_object(self._task.args), + params=self.get_object(params), ) # Check if the data is in binary format diff --git a/plugins/action/support_bundle_status_info.py b/plugins/action/support_bundle_status_info.py index 3b1540fb5..a632b3744 100644 --- a/plugins/action/support_bundle_status_info.py +++ b/plugins/action/support_bundle_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -41,33 +31,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -81,19 +45,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="support_bundle_status", function="get_support_bundle_status_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["SBStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -103,7 +74,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="support_bundle_status", function="get_support_bundle_status_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sxp_connections.py b/plugins/action/sxp_connections.py index 6b352a36a..55b476e97 100644 --- a/plugins/action/sxp_connections.py +++ b/plugins/action/sxp_connections.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -202,44 +192,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SxpConnections(self._task.args, ise) + ise = ISESDK(params=params) + obj = SxpConnections(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sxp_connections_bulk_monitor_status_info.py b/plugins/action/sxp_connections_bulk_monitor_status_info.py index fb82123c3..ba7bf67bf 100644 --- a/plugins/action/sxp_connections_bulk_monitor_status_info.py +++ b/plugins/action/sxp_connections_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="sxp_connections", function="monitor_bulk_status_sxp_connections", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sxp_connections_bulk_request.py b/plugins/action/sxp_connections_bulk_request.py index 8422ce8a8..5b701d66a 100644 --- a/plugins/action/sxp_connections_bulk_request.py +++ b/plugins/action/sxp_connections_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="sxp_connections", function="bulk_request_for_sxp_connections", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sxp_connections_info.py b/plugins/action/sxp_connections_info.py index 6fd8e28cd..a35833312 100644 --- a/plugins/action/sxp_connections_info.py +++ b/plugins/action/sxp_connections_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="sxp_connections", function="get_sxp_connections_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSSxpConnection"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sxp_connections", function="get_sxp_connections_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sxp_local_bindings.py b/plugins/action/sxp_local_bindings.py index f64ef402a..123c7edab 100644 --- a/plugins/action/sxp_local_bindings.py +++ b/plugins/action/sxp_local_bindings.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -197,44 +187,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SxpLocalBindings(self._task.args, ise) + ise = ISESDK(params=params) + obj = SxpLocalBindings(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/sxp_local_bindings_bulk_monitor_status_info.py b/plugins/action/sxp_local_bindings_bulk_monitor_status_info.py index 1b900fe56..7ee95770a 100644 --- a/plugins/action/sxp_local_bindings_bulk_monitor_status_info.py +++ b/plugins/action/sxp_local_bindings_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="sxp_local_bindings", function="monitor_bulk_status_sxp_local_bindings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sxp_local_bindings_bulk_request.py b/plugins/action/sxp_local_bindings_bulk_request.py index 594f0d070..f4b0acb22 100644 --- a/plugins/action/sxp_local_bindings_bulk_request.py +++ b/plugins/action/sxp_local_bindings_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="sxp_local_bindings", function="bulk_request_for_sxp_local_bindings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sxp_local_bindings_info.py b/plugins/action/sxp_local_bindings_info.py index 92aa90806..df7fa144b 100644 --- a/plugins/action/sxp_local_bindings_info.py +++ b/plugins/action/sxp_local_bindings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="sxp_local_bindings", function="get_sxp_local_bindings_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSSxpLocalBindings"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sxp_local_bindings", function="get_sxp_local_bindings_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/sxp_vpns.py b/plugins/action/sxp_vpns.py index aaa067bd4..baafa10c9 100644 --- a/plugins/action/sxp_vpns.py +++ b/plugins/action/sxp_vpns.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -165,44 +155,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SxpVpns(self._task.args, ise) + ise = ISESDK(params=params) + obj = SxpVpns(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/sxp_vpns_bulk_monitor_status_info.py b/plugins/action/sxp_vpns_bulk_monitor_status_info.py index 660dba353..baee9e9a6 100644 --- a/plugins/action/sxp_vpns_bulk_monitor_status_info.py +++ b/plugins/action/sxp_vpns_bulk_monitor_status_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("bulkid") - name = self._task.args.get("name") + id = params.get("bulkid") + name = params.get("name") if id: response = ise.exec( family="sxp_vpns", function="monitor_bulk_status_sxp_vpns", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["BulkStatus"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/sxp_vpns_bulk_request.py b/plugins/action/sxp_vpns_bulk_request.py index 510b5471c..c3e08c6ab 100644 --- a/plugins/action/sxp_vpns_bulk_request.py +++ b/plugins/action/sxp_vpns_bulk_request.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="sxp_vpns", function="bulk_request_for_sxp_vpns", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/sxp_vpns_info.py b/plugins/action/sxp_vpns_info.py index 119f75b70..e36fa3109 100644 --- a/plugins/action/sxp_vpns_info.py +++ b/plugins/action/sxp_vpns_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="sxp_vpns", function="get_sxp_vpn_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["ERSSxpVpn"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sxp_vpns", function="get_sxp_vpns_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/system_certificate.py b/plugins/action/system_certificate.py index 0e36cd260..acdafc8a4 100644 --- a/plugins/action/system_certificate.py +++ b/plugins/action/system_certificate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -231,44 +221,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = SystemCertificate(self._task.args, ise) + ise = ISESDK(params=params) + obj = SystemCertificate(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/system_certificate_create.py b/plugins/action/system_certificate_create.py index 748e8d281..ca4f206d8 100644 --- a/plugins/action/system_certificate_create.py +++ b/plugins/action/system_certificate_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="system_certificate", function="create_system_certificate", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/system_certificate_export_info.py b/plugins/action/system_certificate_export_info.py index 17ef6d73e..046a35a7c 100644 --- a/plugins/action/system_certificate_export_info.py +++ b/plugins/action/system_certificate_export_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,16 +53,23 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) download_response = ise.exec( family="certificates", function="export_system_certificate", - params=self.get_object(self._task.args), + params=self.get_object(params), ) response = dict( data=download_response.data.decode(encoding="utf-8"), diff --git a/plugins/action/system_certificate_import.py b/plugins/action/system_certificate_import.py index 4534a7204..06e9ef8c9 100644 --- a/plugins/action/system_certificate_import.py +++ b/plugins/action/system_certificate_import.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -59,33 +49,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -125,14 +89,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="import_system_certificate", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/system_certificate_info.py b/plugins/action/system_certificate_info.py index d5901e1f3..da4c6368f 100644 --- a/plugins/action/system_certificate_info.py +++ b/plugins/action/system_certificate_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -46,33 +36,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -91,19 +55,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("hostName") + id = params.get("id") + name = params.get("hostName") if id: response = ise.exec( family="certificates", function="get_system_certificate_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -112,7 +83,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="certificates", function="get_system_certificates", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -122,7 +93,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="certificates", function="get_system_certificates_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/system_config_version_info.py b/plugins/action/system_config_version_info.py index 709f58d44..08efc5359 100644 --- a/plugins/action/system_config_version_info.py +++ b/plugins/action/system_config_version_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="version_and_patch", function="get_ise_version_and_patch", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["OperationResult"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/tacacs_command_sets.py b/plugins/action/tacacs_command_sets.py index b2cab70e1..8552044cc 100644 --- a/plugins/action/tacacs_command_sets.py +++ b/plugins/action/tacacs_command_sets.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -174,44 +164,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TacacsCommandSets(self._task.args, ise) + ise = ISESDK(params=params) + obj = TacacsCommandSets(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/tacacs_command_sets_info.py b/plugins/action/tacacs_command_sets_info.py index 2427ae6bb..8f1ee75ab 100644 --- a/plugins/action/tacacs_command_sets_info.py +++ b/plugins/action/tacacs_command_sets_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="tacacs_command_sets", function="get_tacacs_command_sets_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsCommandSets"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="tacacs_command_sets", function="get_tacacs_command_sets_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsCommandSets"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="tacacs_command_sets", function="get_tacacs_command_sets_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/tacacs_external_servers.py b/plugins/action/tacacs_external_servers.py index a88d60557..fae716743 100644 --- a/plugins/action/tacacs_external_servers.py +++ b/plugins/action/tacacs_external_servers.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -183,44 +173,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TacacsExternalServers(self._task.args, ise) + ise = ISESDK(params=params) + obj = TacacsExternalServers(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/tacacs_external_servers_info.py b/plugins/action/tacacs_external_servers_info.py index 813156ec3..d909b9151 100644 --- a/plugins/action/tacacs_external_servers_info.py +++ b/plugins/action/tacacs_external_servers_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="tacacs_external_servers", function="get_tacacs_external_servers_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsExternalServer"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="tacacs_external_servers", function="get_tacacs_external_servers_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsExternalServer"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="tacacs_external_servers", function="get_tacacs_external_servers_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/tacacs_profile.py b/plugins/action/tacacs_profile.py index d18c41caf..f80dd9404 100644 --- a/plugins/action/tacacs_profile.py +++ b/plugins/action/tacacs_profile.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -171,44 +161,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TacacsProfile(self._task.args, ise) + ise = ISESDK(params=params) + obj = TacacsProfile(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/tacacs_profile_info.py b/plugins/action/tacacs_profile_info.py index 4c233a245..93656f1a8 100644 --- a/plugins/action/tacacs_profile_info.py +++ b/plugins/action/tacacs_profile_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="tacacs_profile", function="get_tacacs_profile_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="tacacs_profile", function="get_tacacs_profile_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsProfile"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="tacacs_profile", function="get_tacacs_profile_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/tacacs_server_sequence.py b/plugins/action/tacacs_server_sequence.py index 62b471791..9e08711cd 100644 --- a/plugins/action/tacacs_server_sequence.py +++ b/plugins/action/tacacs_server_sequence.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -189,44 +179,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TacacsServerSequence(self._task.args, ise) + ise = ISESDK(params=params) + obj = TacacsServerSequence(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/tacacs_server_sequence_info.py b/plugins/action/tacacs_server_sequence_info.py index 1372aa120..96e7f9911 100644 --- a/plugins/action/tacacs_server_sequence_info.py +++ b/plugins/action/tacacs_server_sequence_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="tacacs_server_sequence", function="get_tacacs_server_sequence_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsServerSequence"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -104,7 +75,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="tacacs_server_sequence", function="get_tacacs_server_sequence_by_name", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TacacsServerSequence"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -114,7 +85,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="tacacs_server_sequence", function="get_tacacs_server_sequence_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/tasks_info.py b/plugins/action/tasks_info.py index 62ffa7668..aa2924497 100644 --- a/plugins/action/tasks_info.py +++ b/plugins/action/tasks_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("taskId") - name = self._task.args.get("name") + id = params.get("taskId") + name = params.get("name") if id: response = ise.exec( family="tasks", function="get_task_status_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -98,7 +69,7 @@ def run(self, tmp=None, task_vars=None): response = ise.exec( family="tasks", function="get_task_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/telemetry_info.py b/plugins/action/telemetry_info.py index cbf55fc1a..eae35fa25 100644 --- a/plugins/action/telemetry_info.py +++ b/plugins/action/telemetry_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -43,33 +33,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -85,19 +49,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="telemetry_information", function="get_telemetry_info_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["TelemetryInfo"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -107,7 +78,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="telemetry_information", function="get_telemetry_information_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/threat_vulnerabilities_clear.py b/plugins/action/threat_vulnerabilities_clear.py index 097aadc53..44540ecbf 100644 --- a/plugins/action/threat_vulnerabilities_clear.py +++ b/plugins/action/threat_vulnerabilities_clear.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="clear_threats_and_vulnerabilities", function="clear_threats_and_vulnerabilities", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/transport_gateway_settings.py b/plugins/action/transport_gateway_settings.py index 50f828f0f..68fbdbfa7 100644 --- a/plugins/action/transport_gateway_settings.py +++ b/plugins/action/transport_gateway_settings.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -119,44 +109,25 @@ def update(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TransportGatewaySettings(self._task.args, ise) + ise = ISESDK(params=params) + obj = TransportGatewaySettings(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/transport_gateway_settings_info.py b/plugins/action/transport_gateway_settings_info.py index 810ab1fb7..53f61dd34 100644 --- a/plugins/action/transport_gateway_settings_info.py +++ b/plugins/action/transport_gateway_settings_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,19 +35,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="telemetry", function="get_transport_gateway", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/trusted_certificate.py b/plugins/action/trusted_certificate.py index 6202244f9..04421481e 100644 --- a/plugins/action/trusted_certificate.py +++ b/plugins/action/trusted_certificate.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -249,44 +239,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TrustedCertificate(self._task.args, ise) + ise = ISESDK(params=params) + obj = TrustedCertificate(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/trusted_certificate_export_info.py b/plugins/action/trusted_certificate_export_info.py index 8241cc590..bb0607e9f 100644 --- a/plugins/action/trusted_certificate_export_info.py +++ b/plugins/action/trusted_certificate_export_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -42,33 +32,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -83,19 +47,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("filename") + id = params.get("id") + name = params.get("filename") if id: download_response = ise.exec( family="certificates", function="export_trusted_certificate", - params=self.get_object(self._task.args), + params=self.get_object(params), ) response = dict( data=download_response.data.decode(encoding="utf-8"), diff --git a/plugins/action/trusted_certificate_import.py b/plugins/action/trusted_certificate_import.py index 79b05c932..d79161ea8 100644 --- a/plugins/action/trusted_certificate_import.py +++ b/plugins/action/trusted_certificate_import.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -49,33 +39,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -99,14 +63,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="certificates", function="import_trust_certificate", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trusted_certificate_info.py b/plugins/action/trusted_certificate_info.py index 9fbd2926e..e4eb2ca35 100644 --- a/plugins/action/trusted_certificate_info.py +++ b/plugins/action/trusted_certificate_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="certificates", function="get_trusted_certificate_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="certificates", function="get_trusted_certificates_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/trustsec_nbar_app.py b/plugins/action/trustsec_nbar_app.py index 53481b681..1a3936ebc 100644 --- a/plugins/action/trustsec_nbar_app.py +++ b/plugins/action/trustsec_nbar_app.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -188,44 +178,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TrustsecNbarApp(self._task.args, ise) + ise = ISESDK(params=params) + obj = TrustsecNbarApp(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/trustsec_nbar_app_info.py b/plugins/action/trustsec_nbar_app_info.py index fc9146a0a..cfe422880 100644 --- a/plugins/action/trustsec_nbar_app_info.py +++ b/plugins/action/trustsec_nbar_app_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="nbar_app", function="get_nbar_app_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="nbar_app", function="get_nbar_apps_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/trustsec_sg_vn_mapping.py b/plugins/action/trustsec_sg_vn_mapping.py index bd038a172..978d78aa5 100644 --- a/plugins/action/trustsec_sg_vn_mapping.py +++ b/plugins/action/trustsec_sg_vn_mapping.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -205,44 +195,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TrustsecSgVnMapping(self._task.args, ise) + ise = ISESDK(params=params) + obj = TrustsecSgVnMapping(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/trustsec_sg_vn_mapping_bulk_create.py b/plugins/action/trustsec_sg_vn_mapping_bulk_create.py index 12c4549bb..35ab86db9 100644 --- a/plugins/action/trustsec_sg_vn_mapping_bulk_create.py +++ b/plugins/action/trustsec_sg_vn_mapping_bulk_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="sg_vn_mapping", function="bulk_create_sg_vn_mappings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_sg_vn_mapping_bulk_delete.py b/plugins/action/trustsec_sg_vn_mapping_bulk_delete.py index b28e2cf8f..f9a137bb2 100644 --- a/plugins/action/trustsec_sg_vn_mapping_bulk_delete.py +++ b/plugins/action/trustsec_sg_vn_mapping_bulk_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="sg_vn_mapping", function="bulk_delete_sg_vn_mappings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_sg_vn_mapping_bulk_update.py b/plugins/action/trustsec_sg_vn_mapping_bulk_update.py index 0fb367b86..7a37dcd38 100644 --- a/plugins/action/trustsec_sg_vn_mapping_bulk_update.py +++ b/plugins/action/trustsec_sg_vn_mapping_bulk_update.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="sg_vn_mapping", function="bulk_update_sg_vn_mappings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_sg_vn_mapping_info.py b/plugins/action/trustsec_sg_vn_mapping_info.py index 039dbfb8e..16d93b655 100644 --- a/plugins/action/trustsec_sg_vn_mapping_info.py +++ b/plugins/action/trustsec_sg_vn_mapping_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="sg_vn_mapping", function="get_sg_vn_mapping_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="sg_vn_mapping", function="get_sg_vn_mapping_list_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/trustsec_vn.py b/plugins/action/trustsec_vn.py index 93e4de856..c3ac708f4 100644 --- a/plugins/action/trustsec_vn.py +++ b/plugins/action/trustsec_vn.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -192,44 +182,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TrustsecVn(self._task.args, ise) + ise = ISESDK(params=params) + obj = TrustsecVn(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/trustsec_vn_bulk_create.py b/plugins/action/trustsec_vn_bulk_create.py index 7f3635fee..a4d638b5b 100644 --- a/plugins/action/trustsec_vn_bulk_create.py +++ b/plugins/action/trustsec_vn_bulk_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="virtual_network", function="bulk_create_virtual_networks", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_vn_bulk_delete.py b/plugins/action/trustsec_vn_bulk_delete.py index 8fcd10621..b32523cdf 100644 --- a/plugins/action/trustsec_vn_bulk_delete.py +++ b/plugins/action/trustsec_vn_bulk_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="virtual_network", function="bulk_delete_virtual_networks", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_vn_bulk_update.py b/plugins/action/trustsec_vn_bulk_update.py index 00b42d7ba..2738ea077 100644 --- a/plugins/action/trustsec_vn_bulk_update.py +++ b/plugins/action/trustsec_vn_bulk_update.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="virtual_network", function="bulk_update_virtual_networks", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_vn_info.py b/plugins/action/trustsec_vn_info.py index 609bb36c1..7ceb0e9f0 100644 --- a/plugins/action/trustsec_vn_info.py +++ b/plugins/action/trustsec_vn_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="virtual_network", function="get_virtual_network_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="virtual_network", function="get_virtual_networks_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/trustsec_vn_vlan_mapping.py b/plugins/action/trustsec_vn_vlan_mapping.py index 5e7a65232..88012d732 100644 --- a/plugins/action/trustsec_vn_vlan_mapping.py +++ b/plugins/action/trustsec_vn_vlan_mapping.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -204,44 +194,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = TrustsecVnVlanMapping(self._task.args, ise) + ise = ISESDK(params=params) + obj = TrustsecVnVlanMapping(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/trustsec_vn_vlan_mapping_bulk_create.py b/plugins/action/trustsec_vn_vlan_mapping_bulk_create.py index b49f166bf..07828f3b2 100644 --- a/plugins/action/trustsec_vn_vlan_mapping_bulk_create.py +++ b/plugins/action/trustsec_vn_vlan_mapping_bulk_create.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="vn_vlan_mapping", function="bulk_create_vn_vlan_mappings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_vn_vlan_mapping_bulk_delete.py b/plugins/action/trustsec_vn_vlan_mapping_bulk_delete.py index 11718a354..f46937835 100644 --- a/plugins/action/trustsec_vn_vlan_mapping_bulk_delete.py +++ b/plugins/action/trustsec_vn_vlan_mapping_bulk_delete.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="vn_vlan_mapping", function="bulk_delete_vn_vlan_mappings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_vn_vlan_mapping_bulk_update.py b/plugins/action/trustsec_vn_vlan_mapping_bulk_update.py index e69f07606..111ea2cea 100644 --- a/plugins/action/trustsec_vn_vlan_mapping_bulk_update.py +++ b/plugins/action/trustsec_vn_vlan_mapping_bulk_update.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -77,14 +41,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="vn_vlan_mapping", function="bulk_update_vn_vlan_mappings", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/trustsec_vn_vlan_mapping_info.py b/plugins/action/trustsec_vn_vlan_mapping_info.py index fff1d17ff..64abd7dba 100644 --- a/plugins/action/trustsec_vn_vlan_mapping_info.py +++ b/plugins/action/trustsec_vn_vlan_mapping_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if id: response = ise.exec( family="vn_vlan_mapping", function="get_vn_vlan_mapping_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="vn_vlan_mapping", function="get_vn_vlan_mapping_list_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/upgrade_proceed.py b/plugins/action/upgrade_proceed.py index 363ad0476..a12a6e0c0 100644 --- a/plugins/action/upgrade_proceed.py +++ b/plugins/action/upgrade_proceed.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -119,44 +109,25 @@ def create(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = UpgradeProceed(self._task.args, ise) + ise = ISESDK(params=params) + obj = UpgradeProceed(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/upgrade_proceed_info.py b/plugins/action/upgrade_proceed_info.py index 8e26a5df9..cc4649cd4 100644 --- a/plugins/action/upgrade_proceed_info.py +++ b/plugins/action/upgrade_proceed_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: # NOTICE: Does not have a get all method or it is in another action response = None diff --git a/plugins/action/upgrade_stage_cancel.py b/plugins/action/upgrade_stage_cancel.py index 76e074618..24c53e85e 100644 --- a/plugins/action/upgrade_stage_cancel.py +++ b/plugins/action/upgrade_stage_cancel.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -119,44 +109,25 @@ def create(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = UpgradestageCancel(self._task.args, ise) + ise = ISESDK(params=params) + obj = UpgradestageCancel(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/upgrade_stage_cancel_info.py b/plugins/action/upgrade_stage_cancel_info.py index 81cec99ed..9602dc090 100644 --- a/plugins/action/upgrade_stage_cancel_info.py +++ b/plugins/action/upgrade_stage_cancel_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="fullupgrade", function="stage_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/upgrade_stage_start.py b/plugins/action/upgrade_stage_start.py index 3c4bdbc9c..739eb0a7a 100644 --- a/plugins/action/upgrade_stage_start.py +++ b/plugins/action/upgrade_stage_start.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -120,44 +110,25 @@ def create(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = UpgradestageStart(self._task.args, ise) + ise = ISESDK(params=params) + obj = UpgradestageStart(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None if state == "present": diff --git a/plugins/action/upgrade_stage_start_info.py b/plugins/action/upgrade_stage_start_info.py index 81cec99ed..9602dc090 100644 --- a/plugins/action/upgrade_stage_start_info.py +++ b/plugins/action/upgrade_stage_start_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("id") - name = self._task.args.get("name") + id = params.get("id") + name = params.get("name") if not name and not id: response = ise.exec( family="fullupgrade", function="stage_status", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/user_equipment.py b/plugins/action/user_equipment.py index 30eb4c790..6438157fb 100644 --- a/plugins/action/user_equipment.py +++ b/plugins/action/user_equipment.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -188,44 +178,25 @@ def delete(self): class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) - obj = UserEquipment(self._task.args, ise) + ise = ISESDK(params=params) + obj = UserEquipment(params, ise) - state = self._task.args.get("state") + state = params.get("state") response = None diff --git a/plugins/action/user_equipment_bulk.py b/plugins/action/user_equipment_bulk.py index e89886264..ad8c893d8 100644 --- a/plugins/action/user_equipment_bulk.py +++ b/plugins/action/user_equipment_bulk.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -40,33 +30,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict( @@ -79,14 +43,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="user_equipment", function="bulk_user_equipment_operation", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/user_equipment_csv.py b/plugins/action/user_equipment_csv.py index 374bb7fab..ae5e38ba2 100644 --- a/plugins/action/user_equipment_csv.py +++ b/plugins/action/user_equipment_csv.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -35,33 +25,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = False - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = False def get_object(self, params): new_object = dict() @@ -71,14 +35,21 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) response = ise.exec( family="user_equipment", function="create_user_equipments_from_c_s_v", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response self._result.update(dict(ise_response=response)) diff --git a/plugins/action/user_equipment_imei_info.py b/plugins/action/user_equipment_imei_info.py index c10b511bf..5dae094fa 100644 --- a/plugins/action/user_equipment_imei_info.py +++ b/plugins/action/user_equipment_imei_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("imei") - name = self._task.args.get("name") + id = params.get("imei") + name = params.get("name") if id: response = ise.exec( family="user_equipment", function="get_user_equipment_by_i_m_e_i", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/action/user_equipment_info.py b/plugins/action/user_equipment_info.py index d43788f04..c4c9ac200 100644 --- a/plugins/action/user_equipment_info.py +++ b/plugins/action/user_equipment_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -45,33 +35,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -89,19 +53,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response=[])) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("userEquipmentId") - name = self._task.args.get("name") + id = params.get("userEquipmentId") + name = params.get("name") if id: response = ise.exec( family="user_equipment", function="get_user_equipment_by_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) @@ -111,7 +82,7 @@ def run(self, tmp=None, task_vars=None): generator = ise.exec( family="user_equipment", function="get_user_equipments_generator", - params=self.get_object(self._task.args), + params=self.get_object(params), ) try: for item in generator: diff --git a/plugins/action/user_equipment_subscriber_info.py b/plugins/action/user_equipment_subscriber_info.py index 3473b43ab..62ee7cde8 100644 --- a/plugins/action/user_equipment_subscriber_info.py +++ b/plugins/action/user_equipment_subscriber_info.py @@ -7,17 +7,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.plugins.action import ActionBase - -try: - from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( - AnsibleArgSpecValidator, - ) -except ImportError: - ANSIBLE_UTILS_IS_INSTALLED = False -else: - ANSIBLE_UTILS_IS_INSTALLED = True -from ansible.errors import AnsibleActionFail +from ansible_collections.cisco.ise.plugins.plugin_utils.action import ActionModule as ActionBase from ansible_collections.cisco.ise.plugins.plugin_utils.ise import ( ISESDK, ise_argument_spec, @@ -39,33 +29,7 @@ class ActionModule(ActionBase): - def __init__(self, *args, **kwargs): - if not ANSIBLE_UTILS_IS_INSTALLED: - raise AnsibleActionFail( - "ansible.utils is not installed. Execute 'ansible-galaxy collection install ansible.utils'" - ) - super(ActionModule, self).__init__(*args, **kwargs) - self._supports_async = False - self._supports_check_mode = True - self._result = None - - # Checks the supplied parameters against the argument spec for this module - def _check_argspec(self): - aav = AnsibleArgSpecValidator( - data=self._task.args, - schema=dict(argument_spec=argument_spec), - schema_format="argspec", - schema_conditionals=dict( - required_if=required_if, - required_one_of=required_one_of, - mutually_exclusive=mutually_exclusive, - required_together=required_together, - ), - name=self._task.action, - ) - valid, errors, self._task.args = aav.validate() - if not valid: - raise AnsibleActionFail(errors) + _supports_check_mode = True def get_object(self, params): new_object = dict( @@ -77,19 +41,26 @@ def run(self, tmp=None, task_vars=None): self._task.diff = False self._result = super(ActionModule, self).run(tmp, task_vars) self._result["changed"] = False - self._check_argspec() + _, validated_arguments = self.validate_argument_spec( + argument_spec=argument_spec, + mutually_exclusive=mutually_exclusive, + required_if=required_if, + required_one_of=required_one_of, + required_together=required_together, + ) + params = {k: v, for k, v in validated_arguments if k in self._task.args} self._result.update(dict(ise_response={})) - ise = ISESDK(params=self._task.args) + ise = ISESDK(params=params) - id = self._task.args.get("subscriberId") - name = self._task.args.get("name") + id = params.get("subscriberId") + name = params.get("name") if id: response = ise.exec( family="user_equipment", function="get_user_equipments_by_subscriber_id", - params=self.get_object(self._task.args), + params=self.get_object(params), ).response["response"] self._result.update(dict(ise_response=response)) self._result.update(ise.exit_json()) diff --git a/plugins/plugin_utils/action.py b/plugins/plugin_utils/action.py new file mode 100644 index 000000000..4e5d65690 --- /dev/null +++ b/plugins/plugin_utils/action.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright (c) 2025, Cisco Systems +# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt) + +from __future__ import absolute_import, division, print_function + +__metaclass__ = type +from ansible.plugins.action import ActionBase + + +class ActionModule(ActionBase): + def __init__(self, *args, **kwargs): + super(ActionModule, self).__init__(*args, **kwargs) + self._result = None