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

cloudstack: implement diff support (#18254)

Browse source
This commit is contained in:
René Moser 2016-10-30 17:05:24 +01:00 • committed by GitHub
parent 01af859090
commit 44bdc6fb79
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/ansible/module_utils/cloudstack.py
View file

@ -69,6 +69,10 @@ class AnsibleCloudStack(object):
self.result = { self.result = {
'changed': False, 'changed': False,
'diff' : {
'before': dict(),
'after': dict()
}
} }
# Common returns, will be merged with self.returns # Common returns, will be merged with self.returns
@ -149,6 +153,7 @@ class AnsibleCloudStack(object):
def has_changed(self, want_dict, current_dict, only_keys=None): def has_changed(self, want_dict, current_dict, only_keys=None):
result = False
for key, value in want_dict.iteritems(): for key, value in want_dict.iteritems():
# Optionally limit by a list of keys # Optionally limit by a list of keys
@ -172,18 +177,26 @@ class AnsibleCloudStack(object):
current_dict[key] = complex(current_dict[key]) current_dict[key] = complex(current_dict[key])
if value != current_dict[key]: if value != current_dict[key]:
return True self.result['diff']['before'][key] = current_dict[key]
self.result['diff']['after'][key] = value
result = True
else: else:
if self.case_sensitive_keys and key in self.case_sensitive_keys: if self.case_sensitive_keys and key in self.case_sensitive_keys:
if value != current_dict[key].encode('utf-8'): if value != current_dict[key].encode('utf-8'):
return True self.result['diff']['before'][key] = current_dict[key].encode('utf-8')
self.result['diff']['after'][key] = value
result = True
# Test for diff in case insensitive way # Test for diff in case insensitive way
elif value.lower() != current_dict[key].encode('utf-8').lower(): elif value.lower() != current_dict[key].encode('utf-8').lower():
return True self.result['diff']['before'][key] = current_dict[key].encode('utf-8')
self.result['diff']['after'][key] = value
result = True
else: else:
return True self.result['diff']['before'][key] = None
return False self.result['diff']['after'][key] = value
result = True
return result
def _get_by_key(self, key=None, my_dict=None): def _get_by_key(self, key=None, my_dict=None):