You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/02/03 01:24:37 UTC
[5/7] git commit: updated refs/heads/4.3 to 91ec548
CLOUDSTACK-6002. [vCenter 5.5] restoreVM fails with ROOT-x-000001.vmdk not found.
(cherry picked from commit ba5b302ae6cf5b1c38f226f5ded0bbaa5fe85248)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5480a810
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5480a810
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5480a810
Branch: refs/heads/4.3
Commit: 5480a810a681a2dc42b2dbb02692a11f272cf9ef
Parents: 631ea24
Author: Likitha Shetty <li...@citrix.com>
Authored: Fri Jan 31 13:08:53 2014 +0530
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Sun Feb 2 16:08:56 2014 -0800
----------------------------------------------------------------------
.../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5480a810/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 24cfe53..fe568cd 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -363,7 +363,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
// restoreVM - move the new ROOT disk into corresponding VM folder
String vmInternalCSName = volume.getVmName();
if (dsMo.folderExists(String.format("[%s]", dsMo.getName()), vmInternalCSName)) {
- VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo, vmInternalCSName, dsMo, vmdkName);
+ VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo, vmInternalCSName, dsMo, vmdkFileBaseName);
}
VolumeObjectTO newVol = new VolumeObjectTO();