fog-azure-rm 0.3.3 → 0.3.4

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])

data/lib/fog/azurerm/requests/resources/check_azure_resource_exists.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def check_azure_resource_exists(resource_id, api_version)
+        def check_azure_resource_exists(resource_id, api_version = API_VERSION)
           split_resource = resource_id.split('/') unless resource_id.nil?
           raise 'Invalid Resource Id' if split_resource.count != 9
 

data/lib/fog/azurerm/requests/resources/create_resource_group.rb

@@ -3,11 +3,12 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def create_resource_group(name, location)
+        def create_resource_group(name, location, tags)
           msg = "Creating Resource Group: #{name}."
           Fog::Logger.debug msg
           resource_group = Azure::ARM::Resources::Models::ResourceGroup.new
           resource_group.location = location
+          resource_group.tags = tags
           begin
             resource_group = @rmc.resource_groups.create_or_update(name, resource_group)
           rescue  MsRestAzure::AzureOperationError => e

data/lib/fog/azurerm/requests/resources/delete_resource_tag.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def delete_resource_tag(resource_id, tag_name, tag_value)
+        def delete_resource_tag(resource_id, tag_name, tag_value, api_version = API_VERSION)
           split_resource = resource_id.split('/') unless resource_id.nil?
           if split_resource.count != 9
             raise 'Invalid Resource Id'
@@ -18,12 +18,12 @@ module Fog
           Fog::Logger.debug msg
 
           begin
-            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, API_VERSION)
+            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, api_version)
 
             if resource.tags.key?(tag_name)
               resource.tags.delete_if { |key, value| key == tag_name && value == tag_value }
             end
-            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, API_VERSION, resource)
+            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, '', resource_type, resource_name, api_version, resource)
           rescue  MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -34,7 +34,7 @@ module Fog
 
       # This class provides the mock implementation for unit tests.
       class Mock
-        def delete_resource_tag(_resource_id, tag_name, _tag_value)
+        def delete_resource_tag(_resource_id, tag_name, _tag_value, _api_version)
           Fog::Logger.debug "Tag #{tag_name} deleted successfully from Resource your-resource-name"
           true
         end

data/lib/fog/azurerm/requests/resources/tag_resource.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def tag_resource(resource_id, tag_name, tag_value)
+        def tag_resource(resource_id, tag_name, tag_value, api_version = API_VERSION)
           split_resource = resource_id.split('/') unless resource_id.nil?
           if split_resource.count != 9
             raise 'Invalid Resource Id'
@@ -19,10 +19,10 @@ module Fog
           Fog::Logger.debug msg
 
           begin
-            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, API_VERSION)
+            resource = @rmc.resources.get(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version)
             resource.tags = {} if resource.tags.nil?
             resource.tags[tag_name] = tag_value
-            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, API_VERSION, resource)
+            @rmc.resources.create_or_update(resource_group_name, resource_provider_namespace, parent_resource_id, resource_type, resource_name, api_version, resource)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -33,7 +33,7 @@ module Fog
 
       # This class provides the mock implementation for unit tests.
       class Mock
-        def tag_resource(_resource_id, tag_name, _tag_value)
+        def tag_resource(_resource_id, tag_name, _tag_value, _api_version)
           Fog::Logger.debug "Tag #{tag_name} created successfully for Resource 'resource_name'"
           true
         end

data/lib/fog/azurerm/requests/sql/create_or_update_database.rb

@@ -6,19 +6,21 @@ module Fog
         def create_or_update_database(database_hash)
           msg = "Creating SQL Database: #{database_hash[:name]}."
           Fog::Logger.debug msg
+          formatted_database_params = format_database_parameters(database_hash[:location],
+                                                                 database_hash[:create_mode],
+                                                                 database_hash[:edition],
+                                                                 database_hash[:source_database_id],
+                                                                 database_hash[:collation],
+                                                                 database_hash[:max_size_bytes],
+                                                                 database_hash[:requested_service_objective_name],
+                                                                 database_hash[:elastic_pool_name],
+                                                                 database_hash[:requested_service_objective_id],
+                                                                 database_hash[:tags])
           begin
             sql_database = @sql_mgmt_client.databases.create_or_update(database_hash[:resource_group],
                                                                        database_hash[:server_name],
                                                                        database_hash[:name],
-                                                                       format_database_parameters(database_hash[:location],
-                                                                                                  database_hash[:create_mode],
-                                                                                                  database_hash[:edition],
-                                                                                                  database_hash[:source_database_id],
-                                                                                                  database_hash[:collation],
-                                                                                                  database_hash[:max_size_bytes],
-                                                                                                  database_hash[:requested_service_objective_name],
-                                                                                                  database_hash[:elastic_pool_name],
-                                                                                                  database_hash[:requested_service_objective_id]))
+                                                                       formatted_database_params)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -28,7 +30,7 @@ module Fog
 
         private
 
-        def format_database_parameters(location, create_mode, edition, source_database_id, collation, max_size_bytes, requested_service_objective_name, elastic_pool_name, requested_service_objective_id)
+        def format_database_parameters(location, create_mode, edition, source_database_id, collation, max_size_bytes, requested_service_objective_name, elastic_pool_name, requested_service_objective_id, tags)
           database = Azure::ARM::SQL::Models::Database.new
           database.location = location
           database.edition = edition unless edition.nil?
@@ -39,6 +41,7 @@ module Fog
           database.source_database_id = source_database_id unless source_database_id.nil?
           database.requested_service_objective_id = requested_service_objective_id unless requested_service_objective_id.nil?
           database.requested_service_objective_name = requested_service_objective_name unless requested_service_objective_name.nil?
+          database.tags = tags
           database
         end
       end

data/lib/fog/azurerm/requests/sql/create_or_update_sql_server.rb

@@ -6,13 +6,15 @@ module Fog
         def create_or_update_sql_server(server_hash)
           msg = "Creating SQL Server: #{server_hash[:name]}."
           Fog::Logger.debug msg
+          formatted_server_params = format_server_parameters(server_hash[:location],
+                                                             server_hash[:version],
+                                                             server_hash[:administrator_login],
+                                                             server_hash[:administrator_login_password],
+                                                             server_hash[:tags])
           begin
             sql_server = @sql_mgmt_client.servers.create_or_update(server_hash[:resource_group],
                                                                    server_hash[:name],
-                                                                   format_server_parameters(server_hash[:location],
-                                                                                            server_hash[:version],
-                                                                                            server_hash[:administrator_login],
-                                                                                            server_hash[:administrator_login_password]))
+                                                                   formatted_server_params)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -22,12 +24,13 @@ module Fog
 
         private
 
-        def format_server_parameters(location, version, admin_login, admin_password)
+        def format_server_parameters(location, version, admin_login, admin_password, tags)
           server = Azure::ARM::SQL::Models::Server.new
           server.version = version
           server.location = location
           server.administrator_login = admin_login
           server.administrator_login_password = admin_password
+          server.tags = tags
           server
         end
       end

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

@@ -9,7 +9,8 @@ module Fog
           storage_account_params = get_storage_account_params(storage_account_hash[:sku_name],
                                                               storage_account_hash[:location],
                                                               storage_account_hash[:replication],
-                                                              storage_account_hash[:encryption])
+                                                              storage_account_hash[:encryption],
+                                                              storage_account_hash[:tags])
           begin
             storage_account = @storage_mgmt_client.storage_accounts.create(storage_account_hash[:resource_group],
                                                                            storage_account_hash[:name],
@@ -23,7 +24,7 @@ module Fog
 
         private
 
-        def get_storage_account_params(sku_name, location, replication, encryption_enabled)
+        def get_storage_account_params(sku_name, location, replication, encryption_enabled, tags)
           params = Azure::ARM::Storage::Models::StorageAccountCreateParameters.new
           sku = Azure::ARM::Storage::Models::Sku.new
           sku.name = "#{sku_name}_#{replication}"
@@ -40,6 +41,7 @@ module Fog
             encryption.services = encryption_services
             params.encryption = encryption
           end
+          params.tags = tags
           params
         end
       end

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

@@ -6,9 +6,18 @@ 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_hash[:endpoints])
+          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],
+                                                  profile_hash[:tags])
           begin
-            traffic_manager_profile = @traffic_mgmt_client.profiles.create_or_update(profile_hash[:resource_group], profile_hash[:name], profile_parameters)
+            traffic_manager_profile = @traffic_mgmt_client.profiles.create_or_update(profile_hash[:resource_group],
+                                                                                     profile_hash[:name],
+                                                                                     profile_parameters)
           rescue MsRestAzure::AzureOperationError => e
             raise_azure_exception(e, msg)
           end
@@ -18,7 +27,7 @@ module Fog
 
         private
 
-        def get_profile_object(traffic_routing_method, relative_name, ttl, protocol, port, path, endpoints)
+        def get_profile_object(traffic_routing_method, relative_name, ttl, protocol, port, path, endpoints, tags)
           traffic_manager_profile = Azure::ARM::TrafficManager::Models::Profile.new
           traffic_manager_profile.traffic_routing_method = traffic_routing_method
           traffic_manager_profile.location = GLOBAL
@@ -26,6 +35,7 @@ module Fog
           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.tags = tags
           traffic_manager_profile
         end
 

data/lib/fog/azurerm/storage.rb

@@ -64,32 +64,13 @@ module Fog
       request :save_page_blob
       request :multipart_save_block_blob
 
-      # Azure Recovery Vault requests
-      request :create_or_update_recovery_vault
-      request :get_recovery_vault
-      request :list_recovery_vaults
-      request :delete_recovery_vault
-      request :enable_backup_protection
-      request :set_recovery_vault_context
-      request :get_backup_protection_policy
-      request :start_backup
-      request :get_backup_item
-      request :get_backup_container
-      request :disable_backup_protection
-      request :get_all_backup_jobs
-      request :get_all_backup_jobs
-      request :get_backup_job_for_vm
-
       model_path 'fog/azurerm/models/storage'
       model :storage_account
       collection :storage_accounts
-      model :data_disk
       model :directory
       collection :directories
       model :file
       collection :files
-      model :recovery_vault
-      collection :recovery_vaults
 
       # 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.3.3'.freeze
+    VERSION = '0.3.4'.freeze
   end
 end

data/test/api_stub.rb

@@ -18,7 +18,6 @@ module ApiStub
       autoload :StorageAccount, File.expand_path('api_stub/models/storage/storageaccount', __dir__)
       autoload :File, ::File.expand_path('api_stub/models/storage/file', __dir__)
       autoload :Directory, ::File.expand_path('api_stub/models/storage/directory', __dir__)
-      autoload :RecoveryVault, ::File.expand_path('api_stub/models/storage/recovery_vault', __dir__)
     end
 
     module Network
@@ -81,7 +80,6 @@ module ApiStub
       autoload :StorageAccount, File.expand_path('api_stub/requests/storage/storageaccount', __dir__)
       autoload :File, ::File.expand_path('api_stub/requests/storage/file', __dir__)
       autoload :Directory, ::File.expand_path('api_stub/requests/storage/directory', __dir__)
-      autoload :RecoveryVault, ::File.expand_path('api_stub/requests/storage/recovery_vault', __dir__)
     end
 
     module Network

data/test/api_stub/models/compute/server.rb

@@ -124,6 +124,68 @@ module ApiStub
           compute_client.deserialize(vm_mapper, Fog::JSON.decode(body), 'result.body').value
         end
 
+        def self.attach_managed_disk_response(compute_client)
+          body = {
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Compute/virtualMachines/fog-test-server',
+            'name' => 'fog-test-server',
+            'location' => 'West US',
+            'properties' => {
+              'hardwareProfile' => {
+                'vmSize' => 'Basic_A0'
+              },
+              'storageProfile' => {
+                'imageReference' => {
+                  'publisher' => 'Canonical',
+                  'offer' => 'UbuntuServer',
+                  'sku' => '14.04.2-LTS',
+                  'version' => 'latest'
+                },
+                'osDisk' => {
+                  'name' => 'fog-test-server_os_disk',
+                  'vhd' => {
+                    'uri' => 'http://storageAccount.blob.core.windows.net/vhds/fog-test-server_os_disk.vhd'
+                  }
+                },
+                'dataDisks' => [
+                  {
+                    'name' => 'disk1',
+                    'diskSizeGB' => '10',
+                    'lun' => 0,
+                    'vhd' => {
+                      'uri' => 'http://mystorage1.blob.core.windows.net/vhds/disk1.vhd'
+                    }
+                  },
+                  {
+                    'lun' => 1, # add new managed datadisk
+                    'name' => 'datadisk2',
+                    'managedDisk' => {
+                      'id' => '/subscriptions/{subscription-id}/resourceGroups/myresourcegroup1/providers/Microsoft.Compute/disks/myDisk2',
+                      'storageAccountType' => 'Standard_LRS'
+                    },
+                    'createOption' => 'attach'
+                  }
+                ]
+              },
+              'osProfile' => {
+                'computerName' => 'fog-test-server',
+                'adminUsername' => 'shaffan',
+                'linuxConfiguration' => {
+                  'disablePasswordAuthentication' => false
+                }
+              },
+              'networkProfile' => {
+                'networkInterfaces' => [
+                  {
+                    'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkInterfaces/fogtestnetworkinterface'
+                  }
+                ]
+              }
+            }
+          }
+          vm_mapper = Azure::ARM::Compute::Models::VirtualMachine.mapper
+          compute_client.deserialize(vm_mapper, body, 'result.body')
+        end
+
         def self.attach_data_disk_response(compute_client)
           body = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Compute/virtualMachines/fog-test-server',