You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2014/01/31 09:00:11 UTC

git commit: updated refs/heads/4.3-forward to ba5b302

Updated Branches:
  refs/heads/4.3-forward cce4a055a -> ba5b302ae


CLOUDSTACK-6002. [vCenter 5.5] restoreVM fails with ROOT-x-000001.vmdk not found.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba5b302a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba5b302a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba5b302a

Branch: refs/heads/4.3-forward
Commit: ba5b302ae6cf5b1c38f226f5ded0bbaa5fe85248
Parents: cce4a05
Author: Likitha Shetty <li...@citrix.com>
Authored: Fri Jan 31 13:08:53 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Fri Jan 31 13:22:37 2014 +0530

----------------------------------------------------------------------
 .../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/ba5b302a/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();