From 06ccc70c391cb06ede626d33871ea6b8595dd49f Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 30 Sep 2021 21:12:44 -0300
Subject: [PATCH] delegation: Use IPAAnsibleModule method to validate
arguments.
Use the IPAAnsibleModule.params_fail_if_used method to validate
arguments provided by user.
---
plugins/modules/ipadelegation.py | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/plugins/modules/ipadelegation.py b/plugins/modules/ipadelegation.py
index 3ebbe88c..33593056 100644
--- a/plugins/modules/ipadelegation.py
+++ b/plugins/modules/ipadelegation.py
@@ -176,17 +176,14 @@ def main():
# Check parameters
+ invalid = []
+
if state == "present":
if len(names) != 1:
ansible_module.fail_json(
msg="Only one delegation be added at a time.")
if action == "member":
invalid = ["permission", "membergroup", "group"]
- for x in invalid:
- if vars()[x] is not None:
- ansible_module.fail_json(
- msg="Argument '%s' can not be used with action "
- "'%s' and state '%s'" % (x, action, state))
if state == "absent":
if len(names) < 1:
@@ -194,11 +191,8 @@ def main():
invalid = ["permission", "membergroup", "group"]
if action == "delegation":
invalid.append("attribute")
- for x in invalid:
- if vars()[x] is not None:
- ansible_module.fail_json(
- msg="Argument '%s' can not be used with action "
- "'%s' and state '%s'" % (x, action, state))
+
+ ansible_module.params_fail_used_invalid(invalid, state, action)
if permission is not None:
perm = [p for p in permission if p not in ("read", "write")]
--
GitLab