fog-azure-rm 0.0.8 → 0.0.9

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

@@ -3,41 +3,40 @@ module Fog
     class AzureRM
       # Real class for DNS Request
       class Real
-        def create_or_update_zone(resource_group, name)
-          Fog::Logger.debug "Creating/Updating Zone #{name} ..."
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones/#{name}?api-version=2015-05-04-preview"
-
-          body = {
-            location: 'global',
-            tags: {},
-            properties: {}
-          }
-
+        def create_or_update_zone(zone_params)
+          msg = "Creating/updating Zone #{zone_params[:name]} in Resource Group: #{zone_params[:resource_group]}."
+          Fog::Logger.debug msg
+          zone_object = get_zone_object(zone_params)
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            response = RestClient.put(
-              resource_url,
-              body.to_json,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-            Fog::Logger.debug "Zone #{name} created successfully."
-            parsed_response = JSON.parse(response)
-            parsed_response
-          rescue Exception => e
-            Fog::Logger.warning "Exception creating zone #{name} in resource group #{resource_group}"
-            msg = "AzureDns::Zone - Exception is: #{e.message}"
-            raise msg
+            zone = @dns_client.zones.create_or_update(zone_params[:resource_group], zone_params[:name], zone_object)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Zone #{zone_params[:name]} created/updated successfully."
+          zone
+        end
+
+        private
+
+        def get_zone_object(zone_params)
+          zone = Azure::ARM::Dns::Models::Zone.new
+          zone.name = zone_params[:name]
+          zone.location = zone_params[:location]
+          zone.type = zone_params[:type]
+          zone.number_of_record_sets = zone_params[:number_of_record_sets]
+          zone.max_number_of_record_sets = zone_params[:max_number_of_record_sets]
+          zone.tags = zone_params[:tags] if zone.tags.nil?
+          zone.etag = zone_params[:etag]
+
+          zone
         end
       end
 
       # Mock class for DNS Request
       class Mock
-        def create_or_update_zone(resource_group, name)
+        def create_or_update_zone(*)
           {
-            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnszones/#{name}",
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/resource_group/providers/Microsoft.Network/dnszones/name',
             'name' => name,
             'type' => 'Microsoft.Network/dnszones',
             'etag' => '00000002-0000-0000-76c2-f7ad90b5d101',
@@ -46,13 +45,7 @@ module Fog
             'properties' =>
               {
                 'maxNumberOfRecordSets' => 5000,
-                'nameServers' =>
-                [
-                  'ns1-05.azure-dns.com.',
-                  'ns2-05.azure-dns.net.',
-                  'ns3-05.azure-dns.org.',
-                  'ns4-05.azure-dns.info.'
-                ],
+                'nameServers' => %w(ns1-05.azure-dns.com. ns2-05.azure-dns.net. ns3-05.azure-dns.org. ns4-05.azure-dns.info.),
                 'numberOfRecordSets' => 2,
                 'parentResourceGroupName' => resource_group
               }

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

@@ -4,31 +4,22 @@ module Fog
       # Real class for DNS Request
       class Real
         def delete_record_set(resource_group, name, zone_name, record_type)
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones/#{zone_name}/#{record_type}/#{name}?api-version=2015-05-04-preview"
-          Fog::Logger.debug "Deleting RecordSet #{name} of type '#{record_type}' in zone #{zone_name}"
-
+          msg = "Deleting Record Set #{name} from Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            RestClient.delete(
-              resource_url,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-            Fog::Logger.debug "RecordSet #{name} Deleted Successfully!"
-            true
-          rescue Exception => e
-            Fog::Logger.warning "Exception deleting record set #{name} from resource group #{resource_group}"
-            msg = "AzureDns::RecordSet - Exception is: #{e.message}"
-            raise msg
+            @dns_client.record_sets.delete(resource_group, zone_name, name, record_type)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Record Set #{name} Deleted Successfully."
+          true
         end
       end
 
       # Mock class for DNS Request
       class Mock
-        def delete_record_set(_resource_group, name, _zone_name, _record_type)
-          Fog::Logger.debug "Record Set #{name} deleted successfully."
+        def delete_record_set(*)
+          Fog::Logger.debug 'Record Set name deleted successfully.'
           true
         end
       end

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

@@ -4,30 +4,22 @@ module Fog
       # Real class for DNS Request
       class Real
         def delete_zone(resource_group, name)
-          Fog::Logger.debug "Deleting Zone #{name} ..."
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones/#{name}?api-version=2015-05-04-preview"
+          msg = "Deleting Zone #{name} from Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            RestClient.delete(
-              resource_url,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-            Fog::Logger.debug "Zone #{name} deleted successfully."
-            true
-          rescue Exception => e
-            Fog::Logger.warning "Exception deleting zone #{name} from resource group #{resource_group}"
-            msg = "AzureDns::Zone - Exception is: #{e.message}"
-            raise msg
+            @dns_client.zones.delete(resource_group, name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Zone #{name} Deleted Successfully."
+          true
         end
       end
 
       # Mock class for DNS Request
       class Mock
-        def delete_zone(_resource_group, name)
-          Fog::Logger.debug "Zone #{name} deleted successfully."
+        def delete_zone(*)
+          Fog::Logger.debug 'Zone deleted successfully.'
           true
         end
       end

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

@@ -4,39 +4,30 @@ module Fog
       # Real class for DNS Request
       class Real
         def get_record_set(resource_group, name, zone_name, record_type)
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones/#{zone_name}/#{record_type}/#{name}?api-version=2015-05-04-preview"
-          Fog::Logger.debug "Getting a RecordSet #{name} of type '#{record_type}' in zone #{zone_name}"
-
+          msg = "Getting Record Set #{name} from Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            dns_response = RestClient.get(
-              resource_url,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-          rescue Exception => e
-            Fog::Logger.warning "Exception trying to get existing #{record_type} records for the record set: #{name}"
-            msg = "AzureDns::RecordSet - Exception is: #{e.message}"
-            raise msg
+            record_set = @dns_client.record_sets.get(resource_group, zone_name, name, record_type)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
-          JSON.parse(dns_response)
+          record_set
         end
       end
 
       # Mock class for DNS Request
       class Mock
-        def get_record_set(resource_group, name, zone_name, record_type)
+        def get_record_set(*)
           {
-            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnszones/#{zone_name}/#{record_type}/#{name}",
-            'name' => name,
-            'type' => "Microsoft.Network/dnszones/#{record_type}",
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/resource_group/providers/Microsoft.Network/dnszones/zone_name/record_type/name',
+            'name' => 'name',
+            'type' => 'Microsoft.Network/dnszones/record_type',
             'etag' => '3376a38f-a53f-4ed0-a2e7-dfaba67dbb40',
             'location' => 'global',
             'properties' =>
               {
                 'metadata' => nil,
-                'fqdn' => "#{name}.#{zone_name}.",
+                'fqdn' => 'name.zone_name',
                 'TTL' => 60,
                 'ARecords' =>
                   [

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

@@ -4,53 +4,27 @@ module Fog
       # Real class for DNS Request
       class Real
         def get_records_from_record_set(resource_group, name, zone_name, record_type)
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones/#{zone_name}/#{record_type}/#{name}?api-version=2015-05-04-preview"
-          Fog::Logger.debug "Getting all records from RecordSet #{name} of type '#{record_type}' in zone #{zone_name}"
-
-          existing_records = []
+          msg = "Getting all records from RecordSet #{name} of type '#{record_type}' in zone #{zone_name}"
+          Fog::Logger.debug msg
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            dns_response = RestClient.get(
-              resource_url,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-          rescue Exception => e
-            Fog::Logger.warning "Exception trying to get existing #{record_type} records for the record set: #{name}"
-            msg = "AzureDns::RecordSet - Exception is: #{e.message}"
-            raise msg
+            record_set = @dns_client.record_sets.get(resource_group, zone_name, name, record_type)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
 
-          begin
-            dns_hash = JSON.parse(dns_response)
-            case record_type
-            when 'A'
-              dns_hash['properties']['ARecords'].each do |record|
-                Fog::Logger.debug "AzureDns:RecordSet - A record is: #{record}"
-                existing_records.push(record['ipv4Address'])
-              end
-            when 'CNAME'
-              Fog::Logger.debug "AzureDns:RecordSet - CNAME record is: #{dns_hash['properties']['CNAMERecord']['cname']}"
-              existing_records.push(dns_hash['properties']['CNAMERecord']['cname'])
-            end
-            existing_records
-          rescue Exception => e
-            Fog::Logger.warning "Exception trying to parse response: #{dns_response}"
-            msg = "AzureDns::RecordSet - Exception is: #{e.message}"
-            raise msg
+          case record_type
+          when 'A'
+            record_set.arecords
+          when 'CNAME'
+            record_set.cname_record
           end
         end
       end
 
       # Mock class for DNS Request
       class Mock
-        def get_records_from_record_set(_resource_group, _name, _zone_name, _record_type)
-          [
-            '1.2.3.4',
-            '1.2.3.5',
-            '1.2.3.6'
-          ]
+        def get_records_from_record_set(*)
+          %w(1.2.3.4 1.2.3.5 1.2.3.6)
         end
       end
     end

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

@@ -4,32 +4,23 @@ module Fog
       # Real class for DNS Request
       class Real
         def get_zone(resource_group, name)
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones/#{name}?api-version=2016-04-01"
-          Fog::Logger.debug "Getting a zone: #{name}"
-
+          msg = "Getting Zone #{name} from Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            dns_response = RestClient.get(
-              resource_url,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-          rescue Exception => e
-            Fog::Logger.warning "Exception trying to get existing zone: #{name}."
-            msg = "AzureDns::RecordSet - Exception is: #{e.message}"
-            raise msg
+            zone = @dns_client.zones.get(resource_group, name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
-          JSON.parse(dns_response)
+          zone
         end
       end
 
       # Mock class for DNS Request
       class Mock
-        def get_zone(resource_group, name)
+        def get_zone(*)
           {
-            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnszones/#{name}",
-            'name' => name,
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/resource_group/providers/Microsoft.Network/dnszones/zone_name',
+            'name' => 'zone_name',
             'type' => 'Microsoft.Network/dnszones',
             'etag' => '00000003-0000-0000-bd66-02b337a4d101',
             'location' => 'global',
@@ -39,9 +30,9 @@ module Fog
                 'maxNumberOfRecordSets' => 100_00,
                 'nameServers' => nil,
                 'numberOfRecordSets' => 2,
-                'parentResourceGroupName' => resource_group
+                'parentResourceGroupName' => 'resource_group'
               },
-            'resource_group' => resource_group
+            'resource_group' => 'resource_group'
           }
         end
       end

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

@@ -4,31 +4,23 @@ module Fog
       # Real class for DNS Request
       class Real
         def list_record_sets(resource_group, zone_name)
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones/#{zone_name}/recordsets?api-version=2015-05-04-preview"
+          msg = 'Getting list of Record sets.'
+          Fog::Logger.debug msg
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            dns_response = RestClient.get(
-              resource_url,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-            parsed_record_set = JSON.parse(dns_response)
-            parsed_record_set['value']
-          rescue Exception => e
-            Fog::Logger.warning "Exception listing recordsets in zone #{zone_name} in resource group #{resource_group}"
-            msg = "AzureDns::RecordSet - Exception is: #{e.message}"
-            raise msg
+            zones = @dns_client.record_sets.list_all_in_resource_group(resource_group, zone_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          zones
         end
       end
 
       # Mock class for DNS Request
       class Mock
-        def list_record_sets(resource_group, zone_name)
+        def list_record_sets(*)
           [
             {
-              'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnszones/#{zone_name}/A/test_record",
+              'id' => '/subscriptions/########-####-####-####-############/resourceGroups/resource_group/providers/Microsoft.Network/dnszones/zone_name/A/test_record',
               'name' => 'test_record',
               'type' => 'Microsoft.Network/dnszones/A',
               'etag' => '7f159cb1-653d-4920-bc03-153c700412a2',
@@ -36,7 +28,7 @@ module Fog
               'properties' =>
               {
                 'metadata' => nil,
-                'fqdn' => "test_record.#{zone_name}.",
+                'fqdn' => 'test_record.zone_name',
                 'TTL' => 60,
                 'ARecords' =>
                 [
@@ -47,7 +39,7 @@ module Fog
               }
             },
             {
-              'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnszones/#{zone_name}/CNAME/test_record1",
+              'id' => '/subscriptions/########-####-####-####-############/resourceGroups/resource_group/providers/Microsoft.Network/dnszones/zone_name/CNAME/test_record1',
               'name' => 'test_record1',
               'type' => 'Microsoft.Network/dnszones/CNAME',
               'etag' => 'cc5ceb6e-16ad-4a5f-bbd7-9bc31c12d0cf',
@@ -55,7 +47,7 @@ module Fog
               'properties' =>
               {
                 'metadata' => nil,
-                'fqdn' => "test_record1.#{zone_name}.",
+                'fqdn' => 'test_record1.zone_name',
                 'TTL' => 60,
                 'CNAMERecord' =>
                 {

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

@@ -4,34 +4,27 @@ module Fog
       # Real class for DNS Request
       class Real
         def list_zones
-          zone_hash_array = []
-          @resources.resource_groups.each do |rg|
-            list_zones_by_rg(rg.name).each do |zone_hash|
-              zone_hash_array << zone_hash
-            end
+          msg = 'Getting list of Zones.'
+          Fog::Logger.debug msg
+          begin
+            zones = @dns_client.zones.list_in_subscription
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
-          zone_hash_array
+          zones
         end
 
         private
 
         def list_zones_by_rg(resource_group)
-          resource_url = "#{AZURE_RESOURCE}/subscriptions/#{@subscription_id}/resourceGroups/#{resource_group}/providers/Microsoft.Network/dnsZones?api-version=2015-05-04-preview"
+          msg = "Getting list of Zones in Resource Group #{resource_group}."
+          Fog::Logger.debug msg
           begin
-            token = Fog::Credentials::AzureRM.get_token(@tenant_id, @client_id, @client_secret)
-            dns_response = RestClient.get(
-              resource_url,
-              accept: 'application/json',
-              content_type: 'application/json',
-              authorization: token
-            )
-            parsed_zone = JSON.parse(dns_response)
-            parsed_zone['value']
-          rescue Exception => e
-            Fog::Logger.warning "Exception listing zones in resource group #{resource_group}"
-            msg = "AzureDns::RecordSet - Exception is: #{e.message}"
-            raise msg
+            zones = @dns_client.zones.list_in_resource_group(resource_group)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          zones
         end
       end
 
@@ -50,12 +43,7 @@ module Fog
               {
                 'maxNumberOfRecordSets' => 5000,
                 'nameServers' =>
-                  [
-                    'ns1-05.azure-dns.com.',
-                    'ns2-05.azure-dns.net.',
-                    'ns3-05.azure-dns.org.',
-                    'ns4-05.azure-dns.info.'
-                  ],
+                  %w(ns1-05.azure-dns.com. ns2-05.azure-dns.net. ns3-05.azure-dns.org. ns4-05.azure-dns.info.),
                 'numberOfRecordSets' => 2,
                 'parentResourceGroupName' => 'fog_test_rg'
               }
@@ -71,12 +59,7 @@ module Fog
               {
                 'maxNumberOfRecordSets' => 5000,
                 'nameServers' =>
-                [
-                  'ns1-02.azure-dns.com.',
-                  'ns2-02.azure-dns.net.',
-                  'ns3-02.azure-dns.org.',
-                  'ns4-02.azure-dns.info.'
-                ],
+                  %w(ns1-02.azure-dns.com. ns2-02.azure-dns.net. ns3-02.azure-dns.org. ns4-02.azure-dns.info.),
                 'numberOfRecordSets' => 2,
                 'parentResourceGroupName' => 'fog_test_rg'
               }

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

@@ -4,7 +4,9 @@ module Fog
       # Real class for Express Route Circuit Authorization Request
       class Real
         def create_or_update_express_route_circuit_authorization(circuit_authorization_params)
-          msg = "Creating/updating Express Route Circuit Authorization #{circuit_authorization_params[:authorization_name]} in Resource Group: #{circuit_authorization_params[:resource_group]}."
+          msg = @logger_messages['network']['express_route_circuit_authentication']['message']['create']
+                .gsub('NAME', circuit_authorization_params[:authorization_name])
+                .gsub('RESOURCE_GROUP', circuit_authorization_params[:resource_group])
           Fog::Logger.debug msg
           circuit_authorization = get_circuit_authorization_object(circuit_authorization_params)
           begin
@@ -22,7 +24,7 @@ module Fog
           circuit_authorization = Azure::ARM::Network::Models::ExpressRouteCircuitAuthorization.new
           circuit_authorization.name = circuit_authorization_params[:authorization_name]
           circuit_authorization.authorization_key = circuit_authorization_params[:authorization_key]
-          circuit_authorization.authorization_use_status = circuit_authorization_params[:authorization_status]
+          circuit_authorization.authorization_use_status = circuit_authorization_params[:authorization_use_status]
           circuit_authorization.provisioning_state = circuit_authorization_params[:provisioning_state]
           circuit_authorization.etag = circuit_authorization_params[:etag]
 

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

@@ -4,7 +4,9 @@ module Fog
       # Real class for Local Network Gateway Request
       class Real
         def create_or_update_local_network_gateway(local_network_gateway_params)
-          msg = "Creating/Updating Local Network Gateway: #{local_network_gateway_params[:name]} in Resource Group: #{local_network_gateway_params[:resource_group]}."
+          msg = @logger_messages['network']['local_network_gateway']['message']['create']
+                .gsub('NAME', local_network_gateway_params[:name])
+                .gsub('RESOURCE_GROUP', local_network_gateway_params[:resource_group])
           Fog::Logger.debug msg
           local_network_gateway = get_local_network_gateway_object(local_network_gateway_params)
           begin

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

@@ -5,7 +5,9 @@ module Fog
       # Real class for Network Request
       class Real
         def create_or_update_virtual_network_gateway_connection(gateway_connection_params)
-          msg = "Creating/Updating Virtual Network Gateway Connection: #{gateway_connection_params[:name]} in Resource Group: #{gateway_connection_params[:resource_group_name]}."
+          msg = @logger_messages['network']['virtual_network_gateway_connection']['message']['create']
+                .gsub('NAME', gateway_connection_params[:name])
+                .gsub('RESOURCE_GROUP', gateway_connection_params[:resource_group_name])
           Fog::Logger.debug msg
           gateway_connection = get_network_gateway_connection_object(gateway_connection_params)
           begin

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

@@ -4,7 +4,8 @@ module Fog
       # Real class for Express Route Circuit Authorization Request
       class Real
         def delete_express_route_circuit_authorization(resource_group_name, circuit_name, authorization_name)
-          msg = "Deleting Express Route Circuit Authorization #{authorization_name} from Resource Group #{resource_group_name}."
+          msg = @logger_messages['network']['express_route_circuit_authentication']['message']['delete']
+                .gsub('NAME', authorization_name).gsub('RESOURCE_GROUP', resource_group_name)
           Fog::Logger.debug msg
           begin
             @network_client.express_route_circuit_authorizations.delete(resource_group_name, circuit_name, authorization_name)

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

@@ -4,7 +4,8 @@ module Fog
       # Real class for Local Network Gateway Request
       class Real
         def delete_local_network_gateway(resource_group_name, local_network_gateway_name)
-          msg = "Deleting Local Network Gateway: #{local_network_gateway_name}"
+          msg = @logger_messages['network']['local_network_gateway']['message']['delete']
+                .gsub('NAME', local_network_gateway_name).gsub('RESOURCE_GROUP', resource_group_name)
           Fog::Logger.debug msg
           begin
             @network_client.local_network_gateways.delete(resource_group_name, local_network_gateway_name)

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

@@ -4,7 +4,8 @@ module Fog
       # Real class for Network Request
       class Real
         def delete_virtual_network_gateway_connection(resource_group_name, gateway_connection_name)
-          msg = "Deleting Virtual Network Gateway Connection #{gateway_connection_name} from Resource Group #{resource_group_name}."
+          msg = @logger_messages['network']['virtual_network_gateway_connection']['message']['delete']
+                .gsub('NAME', gateway_connection_name).gsub('RESOURCE_GROUP', resource_group_name)
           Fog::Logger.debug msg
           begin
             @network_client.virtual_network_gateway_connections.delete(resource_group_name, gateway_connection_name)

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

@@ -4,7 +4,8 @@ module Fog
       # Real class for Express Route Circuit Authorization Request
       class Real
         def get_express_route_circuit_authorization(resource_group_name, circuit_name, authorization_name)
-          msg = "Getting Express Route Circuit Authorization #{authorization_name} from Resource Group #{resource_group_name}."
+          msg = @logger_messages['network']['express_route_circuit_authentication']['message']['get']
+                .gsub('NAME', authorization_name).gsub('RESOURCE_GROUP', resource_group_name)
           Fog::Logger.debug msg
           begin
             circuit_authorization = @network_client.express_route_circuit_authorizations.get(resource_group_name, circuit_name, authorization_name)

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

@@ -14,10 +14,12 @@ module Fog
           Fog::Logger.debug "Getting Load Balancer #{load_balancer_name} Successfully."
           load_balancer
         end
-        # Mock class for Load-Balancer Request
-        class Mock
-          def get_load_balancer(*)
-            response = '{
+      end
+
+      # Mock class for Load-Balancer Request
+      class Mock
+        def get_load_balancer(*)
+          response = '{
             "name":"mylb1",
             "id":"/subscriptions/{guid}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/mylb1",
             "location":"North US",
@@ -159,9 +161,8 @@ module Fog
               ]
             }
           }'
-            load_balancer_mapper = Azure::ARM::Network::Models::LoadBalancer.mapper
-            @network_client.deserialize(load_balancer_mapper, JSON.load(response), 'result.body')
-          end
+          load_balancer_mapper = Azure::ARM::Network::Models::LoadBalancer.mapper
+          @network_client.deserialize(load_balancer_mapper, JSON.load(response), 'result.body')
         end
       end
     end

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

@@ -4,7 +4,8 @@ module Fog
       # Real class for Local Network Gateway Request
       class Real
         def get_local_network_gateway(resource_group_name, local_network_gateway_name)
-          msg = "Getting Local Network Gateway #{local_network_gateway_name} from Resource Group #{resource_group_name}."
+          msg = @logger_messages['network']['local_network_gateway']['message']['get']
+                .gsub('NAME', local_network_gateway_name).gsub('RESOURCE_GROUP', resource_group_name)
           Fog::Logger.debug msg
           begin
             local_network_gateway = @network_client.local_network_gateways.get(resource_group_name, local_network_gateway_name)

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

@@ -4,7 +4,8 @@ module Fog
       # Real class for Virtual Network Gateway Connection Request
       class Real
         def get_virtual_network_gateway_connection(resource_group_name, gateway_connection_name)
-          msg = "Getting Virtual Network Gateway Connection #{gateway_connection_name} from Resource Group #{resource_group_name}."
+          msg = @logger_messages['network']['virtual_network_gateway_connection']['message']['get']
+                .gsub('NAME', gateway_connection_name).gsub('RESOURCE_GROUP', resource_group_name)
           Fog::Logger.debug msg
           begin
             gateway_connection = @network_client.virtual_network_gateway_connections.get(resource_group_name, gateway_connection_name)

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

@@ -4,7 +4,8 @@ module Fog
       # Real class for Express Route Circuit Authorization Request
       class Real
         def list_express_route_circuit_authorizations(resource_group_name, circuit_name)
-          msg = "Getting list of Express Route Circuit Authorizations from Resource Group #{resource_group_name}."
+          msg = @logger_messages['network']['express_route_circuit_authentication']['message']['list']
+                .gsub('RESOURCE_GROUP', resource_group_name)
           Fog::Logger.debug msg
           begin
             circuit_authorizations = @network_client.express_route_circuit_authorizations.list(resource_group_name, circuit_name)