fog-azure-rm 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86a3f0c7c485417833dbbad2fad9b5aab150e503
-  data.tar.gz: 2b323fe0537e530cc54d7a5a1b0e985b387649bb
+  metadata.gz: 2b4f2441649c95cccb88036a162a4613332f51aa
+  data.tar.gz: 4d1c16d3f1aa6a8c5aec6ea59632de93988b75eb
 SHA512:
-  metadata.gz: c60ea047820659f91d09c395f5b7930fbbbaf0d47dfea3e4b0d36c508650add4d5a3a62803a1a516c19f77611fa3055c20a64cff240dd69f2f5a07cbbf24534b
-  data.tar.gz: 2b9f9a22a6bafd848d8ef9aab6f213fb3768e0bc7fcaea12bd09db444d310fd8f0fb5f1f1bd0b27d787e39253c2dbb4ec923a3162a4f0c2e81594c155b3670e8
+  metadata.gz: b421167e3518fd5b39d9eec7b9dcd286b4402eabab895eb0ddea2a7250dcecf5ddf70e12063c92ea1adda850eced455242bd7d5ae49466b99dd7e2e3c616b4cb
+  data.tar.gz: 12864d9c4833cd859147bf506559a1d9bc91b4911c66cf823a1d2630af0b1ec73791950d9484e9effdac455460da2c7959ee7ee76cc7fdc18f697f9c30733106

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.3.5
+
+**Added:**
+- Compute Service - Added platform update domain and platform fault domain propertied in server model
+- Compute Service - Added support to custom image for managed VM
+
+**Changed:**
+- Compute Service - Changed required arguments for server create method
+
+**Fixed**
+- Compute Service - Fixed issue with creating VM with custom image
+
 ## 0.3.4
 
 **Added:**

data/lib/fog/azurerm/compute.rb

@@ -41,6 +41,8 @@ module Fog
       request :list_managed_disks_in_subscription
       request :revoke_access_to_managed_disk
       request :grant_access_to_managed_disk
+      request :create_generalized_image
+      request :delete_generalized_image
 
       model_path 'fog/azurerm/models/compute'
       model :availability_set

data/lib/fog/azurerm/docs/compute.md

@@ -33,13 +33,16 @@ azure_compute_service.servers.check_vm_exists(<Resource Group name>, <VM Name>)
 
 ## Create Server
 
-Create a new linux server
-
 **Info:**
-Attribute **network_interface_card_ids** is an array of NICs ids. The NIC id at index zero will become primary NIC of this server(virtual machine) by default.
 
-**Info:**
-When using **managed_disk_storage_type** you should not pass the **vhd_path** as the managed disk will be used for the OS disk. Also, data disks cannot be attached to a VM which uses managed disks for the OS disk.
+- Attribute **network_interface_card_ids** is an array of NICs ids. The NIC id at index zero will become primary NIC of this server(virtual machine) by default.
+- To create VM with managed OS disk, use the _managed_disk_storage_type_ argument
+- To create VM with unmanaged OS disk, use the _storage_account_name_ argument
+
+
+### Virtual Machine (Managed OS Disk)
+
+### Virtual Machine (Managed OS Disk)
 
 ```ruby
     azure_compute_service.servers.create(
@@ -47,7 +50,6 @@ When using **managed_disk_storage_type** you should not pass the **vhd_path** as
         location: 'West US',
         resource_group: '<Resource Group Name>',
         vm_size: 'Basic_A0',
-        storage_account_name: '<Storage Account Name>',
         username: '<Username for VM>',
         password: '<Password for VM>',             # Optional, if 'platform' partameter is 'Linux'.
         disable_password_authentication: false,
@@ -61,12 +63,12 @@ When using **managed_disk_storage_type** you should not pass the **vhd_path** as
         vhd_path: '<Path of VHD>',                 # Optional, if you want to create the VM from a custom image.
         custom_data: 'echo customData',            # Optional, if you want to add custom data in this VM.
         os_disk_caching: Fog::ARM::Compute::Models::CachingTypes::None, # Optional, can be one of None, ReadOnly, ReadWrite
-        managed_disk_storage_type: Azure::ARM::Compute::Models::StorageAccountTypes::StandardLRS, # Optional, can be StandardLRS or PremiumLRS
+        managed_disk_storage_type: Azure::ARM::Compute::Models::StorageAccountTypes::StandardLRS, # Optional if storage_account_name is passed, can be StandardLRS or PremiumLRS
         os_disk_size: <Disk Size>                  # Optional, size of the os disk in GB (upto 1023)
     )
 ```
 
-Create a new windows server
+### Virtual Machine (Unmanaged OS Disk)
 
 ```ruby
     azure_compute_service.servers.create(
@@ -87,7 +89,6 @@ Create a new windows server
         platform: 'Windows',
         vhd_path: '<Path of VHD>',                       # Optional, if you want to create the VM from a custom image.
         custom_data: 'echo customData',                  # Optional, if you want to add custom data in this VM.
-        managed_disk_storage_type: Azure::ARM::Compute::Models::StorageAccountTypes::StandardLRS, # Optional, can be StandardLRS or PremiumLRS
         os_disk_size: <Disk Size>                        # Optional, size of the os disk in GB (upto 1023)
     )
 ```

data/lib/fog/azurerm/models/compute/server.rb

@@ -33,6 +33,8 @@ module Fog
         attribute :managed_disk_storage_type
         attribute :os_disk_size
         attribute :tags
+        attribute :platform_update_domain
+        attribute :platform_fault_domain
 
         def self.parse(vm)
           hash = {}
@@ -80,13 +82,19 @@ module Fog
           hash['availability_set_id'] = vm.availability_set.id unless vm.availability_set.nil?
           hash['tags'] = vm.tags
 
+          unless vm.instance_view.nil?
+            hash['platform_update_domain'] = vm.instance_view.platform_update_domain
+            hash['platform_fault_domain'] = vm.instance_view.platform_fault_domain
+          end
+
           hash
         end
 
         def save(async = false)
-          requires :name, :location, :resource_group, :vm_size, :storage_account_name,
-                   :username, :network_interface_card_ids
+          requires :name, :location, :resource_group, :vm_size, :username, :network_interface_card_ids
           requires :publisher, :offer, :sku, :version if vhd_path.nil? && managed_disk_storage_type.nil?
+          requires :storage_account_name if managed_disk_storage_type.nil?
+          requires :managed_disk_storage_type if storage_account_name.nil?
 
           if platform_is_linux?(platform)
             requires :disable_password_authentication

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

@@ -0,0 +1,67 @@
+module Fog
+  module Compute
+    class AzureRM
+      # This class provides the actual implementation for service calls.
+      class Real
+        def create_generalized_image(image_config)
+          msg = "Creating/Updating Generalized Image: #{image_config[:vm_name]}-osImage"
+          Fog::Logger.debug msg
+          image_name = "#{image_config[:vm_name]}-osImage"
+          image = setup_image_params(image_config)
+          begin
+            image_obj = @compute_mgmt_client.images.create_or_update(image_config[:resource_group], image_name, image)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Generalized Image #{image_name} created/updated successfully."
+          image_obj
+        end
+
+        private
+
+        def setup_image_params(image_config)
+          storage_profile_image = Azure::ARM::Compute::Models::ImageStorageProfile.new
+          storage_profile_image.os_disk = create_os_disk_image(image_config)
+          image = Azure::ARM::Compute::Models::Image.new
+          image.storage_profile = storage_profile_image
+          image.location = image_config[:location]
+          image
+        end
+
+        def create_os_disk_image(image_config)
+          os_disk_image = Azure::ARM::Compute::Models::ImageOSDisk.new
+          os_disk_image.os_type = image_config[:platform]
+          os_disk_image.os_state = 'Generalized'
+          os_disk_image.blob_uri = image_config[:new_vhd_path]
+          os_disk_image.caching = Azure::ARM::Compute::Models::CachingTypes::ReadWrite
+          os_disk_image
+        end
+      end
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def create_generalized_image(*)
+          image_obj = {
+            'location' => 'West US',
+            'tags' => {
+              'key' => 'value'
+            },
+            'properties' => {
+              'storageProfile' => {
+                'osDisk' => {
+                  'osType' => 'Linux',
+                  'blobUri' => 'https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd',
+                  'osState' => 'generalized',
+                  'hostCaching' => 'readwrite',
+                  'storageAccountType' => 'Standard_LRS'
+                },
+                'provisioningState' => 'Succeeded'
+              }
+            }
+          }
+          image_mapper = Azure::ARM::Compute::Models::Image.mapper
+          @compute_mgmt_client.deserialize(image_mapper, image_obj, 'result.body')
+        end
+      end
+    end
+  end
+end

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

@@ -32,7 +32,8 @@ module Fog
                                                                    vm_config[:platform],
                                                                    vm_config[:resource_group],
                                                                    vm_config[:managed_disk_storage_type],
-                                                                   vm_config[:os_disk_size])
+                                                                   vm_config[:os_disk_size],
+                                                                   vm_config[:location])
 
           virtual_machine.os_profile = if vm_config[:platform].casecmp(WINDOWS).zero?
                                          define_windows_os_profile(vm_config[:name],
@@ -62,6 +63,9 @@ module Fog
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
+
+          is_managed_custom_vm = !vm_config[:vhd_path].nil? && !vm_config[:managed_disk_storage_type].nil?
+          delete_generalized_image(vm_config[:resource_group], vm_config[:name]) if is_managed_custom_vm
           Fog::Logger.debug "Virtual Machine #{vm_config[:name]} Created Successfully." unless async
           response
         end
@@ -83,40 +87,18 @@ module Fog
           image_reference
         end
 
-        def define_storage_profile(vm_name, storage_account_name, publisher, offer, sku, version, vhd_path, os_disk_caching, platform, resource_group, managed_disk_storage_type, os_disk_size)
+        def define_storage_profile(vm_name, storage_account_name, publisher, offer, sku, version, vhd_path, os_disk_caching, platform, resource_group, managed_disk_storage_type, os_disk_size, location)
           storage_profile = Azure::ARM::Compute::Models::StorageProfile.new
-          storage_profile.image_reference = image_reference(publisher, offer, sku, version)
+          storage_profile.image_reference = image_reference(publisher, offer, sku, version) if vhd_path.nil?
           os_disk = Azure::ARM::Compute::Models::OSDisk.new
 
-          if managed_disk_storage_type.nil?  
+          new_vhd_path = copy_vhd_to_storage_account(resource_group, storage_account_name, vhd_path) unless vhd_path.nil?
+
+          if managed_disk_storage_type.nil?
             vhd = Azure::ARM::Compute::Models::VirtualHardDisk.new
             vhd.uri = get_blob_endpoint(storage_account_name) + "/vhds/#{vm_name}_os_disk.vhd"
 
             unless vhd_path.nil?
-              # Copy if VHD does not exist belongs to same storage account.
-              vhd_storage_account = (vhd_path.split('/')[2]).split('.')[0]
-              if storage_account_name != vhd_storage_account
-                storage_account = @storage_service.storage_accounts.get(resource_group, storage_account_name)
-                access_key = storage_account.get_access_keys.first.value
-                storage_data = Fog::Storage::AzureRM.new(provider: 'AzureRM', azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
-                new_time = current_time
-                container_name = "customvhd#{new_time}"
-                blob_name = "vhd_image#{new_time}.vhd"
-                storage_data.directories.create(
-                  key: container_name
-                )
-
-                storage_data.copy_blob_from_uri(container_name, blob_name, vhd_path)
-                until storage_data.get_blob_properties(container_name, blob_name).properties[:copy_status] == 'success'
-                  Fog::Logger.debug 'Waiting disk to ready'
-                  sleep(10)
-                end
-                new_vhd_path = get_blob_endpoint(storage_account_name) + "/#{container_name}/#{blob_name}"
-                Fog::Logger.debug "Path:#{new_vhd_path}. | Copy done"
-              else
-                new_vhd_path = vhd_path
-              end
-
               img_vhd = Azure::ARM::Compute::Models::VirtualHardDisk.new
               img_vhd.uri = new_vhd_path
               os_disk.image = img_vhd
@@ -124,11 +106,33 @@ module Fog
 
             os_disk.vhd = vhd
           else
+            unless vhd_path.nil?
+              image_obj = create_generalized_image(image_config_params(location, new_vhd_path, platform, resource_group, vm_name))
+              storage_profile.image_reference = Azure::ARM::Compute::Models::ImageReference.new
+              storage_profile.image_reference.id = image_obj.id
+            end
+
             managed_disk = Azure::ARM::Compute::Models::ManagedDiskParameters.new
             managed_disk.storage_account_type = managed_disk_storage_type
             os_disk.managed_disk = managed_disk
           end
-        
+
+          storage_profile.os_disk = configure_os_disk_object(os_disk, os_disk_caching, os_disk_size, platform, vm_name)
+          storage_profile
+        end
+
+        def image_config_params(location, new_vhd_path, platform, resource_group, vm_name)
+          image_config = {
+            location: location,
+            new_vhd_path: new_vhd_path,
+            platform: platform,
+            resource_group: resource_group,
+            vm_name: vm_name
+          }
+          image_config
+        end
+
+        def configure_os_disk_object(os_disk, os_disk_caching, os_disk_size, platform, vm_name)
           os_disk.name = "#{vm_name}_os_disk"
           os_disk.os_type = platform
           os_disk.disk_size_gb = os_disk_size unless os_disk_size.nil?
@@ -143,9 +147,31 @@ module Fog
                                 Azure::ARM::Compute::Models::CachingTypes::ReadWrite
                               end
                             end
-          
-          storage_profile.os_disk = os_disk
-          storage_profile
+          os_disk
+        end
+
+        def copy_vhd_to_storage_account(resource_group, storage_account_name, vhd_path)
+          # Copy if VHD does not exist belongs to same storage account.
+          vhd_storage_account = (vhd_path.split('/')[2]).split('.')[0]
+          if storage_account_name != vhd_storage_account
+            storage_account = @storage_service.storage_accounts.get(resource_group, storage_account_name)
+            access_key = storage_account.get_access_keys.first.value
+            storage_data = Fog::Storage::AzureRM.new(provider: 'AzureRM', azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
+            new_time = current_time
+            container_name = "customvhd#{new_time}"
+            blob_name = "vhd_image#{new_time}.vhd"
+            storage_data.directories.create(key: container_name)
+            storage_data.copy_blob_from_uri(container_name, blob_name, vhd_path)
+            until storage_data.get_blob_properties(container_name, blob_name).properties[:copy_status] == 'success'
+              Fog::Logger.debug 'Waiting disk to ready'
+              sleep(10)
+            end
+            new_vhd_path = get_blob_endpoint(storage_account_name) + "/#{container_name}/#{blob_name}"
+            Fog::Logger.debug "Path:#{new_vhd_path}. | Copy done"
+          else
+            new_vhd_path = vhd_path
+          end
+          new_vhd_path
         end
 
         def define_windows_os_profile(vm_name, username, password, provision_vm_agent, enable_automatic_updates, encoded_data)
@@ -153,7 +179,6 @@ module Fog
           windows_config = Azure::ARM::Compute::Models::WindowsConfiguration.new
           windows_config.provision_vmagent = provision_vm_agent
           windows_config.enable_automatic_updates = enable_automatic_updates
-
           os_profile.windows_configuration = windows_config
           os_profile.computer_name = vm_name
           os_profile.admin_username = username
@@ -189,7 +214,7 @@ module Fog
           network_interface_card_ids.each_with_index do |id, index|
             nic = Azure::ARM::Compute::Models::NetworkInterfaceReference .new
             nic.id = id
-            nic.primary = index == PRIMARY_NIC_INDEX ? true : false
+            nic.primary = index == PRIMARY_NIC_INDEX
             network_interface_cards << nic
           end
 

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class AzureRM
+      # This class provides the actual implementation for service calls.
+      class Real
+        def delete_generalized_image(resource_group, vm_name)
+          msg = "Deleting Generalized Image: #{vm_name}-osImage"
+          Fog::Logger.debug msg
+          image_name = "#{vm_name}-osImage"
+          begin
+            @compute_mgmt_client.images.delete(resource_group, image_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Generalized Image #{image_name} deleted successfully."
+          true
+        end
+      end
+
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def delete_generalized_image(*)
+          Fog::Logger.debug 'Image fog-test-server-osImage from Resource group fog-test-rg deleted successfully.'
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.3.4'.freeze
+    VERSION = '0.3.5'.freeze
   end
 end

data/test/api_stub.rb

@@ -1,6 +1,7 @@
 # Module for API Stub
 module ApiStub
   module Models
+    # Load test Compute models
     module Compute
       autoload :Server, File.expand_path('api_stub/models/compute/server', __dir__)
       autoload :AvailabilitySet, File.expand_path('api_stub/models/compute/availability_set', __dir__)
@@ -8,18 +9,21 @@ module ApiStub
       autoload :ManagedDisk, File.expand_path('api_stub/models/compute/managed_disk', __dir__)
     end
 
+    # Load test Resources models
     module Resources
       autoload :ResourceGroup, File.expand_path('api_stub/models/resources/resource_group', __dir__)
       autoload :Deployment, File.expand_path('api_stub/models/resources/deployment', __dir__)
       autoload :Resource, File.expand_path('api_stub/models/resources/resource', __dir__)
     end
 
+    # Load test Storage models
     module Storage
       autoload :StorageAccount, File.expand_path('api_stub/models/storage/storageaccount', __dir__)
       autoload :File, ::File.expand_path('api_stub/models/storage/file', __dir__)
       autoload :Directory, ::File.expand_path('api_stub/models/storage/directory', __dir__)
     end
 
+    # Load test Network models
     module Network
       autoload :PublicIp, File.expand_path('api_stub/models/network/public_ip', __dir__)
       autoload :Subnet, File.expand_path('api_stub/models/network/subnet', __dir__)
@@ -37,51 +41,61 @@ module ApiStub
       autoload :LocalNetworkGateway, File.expand_path('api_stub/models/network/local_network_gateway', __dir__)
     end
 
+    # Load test ApplicationGateway models
     module ApplicationGateway
       autoload :Gateway, File.expand_path('api_stub/models/application_gateway/gateway', __dir__)
     end
 
+    # Load test TrafficManager models
     module TrafficManager
       autoload :TrafficManagerEndPoint, File.expand_path('api_stub/models/traffic_manager/traffic_manager_end_point', __dir__)
       autoload :TrafficManagerProfile, File.expand_path('api_stub/models/traffic_manager/traffic_manager_profile', __dir__)
     end
 
+    # Load test DNS models
     module DNS
       autoload :Zone, File.expand_path('api_stub/models/dns/zone', __dir__)
       autoload :RecordSet, File.expand_path('api_stub/models/dns/record_set', __dir__)
     end
 
+    # Load test Sql models
     module Sql
       autoload :SqlServer, File.expand_path('api_stub/models/sql/sql_server', __dir__)
       autoload :SqlDatabase, File.expand_path('api_stub/models/sql/sql_database', __dir__)
       autoload :SqlFirewallRule, File.expand_path('api_stub/models/sql/sql_firewall_rule', __dir__)
     end
 
+    # Load test KeyVault models
     module KeyVault
       autoload :Vault, File.expand_path('api_stub/models/key_vault/vault', __dir__)
     end
   end
 
   module Requests
+    # Load test Compute requests
     module Compute
       autoload :AvailabilitySet, File.expand_path('api_stub/requests/compute/availability_set', __dir__)
       autoload :VirtualMachine, File.expand_path('api_stub/requests/compute/virtual_machine', __dir__)
       autoload :VirtualMachineExtension, File.expand_path('api_stub/requests/compute/virtual_machine_extension', __dir__)
       autoload :ManagedDisk, File.expand_path('api_stub/requests/compute/managed_disk', __dir__)
+      autoload :GeneralizedImage, File.expand_path('api_stub/requests/compute/generalized_image', __dir__)
     end
 
+    # Load test Resources requests
     module Resources
       autoload :ResourceGroup, File.expand_path('api_stub/requests/resources/resource_group', __dir__)
       autoload :Deployment, File.expand_path('api_stub/requests/resources/deployment', __dir__)
       autoload :AzureResource, File.expand_path('api_stub/requests/resources/resource', __dir__)
     end
 
+    # Load test Storage requests
     module Storage
       autoload :StorageAccount, File.expand_path('api_stub/requests/storage/storageaccount', __dir__)
       autoload :File, ::File.expand_path('api_stub/requests/storage/file', __dir__)
       autoload :Directory, ::File.expand_path('api_stub/requests/storage/directory', __dir__)
     end
 
+    # Load test Network requests
     module Network
       autoload :PublicIp, File.expand_path('api_stub/requests/network/public_ip', __dir__)
       autoload :Subnet, File.expand_path('api_stub/requests/network/subnet', __dir__)
@@ -99,26 +113,31 @@ module ApiStub
       autoload :LocalNetworkGateway, File.expand_path('api_stub/requests/network/local_network_gateway', __dir__)
     end
 
+    # Load test ApplicationGateway requests
     module ApplicationGateway
       autoload :Gateway, File.expand_path('api_stub/requests/application_gateway/gateway', __dir__)
     end
 
+    # Load test TrafficManager requests
     module TrafficManager
       autoload :TrafficManagerEndPoint, File.expand_path('api_stub/requests/traffic_manager/traffic_manager_endpoint', __dir__)
       autoload :TrafficManagerProfile, File.expand_path('api_stub/requests/traffic_manager/traffic_manager_profile', __dir__)
     end
 
+    # Load test DNS requests
     module DNS
       autoload :Zone, File.expand_path('api_stub/requests/dns/zone', __dir__)
       autoload :RecordSet, File.expand_path('api_stub/requests/dns/record_set', __dir__)
     end
 
+    # Load test Sql requests
     module Sql
       autoload :SqlServer, File.expand_path('api_stub/requests/sql/sql_server', __dir__)
       autoload :SqlDatabase, File.expand_path('api_stub/requests/sql/database', __dir__)
       autoload :FirewallRule, File.expand_path('api_stub/requests/sql/firewall_rule', __dir__)
     end
 
+    # Load test KeyVault requests
     module KeyVault
       autoload :Vault, File.expand_path('api_stub/requests/key_vault/vault', __dir__)
     end

data/test/api_stub/requests/compute/generalized_image.rb

@@ -0,0 +1,41 @@
+module ApiStub
+  module Requests
+    module Compute
+      # Mock class for Virtual Machine Requests
+      class GeneralizedImage
+        def self.generalized_image_params
+          {
+            resource_group: 'fog-test-rg',
+            vm_name: 'fog-test-server',
+            location: 'westus',
+            platform: 'Linux',
+            new_vhd_path: 'https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd'
+          }
+        end
+
+        def self.create_generalized_image(compute_client)
+          body = {
+            'location' => 'West US',
+            'tags' => {
+              'key' => 'value'
+            },
+            'properties' => {
+              'storageProfile' => {
+                'osDisk' => {
+                  'osType' => 'Linux',
+                  'blobUri' => 'https://mystorageaccount.blob.core.windows.net/osimages/osimage.vhd',
+                  'osState' => 'generalized',
+                  'hostCaching' => 'readwrite',
+                  'storageAccountType' => 'Standard_LRS'
+                },
+                'provisioningState' => 'Succeeded'
+              }
+            }
+          }
+          image_mapper = Azure::ARM::Compute::Models::Image.mapper
+          compute_client.deserialize(image_mapper, body, 'result.body')
+        end
+      end
+    end
+  end
+end

data/test/integration/server_custom_image.rb

@@ -79,6 +79,15 @@ begin
     private_ip_allocation_method: Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
   )
 
+  network.network_interfaces.create(
+    name: 'NetInt2',
+    resource_group: 'TestRG-CustomVM',
+    location: LOCATION,
+    subnet_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/TestRG-CustomVM/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/mysubnet",
+    ip_configuration_name: 'testIpConfiguration',
+    private_ip_allocation_method: Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
+  )
+
   ########################################################################################################################
   ######################                                Create Server                               ######################
   ########################################################################################################################
@@ -94,17 +103,41 @@ begin
     disable_password_authentication: false,
     network_interface_card_ids: ["/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/TestRG-CustomVM/providers/Microsoft.Network/networkInterfaces/NetInt"],
     platform: 'linux',
-    vhd_path: 'https://custimagestorage.blob.core.windows.net/newcustomvhd/trusty-server-cloudimg-amd64-disk1-zeeshan.vhd'
+    vhd_path: 'https://myblob.blob.core.windows.net/vhds/myvhd.vhd'
+  )
+  puts "Created custom image un-managed virtual machine: #{custom_image_virtual_machine.name}"
+
+  ########################################################################################################################
+  #################                                Create Managed Server                               ###################
+  ########################################################################################################################
+
+  custom_image_virtual_machine_managed = compute.servers.create(
+    name: 'TestVM-Managed',
+    location: LOCATION,
+    resource_group: 'TestRG-CustomVM',
+    vm_size: 'Basic_A0',
+    storage_account_name: storage_account_name,
+    username: 'testuser',
+    password: 'Confiz=123',
+    disable_password_authentication: false,
+    network_interface_card_ids: ["/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/TestRG-CustomVM/providers/Microsoft.Network/networkInterfaces/NetInt2"],
+    platform: 'linux',
+    vhd_path: 'https://myblob.blob.core.windows.net/vhds/myvhd.vhd',
+    managed_disk_storage_type: Azure::ARM::Compute::Models::StorageAccountTypes::StandardLRS
   )
-  puts "Created custom image virtual machine: #{custom_image_virtual_machine.name}"
+  puts "Created custom image managed virtual machine: #{custom_image_virtual_machine_managed.name}"
 
   ########################################################################################################################
   ######################                            Get and Delete Server                           ######################
   ########################################################################################################################
 
   custom_image_virtual_machine = compute.servers.get('TestRG-CustomVM', 'TestVM')
-  puts "Get custom image virtual machine: #{custom_image_virtual_machine.name}"
-  puts "Deleted custom image virtual machine: #{custom_image_virtual_machine.destroy}"
+  puts "Get custom image un-managed virtual machine: #{custom_image_virtual_machine.name}"
+  puts "Deleted custom image un-managed virtual machine: #{custom_image_virtual_machine.destroy}"
+
+  custom_image_virtual_machine_managed = compute.servers.get('TestRG-CustomVM', 'TestVM-Managed')
+  puts "Get custom image managed virtual machine: #{custom_image_virtual_machine_managed.name}"
+  puts "Deleted custom image managed virtual machine: #{custom_image_virtual_machine_managed.destroy}"
 
   ########################################################################################################################
   ######################                                   CleanUp                                  ######################
@@ -113,6 +146,9 @@ begin
   nic = network.network_interfaces.get('TestRG-CustomVM', 'NetInt')
   nic.destroy
 
+  nic = network.network_interfaces.get('TestRG-CustomVM', 'NetInt2')
+  nic.destroy
+
   vnet = network.virtual_networks.get('TestRG-CustomVM', 'testVnet')
   vnet.destroy
 

data/test/models/compute/test_server.rb

@@ -57,7 +57,9 @@ class TestServer < Minitest::Test
       :availability_set_id,
       :managed_disk_storage_type,
       :os_disk_size,
-      :tags
+      :tags,
+      :platform_update_domain,
+      :platform_fault_domain
     ]
     attributes.each do |attribute|
       assert_respond_to @server, attribute

data/test/requests/compute/test_create_generalized_image.rb

@@ -0,0 +1,27 @@
+require File.expand_path '../../test_helper', __dir__
+
+# Test class for Create Virtual Machine Request
+class TestCreateGeneralizedImage < Minitest::Test
+  def setup
+    @service = Fog::Compute::AzureRM.new(credentials)
+    compute_client = @service.instance_variable_get(:@compute_mgmt_client)
+    @image = compute_client.images
+    @response = ApiStub::Requests::Compute::GeneralizedImage.create_generalized_image(compute_client)
+    @input_params = ApiStub::Requests::Compute::GeneralizedImage.generalized_image_params
+  end
+
+  def test_create_generalized_image_success
+    @image.stub :create_or_update, @response do
+      assert_equal @service.create_generalized_image(@input_params), @response
+    end
+  end
+
+  def test_create_generalized_image_failure
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @image.stub :create_or_update, response do
+      assert_raises RuntimeError do
+        @service.create_generalized_image(@input_params)
+      end
+    end
+  end
+end

data/test/requests/compute/test_delete_generalized_image.rb

@@ -0,0 +1,23 @@
+require File.expand_path '../../test_helper', __dir__
+
+# Test class for Delete Virtual Machine Request
+class TestDeleteGeneralizedImage < Minitest::Test
+  def setup
+    @service = Fog::Compute::AzureRM.new(credentials)
+    compute_client = @service.instance_variable_get(:@compute_mgmt_client)
+    @generalized_image = compute_client.images
+  end
+
+  def test_delete_generalized_image_success
+    @generalized_image.stub :delete, true do
+      assert @service.delete_generalized_image('fog-test-rg', 'fog-test-server-osImage')
+    end
+  end
+
+  def test_delete_generalized_image_failure
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @generalized_image.stub :delete, response do
+      assert_raises(RuntimeError) { @service.delete_generalized_image('fog-test-rg', 'fog-test-server-osImage') }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -406,11 +406,13 @@ files:
 - lib/fog/azurerm/requests/compute/check_vm_extension_exists.rb
 - lib/fog/azurerm/requests/compute/check_vm_status.rb
 - lib/fog/azurerm/requests/compute/create_availability_set.rb
+- lib/fog/azurerm/requests/compute/create_generalized_image.rb
 - lib/fog/azurerm/requests/compute/create_or_update_managed_disk.rb
 - lib/fog/azurerm/requests/compute/create_or_update_vm_extension.rb
 - lib/fog/azurerm/requests/compute/create_virtual_machine.rb
 - lib/fog/azurerm/requests/compute/deallocate_virtual_machine.rb
 - lib/fog/azurerm/requests/compute/delete_availability_set.rb
+- lib/fog/azurerm/requests/compute/delete_generalized_image.rb
 - lib/fog/azurerm/requests/compute/delete_managed_disk.rb
 - lib/fog/azurerm/requests/compute/delete_virtual_machine.rb
 - lib/fog/azurerm/requests/compute/delete_vm_extension.rb
@@ -659,6 +661,7 @@ files:
 - test/api_stub/models/traffic_manager/traffic_manager_profile.rb
 - test/api_stub/requests/application_gateway/gateway.rb
 - test/api_stub/requests/compute/availability_set.rb
+- test/api_stub/requests/compute/generalized_image.rb
 - test/api_stub/requests/compute/managed_disk.rb
 - test/api_stub/requests/compute/virtual_machine.rb
 - test/api_stub/requests/compute/virtual_machine_extension.rb
@@ -802,11 +805,13 @@ files:
 - test/requests/compute/test_check_vm_exists.rb
 - test/requests/compute/test_check_vm_extension_exists.rb
 - test/requests/compute/test_create_availability_set.rb
+- test/requests/compute/test_create_generalized_image.rb
 - test/requests/compute/test_create_or_update_managed_disk.rb
 - test/requests/compute/test_create_virtual_machine.rb
 - test/requests/compute/test_create_vm_extension.rb
 - test/requests/compute/test_deallocate_virtual_machine.rb
 - test/requests/compute/test_delete_availability_set.rb
+- test/requests/compute/test_delete_generalized_image.rb
 - test/requests/compute/test_delete_managed_disk.rb
 - test/requests/compute/test_delete_virtual_machine.rb
 - test/requests/compute/test_detach_data_disk_from_vm.rb