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

VMware: handle special characters in datacenter name (#42922)

Browse source 
This fix handles special characters in VMware objects

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2018-07-27 12:17:10 +05:30 committed by GitHub
parent 7dd5f4c01c
commit aefe963483
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/vmware.py
View file

@ -90,7 +90,7 @@ def find_obj(content, vimtype, name, first=True):
# Select the first match
if first is True:
for obj in obj_list:
if obj.name == name:
if to_text(obj.name) == to_text(name):
return obj
# If no object found, return None

4
lib/ansible/modules/cloud/vmware/vmware_guest.py
View file

@ -710,11 +710,11 @@ class PyVmomiCache(object):
""" Wrapper around find_obj to set datacenter context """
result = find_obj(content, types, name)
if result and confine_to_datacenter:
if self.get_parent_datacenter(result).name != self.dc_name:
if to_text(self.get_parent_datacenter(result).name) != to_text(self.dc_name):
result = None
objects = self.get_all_objs(content, types, confine_to_datacenter=True)
for obj in objects:
if name is None or obj.name == name:
if name is None or to_text(obj.name) == to_text(name):
return obj
return result