small cleanup for handover

apache · nvazquez · May 28, 2020 · May 29, 2020 · May 29, 2020 · Jun 3, 2020
commit cf1cdb7f710d3405cfcd825508147dcd0f0d5301
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1138,7 +1138,7 @@ public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfil
                     if (vm.getHypervisorType() != HypervisorType.BareMetal) {
                         // FR37 TODO do not create a copy volume task for deploy as is on vmware ?
                         if (vmProfile.getTemplate().isDeployAsIs()) {
-                            volumeMgr.prepare(vmProfile, dest);
+                            // FR37 TODO decide whether to skip this step now
                             s_logger.info("skipping prepare volume for a vApp (deploy as is) template");
                         } else {
                             volumeMgr.prepare(vmProfile, dest);

diff --git a/...stration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/...stration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -1337,7 +1337,7 @@ private Pair<VolumeVO, DataStore> recreateVolume(VolumeVO vol, VirtualMachinePro
                     if (result.getResult().contains(REQUEST_TEMPLATE_RELOAD) && (i == 0)) {
                         s_logger.debug("Retry template re-deploy for vmware");
                         continue;
-                    } else if (result.getResult().contains(COPY_NOT_NEEDED_FOR_DEPLOY_AS_IS)) {
+                    } else if (result.getResult().contains(COPY_NOT_NEEDED_FOR_DEPLOY_AS_IS)) { // FR37 can be removed again ?
                         s_logger.debug("template should be used from content library");
                         break;
                     } else {

diff --git a/...s/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/...s/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -519,7 +519,7 @@ private Pair<VirtualMachineMO, Long> copyTemplateFromSecondaryToPrimary(VmwareHy
                 throw new Exception(msg);
             }
         }
-        // FR37 we don't need ot on deploy as is
+
         srcFileName = getOVFFilePath(srcOVAFileName);
         if (srcFileName == null) {
             String msg = "Unable to locate OVF file in template package directory: " + srcOVAFileName;
@@ -864,12 +864,11 @@ public Answer cloneVolumeFromBaseTemplate(CopyCommand cmd) {
                     }
                     ManagedObjectReference morPool = hyperHost.getHyperHostOwnerResourcePool();
                     ManagedObjectReference morFolder = hyperHost.getHyperHostOwnerResourcePool();
-                    createLinkedOrFullClone(template, volume, dcMo, vmMo, morDatastore, dsMo, vmdkName, morPool);
-                    // FR37 TODO make a
-//                    createVMFullClone(vmMo, dcMo, dsMo, vmdkName, morDatastore, morPool);
-                    // FR37 TODO or a
-//                    createVMLinkedClone(vmMo, dcMo, vmdkName, morDatastore, morPool);
-                    vmMo = hyperHost.findVmOnHyperHost(vmdkName);
+                    vmMo = hyperHost.findVmOnHyperHost(template.getPath());
+                    String cloneVMName = "CloneVM-" + vmdkName;
+                    createLinkedOrFullClone(template, volume, dcMo, vmMo, morDatastore, dsMo, cloneVMName, morPool);
+                    vmMo = hyperHost.findVmOnHyperHost(cloneVMName);
+                    // At this point vmMo points to the cloned VM
                     vmdkFileBaseName = vmMo.getVmdkFileBaseNames().get(0);
                 } else {
                     VirtualMachineMO vmTemplate = VmwareHelper.pickOneVmOnRunningHost(dcMo.findVmByNameAndLabel(templatePath), true);