From 67794aba232c592e685c56b4089e5f7bd893f43c Mon Sep 17 00:00:00 2001 From: nvazquez Date: Tue, 20 Oct 2020 03:00:21 -0300 Subject: [PATCH] Fix reinstall VM bug --- .../java/com/cloud/agent/api/to/DeployAsIsInfoTO.java | 2 +- .../cloud/hypervisor/vmware/resource/VmwareResource.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java b/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java index 1c5bf999d84..37d481ea20a 100644 --- a/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java +++ b/api/src/main/java/com/cloud/agent/api/to/DeployAsIsInfoTO.java @@ -31,7 +31,7 @@ public class DeployAsIsInfoTO { @LogLevel(LogLevel.Log4jLevel.Off) private Map properties = new HashMap<>(); private Map nicAdapterMap = new HashMap(); - boolean replaceVm; + private boolean replaceVm; public DeployAsIsInfoTO() { } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 275e61bb7e3..544d779daf2 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -1771,12 +1771,14 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa auxVM.destroy(); String vmNameInVcenter = virtualMachineMO.getName(); virtualMachineMO.tearDownDevices(new Class[]{VirtualDisk.class}); + s_logger.info("Changing VM datastore to " + dsMo); + virtualMachineMO.changeDatastore(morDatastore); for (String vmdkFileBaseName : vmdkFileBaseNames) { - String newPath = null; if (dsMo.folderExists(String.format("[%s]", dsMo.getName()), vmNameInVcenter)) { - newPath = VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo, vmNameInVcenter, dsMo, vmdkFileBaseName, null); + String newPath = VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo, vmNameInVcenter, dsMo, vmdkFileBaseName, null); + s_logger.info("Attaching disk to restored VM at: " + newPath + " on datastore: " + destDatastore); + virtualMachineMO.attachDisk(new String[] {newPath}, morDatastore); } - virtualMachineMO.attachDisk(new String[] {newPath}, morDatastore); } }