ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 05:40:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Various f5 fixes (#44858)

Browse source 
* Remove sdk from modules
* Correct IP address bugs in data_group
* Correct compare_dictionary bug in several modules
This commit is contained in:
Tim Rupp 2018-08-29 16:08:37 -07:00 • committed by GitHub
commit 5bdcaff921
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 359 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lib/ansible/module_utils/network/f5/common.py
View file

@ -335,28 +335,34 @@ def transform_name(partition='', name='', sub_path=''):
return result
def dict2tuple(items):
"""Convert a dictionary to a list of tuples
def compare_complex_list(want, have):
"""Performs a complex list comparison
This method is used in cases where dictionaries need to be compared. Due
to dictionaries inherently having no order, it is easier to compare list
of tuples because these lists can be converted to sets.
This conversion only supports dicts of simple values. Do not give it dicts
that contain sub-dicts. This will not give you the result you want when using
the returned tuple for comparison.
A complex list is a list of dictionaries
Args:
items (dict): The dictionary of items that should be converted
want (list): List of dictionaries to compare with second parameter.
have (list): List of dictionaries compare with first parameter.
Returns:
list: Returns a list of tuples upon success. Otherwise, an empty list.
bool:
"""
result = []
for x in items:
if want == [] and have is None:
return None
if want is None:
return None
w = []
h = []
for x in want:
tmp = [(str(k), str(v)) for k, v in iteritems(x)]
result += tmp
return result
w += tmp
for x in have:
tmp = [(str(k), str(v)) for k, v in iteritems(x)]
h += tmp
if set(w) == set(h):
return None
else:
return want
def compare_dictionary(want, have):
@ -369,12 +375,12 @@ def compare_dictionary(want, have):
Returns:
bool:
"""
if want == [] and have is None:
if want == {} and have is None:
return None
if want is None:
return None
w = dict2tuple(want)
h = dict2tuple(have)
w = [(str(k), str(v)) for k, v in iteritems(want)]
h = [(str(k), str(v)) for k, v in iteritems(have)]
if set(w) == set(h):
return None
else: