From 952f62cd838f4808b367c521532186013a4b76ba Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman <rjeffman@redhat.com> Date: Thu, 30 Sep 2021 21:15:55 -0300 Subject: [PATCH] hbacsvcgroup: Use IPAAnsibleModule method to validate arguments. Use the IPAAnsibleModule.params_fail_if_used method to validate arguments provided by user. --- plugins/modules/ipahbacsvcgroup.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/modules/ipahbacsvcgroup.py b/plugins/modules/ipahbacsvcgroup.py index 1e6e3439..60f05d2d 100644 --- a/plugins/modules/ipahbacsvcgroup.py +++ b/plugins/modules/ipahbacsvcgroup.py @@ -187,17 +187,14 @@ def main(): # Check parameters + invalid = [] + if state == "present": if len(names) != 1: ansible_module.fail_json( msg="Only one hbacsvcgroup can be added at a time.") if action == "member": invalid = ["description", "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: @@ -206,11 +203,8 @@ def main(): invalid = ["description", "nomembers"] if action == "hbacsvcgroup": invalid.extend(["hbacsvc"]) - 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) # Init -- GitLab