fog-azure-rm 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 524c1f0c1c6c31d7d7fd46537968247958d85a5c34bd8d9a32b9999a40406058
-  data.tar.gz: 876712ef9579847efccf838bd144680b196cc3d9fe526c7cd72b2ebb5e68ff5c
+  metadata.gz: 58bc4e9c11864f922ab1714a0fe2b86ec38a13de4c89462600168cff315704db
+  data.tar.gz: b7a07536a11d4959fcad7c0d27c9395500a05a95ea5c7112066ba612221f31dd
 SHA512:
-  metadata.gz: 9f32d3d8d593db5306da3458bbc348ccb5824b5ea2a34661b721755531f9d9c5b853fa365d6d71540b51160f80eb771a22fbe0a164aa59add05fc6d2d8ee1bc8
-  data.tar.gz: b4af7b5491fc177f1804a8a5078ffdd0ae93cfcc7bc3a4333eef1d179e74d22c64e87909901c96e081fdba9201c00bf36803e7896b55da6af82fde409822afeb
+  metadata.gz: b5026003c03125cf94f3653d6a0305a669109a18dd3ab274664e43195a9b0ae3b7e30249c10bed61cfcfedb2e50b6a7d3e5ae0f96a635faf777a451d984f24f1
+  data.tar.gz: 67cc8a80a8bebf498c3713a22e2d987141a98cbe728947a5fa8e689984e0ff946ffdccf8bd915e8ab3115150c6a09f435b0a747841f9118192548918d1f60086

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.3
+
+**Fixed:**
+- Compute Service - Fixed Server Update Scenario
+
 ## 0.4.2
 
 **Fixed:**

data/lib/fog/azurerm.rb

@@ -1,4 +1,5 @@
 require 'ms_rest_azure'
+require 'azure/core/http/http_error'
 require 'erb'
 require 'fog/azurerm/config'
 require 'fog/azurerm/constants'

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

@@ -61,7 +61,8 @@ fog_compute_service.servers.create(
         custom_data: '<Custom Data Value>',                     # [Optional], if you want to add custom data in this VM.
         os_disk_caching: '<Caching Type>',                      # [Optional], can be one of None, ReadOnly, ReadWrite
         managed_disk_storage_type: '<Storage Account Type>',    # [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)
+        os_disk_size: <Disk Size>,                              # [Optional], size of the os disk in GB (upto 1023)
+        os_disk_name: '<Disk Name>'                             # [Optional], name of the os disk
 )
 ```
 
@@ -97,7 +98,8 @@ fog_compute_service.servers.create(
         custom_data: '<Custom Data Value>',                     # [Optional], if you want to add custom data in this VM.
         os_disk_caching: '<Caching Type>',                      # [Optional], can be one of None, ReadOnly, ReadWrite
         managed_disk_storage_type: '<Storage Account Type>',    # [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)
+        os_disk_size: <Disk Size>,                              # [Optional], size of the os disk in GB (upto 1023)
+        os_disk_name: '<Disk Name>'                             # [Optional], name of the os disk
 )
 ```
 
@@ -123,7 +125,8 @@ fog_compute_service.servers.create(
         availability_set_id: '<Availability Set Id>',     # [Optional]
         vhd_path: '<Path of VHD>',                        # [Optional], if you want to create the VM from a custom image.
         custom_data: '<Custom Data Value>',               # [Optional], if you want to add custom data in this VM.
-        os_disk_size: <Disk Size>                         # [Optional], size of the os disk in GB (upto 1023)
+        os_disk_size: <Disk Size>,                        # [Optional], size of the os disk in GB (upto 1023)
+        os_disk_name: '<Disk Name>'                       # [Optional], name of the os disk
 )
 ```
 
@@ -153,7 +156,8 @@ async_response = fog_compute_service.servers.create_async(
         custom_data: '<Custom Data Value>',                  # [Optional], if you want to add custom data in this VM.
         os_disk_caching: '<Caching Type>',                   # [Optional], can be one of None, ReadOnly, ReadWrite
         managed_disk_storage_type: '<Storage Account Type>', # [Optional], can be StandardLRS or PremiumLRS
-        os_disk_size: <Disk Size>                            # [Optional], size of the os disk in GB (upto 1023)
+        os_disk_size: <Disk Size>,                           # [Optional], size of the os disk in GB (upto 1023)
+        os_disk_name: '<Disk Name>'                          # [Optional], name of the os disk
 )
 ```
 Following methods are available to handle async respoonse:

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

@@ -228,7 +228,9 @@ module Fog
             managed_disk_storage_type: managed_disk_storage_type,
             os_disk_size: os_disk_size,
             tags: tags,
-            image_ref: image_ref
+            image_ref: image_ref,
+            os_disk_name: os_disk_name,
+            os_disk_vhd_uri: os_disk_vhd_uri
           }
         end
 

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

@@ -11,6 +11,13 @@ module Fog
           vm_name = vm_config[:name]
           rg_name = vm_config[:resource_group]
 
+          # In case of updating the VM, we check if the user has passed any value for os_disk_name
+          # If the user has not passed any value, we try to retrieve the value of os_disk_name from the VM
+          # If the VM exists then the os_disk_name is retrieved; else it remains nil
+          os_disk_parameters = get_os_disk_parameters(rg_name, vm_name) if vm_config[:os_disk_name].nil? || vm_config[:os_disk_vhd_uri].nil?
+          vm_config[:os_disk_name] = os_disk_parameters[:os_disk_name] if vm_config[:os_disk_name].nil?
+          vm_config[:os_disk_vhd_uri] = os_disk_parameters[:os_disk_vhd_uri] if vm_config[:os_disk_vhd_uri].nil?
+
           msg = "Creating Virtual Machine '#{vm_name}' in Resource Group '#{rg_name}'..."
           Fog::Logger.debug msg
 
@@ -154,12 +161,14 @@ module Fog
           os_disk_size = vm_config[:os_disk_size]
           location = vm_config[:location]
           image_ref = vm_config[:image_ref]
+          os_disk_name = vm_config[:os_disk_name]
+          os_disk_vhd_uri = vm_config[:os_disk_vhd_uri]
 
           storage_profile = Azure::ARM::Compute::Models::StorageProfile.new
           # Set OS disk VHD path
           os_disk = Azure::ARM::Compute::Models::OSDisk.new
           vhd = Azure::ARM::Compute::Models::VirtualHardDisk.new
-          vhd.uri = get_blob_endpoint(storage_account_name) + "/vhds/#{vm_name}_os_disk.vhd"
+          vhd.uri = os_disk_vhd_uri.nil? ? get_blob_endpoint(storage_account_name) + "/vhds/#{vm_name}_os_disk.vhd" : os_disk_vhd_uri
           os_disk.vhd = vhd
 
           if vhd_path.nil? && image_ref.nil?
@@ -180,7 +189,7 @@ module Fog
             storage_profile.image_reference.id = image.id
           end
 
-          storage_profile.os_disk = configure_os_disk_object(os_disk, os_disk_caching, os_disk_size, platform, vm_name)
+          storage_profile.os_disk = configure_os_disk_object(os_disk, os_disk_name, os_disk_caching, os_disk_size, platform, vm_name)
           storage_profile
         end
 
@@ -200,6 +209,7 @@ module Fog
           platform = vm_config[:platform]
           vm_name = vm_config[:name]
           image_ref = vm_config[:image_ref]
+          os_disk_name = vm_config[:os_disk_name]
 
           # Build storage profile
           storage_profile = Azure::ARM::Compute::Models::StorageProfile.new
@@ -226,7 +236,7 @@ module Fog
             storage_profile.image_reference.id = image.id
           end
 
-          storage_profile.os_disk = configure_os_disk_object(os_disk, os_disk_caching, os_disk_size, platform, vm_name)
+          storage_profile.os_disk = configure_os_disk_object(os_disk, os_disk_name, os_disk_caching, os_disk_size, platform, vm_name)
           storage_profile
         end
 
@@ -249,8 +259,9 @@ module Fog
           }
         end
 
-        def configure_os_disk_object(os_disk, os_disk_caching, os_disk_size, platform, vm_name)
-          os_disk.name = "#{vm_name}_os_disk"
+        def configure_os_disk_object(os_disk, os_disk_name, os_disk_caching, os_disk_size, platform, vm_name)
+          # It will use the os_disk_name provided or it will generate a name for itself if it is nil
+          os_disk.name = os_disk_name.nil? ? "#{vm_name}_os_disk" : os_disk_name
           os_disk.os_type = platform
           os_disk.disk_size_gb = os_disk_size unless os_disk_size.nil?
           os_disk.create_option = Azure::ARM::Compute::Models::DiskCreateOptionTypes::FromImage
@@ -332,6 +343,23 @@ module Fog
                                                                             TEMPORARY_STORAGE_ACCOUNT_TAG_KEY,
                                                                             TEMPORARY_STORAGE_ACCOUNT_TAG_VALUE)
         end
+
+        def get_os_disk_parameters(resource_group, virtual_machine_name)
+          os_disk_parameters = {}
+
+          begin
+            vm = get_virtual_machine(resource_group, virtual_machine_name, false)
+          rescue
+            return os_disk_parameters
+          end
+
+          unless vm.storage_profile.nil?
+            os_disk_parameters[:os_disk_name] = vm.storage_profile.os_disk.name
+            os_disk_parameters[:os_disk_vhd_uri] = vm.storage_profile.os_disk.vhd.uri unless vm.storage_profile.os_disk.vhd.nil?
+          end
+
+          os_disk_parameters
+        end
       end
 
       # This class provides the mock implementation for unit tests.

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.4.2'.freeze
+    VERSION = '0.4.3'.freeze
   end
 end

data/test/requests/compute/test_create_virtual_machine.rb

@@ -10,80 +10,104 @@ class TestCreateVirtualMachine < Minitest::Test
     @custom_data_response = ApiStub::Requests::Compute::VirtualMachine.create_virtual_machine_with_custom_data_response(compute_client)
     @linux_virtual_machine_hash = ApiStub::Requests::Compute::VirtualMachine.linux_virtual_machine_params
     @windows_virtual_machine_hash = ApiStub::Requests::Compute::VirtualMachine.windows_virtual_machine_params
+    @error_response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
   end
 
   def test_create_linux_virtual_machine_success
     @virtual_machines.stub :create_or_update, @response do
-      assert_equal @service.create_virtual_machine(@linux_virtual_machine_hash), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(@linux_virtual_machine_hash), @response
+      end
     end
 
     # Async
     @virtual_machines.stub :create_or_update_async, @response do
-      assert_equal @service.create_virtual_machine(@linux_virtual_machine_hash, true), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(@linux_virtual_machine_hash, true), @response
+      end
     end
   end
 
   def test_create_windows_virtual_machine_success
     @virtual_machines.stub :create_or_update, @response do
-      assert_equal @service.create_virtual_machine(@windows_virtual_machine_hash), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(@windows_virtual_machine_hash), @response
+      end
     end
 
     # Async
     @virtual_machines.stub :create_or_update_async, @response do
-      assert_equal @service.create_virtual_machine(@windows_virtual_machine_hash, true), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(@windows_virtual_machine_hash, true), @response
+      end
     end
   end
 
   def test_create_linux_virtual_machine_from_custom_image_success
     linux_virtual_machine_with_custom_image_hash = ApiStub::Requests::Compute::VirtualMachine.linux_virtual_machine_with_custom_image_params
     @virtual_machines.stub :create_or_update, @response do
-      assert_equal @service.create_virtual_machine(linux_virtual_machine_with_custom_image_hash), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(linux_virtual_machine_with_custom_image_hash), @response
+      end
     end
 
     # Async
     @virtual_machines.stub :create_or_update_async, @response do
-      assert_equal @service.create_virtual_machine(linux_virtual_machine_with_custom_image_hash, true), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(linux_virtual_machine_with_custom_image_hash, true), @response
+      end
     end
   end
 
   def test_create_windows_virtual_machine_from_custom_image_success
     windows_virtual_machine_with_custom_image_hash = ApiStub::Requests::Compute::VirtualMachine.windows_virtual_machine_with_custom_image_params
     @virtual_machines.stub :create_or_update, @response do
-      assert_equal @service.create_virtual_machine(windows_virtual_machine_with_custom_image_hash), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(windows_virtual_machine_with_custom_image_hash), @response
+      end
     end
 
     # Async
     @virtual_machines.stub :create_or_update_async, @response do
-      assert_equal @service.create_virtual_machine(windows_virtual_machine_with_custom_image_hash, true), @response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(windows_virtual_machine_with_custom_image_hash, true), @response
+      end
     end
   end
 
   def test_create_linux_virtual_machine_with_custom_data_success
     linux_virtual_machine_with_custom_data_hash = ApiStub::Requests::Compute::VirtualMachine.linux_virtual_machine_with_custom_data_params
     @virtual_machines.stub :create_or_update, @custom_data_response do
-      assert_equal @service.create_virtual_machine(linux_virtual_machine_with_custom_data_hash), @custom_data_response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(linux_virtual_machine_with_custom_data_hash), @custom_data_response
+      end
     end
   end
 
   def test_create_windows_virtual_machine_with_custom_data_success
     windows_virtual_machine_with_custom_data_hash = ApiStub::Requests::Compute::VirtualMachine.windows_virtual_machine_with_custom_data_params
     @virtual_machines.stub :create_or_update, @custom_data_response do
-      assert_equal @service.create_virtual_machine(windows_virtual_machine_with_custom_data_hash), @custom_data_response
+      @virtual_machines.stub :get, @error_response do
+        assert_equal @service.create_virtual_machine(windows_virtual_machine_with_custom_data_hash), @custom_data_response
+      end
     end
   end
 
   def test_create_virtual_machine_failure
-    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @virtual_machines.stub :create_or_update, response do
-      assert_raises RuntimeError do
-        @service.create_virtual_machine(@linux_virtual_machine_hash)
+    @virtual_machines.stub :create_or_update, @error_response do
+      @virtual_machines.stub :get, @error_response do
+        assert_raises RuntimeError do
+          @service.create_virtual_machine(@linux_virtual_machine_hash)
+        end
       end
     end
 
     # Async
-    @virtual_machines.stub :create_or_update_async, response do
-      assert_raises RuntimeError do
-        @service.create_virtual_machine(@linux_virtual_machine_hash, true)
+    @virtual_machines.stub :create_or_update_async, @error_response do
+      @virtual_machines.stub :get, @error_response do
+        assert_raises RuntimeError do
+          @service.create_virtual_machine(@linux_virtual_machine_hash, true)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake