conditional findVms2 call

Author: DaanHoogland

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -7209,7 +7209,7 @@ private Answer execute(PrepareUnmanageVMInstanceCommand cmd) {
 
             ManagedObjectReference  dcMor = hyperHost.getHyperHostDatacenter();
             DatacenterMO dataCenterMo = new DatacenterMO(getServiceContext(), dcMor);
-            VirtualMachineMO vm = dataCenterMo.findVm(instanceName);
+            VirtualMachineMO vm = dataCenterMo.findVm2(instanceName);
             if (vm == null) {
                 return new PrepareUnmanageVMInstanceAnswer(cmd, false, String.format("Cannot find VM with name [%s] in datacenter [%s].", instanceName, dataCenterMo.getName()));
             }
@@ -7515,7 +7515,7 @@ public String acquireVirtualMachineVncTicket(String vmInternalCSName) throws Exc
         VmwareContext context = getServiceContext();
         VmwareHypervisorHost hyperHost = getHyperHost(context);
         DatacenterMO dcMo = new DatacenterMO(hyperHost.getContext(), hyperHost.getHyperHostDatacenter());
-        VirtualMachineMO vmMo = dcMo.findVm(vmInternalCSName);
+        VirtualMachineMO vmMo = dcMo.findVm2(vmInternalCSName);
         return vmMo.acquireVncTicket();
     }
 

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatacenterMO.java

@@ -82,6 +82,49 @@ public VirtualMachineMO findVm(String vmName) throws Exception {
         List<ObjectContent> ocs = getVmProperties(new String[] {"name", instanceNameCustomField});
         return HypervisorHostHelper.findVmFromObjectContent(_context, ocs.toArray(new ObjectContent[0]), vmName, instanceNameCustomField);
     }
+    public VirtualMachineMO findVm2(String vmName) throws Exception {
+        int key = getCustomFieldKey("VirtualMachine", CustomFieldConstants.CLOUD_VM_INTERNAL_NAME);
+        if (key == 0) {
+            logger.warn("Custom field " + CustomFieldConstants.CLOUD_VM_INTERNAL_NAME + " is not registered ?!");
+        }
+        String instanceNameCustomField = "value[" + key + "]";
+        List<ObjectContent> ocs = getVmPropertiesOnDatacenterVmFolder(new String[] {"name", instanceNameCustomField});
+        return HypervisorHostHelper.findVmFromObjectContent(_context, ocs.toArray(new ObjectContent[0]), vmName, instanceNameCustomField);
+    }
+
+    public List<ObjectContent> getVmPropertiesOnDatacenterVmFolder(String[] propertyPaths) throws Exception {
+        PropertySpec pSpec = new PropertySpec();
+        pSpec.setType("VirtualMachine");
+        pSpec.getPathSet().addAll(Arrays.asList(propertyPaths));
+
+        TraversalSpec dc2VmFolderTraversal = new TraversalSpec();
+        dc2VmFolderTraversal.setType("Datacenter");
+        dc2VmFolderTraversal.setPath("vmFolder");
+        dc2VmFolderTraversal.setName("dc2VmFolderTraversal");
+
+        SelectionSpec recurseFolders = new SelectionSpec();
+        recurseFolders.setName("folder2childEntity");
+
+        TraversalSpec folder2childEntity = new TraversalSpec();
+        folder2childEntity.setType("Folder");
+        folder2childEntity.setPath("childEntity");
+        folder2childEntity.setName(recurseFolders.getName());
+        folder2childEntity.getSelectSet().add(recurseFolders);
+        dc2VmFolderTraversal.getSelectSet().add(folder2childEntity);
+
+        ObjectSpec oSpec = new ObjectSpec();
+        oSpec.setObj(_mor);
+        oSpec.setSkip(Boolean.TRUE);
+        oSpec.getSelectSet().add(dc2VmFolderTraversal);
+
+        PropertyFilterSpec pfSpec = new PropertyFilterSpec();
+        pfSpec.getPropSet().add(pSpec);
+        pfSpec.getObjectSet().add(oSpec);
+        List<PropertyFilterSpec> pfSpecArr = new ArrayList<PropertyFilterSpec>();
+        pfSpecArr.add(pfSpec);
+
+        return _context.getService().retrieveProperties(_context.getPropertyCollector(), pfSpecArr);
+    }
 
     public List<VirtualMachineMO> findVmByNameAndLabel(String vmLabel) throws Exception {
         CustomFieldsManagerMO cfmMo = new CustomFieldsManagerMO(_context, _context.getServiceContent().getCustomFieldsManager());