commit fe9b6b78146d83992cd286b85078d2fdce690392
author Sateesh Chodapuneedi <sateesh@apache.org> Thu Mar 13 11:28:29 2014 +0530
committer Sateesh Chodapuneedi <sateesh@apache.org> Thu Mar 13 11:28:29 2014 +0530
tree a8d657b086138c72b00eff0736443ed771c2a7a8
parent a73df09b14d3408d8c71de0da359203d2f62d743

CLOUDSTACK-4757 Support OVA with multiple volumes

Fix device id in worker vm.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

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 @@
             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();