cloudstack: handle unicode API results in has_changed (#16601)

* cloudstack: handle unicode API results in has_changed

* cloudstack: add more case sensitve keys
pull/16623/head
René Moser 9 years ago committed by GitHub
parent 58eab8ee9f
commit 0f5f5fffee

@ -93,6 +93,9 @@ class AnsibleCloudStack(object):
# these keys will be compared case sensitive in self.has_changed() # these keys will be compared case sensitive in self.has_changed()
self.case_sensitive_keys = [ self.case_sensitive_keys = [
'id', 'id',
'displaytext',
'displayname',
'description',
] ]
self.module = module self.module = module
@ -155,11 +158,16 @@ class AnsibleCloudStack(object):
continue continue
if key in current_dict: if key in current_dict:
if isinstance(current_dict[key], (int, long, float, complex)):
if value != current_dict[key]:
return True
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 str(value) != str(current_dict[key]): if value != current_dict[key].encode('utf-8'):
return True return True
# Test for diff in case insensitive way # Test for diff in case insensitive way
elif str(value).lower() != str(current_dict[key]).lower(): elif value.lower() != current_dict[key].encode('utf-8').lower():
return True return True
else: else:
return True return True

Loading…
Cancel
Save