From 602f3a0ff3c71da039039323e793dfd66d1c042b Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman <rjeffman@redhat.com> Date: Thu, 30 Sep 2021 21:14:57 -0300 Subject: [PATCH] group: Use IPAAnsibleModule method to validate arguments. Use the IPAAnsibleModule.params_fail_if_used method to validate arguments provided by user. --- plugins/modules/ipagroup.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/modules/ipagroup.py b/plugins/modules/ipagroup.py index a502f935..2815b460 100644 --- a/plugins/modules/ipagroup.py +++ b/plugins/modules/ipagroup.py @@ -314,6 +314,7 @@ def main(): state = ansible_module.params_get("state") # Check parameters + invalid = [] if state == "present": if len(names) != 1: @@ -322,11 +323,6 @@ def main(): if action == "member": invalid = ["description", "gid", "posix", "nonposix", "external", "nomembers"] - for x in invalid: - if vars()[x] is not None: - ansible_module.fail_json( - msg="Argument '%s' can not be used with action " - "'%s'" % (x, action)) if state == "absent": if len(names) < 1: @@ -336,11 +332,8 @@ def main(): "nomembers"] if action == "group": invalid.extend(["user", "group", "service", "externalmember"]) - for x in invalid: - if vars()[x] is not None: - ansible_module.fail_json( - msg="Argument '%s' can not be used with state '%s'" % - (x, state)) + + ansible_module.params_fail_used_invalid(invalid, state, action) if external is False: ansible_module.fail_json( -- GitLab