From b1c1615aad85fb0a22cf9afa9a544c35f42da848 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 25 May 2021 17:17:00 +0200
Subject: [PATCH] ansible_freeipa_module.py: Add ignore argument to
compare_args_ipa
The new argument ignore has been added to compare_args_ipa to ignore
attributes while comparing attributes of the user args and the object
args returned from IPA find or show command.
This code is using changes from
- Wolskie in PR #392
- jake2184 in PR #486
---
plugins/module_utils/ansible_freeipa_module.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py
index cf62b026..922cfdb0 100644
--- a/plugins/module_utils/ansible_freeipa_module.py
+++ b/plugins/module_utils/ansible_freeipa_module.py
@@ -276,14 +276,14 @@ else:
pass
raise ValueError("Invalid date '%s'" % value)
- def compare_args_ipa(module, args, ipa): # noqa
+ def compare_args_ipa(module, args, ipa, ignore=None): # noqa
"""Compare IPA obj attrs with the command args.
This function compares IPA objects attributes with the args the
- module is intending to use to call a command. This is useful to know
- if call to IPA server will be needed or not.
- In other to compare we have to prepare the perform slight changes in
- data formats.
+ module is intending to use to call a command. ignore can be a list
+ of attributes, that should be ignored in the comparison.
+ This is useful to know if a call to IPA server will be needed or not.
+ In order to compare we have to perform slight changes in data formats.
Returns True if they are the same and False otherwise.
"""
@@ -307,7 +307,12 @@ else:
if not (isinstance(args, dict) and isinstance(ipa, dict)):
raise TypeError("Expected 'dicts' to compare.")
- for key in args.keys():
+ # Create filtered_args using ignore
+ if ignore is None:
+ ignore = []
+ filtered_args = [key for key in args if key not in ignore]
+
+ for key in filtered_args:
if key not in ipa:
module.debug(
base_debug_msg + "Command key not present in IPA: %s" % key
--
GitLab