From 67282b1a6a06ae3562840034de1af8d1d84b83a8 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman <rjeffman@redhat.com> Date: Thu, 30 Sep 2021 21:13:33 -0300 Subject: [PATCH] dnsforwardzone: Use IPAAnsibleModule method to validate arguments. Use the IPAAnsibleModule.params_fail_if_used method to validate arguments provided by user. --- plugins/modules/ipadnsforwardzone.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/modules/ipadnsforwardzone.py b/plugins/modules/ipadnsforwardzone.py index 492a3173..09ff09b9 100644 --- a/plugins/modules/ipadnsforwardzone.py +++ b/plugins/modules/ipadnsforwardzone.py @@ -229,6 +229,7 @@ def main(): else: operation = "add" + invalid = [] if state in ["enabled", "disabled"]: if action == "member": ansible_module.fail_json( @@ -237,22 +238,14 @@ def main(): invalid = [ "forwarders", "forwardpolicy", "skip_overlap_check", "permission" ] - for x in invalid: - if vars()[x] is not None: - ansible_module.fail_json( - msg="Argument '%s' can not be used with action " - "'%s', state `%s`" % (x, action, state)) wants_enable = (state == "enabled") if operation == "del": invalid = [ "forwarders", "forwardpolicy", "skip_overlap_check", "permission" ] - for x in invalid: - if vars()[x] is not None: - ansible_module.fail_json( - msg="Argument '%s' can not be used with action " - "'%s', state `%s`" % (x, action, state)) + + ansible_module.params_fail_used_invalid(invalid, state, action) changed = False exit_args = {} -- GitLab