fog-azure-rm 0.3.3 → 0.3.4

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

@@ -15,11 +15,11 @@ Next, create a connection to the Traffic Manager Service:
 
 ```ruby
     azure_traffic_manager_service = Fog::TrafficManager::AzureRM.new(
-        tenant_id: '<Tenantid>',                                                            # Tenant id of Azure Active Directory Application
-        client_id:    '<Clientid>',                                                         # Client id of Azure Active Directory Application
-        client_secret: '<ClientSecret>',                                                    # Client Secret of Azure Active Directory Application
-        subscription_id: '<Subscriptionid>',                                                # Subscription id of an Azure Account
-        :environment => '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>'   # Azure cloud environment. Default is AzureCloud.
+      tenant_id:        '<Tenantid>',                                                       # Tenant id of Azure Active Directory Application
+      client_id:        '<Clientid>',                                                       # Client id of Azure Active Directory Application
+      client_secret:    '<ClientSecret>',                                                   # Client Secret of Azure Active Directory Application
+      subscription_id:  '<Subscriptionid>',                                                 # Subscription id of an Azure Account
+      environment:      '<AzureCloud/AzureChinaCloud/AzureUSGovernment/AzureGermanCloud>'   # Azure cloud environment. Default is AzureCloud.
 )
 ```
 
@@ -42,7 +42,8 @@ Create a new Traffic Manager Profile. The parameter 'traffic_routing_method' can
         ttl: '30',
         protocol: 'http',
         port: '80',
-        path: '/monitorpage.aspx'
+        path: '/monitorpage.aspx',
+        tags: { key1: "value1", key2: "value2", keyN: "valueN" }                          # [Optional]
       )
 ```
 

data/lib/fog/azurerm/models/application_gateway/gateway.rb

@@ -22,6 +22,7 @@ module Fog
         attribute :http_listeners
         attribute :url_path_maps
         attribute :request_routing_rules
+        attribute :tags
 
         def self.parse(gateway)
           hash = {}
@@ -96,6 +97,8 @@ module Fog
             request_routing_rule = Fog::ApplicationGateway::AzureRM::RequestRoutingRule.new
             hash['request_routing_rules'] << request_routing_rule.merge_attributes(Fog::ApplicationGateway::AzureRM::RequestRoutingRule.parse(rule))
           end unless gateway.request_routing_rules.nil?
+
+          hash['tags'] = gateway.tags
           hash
         end
 
@@ -133,7 +136,8 @@ module Fog
             backend_http_settings_list: backend_http_settings_list,
             http_listeners: http_listeners,
             url_path_maps: url_path_maps,
-            request_routing_rules: request_routing_rules
+            request_routing_rules: request_routing_rules,
+            tags: tags
           }
         end
 

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

@@ -13,6 +13,7 @@ module Fog
         attribute :platform_fault_domain_count
         attribute :use_managed_disk
         attribute :sku_name
+        attribute :tags
 
         def self.parse(availability_set)
           hash = {}
@@ -29,6 +30,7 @@ module Fog
             hash['use_managed_disk'] = availability_set.sku.name.eql?(AS_SKU_ALIGNED)
           end
 
+          hash['tags'] = availability_set.tags
           hash
         end
 
@@ -55,7 +57,8 @@ module Fog
             resource_group: resource_group,
             platform_fault_domain_count: platform_fault_domain_count,
             platform_update_domain_count: platform_update_domain_count,
-            use_managed_disk: use_managed_disk
+            use_managed_disk: use_managed_disk,
+            tags: tags
           }
         end
       end

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

@@ -11,8 +11,10 @@ module Fog
 
         def self.parse(creation_data)
           data = get_hash_from_object(creation_data)
-          image_reference = Fog::Compute::AzureRM::ImageDiskReference.new
-          data['image_reference'] = image_reference.merge_attributes(Fog::Compute::AzureRM::ImageDiskReference.parse(creation_data.image_reference))
+          unless creation_data.image_reference.nil?
+            image_reference = Fog::Compute::AzureRM::ImageDiskReference.new
+            data['image_reference'] = image_reference.merge_attributes(Fog::Compute::AzureRM::ImageDiskReference.parse(creation_data.image_reference))
+          end
           data
         end
       end

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

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class AzureRM
+      # DataDisk Model for Compute Service
+      class DataDisk < Fog::Model
+        identity  :name
+        attribute :disk_size_gb
+        attribute :lun
+        attribute :caching
+        attribute :create_option
+        # For these composite objects we ONLY need one field
+        attribute :vhd_uri
+        attribute :image_uri
+        attribute :managed_disk_id
+
+        def self.parse(disk)
+          disk_hash = get_hash_from_object(disk)
+          disk_hash['vhd_uri'] = disk.vhd.uri if disk.vhd
+          disk_hash['image_uri'] = disk.image.uri if disk.image
+          disk_hash['managed_disk_id'] = disk.managed_disk.id if disk.managed_disk
+          disk_hash
+        end
+      end
+    end
+  end
+end

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

@@ -6,17 +6,17 @@ module Fog
       class ManagedDisk < Fog::Model
         attribute :id
         identity  :name
-        attribute :resource_group_name
         attribute :type
         attribute :location
+        attribute :resource_group_name
         attribute :account_type
-        attribute :time_created
-        attribute :os_type
         attribute :disk_size_gb
         attribute :owner_id
         attribute :provisioning_state
         attribute :tags
+        attribute :time_created
         attribute :creation_data
+        attribute :os_type
         attribute :encryption_settings
 
         def self.parse(managed_disk)
@@ -39,7 +39,7 @@ module Fog
 
         def save
           requires :name, :location, :resource_group_name, :creation_data
-          requires :disk_size_gb if creation_data[:create_option] == 'Empty'
+          requires :disk_size_gb, :account_type
           validate_creation_data_params(creation_data)
 
           disk = service.create_or_update_managed_disk(managed_disk_params)

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

@@ -31,6 +31,8 @@ module Fog
         attribute :custom_data
         attribute :vhd_path
         attribute :managed_disk_storage_type
+        attribute :os_disk_size
+        attribute :tags
 
         def self.parse(vm)
           hash = {}
@@ -41,7 +43,7 @@ module Fog
           hash['vm_size'] = vm.hardware_profile.vm_size unless vm.hardware_profile.vm_size.nil?
           unless vm.storage_profile.nil?
             hash['os_disk_name'] = vm.storage_profile.os_disk.name
-
+            hash['os_disk_size'] = vm.storage_profile.os_disk.disk_size_gb
             if vm.storage_profile.os_disk.vhd.nil?
               hash['managed_disk_storage_type'] = vm.storage_profile.os_disk.managed_disk.storage_account_type
             else
@@ -63,8 +65,8 @@ module Fog
 
           unless vm.storage_profile.data_disks.nil?
             vm.storage_profile.data_disks.each do |disk|
-              data_disk = Fog::Storage::AzureRM::DataDisk.new
-              hash['data_disks'] << data_disk.merge_attributes(Fog::Storage::AzureRM::DataDisk.parse(disk))
+              data_disk = Fog::Compute::AzureRM::DataDisk.new
+              hash['data_disks'] << data_disk.merge_attributes(Fog::Compute::AzureRM::DataDisk.parse(disk))
             end
           end
 
@@ -76,6 +78,7 @@ module Fog
           end
           hash['network_interface_card_ids'] = vm.network_profile.network_interfaces.map(&:id)
           hash['availability_set_id'] = vm.availability_set.id unless vm.availability_set.nil?
+          hash['tags'] = vm.tags
 
           hash
         end
@@ -146,7 +149,7 @@ module Fog
         end
 
         def attach_data_disk(disk_name, disk_size, storage_account_name, async = false)
-          response = service.attach_data_disk_to_vm(resource_group, name, disk_name, disk_size, storage_account_name, async)
+          response = service.attach_data_disk_to_vm(data_disk_params(disk_name, disk_size, storage_account_name), async)
           async ? create_fog_async_response(response) : merge_attributes(Fog::Compute::AzureRM::Server.parse(response))
         end
 
@@ -155,6 +158,16 @@ module Fog
           async ? create_fog_async_response(response) : merge_attributes(Fog::Compute::AzureRM::Server.parse(response))
         end
 
+        def attach_managed_disk(disk_name, disk_resource_group, async = false)
+          response = service.attach_data_disk_to_vm(data_disk_params(disk_name, nil, nil, disk_resource_group), async)
+          async ? create_fog_async_response(response) : merge_attributes(Fog::Compute::AzureRM::Server.parse(response))
+        end
+
+        def detach_managed_disk(disk_name, async = false)
+          response = service.detach_data_disk_from_vm(resource_group, name, disk_name, async)
+          async ? create_fog_async_response(response) : merge_attributes(Fog::Compute::AzureRM::Server.parse(response))
+        end
+
         private
 
         def platform_is_linux?(platform)
@@ -190,7 +203,20 @@ module Fog
             custom_data: custom_data,
             vhd_path: vhd_path,
             os_disk_caching: os_disk_caching,
-            managed_disk_storage_type: managed_disk_storage_type
+            managed_disk_storage_type: managed_disk_storage_type,
+            os_disk_size: os_disk_size,
+            tags: tags
+          }
+        end
+
+        def data_disk_params(disk_name, disk_size = nil, storage_account = nil, disk_resource_group = nil)
+          {
+            vm_name: name,
+            vm_resource_group: resource_group,
+            disk_name: disk_name,
+            disk_size_gb: disk_size,
+            storage_account_name: storage_account,
+            disk_resource_group: disk_resource_group
           }
         end
       end

data/lib/fog/azurerm/models/key_vault/vault.rb

@@ -15,6 +15,7 @@ module Fog
         attribute :enabled_for_deployment
         attribute :enabled_for_disk_encryption
         attribute :enabled_for_template_deployment
+        attribute :tags
 
         def self.parse(vault)
           vault_hash = get_hash_from_object(vault)
@@ -67,7 +68,8 @@ module Fog
             tenant_id: tenant_id,
             sku_family: sku_family,
             sku_name: sku_name,
-            access_policies: access_policies
+            access_policies: access_policies,
+            tags: tags
           }
         end
       end

data/lib/fog/azurerm/models/network/load_balancer.rb

@@ -13,6 +13,7 @@ module Fog
         attribute :probes
         attribute :inbound_nat_rules
         attribute :inbound_nat_pools
+        attribute :tags
 
         # @param [Object] load_balancer
         def self.parse(load_balancer)
@@ -22,6 +23,7 @@ module Fog
           hash['location'] = load_balancer.location
           hash['resource_group'] = get_resource_group_from_id(load_balancer.id)
           hash['backend_address_pool_names'] = load_balancer.backend_address_pools.map(&:id) unless load_balancer.backend_address_pools.nil?
+          hash['tags'] = load_balancer.tags
 
           hash['frontend_ip_configurations'] = []
           load_balancer.frontend_ipconfigurations.each do |fic|
@@ -65,7 +67,7 @@ module Fog
           validate_inbound_nat_rules(inbound_nat_rules) unless inbound_nat_rules.nil?
           validate_inbound_nat_pools(inbound_nat_pools) unless inbound_nat_pools.nil?
 
-          load_balancer = service.create_load_balancer(name, location, resource_group, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
+          load_balancer = service.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)
 
           merge_attributes(Fog::Network::AzureRM::LoadBalancer.parse(load_balancer))
         end

data/lib/fog/azurerm/models/network/local_network_gateway.rb

@@ -15,6 +15,7 @@ module Fog
         attribute :bgp_peering_address
         attribute :peer_weight
         attribute :provisioning_state
+        attribute :tags
 
         def self.parse(local_network_gateway)
           local_network_gateway_hash = get_hash_from_object(local_network_gateway)
@@ -51,7 +52,8 @@ module Fog
             gateway_ip_address: gateway_ip_address,
             asn: asn,
             bgp_peering_address: bgp_peering_address,
-            peer_weight: peer_weight
+            peer_weight: peer_weight,
+            tags: tags
           }
         end
       end

data/lib/fog/azurerm/models/network/network_interface.rb

@@ -22,6 +22,7 @@ module Fog
         attribute :applied_dns_servers
         attribute :internal_dns_name_label
         attribute :internal_fqd
+        attribute :tags
 
         def self.parse(nic)
           hash = {}
@@ -33,6 +34,7 @@ module Fog
           hash['mac_address'] = nic.mac_address unless nic.mac_address.nil?
           hash['network_security_group_id'] = nil
           hash['network_security_group_id'] = nic.network_security_group.id unless nic.network_security_group.nil?
+          hash['tags'] = nic.tags
           ip_configuration = nic.ip_configurations[0] unless nic.ip_configurations.nil?
           unless ip_configuration.nil?
             hash['ip_configuration_name'] = ip_configuration.name
@@ -62,7 +64,7 @@ module Fog
           requires :subnet_id
           requires :ip_configuration_name
           requires :private_ip_allocation_method
-          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_configuration_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_configuration_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids, tags)
           merge_attributes(Fog::Network::AzureRM::NetworkInterface.parse(nic))
         end
 

data/lib/fog/azurerm/models/network/network_security_group.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :subnets_ids
         attribute :security_rules
         attribute :default_security_rules
+        attribute :tags
 
         def self.parse(nsg)
           hash = {}
@@ -22,6 +23,7 @@ module Fog
           hash['subnets_ids'] = nsg.subnets.map(&:id) unless nsg.subnets.nil?
           hash['security_rules'] = []
           hash['default_security_rules'] = []
+          hash['tags'] = nsg.tags
 
           nsg.security_rules.each do |sr|
             security_rule = Fog::Network::AzureRM::NetworkSecurityRule.new
@@ -40,7 +42,7 @@ module Fog
           requires :name, :location, :resource_group
 
           validate_security_rules(security_rules) unless security_rules.nil?
-          nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules)
+          nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules, tags)
           merge_attributes(Fog::Network::AzureRM::NetworkSecurityGroup.parse(nsg))
         end
 
@@ -54,7 +56,7 @@ module Fog
           if !security_rule_hash[:security_rules].nil? && security_rule_hash.length == 1
             validate_security_rules(security_rule_hash[:security_rules])
             merge_attributes(security_rule_hash)
-            nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules)
+            nsg = service.create_or_update_network_security_group(resource_group, name, location, security_rules, tags)
             return merge_attributes(Fog::Network::AzureRM::NetworkSecurityGroup.parse(nsg))
           end
           raise 'Invalid hash key.'

data/lib/fog/azurerm/models/network/public_ip.rb

@@ -14,6 +14,7 @@ module Fog
         attribute :domain_name_label
         attribute :fqdn
         attribute :reverse_fqdn
+        attribute :tags
 
         def self.parse(public_ip)
           hash = {}
@@ -25,6 +26,7 @@ module Fog
           hash['ip_address'] = public_ip.ip_address
           hash['idle_timeout_in_minutes'] = public_ip.idle_timeout_in_minutes
           hash['ip_configuration_id'] = public_ip.ip_configuration.id unless public_ip.ip_configuration.nil?
+          hash['tags'] = public_ip.tags
 
           unless public_ip.dns_settings.nil?
             hash['domain_name_label'] = public_ip.dns_settings.domain_name_label
@@ -40,7 +42,7 @@ module Fog
           requires :public_ip_allocation_method
           requires :location
           requires :resource_group
-          public_ip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label)
+          public_ip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label, tags)
           merge_attributes(Fog::Network::AzureRM::PublicIp.parse(public_ip))
         end
 
@@ -51,7 +53,7 @@ module Fog
         def update(input_hash)
           validate_input(input_hash)
           merge_attributes(input_hash)
-          pip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label)
+          pip = service.create_or_update_public_ip(resource_group, name, location, public_ip_allocation_method, idle_timeout_in_minutes, domain_name_label, tags)
           merge_attributes(Fog::Network::AzureRM::PublicIp.parse(pip))
         end
 

data/lib/fog/azurerm/models/network/virtual_network.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :dns_servers
         attribute :subnets
         attribute :address_prefixes
+        attribute :tags
 
         def self.parse(vnet)
           hash = {}
@@ -20,6 +21,7 @@ module Fog
           hash['location'] = vnet.location
           hash['dns_servers'] = vnet.dhcp_options.dns_servers unless vnet.dhcp_options.nil?
           hash['address_prefixes'] = vnet.address_space.address_prefixes unless vnet.address_space.address_prefixes.nil?
+          hash['tags'] = vnet.tags
 
           subnets = []
           vnet.subnets.each do |subnet|
@@ -36,7 +38,7 @@ module Fog
           requires :resource_group
           validate_subnets!(subnets) unless subnets.nil?
 
-          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes)
+          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes, tags)
           merge_attributes(Fog::Network::AzureRM::VirtualNetwork.parse(virtual_network))
         end
 
@@ -75,7 +77,7 @@ module Fog
           raise('Provided hash can not be empty.') if vnet_hash.empty? || vnet_hash.nil?
           validate_update_attributes!(vnet_hash)
           merge_attributes(vnet_hash)
-          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes)
+          virtual_network = service.create_or_update_virtual_network(resource_group, name, location, dns_servers, subnets, address_prefixes, tags)
           merge_attributes(Fog::Network::AzureRM::VirtualNetwork.parse(virtual_network))
         end
 

data/lib/fog/azurerm/models/resources/resource_group.rb

@@ -7,19 +7,21 @@ module Fog
         identity :name
         attribute :id
         attribute :location
+        attribute :tags
 
         def self.parse(resource_group)
           hash = {}
           hash['id'] = resource_group.id
           hash['name'] = resource_group.name
           hash['location'] = resource_group.location
+          hash['tags'] = resource_group.tags
           hash
         end
 
         def save
           requires :name
           requires :location
-          resource_group = service.create_resource_group(name, location)
+          resource_group = service.create_resource_group(name, location, tags)
           merge_attributes(Fog::Resources::AzureRM::ResourceGroup.parse(resource_group))
         end