You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/03/12 14:45:58 UTC

git commit: updated refs/heads/ova-multiple-disks to 7fb5641

Repository: cloudstack
Updated Branches:
  refs/heads/ova-multiple-disks 99eb63ed8 -> 7fb5641f4


CLOUDSTACK-4757 Support OVA with multiple volumes

If no user configured bootdisk available, choose 1st disk.

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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7fb5641f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7fb5641f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7fb5641f

Branch: refs/heads/ova-multiple-disks
Commit: 7fb5641f48f63c72e41b11828b57e910e381c737
Parents: 99eb63e
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Wed Mar 12 19:14:04 2014 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Wed Mar 12 19:14:04 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/7fb5641f/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);
             }