Repository: cloudstack Updated Branches: refs/heads/ova-multiple-disks a73df09b1 -> fe9b6b781
CLOUDSTACK-4757 Support OVA with multiple volumes Fix device id in worker vm. Signed-off-by: Sateesh Chodapuneedi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe9b6b78 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe9b6b78 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe9b6b78 Branch: refs/heads/ova-multiple-disks Commit: fe9b6b78146d83992cd286b85078d2fdce690392 Parents: a73df09 Author: Sateesh Chodapuneedi <[email protected]> Authored: Thu Mar 13 11:28:29 2014 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Thu Mar 13 11:28:29 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe9b6b78/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java ---------------------------------------------------------------------- diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java index 989aae4..082e53c 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -1277,10 +1277,11 @@ public class HypervisorHostHelper { deviceConfigSpec.setOperation(VirtualDeviceConfigSpecOperation.ADD); vmConfigSpec.getDeviceChange().add(deviceConfigSpec); workerVmMo.configureVm(vmConfigSpec); + String deviceId = File.separator + workerVmMo.getMor().getValue() + File.separator + "VirtualIDEController0:0"; bSuccess = true; OvfFile ovfFile = new OvfFile(); ovfFile.setPath(diskFileName); - ovfFile.setDeviceId("1000"); + ovfFile.setDeviceId(deviceId); ovfFile.setSize(size); // write OVF descriptor file OvfCreateDescriptorParams ovfDescParams = new OvfCreateDescriptorParams();
