Enhance request detach disk to take more than one disk

Author: KevinLoiseau

lib/fog/azurerm/requests/compute/detach_data_disk_from_vm.rb

@@ -3,15 +3,12 @@ module Compute
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def detach_data_disk_from_vm(resource_group, vm_name, disk_name, async)
-          msg = "Detaching Data Disk #{disk_name} from Virtual Machine #{vm_name} in Resource Group #{resource_group}."
+        def detach_data_disk_from_vm(resource_group, vm_name, disk_names, async)
+          disk_names = disk_names.is_a?(Array) ? disk_names : [disk_names]
+          msg = "Detaching Data Disk #{disk_names.join(', ')} from Virtual Machine #{vm_name} in Resource Group #{resource_group}."
           Fog::Logger.debug msg
           vm = get_virtual_machine_instance(resource_group, vm_name)
-          vm.storage_profile.data_disks.each_with_index do |disk, index|
-            if disk.name == disk_name
-              vm.storage_profile.data_disks.delete_at(index)
-            end
-          end
+          vm.storage_profile.data_disks.delete_if {|disk| disk_names.include? disk.name }
           begin
             if async
               response = @compute_mgmt_client.virtual_machines.create_or_update_async(resource_group, vm_name, vm)
@@ -24,7 +21,7 @@ def detach_data_disk_from_vm(resource_group, vm_name, disk_name, async)
           if async
             response
           else
-            Fog::Logger.debug "Data Disk #{disk_name} detached from Virtual Machine #{vm_name} successfully."
+            Fog::Logger.debug "Data Disk #{disk_names.join(', ')} detached from Virtual Machine #{vm_name} successfully."
             virtual_machine
           end
         end

test/requests/compute/test_detach_data_disk_from_vm.rb

@@ -18,6 +18,16 @@ def test_detach_data_disk_from_vm_success
     end
   end
 
+  def test_detach_multiple_data_disks_from_vm_success
+    get_vm_response = ApiStub::Requests::Compute::VirtualMachine.create_virtual_machine_response(@compute_client)
+    update_vm_response = ApiStub::Requests::Compute::VirtualMachine.detach_data_disk_from_vm_response(@compute_client)
+    @virtual_machines.stub :get, get_vm_response do
+      @virtual_machines.stub :create_or_update, update_vm_response do
+        assert_equal @service.detach_data_disk_from_vm('fog-test-rg', 'fog-test-vm', %w(mydatadisk1 mydatadisk2), false), update_vm_response
+      end
+    end
+  end
+
   def test_detach_data_disk_from_vm_failure
     get_vm_response = ApiStub::Requests::Compute::VirtualMachine.create_virtual_machine_response(@compute_client)
     update_vm_response = proc { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }