fog-azure-rm 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4f2441649c95cccb88036a162a4613332f51aa
-  data.tar.gz: 4d1c16d3f1aa6a8c5aec6ea59632de93988b75eb
+  metadata.gz: 5739d794d701fe153ca306a2aa5c7409db70071a
+  data.tar.gz: 99c2a40c35f19f50622dce9a8b0efd83fe1eb399
 SHA512:
-  metadata.gz: b421167e3518fd5b39d9eec7b9dcd286b4402eabab895eb0ddea2a7250dcecf5ddf70e12063c92ea1adda850eced455242bd7d5ae49466b99dd7e2e3c616b4cb
-  data.tar.gz: 12864d9c4833cd859147bf506559a1d9bc91b4911c66cf823a1d2630af0b1ec73791950d9484e9effdac455460da2c7959ee7ee76cc7fdc18f697f9c30733106
+  metadata.gz: 0e0f89cc3179b58e2f898938831106b9677d748815c8ab664611318ad30c723846c5699a1b43b6b591a9e8811ee3f6845861fd9cf03764e562c4c20285573312
+  data.tar.gz: 68de5ecf3ab00bd154878b0701e785cb33ae9973a4133004815f748e7d9d91d0aa1e2a287b5836ce80228c72d07d3384eb9d5d875218ca13e215083607a57f73

data/.travis.yml

@@ -23,11 +23,23 @@ matrix:
 notifications:
   email:
     recipients:
-      - oneops_azure@confiz.com
+      - dev-oneops@confiz.com
     on_success: always
     on_failure: always
-  
-  
+
 addons:
-    code_climate:
-        repo_token: b1401494baa004d90402414cb33a7fc6420fd3693e60c677a120ddefd7d84cfd
+  code_climate:
+    repo_token: b1401494baa004d90402414cb33a7fc6420fd3693e60c677a120ddefd7d84cfd
+
+jobs:
+  include:
+    - stage: gem release
+      deploy:
+        provider: rubygems
+        api_key:
+          secure: "aKIOqa6gFMQOcwdNBNsfRoAQm+LVCRf9JpEFnDH8YLRp9A+roj0BL3hZ+pP+pb2sQSEQqU46bfBBrhB2b6Xmjnmv5d0878bl+eYOXeu90CfqRf+v/y+2k/pMsVsKs3Su7M0bHGOeHYT+segRqDHaZaJHkAW8RwLLm5A+0TyEeVjkkpFcyX8fjr5sfvD+XbEmXmmPWPuShQjKTTj1HFYJknRLLNXVYd7ZM9eKgiQfuyomdUTk8yguqNDBWW1BjiEE/0JYqx4wJxdGKPHYT+enP1xIebJVx1gEEnc/OgyBZqtmOirlh2Rnuk58NZfArzwMzIvVclJvPmynmEAlHEWtXwUgQMW5Wu/RYpxRRpr5tDRfru99hll4N9bcA439GlsNHTNJf82zmGNFIdDJ8kUJ08tVPwTvEnWGzLIdKAKWyRV+SESmZb5u3m9e4VTd06/q8gdbW9pG9UGmoes/j32lKzk9DkheCVzQjdxfRs81Z/7uTB3OhhpQnrRlf7qa2OnMDZKrip67UQHiruzAX6naQ7D5fEHR64DGZG7fQ/xRi0oG21UdNl1n/Bioj6ChFXLyInKeA0fiEwwquWK2S/2Sr5ERTBzbv9TkvbJ/1vv8FWcYYmb7bL22699V9yWcsOxEdZEYDucg71g6OrPeNeFZDsJ1749fZzW2X444+4Xtwys="
+        gem: fog-azure-rm
+        gemspec: fog-azure-rm.gemspec
+        on:
+          tags: true
+          branch: master

data/CHANGELOG.md

@@ -1,8 +1,19 @@
+## 0.3.6
+
+**Added:**
+- Compute Service - Added support for custom image provisioning with managed disk
+- DNS Service - Fog Models for RecordSet Types 'A' and 'CNAME'
+- Automated gem publishing on release tagging
+
+**Changed:**
+- Loosened dependency on fog-core
+- Updated documentation
+
 ## 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
+- Compute Service - Added custom image support for managed VM
 
 **Changed:**
 - Compute Service - Changed required arguments for server create method

data/fog-azure-rm.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.8.4'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'codeclimate-test-reporter' , '~> 1.0.0'
-  spec.add_dependency 'fog-core', '~> 1.43.0'
+  spec.add_dependency 'fog-core', '~> 1.43'
   spec.add_dependency 'fog-json', '~> 1.0'
   spec.add_dependency 'azure_mgmt_compute', '~> 0.9.0'
   spec.add_dependency 'azure_mgmt_resources', '~> 0.9.0'

data/lib/fog/azurerm/async_response.rb

@@ -2,14 +2,17 @@ module Fog
   module AzureRM
     # class for Async Response
     class AsyncResponse
-      def initialize(model, promise)
+      def initialize(model, promise, delete_extra_resource = false)
         @fog_model = model
         @promise = promise
+        @delete_extra_resource = delete_extra_resource
       end
 
       def value
         response = @promise.value.body
         @fog_model.merge_attributes(@fog_model.class.parse(response))
+        @fog_model.delete_extra_resources if @delete_extra_resource
+        @fog_model
       end
 
       def state

data/lib/fog/azurerm/constants.rb

@@ -5,7 +5,7 @@ PUBLIC_IP = 'Public-IP-Address'.freeze
 NETWORK_SECURITY_GROUP = 'Network-Security-Group'.freeze
 STANDARD_STORAGE = 'Standard'.freeze
 PREMIUM_STORAGE = 'Premium'.freeze
-ALLOWED_STANDARD_REPLICATION = %w(LRS ZRS GRS RAGRS).freeze
+ALLOWED_STANDARD_REPLICATION = %w[LRS ZRS GRS RAGRS].freeze
 API_VERSION = '2016-06-01'.freeze
 FAULT_DOMAIN_COUNT = 2
 UPDATE_DOMAIN_COUNT = 5
@@ -17,7 +17,7 @@ RESOURCE_PROVIDER_NAMESPACE = 6
 RESOURCE_TYPE = 7
 RESOURCE_NAME = 8
 ENDPOINT_PREFIX = 'Microsoft.Network/trafficManagerProfiles'.freeze
-DISK_PREFIX = 'Microsoft.Compute/disks'
+DISK_PREFIX = 'Microsoft.Compute/disks'.freeze
 AZURE_ENDPOINTS = 'azureEndpoints'.freeze
 EXTERNAL_ENDPOINTS = 'externalEndpoints'.freeze
 NESTED_ENDPOINTS = 'nestedEndpoints'.freeze
@@ -58,6 +58,10 @@ MAXIMUM_CHUNK_SIZE = 4 * 1024 * 1024
 
 # The hash value of 4MB empty content
 HASH_OF_4MB_EMPTY_CONTENT = 'b5cfa9d6c8febd618f91ac2843d50a1c'.freeze
-REST_CLIENT_API_VERSION = %w(2014-04-01-preview 2016-05-01).freeze
+REST_CLIENT_API_VERSION = %w[2014-04-01-preview 2016-05-01].freeze
 AS_SKU_CLASSIC = 'Classic'.freeze
 AS_SKU_ALIGNED = 'Aligned'.freeze
+
+# The tag key and tag value for creating a temporary storage account for generalized image
+TEMPORARY_STORAGE_ACCOUNT_TAG_KEY = 'generalized_image'.freeze
+TEMPORARY_STORAGE_ACCOUNT_TAG_VALUE = 'delete'.freeze

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

@@ -15,8 +15,7 @@ require 'fog/azurerm'
 Next, create a connection to the Compute Service:
 
 ```ruby
-    azure_compute_service = Fog::Compute.new(
-      provider:         'AzureRM',
+    azure_compute_service = Fog::Compute::AzureRM.new(
       tenant_id:        '<Tenantid>',                                                      # Tenant id of Azure Active Directory Application
       client_id:        '<Clientid>',                                                      # Client id of Azure Active Directory Application
       client_secret:    '<ClientSecret>',                                                  # Client Secret of Azure Active Directory Application
@@ -39,9 +38,6 @@ azure_compute_service.servers.check_vm_exists(<Resource Group name>, <VM Name>)
 - 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

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

@@ -15,15 +15,14 @@ require 'fog/azurerm'
 Next, create a connection to the Storage Service:
 
 ```ruby
-azure_storage_service = Fog::Storage.new(
-  :provider => 'AzureRM',
-  :tenant_id => '<Tenantid>',                                                       # Tenant id of Azure Active Directory Application
-  :client_id =>    '<Clientid>',                                                    # Client id of Azure Active Directory Application
-  :client_secret => '<ClientSecret>',                                               # Client Secret of Azure Active Directory Application
-  :subscription_id => '<Subscriptionid>',                                           # Subscription id of an Azure Account
-  :azure_storage_account_name => '<StorageAccountName>',                            # Name of an Azure Storage Account
-  :azure_storage_access_key => '<StorageAccountKey>',                               # Key of an Azure Storage Account
-  :environment => '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>' # Azure cloud environment. Default is AzureCloud.
+azure_storage_service = Fog::Storage::AzureRM.new(
+  tenant_id: '<Tenantid>',                                                       # Tenant id of Azure Active Directory Application
+  client_id:    '<Clientid>',                                                    # Client id of Azure Active Directory Application
+  client_secret: '<ClientSecret>',                                               # Client Secret of Azure Active Directory Application
+  subscription_id: '<Subscriptionid>',                                           # Subscription id of an Azure Account
+  azure_storage_account_name: '<StorageAccountName>',                            # Name of an Azure Storage Account
+  azure_storage_access_key: '<StorageAccountKey>',                               # Key of an Azure Storage Account
+  environment: '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>' # Azure cloud environment. Default is AzureCloud.
 )
 ```
 

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

@@ -176,15 +176,22 @@ module Fog
           async ? create_fog_async_response(response) : merge_attributes(Fog::Compute::AzureRM::Server.parse(response))
         end
 
+        def delete_extra_resources
+          unless vhd_path.nil? || !managed_disk_storage_type.nil?
+            service.delete_generalized_image(resource_group, name)
+            delete_storage_account_or_container(resource_group, storage_account_name, name)
+          end
+        end
+
         private
 
         def platform_is_linux?(platform)
           platform.strip.casecmp(PLATFORM_LINUX).zero?
         end
 
-        def create_fog_async_response(response)
+        def create_fog_async_response(response, delete_extra_resource = false)
           server = Fog::Compute::AzureRM::Server.new(service: service)
-          Fog::AzureRM::AsyncResponse.new(server, response)
+          Fog::AzureRM::AsyncResponse.new(server, response, delete_extra_resource)
         end
 
         def virtual_machine_params(ssh_key_path)
@@ -227,6 +234,23 @@ module Fog
             disk_resource_group: disk_resource_group
           }
         end
+
+        def delete_storage_account_or_container(resource_group, storage_account_name, vm_name)
+          delete_storage_account(resource_group) if storage_account_name.nil?
+          delete_storage_container(resource_group, storage_account_name, vm_name) unless storage_account_name.nil?
+        end
+
+        def delete_storage_container(resource_group, storage_account_name, vm_name)
+          @storage_service = service.instance_variable_get(:@storage_service)
+          access_key = @storage_service.get_storage_access_keys(resource_group, storage_account_name).first.value
+          container_name = "customvhd-#{vm_name.downcase}-os-image"
+          @storage_service.directories.delete_temporary_container(storage_account_name, access_key, container_name)
+        end
+
+        def delete_storage_account(resource_group)
+          @storage_service = service.instance_variable_get(:@storage_service)
+          @storage_service.storage_accounts.delete_storage_account_from_tag(resource_group, TEMPORARY_STORAGE_ACCOUNT_TAG_KEY, TEMPORARY_STORAGE_ACCOUNT_TAG_VALUE)
+        end
       end
     end
   end

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

@@ -18,8 +18,8 @@ module Fog
 
         def create_async(attributes = {})
           server = new(attributes)
-          async_response = server.save(true)
-          Fog::AzureRM::AsyncResponse.new(server, async_response)
+          promise = server.save(true)
+          Fog::AzureRM::AsyncResponse.new(server, promise, true)
         end
 
         def get(resource_group_name, virtual_machine_name, async = false)

data/lib/fog/azurerm/models/dns/a_record.rb

@@ -0,0 +1,15 @@
+module Fog
+  module DNS
+    class AzureRM
+      # This class is giving an implementation of 'A' RecordSet type
+      class ARecord < Fog::Model
+        attribute :ipv4address
+
+        def self.parse(arecord)
+          hash = get_hash_from_object(arecord)
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/fog/azurerm/models/dns/cname_record.rb

@@ -0,0 +1,15 @@
+module Fog
+  module DNS
+    class AzureRM
+      # This class is giving an implementation of 'CNAME' RecordSet type
+      class CnameRecord < Fog::Model
+        attribute :cname
+
+        def self.parse(cnamerecord)
+          hash = get_hash_from_object(cnamerecord)
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/fog/azurerm/models/dns/record_set.rb

@@ -15,13 +15,11 @@ module Fog
         attribute :a_records
 
         def self.parse(recordset)
-          hash = {}
-          hash['id'] = recordset.id
-          hash['name'] = recordset.name
+          hash = get_hash_from_object(recordset)
           hash['resource_group'] = get_resource_group_from_id(recordset.id)
           hash['zone_name'] = get_record_set_from_id(recordset.id)
-          hash['type'] = recordset.type
           type = get_type_from_recordset_type(recordset.type)
+
           hash['records'] = []
           if type == 'A'
             record_entries = recordset.arecords
@@ -31,11 +29,25 @@ module Fog
           end
           if type == 'CNAME'
             record_entries = recordset.cname_record
-            hash['records'] << record_entries
+            hash['records'] << record_entries.cname
+          end
+
+          unless recordset.arecords.nil?
+            a_records = []
+            recordset.arecords.each do |record|
+              a_record = Fog::DNS::AzureRM::ARecord.new
+              a_record.merge_attributes(Fog::DNS::AzureRM::ARecord.parse(record))
+              a_records.push(a_record)
+            end
+            hash['a_records'] = a_records
           end
-          hash['a_records'] = recordset.arecords if type == 'A'
-          hash['cname_record'] = recordset.cname_record if type == 'CNAME'
-          hash['ttl'] = recordset.ttl
+
+          unless recordset.cname_record.nil?
+            cname_record = Fog::DNS::AzureRM::CnameRecord.new
+            cname_record.merge_attributes(Fog::DNS::AzureRM::CnameRecord.parse(recordset.cname_record))
+            hash['cname_record'] = cname_record
+          end
+
           hash
         end
 

data/lib/fog/azurerm/models/storage/directories.rb

@@ -56,11 +56,16 @@ module Fog
           end
           directory.files.load(blobs)
           directory
-        rescue => error
+        rescue Exception => error
           return nil if error.message == 'NotFound'
           raise error
         end
 
+        def delete_temporary_container(storage_account_name, access_key, container_name)
+          storage_data = Fog::Storage::AzureRM.new(azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
+          storage_data.delete_container(container_name)
+        end
+
         def check_container_exists(name)
           service.check_container_exists(name)
         end

data/lib/fog/azurerm/models/storage/storage_accounts.rb

@@ -31,6 +31,13 @@ module Fog
           service.check_storage_account_name_availability(name, type)
         end
 
+        def delete_storage_account_from_tag(resource_group_name, tag_key, tag_value)
+          storage_accounts = service.storage_accounts(resource_group: resource_group_name)
+          storage_accounts.each do |account|
+            account.destroy if account.tags[tag_key].eql? tag_value
+          end
+        end
+
         def check_storage_account_exists(resource_group_name, storage_account_name)
           service.check_storage_account_exists(resource_group_name, storage_account_name)
         end

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

@@ -63,9 +63,12 @@ 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
+          unless async
+            unless vm_config[:vhd_path].nil? || vm_config[:managed_disk_storage_type].nil?
+              delete_generalized_image(vm_config[:resource_group], vm_config[:name])
+              delete_storage_account_or_container(vm_config[:resource_group], vm_config[:storage_account_name], vm_config[:name])
+            end
+          end
           Fog::Logger.debug "Virtual Machine #{vm_config[:name]} Created Successfully." unless async
           response
         end
@@ -92,7 +95,7 @@ module Fog
           storage_profile.image_reference = image_reference(publisher, offer, sku, version) if vhd_path.nil?
           os_disk = Azure::ARM::Compute::Models::OSDisk.new
 
-          new_vhd_path = copy_vhd_to_storage_account(resource_group, storage_account_name, vhd_path) unless vhd_path.nil?
+          new_vhd_path = copy_vhd_to_storage_account(resource_group, storage_account_name, vhd_path, location, vm_name) unless vhd_path.nil?
 
           if managed_disk_storage_type.nil?
             vhd = Azure::ARM::Compute::Models::VirtualHardDisk.new
@@ -116,20 +119,18 @@ module Fog
             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)
@@ -150,30 +151,6 @@ module Fog
           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)
           os_profile = Azure::ARM::Compute::Models::OSProfile.new
           windows_config = Azure::ARM::Compute::Models::WindowsConfiguration.new
@@ -209,6 +186,52 @@ module Fog
           os_profile
         end
 
+        def copy_vhd_to_storage_account(resource_group, storage_account_name, vhd_path, location, vm_name)
+          # 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
+            if storage_account_name.nil?
+              new_time = current_time
+              storage_account_name = "sa#{new_time}"
+              storage_account = @storage_service.storage_accounts.create(
+                storage_account_config_params(location, resource_group, storage_account_name)
+              )
+            else
+              storage_account = @storage_service.storage_accounts.get(resource_group, storage_account_name)
+            end
+            access_key = storage_account.get_access_keys.first.value
+            storage_data = Fog::Storage::AzureRM.new(azure_storage_account_name: storage_account_name, azure_storage_access_key: access_key)
+            new_time = current_time
+            container_name = "customvhd-#{vm_name.downcase}-os-image"
+            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 storage_account_config_params(location, resource_group, storage_account_name)
+          {
+            name: storage_account_name,
+            location: location,
+            resource_group: resource_group,
+            account_type: 'Standard',
+            replication: 'LRS',
+            tags:
+            {
+              TEMPORARY_STORAGE_ACCOUNT_TAG_KEY => TEMPORARY_STORAGE_ACCOUNT_TAG_VALUE
+            }
+          }
+        end
+
         def define_network_profile(network_interface_card_ids)
           network_interface_cards = []
           network_interface_card_ids.each_with_index do |id, index|
@@ -222,6 +245,21 @@ module Fog
           network_profile.network_interfaces = network_interface_cards
           network_profile
         end
+
+        def delete_storage_account_or_container(resource_group, storage_account_name, vm_name)
+          delete_storage_account(resource_group) if storage_account_name.nil?
+          delete_storage_container(resource_group, storage_account_name, vm_name) unless storage_account_name.nil?
+        end
+
+        def delete_storage_container(resource_group, storage_account_name, vm_name)
+          access_key = @storage_service.get_storage_access_keys(resource_group, storage_account_name).first.value
+          container_name = "customvhd-#{vm_name.downcase}-os-image"
+          @storage_service.directories.delete_temporary_container(storage_account_name, access_key, container_name)
+        end
+
+        def delete_storage_account(resource_group)
+          @storage_service.storage_accounts.delete_storage_account_from_tag(resource_group, TEMPORARY_STORAGE_ACCOUNT_TAG_KEY, TEMPORARY_STORAGE_ACCOUNT_TAG_VALUE)
+        end
       end
       # This class provides the mock implementation for unit tests.
       class Mock

data/lib/fog/azurerm/requests/dns/create_or_update_record_set.rb

@@ -34,9 +34,10 @@ module Fog
             end
             record_set.arecords = a_type_records_array
           when 'CNAME'
-            record_set.cname_record = record_set_params[:records].first # because cname only has 1 value and we know the object is an array passed in.
+            cname_record = Azure::ARM::Dns::Models::CnameRecord.new
+            cname_record.cname = record_set_params[:records].first # because cname only has 1 value and we know the object is an array passed in.
+            record_set.cname_record = cname_record
           end
-
           record_set
         end
       end

data/lib/fog/azurerm/version.rb

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

data/test/integration/record_set.rb

@@ -57,13 +57,13 @@ begin
     type: 'CNAME',
     ttl: 60
   )
-  puts "Created CNAME type record set: #{record_set.name}"
+  puts "Created CNAME type record set: #{record_set.inspect}"
 
   ########################################################################################################################
   ######################                        Create A Type Record Set in a Zone                   ######################
   ########################################################################################################################
 
-  dns.record_sets.create(
+  record_set = dns.record_sets.create(
     name: 'TestRS2',
     resource_group: 'TestRG-RS',
     zone_name: 'test-zone.com',
@@ -71,14 +71,14 @@ begin
     type: 'A',
     ttl: 60
   )
-  puts "Created A type record set: #{record_set.name}"
+  puts "Created A type record set: #{record_set.inspect}"
 
   ########################################################################################################################
   ######################                Get And Destroy CNAME Type Record Set in a Zone             ######################
   ########################################################################################################################
 
   record_set = dns.record_sets.get('TestRG-RS', 'TestRS1', 'test-zone.com', 'CNAME')
-  puts "Get CNAME Type record set: #{record_set.name}"
+  puts "Get CNAME Type record set: #{record_set.inspect}"
   record_set.destroy
 
   ########################################################################################################################
@@ -86,7 +86,7 @@ begin
   ########################################################################################################################
 
   record_set = dns.record_sets.get('TestRG-RS', 'TestRS2', 'test-zone.com', 'A')
-  puts "Get A Type record set: #{record_set.name}"
+  puts "Get A Type record set: #{record_set.inspect}"
 
   ########################################################################################################################
   ######################                               Update a Record Set                          ######################

data/test/integration/server_custom_image.rb

@@ -40,9 +40,11 @@ network = Fog::Network::AzureRM.new(
 ######################                                 Prerequisites                              ######################
 ########################################################################################################################
 
+RG_NAME = 'TestRG-CustomVM'.freeze
+
 begin
   resource_group = rs.resource_groups.create(
-    name: 'TestRG-CustomVM',
+    name: RG_NAME,
     location: LOCATION
   )
 
@@ -51,7 +53,7 @@ begin
   storage.storage_accounts.create(
     name: storage_account_name,
     location: LOCATION,
-    resource_group: 'TestRG-CustomVM',
+    resource_group: RG_NAME,
     account_type: 'Standard',
     replication: 'LRS'
   )
@@ -59,31 +61,40 @@ begin
   network.virtual_networks.create(
     name:             'testVnet',
     location:         LOCATION,
-    resource_group:   'TestRG-CustomVM',
+    resource_group:   RG_NAME,
     network_address_list:  '10.1.0.0/16,10.2.0.0/16'
   )
 
   network.subnets.create(
     name: 'mysubnet',
-    resource_group: 'TestRG-CustomVM',
+    resource_group: RG_NAME,
     virtual_network_name: 'testVnet',
     address_prefix: '10.2.0.0/24'
   )
 
   network.network_interfaces.create(
     name: 'NetInt',
-    resource_group: 'TestRG-CustomVM',
+    resource_group: RG_NAME,
     location: LOCATION,
-    subnet_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/TestRG-CustomVM/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/mysubnet",
+    subnet_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/#{RG_NAME}/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/mysubnet",
     ip_configuration_name: 'testIpConfiguration',
     private_ip_allocation_method: Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
   )
 
   network.network_interfaces.create(
     name: 'NetInt2',
-    resource_group: 'TestRG-CustomVM',
+    resource_group: RG_NAME,
     location: LOCATION,
-    subnet_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/TestRG-CustomVM/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/mysubnet",
+    subnet_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/#{RG_NAME}/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/mysubnet",
+    ip_configuration_name: 'testIpConfiguration',
+    private_ip_allocation_method: Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
+  )
+
+  network.network_interfaces.create(
+    name: 'NetInt3',
+    resource_group: RG_NAME,
+    location: LOCATION,
+    subnet_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/#{RG_NAME}/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/mysubnet",
     ip_configuration_name: 'testIpConfiguration',
     private_ip_allocation_method: Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
   )
@@ -95,16 +106,17 @@ begin
   custom_image_virtual_machine = compute.servers.create(
     name: 'TestVM',
     location: LOCATION,
-    resource_group: 'TestRG-CustomVM',
-    vm_size: 'Basic_A0',
+    resource_group: RG_NAME,
     storage_account_name: storage_account_name,
+    vm_size: 'Basic_A0',
     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/NetInt"],
+    network_interface_card_ids: ["/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/#{RG_NAME}/providers/Microsoft.Network/networkInterfaces/NetInt"],
     platform: 'linux',
-    vhd_path: 'https://myblob.blob.core.windows.net/vhds/myvhd.vhd'
+    vhd_path: 'https://myblob.blob.core.windows.net/vhds/my_vhd.vhd'
   )
+
   puts "Created custom image un-managed virtual machine: #{custom_image_virtual_machine.name}"
 
   ########################################################################################################################
@@ -114,48 +126,91 @@ begin
   custom_image_virtual_machine_managed = compute.servers.create(
     name: 'TestVM-Managed',
     location: LOCATION,
-    resource_group: 'TestRG-CustomVM',
-    vm_size: 'Basic_A0',
+    resource_group: RG_NAME,
     storage_account_name: storage_account_name,
+    vm_size: 'Basic_A0',
     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"],
+    network_interface_card_ids: ["/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/#{RG_NAME}/providers/Microsoft.Network/networkInterfaces/NetInt2"],
     platform: 'linux',
-    vhd_path: 'https://myblob.blob.core.windows.net/vhds/myvhd.vhd',
+    vhd_path: 'https://myblob.blob.core.windows.net/vhds/my_vhd.vhd',
     managed_disk_storage_type: Azure::ARM::Compute::Models::StorageAccountTypes::StandardLRS
   )
+
   puts "Created custom image managed virtual machine: #{custom_image_virtual_machine_managed.name}"
 
+  ########################################################################################################################
+  ##############                                Create Managed Server Async                               ################
+  ########################################################################################################################
+
+  async_response = compute.servers.create_async(
+    name: 'TestVM-ManagedAsync',
+    location: LOCATION,
+    resource_group: RG_NAME,
+    storage_account_name: storage_account_name,
+    vm_size: 'Basic_A0',
+    username: 'testuser',
+    password: 'Confiz=123',
+    disable_password_authentication: false,
+    network_interface_card_ids: ["/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/#{RG_NAME}/providers/Microsoft.Network/networkInterfaces/NetInt3"],
+    platform: 'linux',
+    vhd_path: 'https://myblob.blob.core.windows.net/vhds/my_vhd.vhd',
+    managed_disk_storage_type: Azure::ARM::Compute::Models::StorageAccountTypes::StandardLRS
+  )
+
+  loop do
+    puts async_response.state
+
+    sleep(2) if async_response.pending?
+
+    if async_response.fulfilled?
+      puts "Created custom image managed virtual machine: #{async_response.value.name}"
+      break
+    end
+
+    if async_response.rejected?
+      puts async_response.reason.inspect
+      break
+    end
+  end
+
   ########################################################################################################################
   ######################                            Get and Delete Server                           ######################
   ########################################################################################################################
 
-  custom_image_virtual_machine = compute.servers.get('TestRG-CustomVM', 'TestVM')
+  custom_image_virtual_machine = compute.servers.get(RG_NAME, 'TestVM')
   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')
+  custom_image_virtual_machine_managed = compute.servers.get(RG_NAME, '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}"
 
+  custom_image_virtual_machine_managed_async = compute.servers.get(RG_NAME, 'TestVM-ManagedAsync')
+  puts "Get custom image managed virtual machine async: #{custom_image_virtual_machine_managed_async.name}"
+  puts "Deleted custom image managed virtual machine async: #{custom_image_virtual_machine_managed_async.destroy}"
+
   ########################################################################################################################
   ######################                                   CleanUp                                  ######################
   ########################################################################################################################
 
-  nic = network.network_interfaces.get('TestRG-CustomVM', 'NetInt')
+  nic = network.network_interfaces.get(RG_NAME, 'NetInt')
+  nic.destroy
+
+  nic = network.network_interfaces.get(RG_NAME, 'NetInt2')
   nic.destroy
 
-  nic = network.network_interfaces.get('TestRG-CustomVM', 'NetInt2')
+  nic = network.network_interfaces.get(RG_NAME, 'NetInt3')
   nic.destroy
 
-  vnet = network.virtual_networks.get('TestRG-CustomVM', 'testVnet')
+  vnet = network.virtual_networks.get(RG_NAME, 'testVnet')
   vnet.destroy
 
-  storage = storage.storage_accounts.get('TestRG-CustomVM', storage_account_name)
+  storage = storage.storage_accounts.get(RG_NAME, storage_account_name)
   storage.destroy
 
-  resource_group = rs.resource_groups.get('TestRG-CustomVM')
+  resource_group = rs.resource_groups.get(RG_NAME)
   resource_group.destroy
 rescue
   puts 'Integration Test for custom image virtual machine is failing'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,202 +18,202 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.8.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: '1.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: '1.43'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_compute
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_dns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_traffic_manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_sql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_key_vault
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
@@ -253,12 +253,12 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .arclint
-- .codeclimate.yml
-- .gitignore
-- .hound.yml
-- .rubocop.yml
-- .travis.yml
+- ".arclint"
+- ".codeclimate.yml"
+- ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -313,6 +313,8 @@ files:
 - lib/fog/azurerm/models/compute/servers.rb
 - lib/fog/azurerm/models/compute/virtual_machine_extension.rb
 - lib/fog/azurerm/models/compute/virtual_machine_extensions.rb
+- lib/fog/azurerm/models/dns/a_record.rb
+- lib/fog/azurerm/models/dns/cname_record.rb
 - lib/fog/azurerm/models/dns/record_set.rb
 - lib/fog/azurerm/models/dns/record_sets.rb
 - lib/fog/azurerm/models/dns/zone.rb
@@ -1024,22 +1026,22 @@ licenses:
 metadata: {}
 post_install_message: Thanks for installing!
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Azure Resource Manager cloud services.