You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/01/07 19:39:02 UTC
[3/6] git commit: Missed portion of the fix for CLOUDSTACK-595
submitted by commit 3ffbc4320abc9fd03ad3abd1f8077cc8d8f9ed4c which caused
build break.
Missed portion of the fix for CLOUDSTACK-595 submitted by commit
3ffbc4320abc9fd03ad3abd1f8077cc8d8f9ed4c which caused build break.
Fixing the build break and added missing code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bf6ed931
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bf6ed931
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bf6ed931
Branch: refs/heads/api_refactoring
Commit: bf6ed9312d529f9c790622f06e9e2363b32339e8
Parents: 3ffbc43
Author: Murali Reddy <mu...@citrix.com>
Authored: Mon Jan 7 16:36:47 2013 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Mon Jan 7 16:36:47 2013 +0530
----------------------------------------------------------------------
.../hypervisor/vmware/resource/VmwareResource.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bf6ed931/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index b1b15bb..a444cfe 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3775,8 +3775,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
String.format("[%s] %s.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(), true);
dsMo.moveDatastoreFile(String.format("[%s] %s/%s-delta.vmdk", dsMo.getName(), vmdkName, vmdkName),
- dcMo.getMor(), dsMo.getMor(),
- String.format("[%s] %s-delta.vmdk", dsMo.getName(), name), dcMo.getMor(), true);
+ dcMo.getMor(), dsMo.getMor(),
+ String.format("[%s] %s-delta.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(), true);
s_logger.info("detach disks from volume-wrapper VM " + vmdkName);
vmMo.detachAllDisks();
@@ -3787,7 +3787,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
String srcFile = String.format("[%s] %s/", dsMo.getName(), vmdkName);
dsMo.deleteFile(srcFile, dcMo.getMor(), true);
- VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), name, cmd.getDiskCharacteristics().getSize(), null);
+ VolumeTO vol = new VolumeTO(cmd.getVolumeId(), dskch.getType(), pool.getType(), pool.getUuid(), dskch.getName(), pool.getPath(), vmdkName, dskch.getSize(), null);
return new CreateAnswer(cmd, vol);
}
} else {