fixed issue where datastore and cluster would not be correctly identified when cluster had same name as datastore during deploy

Author: nahumtimerman

package/cloudshell/cp/vcenter/common/vcenter/vmomi_service.py

@@ -8,6 +8,7 @@
 from cloudshell.cp.vcenter.common.utilites.common_utils import str2bool
 from cloudshell.cp.vcenter.common.vcenter.task_waiter import SynchronousTaskWaiter
 from cloudshell.cp.vcenter.exceptions.task_waiter import TaskFaultException
+from debug_utils import debugger
 
 
 class VCenterAuthError(Exception):
@@ -227,7 +228,7 @@ def find_obj_by_path(self, si, path, name, type_name):
         '#searches for the specific vm in the folder'
         return search_index.FindChild(look_in, name)
 
-    def find_dvs_by_path(self,si ,path):
+    def find_dvs_by_path(self, si, path):
         """
         Finds vm in the vCenter or returns "None"
         :param si:         pyvmomi 'ServiceInstance'
@@ -336,12 +337,12 @@ def get_obj(self, content, vimtypes, name):
                     obj = c
                     break
 
-            return obj
+        return obj
 
     @staticmethod
     def _get_all_objects_by_type(content, vimtype):
         container = content.viewManager.CreateContainerView(
-                content.rootFolder, vimtype, True)
+            content.rootFolder, vimtype, True)
         return container
 
     @staticmethod
@@ -419,6 +420,8 @@ def clone_vm(self, clone_params, logger, cancellation_context):
         :param clone_params: CloneVmParameters =
         :param logger:
         """
+        debugger.attach_debugger()
+
         result = self.CloneVmResult()
 
         if not isinstance(clone_params.si, self.vim.ServiceInstance):
@@ -523,11 +526,11 @@ def _get_datastore(self, clone_params):
         name = parts[len(parts) - 1]
         if name:
             datastore = self.get_obj(clone_params.si.content,
-                                     [self.vim.Datastore],
+                                     [[self.vim.Datastore]],
                                      name)
         if not datastore:
             datastore = self.get_obj(clone_params.si.content,
-                                     [self.vim.StoragePod],
+                                     [[self.vim.StoragePod]],
                                      name)
             if datastore:
                 datastore = sorted(datastore.childEntity,
@@ -540,10 +543,12 @@ def _get_datastore(self, clone_params):
 
     def _get_resource_pool(self, datacenter_name, clone_params):
 
-        resource_full_path = '{0}/{1}/{2}'.format(datacenter_name,
-                                                  clone_params.cluster_name,
-                                                  clone_params.resource_pool)
-        obj = self.get_folder(clone_params.si, resource_full_path)
+        obj_name = '{0}/{1}/{2}'.format(datacenter_name,
+                                        clone_params.cluster_name,
+                                        clone_params.resource_pool).rstrip('/').split('/')[-1]
+        # obj = self.get_folder(clone_params.si, resource_full_path)
+        accepted_types = [[vim.ResourcePool], [vim.ClusterComputeResource], [vim.HostSystem]]
+        obj = self.get_obj(clone_params.si.content, accepted_types, obj_name)
 
         resource_pool = None
         host = None
@@ -739,7 +744,8 @@ def get_vm_full_path(self, si, vm):
             folder_name = folder.name
             folder_parent = folder.parent
 
-            while folder_parent and folder_parent.name and folder_parent != si.content.rootFolder and not isinstance(folder_parent, vim.Datacenter):
+            while folder_parent and folder_parent.name and folder_parent != si.content.rootFolder and not isinstance(
+                    folder_parent, vim.Datacenter):
                 folder_name = folder_parent.name + '/' + folder_name
                 try:
                     folder_parent = folder_parent.parent
@@ -755,4 +761,4 @@ def get_vm_full_path(self, si, vm):
 def vm_has_no_vnics(vm):
     # Is there any network device on vm
     return next((False for device in vm.config.hardware.device
-                if isinstance(device, vim.vm.device.VirtualEthernetCard) and hasattr(device, 'macAddress')), True)
+                 if isinstance(device, vim.vm.device.VirtualEthernetCard) and hasattr(device, 'macAddress')), True)

package/cloudshell/tests/utils/helpers.py

@@ -16,6 +16,6 @@ def get_uuid(virtual_machine_name):
 
 
 def get_vm_uuid(py_vmomi_service, si, virtual_machine_name):
-    vm = py_vmomi_service.get_obj(si.content, [vim.VirtualMachine], virtual_machine_name)
+    vm = py_vmomi_service.get_obj(si.content, [[vim.VirtualMachine]], virtual_machine_name)
     vm_uuid = vm.config.uuid
     return vm_uuid