cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added helper function and logic to sort attributes before comparing.

Browse source
This commit is contained in:
Tom Melendez 2016-07-13 19:56:43 +00:00 committed by Matt Clay
parent 4a8a052e2e
commit 067bb6ec01
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/ansible/modules/cloud/google/gce_net.py
View file

@ -174,6 +174,14 @@ def format_allowed(allowed):
return_value.append(format_allowed_section(section)) return_value.append(format_allowed_section(section))
return return_value return return_value
def sorted_allowed_list(allowed_list):
"""Sort allowed_list (output of format_allowed) by protocol and port."""
# sort by protocol
allowed_by_protocol = sorted(allowed_list,key=lambda x: x['IPProtocol'])
# sort the ports list
return sorted(allowed_by_protocol, key=lambda y: y['ports'].sort())
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
@ -256,21 +264,38 @@ def main():
# If old and new attributes are different, we update the firewall rule. # If old and new attributes are different, we update the firewall rule.
# This implicitly let's us clear out attributes as well. # This implicitly let's us clear out attributes as well.
# allowed_list is required and must not be None for firewall rules. # allowed_list is required and must not be None for firewall rules.
if allowed_list and (allowed_list != fw.allowed): if allowed_list and (sorted_allowed_list(allowed_list) != sorted_allowed_list(fw.allowed)):
fw.allowed = allowed_list fw.allowed = allowed_list
fw_changed = True fw_changed = True
if src_range != fw.source_ranges: # If these attributes are lists, we sort them first, then compare.
fw.source_ranges = src_range # Otherwise, we update if they differ.
fw_changed = True if fw.source_ranges != src_range:
if isinstance(src_range, list):
if sorted(fw.source_ranges) != sorted(src_range):
fw.source_ranges = src_range
fw_changed = True
else:
fw.source_ranges = src_range
fw_changed = True
if src_tags != fw.source_tags: if fw.source_tags != src_tags:
fw.source_tags = src_tags if isinstance(src_range, list):
fw_changed = True if sorted(fw.source_tags) != sorted(src_tags):
fw.source_tags = src_tags
fw_changed = True
else:
fw.source_tags = src_tags
fw_changed = True
if src_tags != fw.target_tags: if fw.target_tags != target_tags:
fw.target_tags = target_tags if isinstance(target_tags, list):
fw_changed = True if sorted(fw.target_tags) != sorted(target_tags):
fw.target_tags = target_tags
fw_changed = True
else:
fw.target_tags = target_tags
fw_changed = True
if fw_changed is True: if fw_changed is True:
try: try: