internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 11:54:47 +00:00
Code Issues Projects Releases Wiki Activity

ansible_freeipa_module: Convert int to string in compare_args_ipa

Browse Source 
With IPA 4.5 integers for examle in pwpolicy_find are returned as
integer values. The internally generated value will be converted from
integer to string (using to_text) if the value from find call result
is a string (or unicode for Python2).
This commit is contained in:
Thomas Woerner
2019-10-22 12:28:53 +02:00
parent ccc001ada0
commit 5d435c375c
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/module_utils/ansible_freeipa_module.py
View File

@@ -38,6 +38,11 @@ from ipapython.ipautil import run
from ipaplatform.paths import paths from ipaplatform.paths import paths
from ipalib.krb_utils import get_credentials_if_valid from ipalib.krb_utils import get_credentials_if_valid
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
import six
if six.PY3:
unicode = str
def valid_creds(module, principal): def valid_creds(module, principal):
@@ -185,8 +190,13 @@ def compare_args_ipa(module, args, ipa):
# are lists, but not all. # are lists, but not all.
if isinstance(ipa_arg, tuple): if isinstance(ipa_arg, tuple):
ipa_arg = list(ipa_arg) ipa_arg = list(ipa_arg)
if isinstance(ipa_arg, list) and not isinstance(arg, list): if isinstance(ipa_arg, list):
arg = [arg] if not isinstance(arg, list):
arg = [arg]
if isinstance(ipa_arg[0], str) and isinstance(arg[0], int):
arg = [to_text(_arg) for _arg in arg]
if isinstance(ipa_arg[0], unicode) and isinstance(arg[0], int):
arg = [to_text(_arg) for _arg in arg]
# module.warn("%s <=> %s" % (arg, ipa_arg)) # module.warn("%s <=> %s" % (arg, ipa_arg))
if set(arg) != set(ipa_arg): if set(arg) != set(ipa_arg):
# module.warn("DIFFERENT") # module.warn("DIFFERENT")