fog-azure-rm 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e9a15cf8f593c6eca92fddd5099c18d219f0be
-  data.tar.gz: 49fae3451340031eea99a48be0ab7eaef088ac04
+  metadata.gz: 3506ec3296726b6937f5a7dcb37cd44d1de99be9
+  data.tar.gz: 247976bb6378c17700f6090a81e0a1bdab573533
 SHA512:
-  metadata.gz: c7163130df668fe82cc2c517a51b826085f931328afd5c8b72da34aa5baacbfc8ba45a38062e51985df74e20991663f633d69cf16a3b071e8a62af06936d0089
-  data.tar.gz: 4b1203a28c2ca1f24b2f269fdb9b0b9256d26fcf90ef2cf6fa47b12e7d74d6c9d923fcff8ffd4938c81e341a821985c7409c2e6d4db3607cf34f324ebfe5f215
+  metadata.gz: 44c94ae25c0c8388b0e431f542062e896ff9e326e86fcc1e1bf941162437b484149bed747d085856d5f5cbf98e29e5c5fec41a4b5567abb2fb19ef2dc0552a48
+  data.tar.gz: 08d076b807216e3a731840fef407773fec62787daf9792555f9c399fccfefb138e4b635c416d675d82511bf802e937009d1e61ff759e336396161f515a36a0ad

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.1
+
+**Changed:**
+- Compute Service - Added new parameter to create virtual machine request
+
 ## 0.2.0
 
 **Added:**

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

@@ -53,6 +53,7 @@ Create a new linux server
         platform: 'Linux',
         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: 'None/ReadOnly/ReadWrite' # Optional, can be one of None, ReadOnly, ReadWrite
     )
 ```
 

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

@@ -54,9 +54,10 @@ azure_storage_service = Fog::Storage.new(
 ## Check Name Availability 
 
 Check Storage Account Name Availability.This operation checks that account name is valid and is not already in use.
+_Storage Account Type_ is an optional parameter
 
 ```ruby
-azure_storage_service.storage_accounts.check_name_availability('<Storage Account name>')
+azure_storage_service.storage_accounts.check_name_availability(<Storage Account name>, <Storage Account Type>)
 ```
 
 ## Check Storage Account Existence

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

@@ -12,6 +12,7 @@ module Fog
         attribute :storage_account_name
         attribute :os_disk_name
         attribute :os_disk_vhd_uri
+        attribute :os_disk_caching
         attribute :publisher
         attribute :offer
         attribute :sku
@@ -40,6 +41,7 @@ module Fog
           unless vm.storage_profile.nil?
             hash['os_disk_name'] = vm.storage_profile.os_disk.name
             hash['os_disk_vhd_uri'] = vm.storage_profile.os_disk.vhd.uri
+            hash['os_disk_caching'] = vm.storage_profile.os_disk.caching
             unless vm.storage_profile.image_reference.nil?
               hash['publisher'] = vm.storage_profile.image_reference.publisher
               hash['offer'] = vm.storage_profile.image_reference.offer
@@ -148,7 +150,8 @@ module Fog
             provision_vm_agent: provision_vm_agent,
             enable_automatic_updates: enable_automatic_updates,
             custom_data: custom_data,
-            vhd_path: vhd_path
+            vhd_path: vhd_path,
+            os_disk_caching: os_disk_caching
           }
         end
       end

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

@@ -27,11 +27,8 @@ module Fog
           storage_account_fog.merge_attributes(Fog::Storage::AzureRM::StorageAccount.parse(storage_account))
         end
 
-        def check_name_availability(name)
-          params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
-          params.name = name
-          params.type = 'Microsoft.Storage/storageAccounts'
-          service.check_storage_account_name_availability(params)
+        def check_name_availability(name, type = 'Microsoft.Storage/storageAccounts')
+          service.check_storage_account_name_availability(name, type)
         end
 
         def check_storage_account_exists(resource_group_name, storage_account_name)

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

@@ -28,6 +28,7 @@ module Fog
                                                                    vm_hash[:sku],
                                                                    vm_hash[:version],
                                                                    vm_hash[:vhd_path],
+                                                                   vm_hash[:os_disk_caching],
                                                                    vm_hash[:platform],
                                                                    vm_hash[:resource_group])
 
@@ -75,7 +76,7 @@ module Fog
           image_reference
         end
 
-        def define_storage_profile(vm_name, storage_account_name, publisher, offer, sku, version, vhd_path, platform, resource_group)
+        def define_storage_profile(vm_name, storage_account_name, publisher, offer, sku, version, vhd_path, os_disk_caching, platform, resource_group)
           storage_profile = Azure::ARM::Compute::Models::StorageProfile.new
           os_disk = Azure::ARM::Compute::Models::OSDisk.new
           vhd = Azure::ARM::Compute::Models::VirtualHardDisk.new
@@ -118,6 +119,14 @@ module Fog
           os_disk.name = "#{vm_name}_os_disk"
           os_disk.vhd = vhd
           os_disk.create_option = Azure::ARM::Compute::Models::DiskCreateOptionTypes::FromImage
+          os_disk.caching = case os_disk_caching
+                              when 'None'
+                                Azure::ARM::Compute::Models::CachingTypes::None
+                              when 'ReadOnly'
+                                Azure::ARM::Compute::Models::CachingTypes::ReadOnly
+                              when 'ReadWrite'
+                                Azure::ARM::Compute::Models::CachingTypes::ReadWrite
+                            end unless os_disk_caching.nil?
           storage_profile.os_disk = os_disk
           storage_profile
         end

data/lib/fog/azurerm/requests/storage/check_storage_account_exists.rb

@@ -7,17 +7,23 @@ module Fog
           msg = "Checking Storage Account: #{storage_account_name}."
           Fog::Logger.debug msg
           begin
-            @storage_mgmt_client.storage_accounts.get_properties(resource_group_name, storage_account_name)
-            Fog::Logger.debug "Storage Account #{storage_account_name} exists."
-            true
+            storage_account = @storage_mgmt_client.storage_accounts.get_properties(resource_group_name, storage_account_name)
           rescue MsRestAzure::AzureOperationError => e
             if e.body['error']['code'] == 'ResourceNotFound'
               Fog::Logger.debug "Storage Account #{storage_account_name} doesn't exist."
-              false
+              return false
             else
               raise_azure_exception(e, msg)
             end
           end
+
+          if storage_account.provisioning_state == 'Succeeded'
+            Fog::Logger.debug "Storage Account #{storage_account_name} exists."
+            true
+          else
+            Fog::Logger.debug "Storage Account #{storage_account_name} doesn't exist."
+            false
+          end
         end
       end
       # This class provides the mock implementation.

data/lib/fog/azurerm/requests/storage/check_storage_account_name_availability.rb

@@ -3,23 +3,34 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def check_storage_account_name_availability(params)
-          msg = "Checking Name availability: #{params.name}."
+        def check_storage_account_name_availability(storage_account_name, storage_account_type)
+          msg = "Checking Storage Account Name availability: #{storage_account_name}."
           Fog::Logger.debug msg
+
+          storage_account_params = create_storage_account_params(storage_account_name, storage_account_type)
           begin
-            name_available_obj = @storage_mgmt_client.storage_accounts.check_name_availability(params)
+            name_available_obj = @storage_mgmt_client.storage_accounts.check_name_availability(storage_account_params)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
           if name_available_obj.name_available
-            Fog::Logger.debug "Name: #{params.name} is available."
+            Fog::Logger.debug "Name: #{storage_account_name} is available."
             true
           else
-            Fog::Logger.debug "Name: #{params.name} is not available."
+            Fog::Logger.debug "Name: #{storage_account_type} is not available."
             Fog::Logger.debug "Reason: #{name_available_obj.reason}."
             false
           end
         end
+
+        private
+
+        def create_storage_account_params(name, type)
+          params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
+          params.name = name
+          params.type = type
+          params
+        end
       end
       # This class provides the mock implementation for unit tests.
       class Mock

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

data/test/api_stub/requests/storage/storageaccount.rb

@@ -5,7 +5,7 @@ module ApiStub
       class StorageAccount
         def self.storage_account_request(storage_mgmt_client)
           storage_account_hash = {
-            'id' => '/subscriptions/67f2116d-4ea2-4c6c-b20a-f92183dbe3cb/resourceGroups/fog_test_rg/providers/Microsoft.Storage/storageAccounts/fogtestsasecond',
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog_test_rg/providers/Microsoft.Storage/storageAccounts/fog-test-storage-account',
             'name' => 'fog-test-storage-account',
             'location' => 'west us',
             'sku' =>

data/test/integration/server.rb

@@ -105,7 +105,8 @@ begin
     sku: '14.04.2-LTS',
     version: 'latest',
     platform: 'linux',
-    custom_data: 'echo customData'
+    custom_data: 'echo customData',
+    os_disk_caching: 'None'
   )
   puts "Created virtual machine: #{virtual_machine.name}"
 

data/test/integration/storage_account.rb

@@ -37,9 +37,8 @@ begin
   ######################                    Check Storage Account name Availability                 ######################
   ########################################################################################################################
 
-  storage_account_avail = storage.storage_accounts.check_name_availability('test-storage')
-  puts 'Storage account available' if storage_account_avail
-  puts 'Storage account unavailale' unless storage_account_avail
+  storage_account_avail = storage.storage_accounts.check_name_availability('teststorage123')
+  puts storage_account_avail ? 'Storage Account name available' : 'Storage Account name unavailable'
 
   ########################################################################################################################
   ######################                         Check Subnet Exists?                               ######################

data/test/models/compute/test_server.rb

@@ -37,6 +37,7 @@ class TestServer < Minitest::Test
       :storage_account_name,
       :os_disk_name,
       :os_disk_vhd_uri,
+      :os_disk_caching,
       :publisher,
       :offer,
       :sku,

data/test/requests/storage/test_check_storage_account_exists.rb

@@ -11,13 +11,15 @@ class TestCheckStorageAccountExists < Minitest::Test
 
   def test_check_storage_account_exists_success
     response_body = ApiStub::Requests::Storage::StorageAccount.storage_account_request(@storage_mgmt_client)
+    response_body.provisioning_state = 'Succeeded'
     @storage_accounts.stub :get_properties, response_body do
-      assert @service.check_storage_account_exists('fog_test_rg', 'fogtestsasecond')
+      assert_equal @service.check_storage_account_exists('fog_test_rg', 'fog-test-storage-account'), true
     end
   end
 
   def test_check_storage_account_exists_failure
-    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception', 'code' => 'ResourceNotFound' }) }
+    response = ApiStub::Requests::Storage::StorageAccount.storage_account_request(@storage_mgmt_client)
+    response.provisioning_state = 'Failed'
     @storage_accounts.stub :get_properties, response do
       assert !@service.check_storage_account_exists('fog_test_rg', 'fogtestsasecond')
     end

data/test/requests/storage/test_check_storage_account_name_availability.rb

@@ -10,35 +10,26 @@ class TestCheckStorageAccountNameAvailability < Minitest::Test
   end
 
   def test_check_storage_account_name_availability_success
-    params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
-    params.name = 'teststorageaccount'
-    params.type = 'Microsoft.Storage/storageAccounts'
     true_case_response = ApiStub::Requests::Storage::StorageAccount.true_case_for_check_name_availability(@storage_mgmt_client)
     @storage_accounts.stub :check_name_availability, true_case_response do
-      assert_equal @azure_credentials.check_storage_account_name_availability(params), true
+      assert_equal @azure_credentials.check_storage_account_name_availability('teststorageaccount', 'Microsoft.Storage/storageAccounts'), true
     end
   end
 
   def test_check_storage_account_name_availability_failure
-    params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
-    params.name = 'teststorageaccount'
-    params.type = 'Microsoft.Storage/storageAccounts'
     false_case_response = ApiStub::Requests::Storage::StorageAccount.false_case_for_check_name_availability(@storage_mgmt_client)
     @storage_accounts.stub :check_name_availability, false_case_response do
-      assert_equal @azure_credentials.check_storage_account_name_availability(params), false
+      assert_equal @azure_credentials.check_storage_account_name_availability('testname', 'Microsoft.Storage/storageAccounts'), false
       assert_raises ArgumentError do
-        @azure_credentials.check_storage_account_name_availability(params, 'wrong arg')
+        @azure_credentials.check_storage_account_name_availability
       end
     end
   end
 
   def test_check_storage_account_name_availability_exception
-    params = Azure::ARM::Storage::Models::StorageAccountCheckNameAvailabilityParameters.new
-    params.name = 'teststorageaccount'
-    params.type = 'Microsoft.Storage/storageAccounts'
     raise_exception = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception', 'code' => 'ResourceGroupNotFound' }) }
     @storage_accounts.stub :check_name_availability, raise_exception do
-      assert_raises(RuntimeError) { @azure_credentials.check_storage_account_name_availability(params) }
+      assert_raises(RuntimeError) { @azure_credentials.check_storage_account_name_availability('teststorageaccount', 'Microsoft.Storage/storageAccounts') }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake