fog-azure-rm 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b24d2c21a6e6802af2ca763b1230cb7a7d75acc
-  data.tar.gz: 1a176bf88ef73639cf5c4cceafdebfb13f676d28
+  metadata.gz: abba2750995255a81a2edf8cb5d51bf41331f5b3
+  data.tar.gz: d883aa12233282ce91ce91ceb1ca895eb2ae2810
 SHA512:
-  metadata.gz: 57b1cd6b6c20875fcd62db652f45818741b6fb37bd855250881ea261a50b401900dea6851384565642fa9cb492030aac6f4e3708135fe03bd69525c9bee6a3de
-  data.tar.gz: e730e48874f042e56027233ee84167ae48cdb38fbc96c02a49ecf9aaddee839bbdcf4953fb88b9a8087d80cb6a3262d1bd8296a403ec3b237a8592c8be39833d
+  metadata.gz: c17370ff19fd0e568d8309ca054b957e6affee602909e7fc102640eeab68a218ff1f2b47438fc4e015392e9d7d77c9cd4ea7e855fe440dcb35eca441f1d79e32
+  data.tar.gz: 390a20c58f0321402dc6ebc7d6c789a7a5c8a484b76b14deec8ebf274a50cf09b908f4cfcc1efcc7c41041cdc4d88e734a788582d1afeade4cc49e1e4fda4f2c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.7
+
+**Changed:**
+- Traffic Manager Service - Updated Traffic Manager Profile create method to receive and create Endpoints with it.
+
+**Fixed:**
+- Network Service - Fixed issue in check_virtual_network_exists request
+
 ## 0.2.6
 
 **Fixed:**

data/lib/fog/azurerm/constants.rb

@@ -16,6 +16,7 @@ RESOURCE_GROUP_NAME = 4
 RESOURCE_PROVIDER_NAMESPACE = 6
 RESOURCE_TYPE = 7
 RESOURCE_NAME = 8
+ENDPOINT_PREFIX = 'Microsoft.Network/trafficManagerProfiles'.freeze
 AZURE_ENDPOINTS = 'azureEndpoints'.freeze
 EXTERNAL_ENDPOINTS = 'externalEndpoints'.freeze
 NESTED_ENDPOINTS = 'nestedEndpoints'.freeze

data/lib/fog/azurerm/models/traffic_manager/traffic_manager_profile.rb

@@ -77,7 +77,8 @@ module Fog
             ttl: ttl,
             protocol: protocol,
             port: port,
-            path: path
+            path: path,
+            endpoints: endpoints
           }
         end
       end

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

@@ -15,7 +15,11 @@ module Fog
           begin
             virtual_machine = @compute_mgmt_client.virtual_machines.create_or_update(resource_group, vm_name, vm)
           rescue MsRestAzure::AzureOperationError => e
+            if e.body.to_s =~ /InvalidParameter/ && e.body.to_s =~ /already exists/
+              Fog::Logger.debug 'The disk is already attached'
+            else
             raise_azure_exception(e, msg)
+            end
           end
           Fog::Logger.debug "Data Disk #{disk_name} attached to Virtual Machine #{vm_name} successfully."
           virtual_machine
@@ -66,9 +70,9 @@ module Fog
           data_disk.lun = lun
           data_disk.disk_size_gb = disk_size.to_s
           data_disk.vhd = Azure::ARM::Compute::Models::VirtualHardDisk.new
-          data_disk.vhd.uri = "https://#{storage_account_name}.blob.core.windows.net/vhds/#{disk_name}.vhd"
+          data_disk.vhd.uri = "https://#{storage_account_name}.blob.core.windows.net/vhds/#{storage_account_name}-#{disk_name}.vhd"
           data_disk.caching = Azure::ARM::Compute::Models::CachingTypes::ReadWrite
-          blob_name = "#{disk_name}.vhd"
+          blob_name = "#{storage_account_name}-#{disk_name}.vhd"
           disk_exist = check_blob_exist(storage_account_name, blob_name, access_key)
           data_disk.create_option = Azure::ARM::Compute::Models::DiskCreateOptionTypes::Empty
           data_disk.create_option = Azure::ARM::Compute::Models::DiskCreateOptionTypes::Attach if disk_exist

data/lib/fog/azurerm/requests/network/check_virtual_network_exists.rb

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Virtual Network #{name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.response.status == '404'
+            if e.error_code == 'ResourceNotFound'
               Fog::Logger.debug "Virtual Network #{name} doesn't exist."
               false
             else

data/lib/fog/azurerm/requests/traffic_manager/create_or_update_traffic_manager_profile.rb

@@ -6,7 +6,7 @@ module Fog
         def create_or_update_traffic_manager_profile(profile_hash)
           msg = "Creating Traffic Manager Profile: #{profile_hash[:name]}."
           Fog::Logger.debug msg
-          profile_parameters = get_profile_object(profile_hash[:traffic_routing_method], profile_hash[:relative_name], profile_hash[:ttl], profile_hash[:protocol], profile_hash[:port], profile_hash[:path])
+          profile_parameters = get_profile_object(profile_hash[:traffic_routing_method], profile_hash[:relative_name], profile_hash[:ttl], profile_hash[:protocol], profile_hash[:port], profile_hash[:path], profile_hash[:endpoints])
           begin
             traffic_manager_profile = @traffic_mgmt_client.profiles.create_or_update(profile_hash[:resource_group], profile_hash[:name], profile_parameters)
           rescue MsRestAzure::AzureOperationError => e
@@ -18,16 +18,29 @@ module Fog
 
         private
 
-        def get_profile_object(traffic_routing_method, relative_name, ttl, protocol, port, path)
+        def get_profile_object(traffic_routing_method, relative_name, ttl, protocol, port, path, endpoints)
           traffic_manager_profile = Azure::ARM::TrafficManager::Models::Profile.new
           traffic_manager_profile.traffic_routing_method = traffic_routing_method
           traffic_manager_profile.location = GLOBAL
 
           traffic_manager_profile.dns_config = get_traffic_manager_dns_config(relative_name, ttl)
           traffic_manager_profile.monitor_config = get_traffic_manager_monitor_config(protocol, port, path)
+          traffic_manager_profile.endpoints = get_endpoints(endpoints) unless endpoints.nil?
           traffic_manager_profile
         end
 
+        def get_endpoints(endpoints)
+          endpoint_objects = []
+
+          endpoints.each do |endpoint|
+            endpoint_object = get_endpoint_object(endpoint[:target_resource_id], endpoint[:target], endpoint[:weight], endpoint[:priority], endpoint[:endpoint_location], endpoint[:min_child_endpoints])
+            endpoint_object.name = endpoint[:name]
+            endpoint_object.type = "#{ENDPOINT_PREFIX}/#{endpoint[:type]}"
+            endpoint_objects.push(endpoint_object)
+          end
+          endpoint_objects
+        end
+
         def get_traffic_manager_dns_config(relative_name, ttl)
           traffic_manager_dns_config = Azure::ARM::TrafficManager::Models::DnsConfig.new
           traffic_manager_dns_config.relative_name = relative_name

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.2.6'.freeze
+    VERSION = '0.2.7'.freeze
   end
 end

data/test/api_stub/requests/traffic_manager/traffic_manager_profile.rb

@@ -146,7 +146,18 @@ module ApiStub
             ttl: 'ttl',
             protocol: 'protocol',
             port: 'port',
-            path: 'path'
+            path: 'path',
+            endpoints: [{
+              name: 'endpoint2',
+              traffic_manager_profile_name: 'test-tmp',
+              resource_group: 'TestRG-TM',
+              type: 'externalEndpoints',
+              target: 'test-app.com',
+              endpoint_location: 'eastus',
+              endpoint_status: 'Enabled',
+              priority: 5,
+              weight: 10
+            }]
           }
         end
       end

data/test/integration/traffic_manager.rb

@@ -51,7 +51,16 @@ begin
     ttl: '30',
     protocol: 'http',
     port: '80',
-    path: '/monitorpage.aspx'
+    path: '/monitorpage.aspx',
+    endpoints: [{
+      name: 'endpoint1',
+      type: 'externalEndpoints',
+      target: 'test-app.com',
+      endpoint_location: 'eastus',
+      endpoint_status: 'Enabled',
+      priority: 5,
+      weight: 10
+    }]
   )
   puts "Created traffic manager profile: #{traffic_manager_profile.name}"
 

data/test/requests/network/test_check_virtual_network_exists.rb

@@ -18,10 +18,8 @@ class TestCheckVirtualNetworkExists < Minitest::Test
     faraday_response = Faraday::Response.new(nil)
     response = proc { raise MsRestAzure::AzureOperationError.new(nil, faraday_response, 'error' => { 'message' => 'mocked exception', 'code' => 'ResourceNotFound' }) }
 
-    faraday_response.stub :status, '404' do
-      @virtual_networks.stub :get, response do
-        assert !@service.check_virtual_network_exists('fog-test-rg', 'fog-test-virtual-network')
-      end
+    @virtual_networks.stub :get, response do
+      assert !@service.check_virtual_network_exists('fog-test-rg', 'fog-test-virtual-network')
     end
   end
 
@@ -29,10 +27,8 @@ class TestCheckVirtualNetworkExists < Minitest::Test
     faraday_response = Faraday::Response.new(nil)
     response = proc { raise MsRestAzure::AzureOperationError.new(nil, faraday_response, 'error' => { 'message' => 'mocked exception', 'code' => 'ResourceGroupNotFound' }) }
 
-    faraday_response.stub :status, '400' do
-      @virtual_networks.stub :get, response do
-        assert_raises(RuntimeError) { @service.check_virtual_network_exists('fog-test-rg', 'fog-test-virtual-network') }
-      end
+    @virtual_networks.stub :get, response do
+      assert_raises(RuntimeError) { @service.check_virtual_network_exists('fog-test-rg', 'fog-test-virtual-network') }
     end
   end
 end

metadata

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