From 8027aad4b89f53bc10b2a0bea45afc8b2cf722ea Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Mon, 31 Jul 2017 08:18:57 +0530
Subject: [PATCH] Add support for Python3 in vmware_guest_find

* Remove redundant get_obj method
* Fix testcase
* Correct logic for compile_folder_path_for_object

Fixes: #25984

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
---
 lib/ansible/module_utils/vmware.py            |  4 ++--
 .../modules/cloud/vmware/vmware_guest_find.py | 23 ++-----------------
 .../targets/vmware_guest_find/aliases         |  1 -
 .../targets/vmware_guest_find/tasks/main.yml  |  4 ++++
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/lib/ansible/module_utils/vmware.py b/lib/ansible/module_utils/vmware.py
index e79ed51c93e..f76ab91eca8 100644
--- a/lib/ansible/module_utils/vmware.py
+++ b/lib/ansible/module_utils/vmware.py
@@ -234,11 +234,11 @@ def compile_folder_path_for_object(vobj):
     thisobj = vobj
     while hasattr(thisobj, 'parent'):
         thisobj = thisobj.parent
+        if thisobj.name == 'Datacenters':
+            break
         if isinstance(thisobj, vim.Folder):
             paths.append(thisobj.name)
     paths.reverse()
-    if paths[0] == 'Datacenters':
-        paths.remove('Datacenters')
     return '/' + '/'.join(paths)
 
 
diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_find.py b/lib/ansible/modules/cloud/vmware/vmware_guest_find.py
index dc0bc68acf2..57b3e25ee37 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_guest_find.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_guest_find.py
@@ -38,7 +38,7 @@ options:
             - This is required if name is not supplied.
    datacenter:
         description:
-            - Destination datacenter for the deploy operation.
+            - Destination datacenter for the find operation.
         required: True
 extends_documentation_fragment: vmware.documentation
 '''
@@ -78,14 +78,13 @@ from ansible.module_utils.vmware import (
     find_datacenter_by_name
 )
 
-HAS_PYVMOMI = False
 try:
     import pyVmomi
     from pyVmomi import vim
 
     HAS_PYVMOMI = True
 except ImportError:
-    pass
+    HAS_PYVMOMI = False
 
 
 class PyVmomiHelper(object):
@@ -199,24 +198,6 @@ class PyVmomiHelper(object):
         self.folders = self._build_folder_tree(self.datacenter.vmFolder)
         self._build_folder_map(self.folders)
 
-    @staticmethod
-    def compile_folder_path_for_object(vobj):
-        """ make a /vm/foo/bar/baz like folder path for an object """
-
-        paths = []
-        if isinstance(vobj, vim.Folder):
-            paths.append(vobj.name)
-
-        thisobj = vobj
-        while hasattr(thisobj, 'parent'):
-            thisobj = thisobj.parent
-            if isinstance(thisobj, vim.Folder):
-                paths.append(thisobj.name)
-        paths.reverse()
-        if paths[0] == 'Datacenters':
-            paths.remove('Datacenters')
-        return '/' + '/'.join(paths)
-
 
 def main():
     argument_spec = vmware_argument_spec()
diff --git a/test/integration/targets/vmware_guest_find/aliases b/test/integration/targets/vmware_guest_find/aliases
index 3cf34dcdb09..307f71079d1 100644
--- a/test/integration/targets/vmware_guest_find/aliases
+++ b/test/integration/targets/vmware_guest_find/aliases
@@ -1,4 +1,3 @@
 posix/ci/cloud/vcenter
 cloud/vcenter
-skip/python3
 destructive
diff --git a/test/integration/targets/vmware_guest_find/tasks/main.yml b/test/integration/targets/vmware_guest_find/tasks/main.yml
index 14c99038065..e89483f0003 100644
--- a/test/integration/targets/vmware_guest_find/tasks/main.yml
+++ b/test/integration/targets/vmware_guest_find/tasks/main.yml
@@ -1,3 +1,7 @@
+# Test code for the vmware_guest_find module.
+# (c) 2017, James Tanner <tanner.jc@gmail.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
 - name: make sure pyvmomi is installed
   pip:
     name: pyvmomi