CLOUDSTACK-4757 Support OVA with multiple volumes If no user configured bootdisk available, choose 1st disk.
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/87352b8c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/87352b8c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/87352b8c Branch: refs/heads/multiple-disk-ova Commit: 87352b8c4ccbba9bb2735764ef81aa6f755d9c5c Parents: ac0e7f7 Author: Sateesh Chodapuneedi <[email protected]> Authored: Wed Mar 12 19:14:04 2014 +0530 Committer: Likitha Shetty <[email protected]> Committed: Fri May 2 13:07:27 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87352b8c/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 28fcd1c..8f64a03 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -1264,8 +1264,8 @@ public class HypervisorHostHelper { sizeKb = ((VirtualDisk)device).getCapacityInKB(); if (diskCount == osDiskSeqNumber) { osDisk = true; - diskCount++; } + diskCount++; ovfVolumeInfo = new Ternary<String, Long, Boolean>(files.get(diskCount), sizeKb, osDisk); ovfVolumeInfos.add(ovfVolumeInfo); }
