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

Python 3 fixes for CloudStack modules and tests. (#24400)

Browse source
This commit is contained in:
Matt Clay 2017-05-09 19:37:08 +08:00 • committed by René Moser
parent 6aa32d3e9d
commit d999d613cb
23 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,11 @@
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import os
import sys
import time
from ansible.module_utils._text import to_text
try:
from cs import CloudStack, CloudStackException, read_config
HAS_LIB_CS = True
@ -47,6 +51,9 @@ CS_HYPERVISORS = [
'Simulator', 'simulator',
]
if sys.version_info > (3,):
long = int
def cs_argument_spec():
return dict(
@ -184,20 +191,23 @@ class AnsibleCloudStack(object):
self.result['diff']['after'][key] = value
result = True
else:
before_value = to_text(current_dict[key])
after_value = to_text(value)
if self.case_sensitive_keys and key in self.case_sensitive_keys:
if value != current_dict[key].encode('utf-8'):
self.result['diff']['before'][key] = current_dict[key].encode('utf-8')
self.result['diff']['after'][key] = value
if before_value != after_value:
self.result['diff']['before'][key] = before_value
self.result['diff']['after'][key] = after_value
result = True
# Test for diff in case insensitive way
elif value.lower() != current_dict[key].encode('utf-8').lower():
self.result['diff']['before'][key] = current_dict[key].encode('utf-8')
self.result['diff']['after'][key] = value
elif before_value.lower() != after_value.lower():
self.result['diff']['before'][key] = before_value
self.result['diff']['after'][key] = after_value
result = True
else:
self.result['diff']['before'][key] = None
self.result['diff']['after'][key] = value
self.result['diff']['after'][key] = to_text(value)
result = True
return result