CLOUDSTACK-4757 Support OVA with multiple volumes Fix device id in worker vm.
Signed-off-by: Sateesh Chodapuneedi <sate...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e467d11d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e467d11d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e467d11d Branch: refs/heads/multiple-disk-ova Commit: e467d11d6fddb58177393a6f5355b463f070150a Parents: 87352b8 Author: Sateesh Chodapuneedi <sate...@apache.org> Authored: Thu Mar 13 11:28:29 2014 +0530 Committer: Likitha Shetty <likitha.she...@citrix.com> Committed: Fri May 2 13:07:38 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/e467d11d/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 8f64a03..e17b305 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -1356,10 +1356,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();
