From b1bca2a2c02d0f0f5e3435fe2587334ae107495d Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Wed, 3 Dec 2014 19:28:41 +0530
Subject: [PATCH] CLOUDSTACK-8119. [VMware] Cannot attach more than 8 volumes
 to a VM.

---
 .../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index cd96105a34d..727903e59eb 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -2323,7 +2323,7 @@ public class VirtualMachineMO extends BaseMO {
 
         List<Integer> existingUnitNumbers = new ArrayList<Integer>();
         int deviceNumber = 0;
-        int ideControllerKey = getIDEDeviceControllerKey();
+        int scsiControllerKey = getScsiDeviceControllerKeyNoException();
         if (devices != null && devices.size() > 0) {
             for (VirtualDevice device : devices) {
                 if (device.getControllerKey() != null && device.getControllerKey().intValue() == controllerKey) {
@@ -2334,7 +2334,7 @@ public class VirtualMachineMO extends BaseMO {
         while (true) {
             // Next device number should be the lowest device number on the key that is not in use and is not reserved.
             if (!existingUnitNumbers.contains(Integer.valueOf(deviceNumber))) {
-                if (controllerKey != ideControllerKey && !VmwareHelper.isReservedScsiDeviceNumber(deviceNumber))
+                if (controllerKey != scsiControllerKey || !VmwareHelper.isReservedScsiDeviceNumber(deviceNumber))
                     break;
             }
             ++deviceNumber;