fog-azure-rm 0.0.4 → 0.0.5

data/lib/fog/azurerm/requests/compute/deallocate_virtual_machine.rb

@@ -1,25 +1,24 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def deallocate_virtual_machine(resource_group, name)
-          Fog::Logger.debug "Deallocating Virtual Machine #{name} in Resource Group #{resource_group}."
+          msg = "Deallocating Virtual Machine #{name} in Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            promise = @compute_mgmt_client.virtual_machines.deallocate(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Virtual Machine #{name} Deallocated Successfully."
-            true
+            @compute_mgmt_client.virtual_machines.deallocate(resource_group, name)
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Error Deallocating Virtual Machine '#{name}' in Resource Group '#{resource_group}'. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Virtual Machine #{name} Deallocated Successfully."
+          true
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def deallocate_virtual_machine(resource_group, name)
-          Fog::Logger.debug "Virtual Machine #{name} from Resource group #{resource_group} Deallocated successfully."
+        def deallocate_virtual_machine(*)
+          Fog::Logger.debug 'Virtual Machine fog-test-server from Resource group fog-test-rg Deallocated successfully.'
           true
         end
       end

data/lib/fog/azurerm/requests/compute/delete_availability_set.rb

@@ -1,19 +1,18 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_availability_set(resource_group, name)
+          msg = "Deleting Availability Set: #{name}."
+          Fog::Logger.debug msg
           begin
-            Fog::Logger.debug "Deleting Availability Set: #{name}."
-            promise = @compute_mgmt_client.availability_sets.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Availability Set #{name} deleted successfully."
-            true
+            @compute_mgmt_client.availability_sets.delete(resource_group, name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Availability Set #{name} in Resourse Group #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Availability Set #{name} deleted successfully."
+          true
         end
       end
       # This class provides the mock implementation for unit tests.

data/lib/fog/azurerm/requests/compute/delete_virtual_machine.rb

@@ -1,25 +1,24 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def delete_virtual_machine(resource_group, name)
-          Fog::Logger.debug "Deleting Virtual Machine #{name} from Resource Group #{resource_group}."
+          msg = "Deleting Virtual Machine #{name} from Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            promise = @compute_mgmt_client.virtual_machines.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Virtual Machine #{name} Deleted Successfully."
-            true
+            @compute_mgmt_client.virtual_machines.delete(resource_group, name)
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Error Deleting Virtual Machine '#{name}' from Resource Group '#{resource_group}'. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Virtual Machine #{name} Deleted Successfully."
+          true
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def delete_virtual_machine(resource_group, name)
-          Fog::Logger.debug "Virtual Machine #{name} from Resource group #{resource_group} deleted successfully."
+        def delete_virtual_machine(*)
+          Fog::Logger.debug 'Virtual Machine fog-test-server from Resource group fog-test-rg deleted successfully.'
           true
         end
       end

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

@@ -4,32 +4,31 @@ module Fog
       # This class provides the actual implementation for service calls.
       class Real
         def detach_data_disk_from_vm(resource_group, vm_name, disk_name)
-          Fog::Logger.debug "Detaching Data Disk #{disk_name} from Virtual Machine #{vm_name} in Resource Group #{resource_group}."
+          msg = "Detaching Data Disk #{disk_name} from Virtual Machine #{vm_name} in Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           vm = get_virtual_machine_instance(resource_group, vm_name, @compute_mgmt_client)
-          vm.properties.storage_profile.data_disks.each_with_index do |disk, index|
+          vm.storage_profile.data_disks.each_with_index do |disk, index|
             if disk.name == disk_name
-              vm.properties.storage_profile.data_disks.delete_at(index)
+              vm.storage_profile.data_disks.delete_at(index)
             end
           end
           vm.resources = nil
           begin
-            promise = @compute_mgmt_client.virtual_machines.create_or_update(resource_group, vm_name, vm)
-            result = promise.value!
-            Fog::Logger.debug "Data Disk #{disk_name} detached from Virtual Machine #{vm_name} successfully."
-            Azure::ARM::Compute::Models::VirtualMachine.serialize_object(result.body)
+            virtual_machine = @compute_mgmt_client.virtual_machines.create_or_update(resource_group, vm_name, vm)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Error Detaching Data Disk #{disk_name} from Virtual Machine #{vm_name} in Resource Group #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Data Disk #{disk_name} detached from Virtual Machine #{vm_name} successfully."
+          virtual_machine
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def detach_data_disk_from_vm(resource_group, vm_name, disk_name)
-          {
+        def detach_data_disk_from_vm(*)
+          vm = {
             'location' => 'West US',
-            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Compute/virtualMachines/#{name}",
-            'name' => vm_name,
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Compute/virtualMachines/fog-test-server',
+            'name' => 'fog-test-server',
             'type' => 'Microsoft.Compute/virtualMachines',
             'properties' =>
               {
@@ -48,10 +47,10 @@ module Fog
                       },
                     'osDisk' =>
                       {
-                        'name' => "#{vm_name}_os_disk",
+                        'name' => 'fog-test-server_os_disk',
                         'vhd' =>
                           {
-                            'uri' => "http://#{storage_account_name}.blob.core.windows.net/vhds/#{vm_name}_os_disk.vhd"
+                            'uri' => 'http://mystorage1.blob.core.windows.net/vhds/fog-test-server_os_disk.vhd'
                           },
                         'createOption' => 'FromImage',
                         'osType' => 'Linux',
@@ -59,10 +58,10 @@ module Fog
                       },
                     'dataDisks' => [{
                       'lun' => 0,
-                      'name' => disk_name,
-                      'vhd_uri' => "https://confizrg7443.blob.core.windows.net/vhds/#{disk_name}.vhd",
+                      'name' => 'fog-test-server_data_disk',
+                      'vhd_uri' => 'https://confizrg7443.blob.core.windows.net/vhds/fog-test-server_data_disk.vhd',
                       'create_option' => 'empty',
-                      'disk_size_gb' => disk_size
+                      'disk_size_gb' => 1
                     }]
                   },
                 'osProfile' =>
@@ -80,13 +79,15 @@ module Fog
                     'networkInterfaces' =>
                       [
                         {
-                          'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/fog-test-vnet"
+                          'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkInterfaces/fog-test-vnet'
                         }
                       ]
                   },
                 'provisioningState' => 'Succeeded'
               }
           }
+          vm_mapper = Azure::ARM::Compute::Models::VirtualMachine.mapper
+          @compute_mgmt_client.deserialize(vm_mapper, vm, 'result.body')
         end
       end
     end

data/lib/fog/azurerm/requests/compute/generalize_virtual_machine.rb

@@ -1,25 +1,24 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def generalize_virtual_machine(resource_group, name)
-          Fog::Logger.debug "Generalizing Virtual Machine #{name} in Resource Group #{resource_group}."
+          msg = "Generalizing Virtual Machine #{name} in Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            promise = @compute_mgmt_client.virtual_machines.generalize(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Virtual Machine #{name} Generalized Successfully."
-            true
+            @compute_mgmt_client.virtual_machines.generalize(resource_group, name)
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Error Generalizing Virtual Machine '#{name}' in Resource Group '#{resource_group}'. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Virtual Machine #{name} Generalized Successfully."
+          true
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def generalize_virtual_machine(resource_group, name)
-          Fog::Logger.debug "Virtual Machine #{name} from Resource group #{resource_group} Generalized successfully."
+        def generalize_virtual_machine(*)
+          Fog::Logger.debug 'Virtual Machine fog-test-server from Resource group fog-test-rg Generalized successfully.'
           true
         end
       end

data/lib/fog/azurerm/requests/compute/get_availability_set.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Compute
+    class AzureRM
+      # This class provides the actual implementation for service call.
+      class Real
+        def get_availability_set(resource_group, name)
+          msg = "Listing Availability Set: #{name} in Resource Group: #{resource_group}"
+          Fog::Logger.debug msg
+          begin
+            @compute_mgmt_client.availability_sets.get(resource_group, name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+        end
+      end
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def get_availability_set(*)
+          {
+            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/'resource_group'/providers/Microsoft.Compute/virtualMachines/'name'",
+            'name' => 'name',
+            'type' => 'Microsoft.Compute/virtualMachines',
+            'location' => 'westus',
+            '@platform_update_domain_count' => UPDATE_DOMAIN_COUNT,
+            '@platform_fault_domain_count' => FAULT_DOMAIN_COUNT,
+            '@virtual_machines' => []
+          }
+        end
+      end
+    end
+  end
+end

data/lib/fog/azurerm/requests/compute/get_virtual_machine.rb

@@ -1,26 +1,27 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def get_virtual_machine(resource_group, name)
+          msg = "Getting Virtual Machine #{name} from Resource Group '#{resource_group}'"
+          Fog::Logger.debug msg
           begin
-            promise = @compute_mgmt_client.virtual_machines.get(resource_group, name)
-            response = promise.value!
-            Azure::ARM::Compute::Models::VirtualMachine.serialize_object(response.body)
+            virtual_machine = @compute_mgmt_client.virtual_machines.get(resource_group, name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception getting Virtual Machine #{name} from Resource Group '#{resource_group}'. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Getting Virtual Machine #{name} from Resource Group '#{resource_group}' successful"
+          virtual_machine
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def get_virtual_machine(resource_group, name)
-          {
+        def get_virtual_machine(*)
+          vm = {
             'location' => 'westus',
-            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Compute/virtualMachines/#{name}",
-            'name' => name,
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Compute/virtualMachines/fog-test-server',
+            'name' => 'fog-test-server',
             'type' => 'Microsoft.Compute/virtualMachines',
             'properties' =>
             {
@@ -39,10 +40,10 @@ module Fog
                     },
                   'osDisk' =>
                     {
-                      'name' => "#{name}_os_disk",
+                      'name' => "fog-test-server_os_disk",
                       'vhd' =>
                         {
-                          'uri' => 'http://fogtestsafirst.blob.core.windows.net/vhds/testVM_os_disk.vhd'
+                          'uri' => 'http://fogtestsafirst.blob.core.windows.net/vhds/fog-test-server_os_disk.vhd'
                         },
                       'createOption' => 'FromImage',
                       'osType' => 'Linux',
@@ -52,7 +53,7 @@ module Fog
                 },
               'osProfile' =>
                 {
-                  'computerName' => name,
+                  'computerName' => 'fog',
                   'adminUsername' => 'testfog',
                   'linuxConfiguration' =>
                     {
@@ -65,13 +66,15 @@ module Fog
                   'networkInterfaces' =>
                     [
                       {
-                        'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/testNIC"
+                        'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkInterfaces/fog-test-vnet'
                       }
                     ]
                 },
               'provisioningState' => 'Succeeded'
             }
           }
+          vm_mapper = Azure::ARM::Compute::Models::VirtualMachine.mapper
+          @compute_mgmt_client.deserialize(vm_mapper, vm, 'result.body')
         end
       end
     end

data/lib/fog/azurerm/requests/compute/list_availability_sets.rb

@@ -1,17 +1,18 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_availability_sets(resource_group)
+          msg = "Listing Availability Sets in Resource Group: #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            promise = @compute_mgmt_client.availability_sets.list(resource_group)
-            response = promise.value!
-            Azure::ARM::Compute::Models::AvailabilitySetListResult.serialize_object(response.body)['value']
+            avail_sets = @compute_mgmt_client.availability_sets.list(resource_group)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception listing availability sets in Resource Group #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Listing Availability Sets in Resource Group: #{resource_group} successful."
+          avail_sets.value
         end
       end
       # This class provides the mock implementation for unit tests.

data/lib/fog/azurerm/requests/compute/list_available_sizes_for_virtual_machine.rb

@@ -1,48 +1,54 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_available_sizes_for_virtual_machine(resource_group, name)
+          msg = "Listing sizes for Virtual Machine #{name} in Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            response = @compute_mgmt_client.virtual_machines.list_available_sizes(resource_group, name)
-            result = response.value!
-            Azure::ARM::Compute::Models::VirtualMachineSizeListResult.serialize_object(result.body)['value']
+            vm_sizes = @compute_mgmt_client.virtual_machines.list_available_sizes(resource_group, name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Error listing Sizes for Virtual Machine #{name} in Resource Group '#{resource_group}'. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Successfully listed sizes for Virtual Machine #{name} in Resource Group #{resource_group}"
+          vm_sizes.value
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def list_available_sizes_for_virtual_machine(_resource_group, _name)
-          [
+        def list_available_sizes_for_virtual_machine(*)
+          vm_sizes =
             {
-              'name' => 'Standard_A0',
-              'numberOfCores' => 1,
-              'osDiskSizeInMB' => 1_047_552,
-              'resourceDiskSizeInMB' => 20_480,
-              'memoryInMB' => 768,
-              'maxDataDiskCount' => 1
-            },
-            {
-              'name' => 'Standard_A1',
-              'numberOfCores' => 1,
-              'osDiskSizeInMB' => 1_047_552,
-              'resourceDiskSizeInMB' => 71_680,
-              'memoryInMB' => 1792,
-              'maxDataDiskCount' => 2
-            },
-            {
-              'name' => 'Standard_A2',
-              'numberOfCores' => 2,
-              'osDiskSizeInMB' => 1_047_552,
-              'resourceDiskSizeInMB' => 138_240,
-              'memoryInMB' => 3584,
-              'maxDataDiskCount' => 4
+              'value' => [
+                {
+                  'name' => 'Standard_A0',
+                  'numberOfCores' => 1,
+                  'osDiskSizeInMB' => 1_047_552,
+                  'resourceDiskSizeInMB' => 20_480,
+                  'memoryInMB' => 768,
+                  'maxDataDiskCount' => 1
+                },
+                {
+                  'name' => 'Standard_A1',
+                  'numberOfCores' => 1,
+                  'osDiskSizeInMB' => 1_047_552,
+                  'resourceDiskSizeInMB' => 71_680,
+                  'memoryInMB' => 1792,
+                  'maxDataDiskCount' => 2
+                },
+                {
+                  'name' => 'Standard_A2',
+                  'numberOfCores' => 2,
+                  'osDiskSizeInMB' => 1_047_552,
+                  'resourceDiskSizeInMB' => 138_240,
+                  'memoryInMB' => 3584,
+                  'maxDataDiskCount' => 4
+                }
+              ]
             }
-          ]
+          vm_mapper = Azure::ARM::Compute::Models::VirtualMachineSizeListResult.mapper
+          @compute_mgmt_client.deserialize(vm_mapper, vm_sizes, 'result.body').value
         end
       end
     end

data/lib/fog/azurerm/requests/compute/list_virtual_machines.rb

@@ -1,62 +1,67 @@
 module Fog
   module Compute
     class AzureRM
-      # This class provides the actual implemention for service calls.
+      # This class provides the actual implementation for service calls.
       class Real
         def list_virtual_machines(resource_group)
+          msg = "Listing Virtual Machines in Resource Group '#{resource_group}'"
+          Fog::Logger.debug msg
           begin
-            response = @compute_mgmt_client.virtual_machines.list(resource_group)
-            result = response.value!
-            Azure::ARM::Compute::Models::VirtualMachineListResult.serialize_object(result.body)['value']
+            virtual_machines = @compute_mgmt_client.virtual_machines.list_as_lazy(resource_group)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Error listing Virtual Machines in Resource Group '#{resource_group}'. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "listing Virtual Machines in Resource Group '#{resource_group}' successful"
+          virtual_machines.value
         end
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def list_virtual_machines(resource_group)
-          [
-            {
-              'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Compute/virtualMachines/fog-test-server",
-              'name' => 'fog-test-server',
-              'location' => 'West US',
-              'properties' => {
-                'hardwareProfile' => {
-                  'vmSize' => 'Basic_A0'
-                },
-                'storageProfile' => {
-                  'imageReference' => {
-                    'publisher' => 'Canonical',
-                    'offer' => 'UbuntuServer',
-                    'sku' => '14.04.2-LTS',
-                    'version' => 'latest'
+        def list_virtual_machines(*)
+          vms = {
+            'value' => [
+              {
+                'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Compute/virtualMachines/fog-test-server',
+                'name' => 'fog-test-server',
+                'location' => 'West US',
+                'properties' => {
+                  'hardwareProfile' => {
+                    'vmSize' => 'Basic_A0'
                   },
-                  'osDisk' => {
-                    'name' => 'fog-test-server_os_disk',
-                    'vhd' => {
-                      'uri' => 'http://storageAccount.blob.core.windows.net/vhds/fog-test-server_os_disk.vhd'
+                  'storageProfile' => {
+                    'imageReference' => {
+                      'publisher' => 'Canonical',
+                      'offer' => 'UbuntuServer',
+                      'sku' => '14.04.2-LTS',
+                      'version' => 'latest'
+                    },
+                    'osDisk' => {
+                      'name' => 'fog-test-server_os_disk',
+                      'vhd' => {
+                        'uri' => 'http://storageAccount.blob.core.windows.net/vhds/fog-test-server_os_disk.vhd'
+                      }
                     }
-                  }
-                },
-                'osProfile' => {
-                  'computerName' => 'fog-test-server',
-                  'adminUsername' => 'shaffan',
-                  'linuxConfiguration' => {
-                    'disablePasswordAuthentication' => false
-                  }
-                },
-                'networkProfile' => {
-                  'networkInterfaces' => [
-                    {
-                      'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/fogtestnetworkinterface"
+                  },
+                  'osProfile' => {
+                    'computerName' => 'fog-test-server',
+                    'adminUsername' => 'shaffan',
+                    'linuxConfiguration' => {
+                      'disablePasswordAuthentication' => false
                     }
-                  ]
+                  },
+                  'networkProfile' => {
+                    'networkInterfaces' => [
+                      {
+                        'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkInterfaces/fog-test-vnet'
+                      }
+                    ]
+                  }
                 }
               }
-            }
-          ]
+            ]
+          }
+          vm_mapper = Azure::ARM::Compute::Models::VirtualMachineListResult.mapper
+          @compute_mgmt_client.deserialize(vm_mapper, vms, 'result.body').value
         end
       end
     end