Updated Branches: refs/heads/4.0 c69da4c1b -> 9a61ff214
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/9a61ff21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9a61ff21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9a61ff21 Branch: refs/heads/4.0 Commit: 9a61ff2143aeba31011715fc9282db55457d03a5 Parents: c69da4c Author: Murali Reddy <[email protected]> Authored: Mon Jan 7 16:36:47 2013 +0530 Committer: Murali Reddy <[email protected]> Committed: Mon Jan 7 16:47:38 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/9a61ff21/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 66c421f..f8d2985 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 @@ -3778,8 +3778,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(); @@ -3790,7 +3790,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 {
