From 8d30c0ff11f18cefaf0aa28727cc5a7f27718408 Mon Sep 17 00:00:00 2001
From: Lucy Fu <lufu@redhat.com>
Date: Thu, 28 Apr 2016 17:54:36 -0400
Subject: [PATCH] getScsiCandU may return either an empty hash or an array of
 controller key and unit number.

https://bugzilla.redhat.com/show_bug.cgi?id=1331184
---
 .../vmware/infra_manager/vm/reconfigure.rb    |  2 +-
 .../infra_manager/vm/reconfigure_spec.rb      | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb b/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb
index 0fb8a184bb1..1e6084b5bf9 100644
--- a/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb
+++ b/app/models/manageiq/providers/vmware/infra_manager/vm/reconfigure.rb
@@ -79,7 +79,7 @@ def add_disks(vim_obj, vmcs, disks)
     controller_key, unit_number = vim_obj.send(:getScsiCandU)
 
     # if there is no scsi controller
-    if controller_key.nil?
+    if controller_key.blank?
       controller_key, unit_number = [-99, 0]
       add_scsi_controller(vmcs, 0, controller_key)
     end
diff --git a/spec/models/manageiq/providers/vmware/infra_manager/vm/reconfigure_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/vm/reconfigure_spec.rb
index 43d6fd5d98c..9cb93278fa5 100644
--- a/spec/models/manageiq/providers/vmware/infra_manager/vm/reconfigure_spec.rb
+++ b/spec/models/manageiq/providers/vmware/infra_manager/vm/reconfigure_spec.rb
@@ -183,4 +183,26 @@
       expect(subject).to eq('independent_nonpersistent')
     end
   end
+
+  context '#add_disks' do
+    let(:vim)  { double("vim object") }
+    let(:vmcs) { double("VirtualMachineConfigSpec").as_null_object }
+    let(:disk) { {:disk_size_in_mb => 1024} }
+
+    it 'with valid controller key' do
+      allow(vim).to receive(:getScsiCandU).and_return([200, 1])
+
+      expect(vm).not_to receive(:add_scsi_controller)
+      expect(vm).to receive(:add_disk_config_spec).with(vmcs, disk).once
+      vm.add_disks(vim, vmcs, [disk])
+    end
+
+    it 'with no controller key' do
+      allow(vim).to receive(:getScsiCandU).and_return({})
+
+      expect(vm).to receive(:add_scsi_controller).with(vmcs, 0, -99).once
+      expect(vm).to receive(:add_disk_config_spec).with(vmcs, disk).once
+      vm.add_disks(vim, vmcs, [disk])
+    end
+  end
 end