fog-azure-rm-temp 0.0.4 → 0.0.5

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class AzureRM
+      # This class provides the actual implementation for service calls.
+      class Real
+        def delete_image(resource_group, vm_name)
+          msg = "Deleting Image: #{vm_name}-osImage"
+          Fog::Logger.debug msg
+          image_name = "#{vm_name}-osImage"
+          begin
+            @compute_mgmt_client.images.delete(resource_group, image_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Image #{image_name} deleted successfully."
+          true
+        end
+      end
+
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def delete_image(*)
+          Fog::Logger.debug 'Image fog-test-server-osImage from Resource group fog-test-rg deleted successfully.'
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+module Fog
+  module Compute
+    class AzureRM
+      # Real class for Compute Request
+      class Real
+        def get_image(resource_group_name, image_name)
+          msg = "Getting Image #{image_name} in Resource Group #{resource_group_name}"
+          Fog::Logger.debug msg
+          begin
+            image = @compute_mgmt_client.images.get(resource_group_name, image_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "#{msg} successful"
+          image
+        end
+      end
+
+      # Mock class for Compute Request
+      class Mock
+        def get_image(*)
+          body = {
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/TestRG/providers/Microsoft.Compute/images/TestImage',
+            'name' => 'TestImage',
+            'resource_group' => 'TestRG',
+            'location' => 'West US',
+            'storage_profile' => {
+              'os_disk' => {
+                'os_type' => 'Linux',
+                'os_state' => 'Generalized',
+                'blob_uri' => 'https://myblob.blob.core.windows.net/images/testimage.vhd',
+                'caching' => 'ReadWrite',
+                'disk_size_gb' => '5'
+              },
+              'data_disks' => []
+            },
+            'provisioning_state' => 'Succeeded'
+          }
+          image_mapper = Azure::ARM::Compute::Models::Image.mapper
+          @compute_mgmt_client.deserialize(image_mapper, body, 'result.body')
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+INSTANCE_VIEW = 'instanceView'.freeze
+
 module Fog
   module Compute
     class AzureRM
@@ -8,9 +10,9 @@ module Fog
           Fog::Logger.debug msg
           begin
             if async
-              response = @compute_mgmt_client.virtual_machines.get_async(resource_group, name)
+              response = @compute_mgmt_client.virtual_machines.get_async(resource_group, name, INSTANCE_VIEW)
             else
-              response = @compute_mgmt_client.virtual_machines.get(resource_group, name)
+              response = @compute_mgmt_client.virtual_machines.get(resource_group, name, INSTANCE_VIEW)
             end
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Record set #{name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['code'] == 'NotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Record set #{name} doesn't exist."
               false
             else

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

@@ -9,8 +9,9 @@ module Fog
           begin
             zone = @dns_client.zones.get(resource_group, name)
           rescue MsRestAzure::AzureOperationError => e
-            if !e.body['error'].nil? && e.body['error']['code'] == ERROR_CODE_RESOURCE_NOT_FOUND
-              zone = nil
+            if resource_not_found?(e)
+              Fog::Logger.debug "Zone #{name} doesn't exist."
+              return false
             else
               raise_azure_exception(e, msg)
             end

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/requests/dns/create_or_update_zone.rb

@@ -25,9 +25,8 @@ module Fog
           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.tags = zone_params[:tags]
           zone.etag = zone_params[:etag]
-
           zone
         end
       end

data/lib/fog/azurerm/requests/key_vault/check_vault_exists.rb

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Vault #{vault_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Vault #{vault_name} doesn't exist."
               false
             else

data/lib/fog/azurerm/requests/key_vault/create_or_update_vault.rb

@@ -21,6 +21,7 @@ module Fog
         def get_vault_param_object(vault_hash)
           vault_param = Azure::ARM::KeyVault::Models::VaultCreateOrUpdateParameters.new
           vault_param.location = vault_hash[:location]
+          vault_param.tags = vault_hash[:tags]
           vault_param.properties = get_vault_properties_object(vault_hash)
           vault_param
         end

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Express Route Circuit Authorization #{authorization_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Express Route Circuit Authorization #{authorization_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Express Route Circuit #{circuit_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Express Route Circuit #{circuit_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Load Balancer #{load_balancer_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Load Balancer #{load_balancer_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Local Network Gateway #{local_network_gateway_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Local Network Gateway #{local_network_gateway_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Network Security Group #{security_group_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Network Security Group #{security_group_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Network Security Rule #{security_rule_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if !e.body['error'].nil? && (e.body['error']['code'] == ERROR_CODE_RESOURCE_NOT_FOUND || e.body['error']['code'] == ERROR_CODE_NOT_FOUND)
+            if resource_not_found?(e)
               Fog::Logger.debug "Network Security Rule #{security_rule_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Network Interface #{nic_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Network Interface #{nic_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Public IP #{name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Public IP #{name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Subnet #{subnet_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if !e.body['error'].nil? && (e.body['error']['code'] == ERROR_CODE_RESOURCE_NOT_FOUND || e.body['error']['code'] == ERROR_CODE_NOT_FOUND)
+            if resource_not_found?(e)
               Fog::Logger.debug "Subnet #{subnet_name} doesn't exist."
               false
             else

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.error_code == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Virtual Network #{name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Virtual Network Gateway Connection #{gateway_connection_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Virtual Network Gateway Connection #{gateway_connection_name} doesn't exist."
               false
             else

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

@@ -11,7 +11,7 @@ module Fog
             Fog::Logger.debug "Virtual Network Gateway #{network_gateway_name} exists."
             true
           rescue MsRestAzure::AzureOperationError => e
-            if e.body['error']['code'] == 'ResourceNotFound'
+            if resource_not_found?(e)
               Fog::Logger.debug "Virtual Network Gateway #{network_gateway_name} doesn't exist."
               false
             else

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

@@ -3,10 +3,10 @@ module Fog
     class AzureRM
       # Real class for Load-Balancer Request
       class Real
-        def create_load_balancer(name, location, resource_group, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
+        def create_load_balancer(name, location, resource_group, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools, tags)
           msg = "Creating Load-Balancer: #{name}"
           Fog::Logger.debug msg
-          load_balancer = define_load_balancer(name, location, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
+          load_balancer = define_load_balancer(name, location, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools, tags)
           begin
             load_balancer = @network_client.load_balancers.create_or_update(resource_group, name, load_balancer)
           rescue MsRestAzure::AzureOperationError => e
@@ -18,11 +18,11 @@ module Fog
 
         private
 
-        def define_load_balancer(name, location, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
+        def define_load_balancer(name, location, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools, tags)
           load_balancer = Azure::ARM::Network::Models::LoadBalancer.new
           load_balancer.name = name
           load_balancer.location = location
-
+          load_balancer.tags = tags
           if frontend_ip_configurations
             frontend_ip_configuration_arr = define_lb_frontend_ip_configurations(frontend_ip_configurations)
             load_balancer.frontend_ipconfigurations = frontend_ip_configuration_arr

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

@@ -47,7 +47,7 @@ module Fog
           express_route_circuit.name = circuit_name
           express_route_circuit.location = location
           express_route_circuit.sku = sku
-          express_route_circuit.tags = tags if express_route_circuit.tags.nil?
+          express_route_circuit.tags = tags
           express_route_circuit
         end
 

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

@@ -25,13 +25,12 @@ module Fog
           local_network_gateway.local_network_address_space = get_local_network_address_space_object(local_network_gateway_params[:local_network_address_space_prefixes]) if local_network_gateway_params[:local_network_address_space_prefixes]
           local_network_gateway.gateway_ip_address = local_network_gateway_params[:gateway_ip_address] if local_network_gateway_params[:gateway_ip_address]
           local_network_gateway.bgp_settings = get_bgp_settings_object(local_network_gateway_params)
-
           local_network_gateway.name = local_network_gateway_params[:name]
           local_network_gateway.type = local_network_gateway_params[:type]
           local_network_gateway.location = local_network_gateway_params[:location]
           local_network_gateway.tags = local_network_gateway_params[:tags] if local_network_gateway.tags.nil?
           local_network_gateway.provisioning_state = local_network_gateway_params[:provisioning_state]
-
+          local_network_gateway.tags = local_network_gateway_params[:tags]
           local_network_gateway
         end
 

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

@@ -4,10 +4,10 @@ module Fog
     class AzureRM
       # Real class for Network Request
       class Real
-        def create_or_update_network_interface(resource_group_name, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+        def create_or_update_network_interface(resource_group_name, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids, tags)
           msg = "Creating/Updating Network Interface Card: #{name}"
           Fog::Logger.debug msg
-          network_interface = get_network_interface_object(name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+          network_interface = get_network_interface_object(name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids, tags)
           begin
             network_interface_obj = @network_client.network_interfaces.create_or_update(resource_group_name, name, network_interface)
           rescue MsRestAzure::AzureOperationError => e
@@ -19,7 +19,7 @@ module Fog
 
         private
 
-        def get_network_interface_object(name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+        def get_network_interface_object(name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids, tags)
           if public_ip_address_id
             public_ipaddress = Azure::ARM::Network::Models::PublicIPAddress.new
             public_ipaddress.id = public_ip_address_id
@@ -59,6 +59,7 @@ module Fog
           network_interface.name = name
           network_interface.location = location
           network_interface.ip_configurations = [ip_configs]
+          network_interface.tags = tags
 
           if network_security_group_id
             network_security_group = Azure::ARM::Network::Models::NetworkSecurityGroup.new

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

@@ -3,11 +3,11 @@ module Fog
     class AzureRM
       # Real class for Network Request
       class Real
-        def create_or_update_network_security_group(resource_group_name, security_group_name, location, security_rules)
+        def create_or_update_network_security_group(resource_group_name, security_group_name, location, security_rules, tags)
           msg = "Creating/Updating Network Security Group #{security_group_name} in Resource Group #{resource_group_name}."
           Fog::Logger.debug msg
 
-          security_group = get_security_group_object(security_rules, location)
+          security_group = get_security_group_object(security_rules, location, tags)
 
           begin
             security_group = @network_client.network_security_groups.begin_create_or_update(resource_group_name, security_group_name, security_group)
@@ -21,10 +21,11 @@ module Fog
 
         private
 
-        def get_security_group_object(security_rules, location)
+        def get_security_group_object(security_rules, location, tags)
           security_group = Azure::ARM::Network::Models::NetworkSecurityGroup.new
           security_group.security_rules = get_security_rule_objects(security_rules)
           security_group.location = location
+          security_group.tags = tags
           security_group
         end
 

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

@@ -3,10 +3,10 @@ module Fog
     class AzureRM
       # Real class for Network Request
       class Real
-        def create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label)
+        def create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label, tags)
           msg = "Creating/Updating PublicIP #{name} in Resource Group #{resource_group}."
           Fog::Logger.debug msg
-          public_ip = get_public_ip_object(name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label)
+          public_ip = get_public_ip_object(name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label, tags)
           begin
             public_ip_obj = @network_client.public_ipaddresses.create_or_update(resource_group, name, public_ip)
           rescue MsRestAzure::AzureOperationError => e
@@ -18,12 +18,14 @@ module Fog
 
         private
 
-        def get_public_ip_object(name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label)
+        def get_public_ip_object(name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label, tags)
           public_ip = Azure::ARM::Network::Models::PublicIPAddress.new
           public_ip.name = name
           public_ip.location = location
           public_ip.public_ipallocation_method = public_ip_allocation_method unless public_ip_allocation_method.nil?
           public_ip.idle_timeout_in_minutes = idle_timeout_in_minutes unless idle_timeout_in_minutes.nil?
+          public_ip.tags = tags
+
           unless domain_name_label.nil?
             public_ip.dns_settings = Azure::ARM::Network::Models::PublicIPAddressDnsSettings.new
             public_ip.dns_settings.domain_name_label = domain_name_label

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

@@ -3,8 +3,8 @@ module Fog
     class AzureRM
       # Real class for Network Request
       class Real
-        def create_or_update_virtual_network(resource_group_name, virtual_network_name, location, dns_servers, subnets, address_prefixes)
-          virtual_network = define_vnet_object(location, address_prefixes, dns_servers, subnets)
+        def create_or_update_virtual_network(resource_group_name, virtual_network_name, location, dns_servers, subnets, address_prefixes, tags)
+          virtual_network = define_vnet_object(location, address_prefixes, dns_servers, subnets, tags)
           create_or_update_vnet(resource_group_name, virtual_network_name, virtual_network)
         end
 
@@ -22,9 +22,10 @@ module Fog
           virtual_network
         end
 
-        def define_vnet_object(location, address_prefixes, dns_servers, subnets)
+        def define_vnet_object(location, address_prefixes, dns_servers, subnets, tags)
           virtual_network = Azure::ARM::Network::Models::VirtualNetwork.new
           virtual_network.location = location
+          virtual_network.tags = tags
 
           if address_prefixes.nil? || !address_prefixes.any?
             address_space = Azure::ARM::Network::Models::AddressSpace.new

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

@@ -26,7 +26,7 @@ module Fog
 
           gateway_connection.name = gateway_connection_params[:name]
           gateway_connection.location = gateway_connection_params[:location]
-          gateway_connection.tags = gateway_connection_params[:tags] if gateway_connection.tags.nil?
+          gateway_connection.tags = gateway_connection_params[:tags]
 
           if gateway_connection_params[:virtual_network_gateway1]
             gateway_connection.virtual_network_gateway1 = get_virtual_network_gateway(gateway_connection_params[:virtual_network_gateway1][:resource_group], gateway_connection_params[:virtual_network_gateway1][:name])