fog-azure-rm 0.0.4 → 0.0.5

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

@@ -0,0 +1,29 @@
+require 'fog/core/collection'
+require 'fog/azurerm/models/network/express_route_circuit'
+
+module Fog
+  module Network
+    class AzureRM
+      # ExpressRouteCircuit collection class for Network Service
+      class ExpressRouteCircuits < Fog::Collection
+        model Fog::Network::AzureRM::ExpressRouteCircuit
+        attribute :resource_group
+
+        def all
+          requires :resource_group
+          express_route_circuits = []
+          service.list_express_route_circuits(resource_group).each do |circuit|
+            express_route_circuits << Fog::Network::AzureRM::ExpressRouteCircuit.parse(circuit)
+          end
+          load(express_route_circuits)
+        end
+
+        def get(resource_group_name, name)
+          circuit = service.get_express_route_circuit(resource_group_name, name)
+          express_route_circuit = Fog::Network::AzureRM::ExpressRouteCircuit.new(service: service)
+          express_route_circuit.merge_attributes(Fog::Network::AzureRM::ExpressRouteCircuit.parse(circuit))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Network
+    class AzureRM
+      # Express Route Service Provider model class for Network Service
+      class ExpressRouteServiceProvider < Fog::Model
+        identity :name
+        attribute :id
+        attribute :peering_locations
+        attribute :bandwidths_offered
+
+        def self.parse(service_provider)
+          hash = {}
+          hash['id'] = service_provider.id
+          hash['name'] = service_provider.name
+
+          hash['peering_locations'] = []
+          service_provider.peering_locations.each do |peering_location|
+            hash['peering_locations'] << peering_location
+          end unless service_provider.peering_locations.nil?
+          hash['bandwidths_offered'] = []
+          service_provider.bandwidths_offered.each do |bandwidth_offered|
+            hash['bandwidths_offered'] << bandwidth_offered
+          end unless service_provider.bandwidths_offered.nil?
+          hash
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'fog/core/collection'
+require 'fog/azurerm/models/network/express_route_service_provider'
+
+module Fog
+  module Network
+    class AzureRM
+      # ExpressRouteServiceProvider collection class for Network Service
+      class ExpressRouteServiceProviders < Fog::Collection
+        model Fog::Network::AzureRM::ExpressRouteServiceProvider
+
+        def all
+          express_route_service_providers = []
+          service.list_express_route_service_providers.each do |service_provider|
+            express_route_service_providers << Fog::Network::AzureRM::ExpressRouteServiceProvider.parse(service_provider)
+          end
+          load(express_route_service_providers)
+        end
+      end
+    end
+  end
+end

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

@@ -13,21 +13,11 @@ module Fog
 
         def self.parse(frontend_ip_configuration)
           hash = {}
-          hash['name'] = frontend_ip_configuration['name']
-          subnet = frontend_ip_configuration['properties']['subnet']
-          hash['subnet_id'] = subnet['id'] unless subnet.nil?
-          private_ip_address = frontend_ip_configuration['properties']['private_ipaddress']
-          unless private_ip_address.nil?
-            hash['private_ipaddress'] = private_ip_address
-          end
-          private_ipallocation_method = frontend_ip_configuration['properties']['privateIPAllocationMethod']
-          unless private_ipallocation_method.nil?
-            hash['private_ipallocation_method'] = private_ipallocation_method
-          end
-          public_ip_address = frontend_ip_configuration['properties']['publicIPAddress']
-          unless public_ip_address.nil?
-            hash['public_ip_address_id'] = public_ip_address['id']
-          end
+          hash['name'] = frontend_ip_configuration.name
+          hash['subnet_id'] = frontend_ip_configuration.subnet.id unless frontend_ip_configuration.subnet.nil?
+          hash['private_ipaddress'] = frontend_ip_configuration.private_ipaddress if frontend_ip_configuration.respond_to?(:private_ipaddress)
+          hash['private_ipallocation_method'] = frontend_ip_configuration.private_ipallocation_method unless frontend_ip_configuration.private_ipallocation_method.nil?
+          hash['public_ip_address_id'] = frontend_ip_configuration.public_ipaddress unless frontend_ip_configuration.public_ipaddress.nil?
           hash
         end
       end

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

@@ -11,14 +11,13 @@ module Fog
         attribute :backend_port
 
         def self.parse(inbound_nat_pool)
-          inbound_nat_pool_prop = inbound_nat_pool['properties']
           hash = {}
-          hash['id'] = inbound_nat_pool['id']
-          hash['name'] = inbound_nat_pool['name']
-          hash['protocol'] = inbound_nat_pool_prop['protocol']
-          hash['frontend_port_range_start'] = inbound_nat_pool_prop['frontendPortRangeStart']
-          hash['frontend_port_range_end'] = inbound_nat_pool_prop['frontendPortRangeEnd']
-          hash['backend_port'] = inbound_nat_pool_prop['backendPort']
+          hash['id'] = inbound_nat_pool.id
+          hash['name'] = inbound_nat_pool.name
+          hash['protocol'] = inbound_nat_pool.protocol
+          hash['frontend_port_range_start'] = inbound_nat_pool.frontend_port_range_start
+          hash['frontend_port_range_end'] = inbound_nat_pool.frontend_port_range_end
+          hash['backend_port'] = inbound_nat_pool.backend_port
           hash
         end
       end

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

@@ -11,16 +11,13 @@ module Fog
         attribute :backend_port
 
         def self.parse(inbound_nat_rule)
-          inbound_nat_rule_prop = inbound_nat_rule['properties']
           hash = {}
-          hash['id'] = inbound_nat_rule['id']
-          hash['name'] = inbound_nat_rule['name']
-          unless inbound_nat_rule_prop['frontendIPConfiguration'].nil?
-            hash['frontend_ip_configuration_id'] = inbound_nat_rule_prop['frontendIPConfiguration']['id']
-          end
-          hash['protocol'] = inbound_nat_rule_prop['protocol']
-          hash['frontend_port'] = inbound_nat_rule_prop['frontendPort']
-          hash['backend_port'] = inbound_nat_rule_prop['backendPort']
+          hash['id'] = inbound_nat_rule.id
+          hash['name'] = inbound_nat_rule.name
+          hash['frontend_ip_configuration_id'] = inbound_nat_rule.frontend_ipconfiguration.id unless inbound_nat_rule.frontend_ipconfiguration.nil?
+          hash['protocol'] = inbound_nat_rule.protocol
+          hash['frontend_port'] = inbound_nat_rule.frontend_port
+          hash['backend_port'] = inbound_nat_rule.backend_port
           hash
         end
       end

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

@@ -16,44 +16,42 @@ module Fog
 
         # @param [Object] load_balancer
         def self.parse(load_balancer)
-          load_balancer_properties = load_balancer['properties']
-
           hash = {}
-          hash['id'] = load_balancer['id']
-          hash['name'] = load_balancer['name']
-          hash['location'] = load_balancer['location']
-          hash['resource_group'] = load_balancer['id'].split('/')[4]
-          hash['backend_address_pool_names'] = load_balancer_properties['backendAddressPools'].map { |item| item['name'] } unless load_balancer_properties['backendAddressPools'].nil?
+          hash['id'] = load_balancer.id
+          hash['name'] = load_balancer.name
+          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['frontend_ip_configurations'] = []
-          load_balancer_properties['frontendIPConfigurations'].each do |fic|
+          load_balancer.frontend_ipconfigurations.each do |fic|
             frontend_ip_configuration = Fog::Network::AzureRM::FrontendIPConfiguration.new
             hash['frontend_ip_configurations'] << frontend_ip_configuration.merge_attributes(Fog::Network::AzureRM::FrontendIPConfiguration.parse(fic))
-          end unless load_balancer_properties['frontendIPConfigurations'].nil?
+          end unless load_balancer.frontend_ipconfigurations.nil?
 
           hash['load_balancing_rules'] = []
-          load_balancer_properties['loadBalancingRules'].each do |lbr|
+          load_balancer.load_balancing_rules.each do |lbr|
             load_balancing_rule = Fog::Network::AzureRM::LoadBalangcingRule.new
             hash['load_balancing_rules'] << load_balancing_rule.merge_attributes(Fog::Network::AzureRM::LoadBalangcingRule.parse(lbr))
-          end unless load_balancer_properties['loadBalancingRules'].nil?
+          end unless load_balancer.load_balancing_rules.nil?
 
           hash['probes'] = []
-          load_balancer_properties['probes'].each do |prb|
+          load_balancer.probes.each do |prb|
             prob = Fog::Network::AzureRM::Probe.new
             hash['probes'] << prob.merge_attributes(Fog::Network::AzureRM::Probe.parse(prb))
-          end unless load_balancer_properties['probes'].nil?
+          end unless load_balancer.probes.nil?
 
           hash['inbound_nat_rules'] = []
-          load_balancer_properties['inboundNatRules'].each do |inr|
+          load_balancer.inbound_nat_rules.each do |inr|
             inbound_nat_rule = Fog::Network::AzureRM::InboundNatRule.new
             hash['inbound_nat_rules'] << inbound_nat_rule.merge_attributes(Fog::Network::AzureRM::InboundNatRule.parse(inr))
-          end unless load_balancer_properties['inboundNatRules'].nil?
+          end unless load_balancer.inbound_nat_rules.nil?
 
-          hash['inbound_nat_rules'] = []
-          load_balancer_properties['inboundNatPools'].each do |inp|
+          hash['inbound_nat_pools'] = []
+          load_balancer.inbound_nat_pools.each do |inp|
             inbound_nat_pool = Fog::Network::AzureRM::InboundNatPool.new
-            hash['inbound_nat_rules'] << inbound_nat_pool.merge_attributes(Fog::Network::AzureRM::InboundNatPool.parse(inp))
-          end unless load_balancer_properties['inboundNatPools'].nil?
+            hash['inbound_nat_pools'] << inbound_nat_pool.merge_attributes(Fog::Network::AzureRM::InboundNatPool.parse(inp))
+          end unless load_balancer.inbound_nat_pools.nil?
 
           hash
         end

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

@@ -16,24 +16,19 @@ module Fog
         attribute :load_distribution
 
         def self.parse(load_balancing_rule)
-          load_balancing_rule_prop = load_balancing_rule['properties']
           hash = {}
-          hash['id'] = load_balancing_rule['id']
-          hash['name'] = load_balancing_rule['name']
-          unless load_balancing_rule_prop['frontendIPConfiguration'].nil?
-            hash['frontend_ip_configuration_id'] = load_balancing_rule_prop['frontendIPConfiguration']['id']
-          end
-          unless load_balancing_rule_prop['backendAddressPool'].nil?
-            hash['backend_address_pool_id'] = load_balancing_rule_prop['backendAddressPool']['id']
-          end
+          hash['id'] = load_balancing_rule.id
+          hash['name'] = load_balancing_rule.name
+          hash['frontend_ip_configuration_id'] = load_balancing_rule.frontend_ipconfiguration.id unless load_balancing_rule.frontend_ipconfiguration.nil?
+          hash['backend_address_pool_id'] = load_balancing_rule.backend_address_pool.id unless load_balancing_rule.backend_address_pool.nil?
 
-          hash['protocol'] = load_balancing_rule_prop['protocol']
-          hash['frontend_port'] = load_balancing_rule_prop['frontendPort']
-          hash['backend_port'] = load_balancing_rule_prop['backendPort']
-          hash['probe_id'] = load_balancing_rule_prop['probe']['id'] unless load_balancing_rule_prop['probe'].nil?
-          hash['enable_floating_ip'] = load_balancing_rule_prop['enableFloatingIP']
-          hash['idle_timeout_in_minutes'] = load_balancing_rule_prop['idleTimeoutInMinutes']
-          hash['load_distribution'] = load_balancing_rule_prop['loadDistribution']
+          hash['protocol'] = load_balancing_rule.protocol
+          hash['frontend_port'] = load_balancing_rule.frontend_port
+          hash['backend_port'] = load_balancing_rule.backend_port
+          hash['probe_id'] = load_balancing_rule.probe.id unless load_balancing_rule.probe.nil?
+          hash['enable_floating_ip'] = load_balancing_rule.enable_floating_ip
+          hash['idle_timeout_in_minutes'] = load_balancing_rule.idle_timeout_in_minutes
+          hash['load_distribution'] = load_balancing_rule.load_distribution
           hash
         end
       end

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

@@ -24,34 +24,34 @@ module Fog
         attribute :internal_fqd
 
         def self.parse(nic)
-          nic_properties = nic['properties']
-          nic_ip_configuration = nic_properties['ipConfigurations'][0]
           hash = {}
-          hash['id'] = nic['id']
-          hash['name'] = nic['name']
-          hash['location'] = nic['location']
-          hash['resource_group'] = nic['id'].split('/')[4]
-          hash['virtual_machine_id'] = nic_properties['virtualMachine']['id'] unless nic_properties['virtualMachine'].nil?
-          hash['mac_address'] = nic_properties['macAddress'] unless nic_properties['macAddress'].nil?
+          hash['id'] = nic.id
+          hash['name'] = nic.name
+          hash['location'] = nic.location
+          hash['resource_group'] = get_resource_from_resource_id(nic.id, RESOURCE_GROUP_NAME)
+          hash['virtual_machine_id'] = nic.virtual_machine.id unless nic.virtual_machine.nil?
+          hash['mac_address'] = nic.mac_address unless nic.mac_address.nil?
           hash['network_security_group_id'] = nil
-          hash['network_security_group_id'] = nic_properties['networkSecurityGroup']['id'] unless nic_properties['networkSecurityGroup'].nil?
-          unless nic_ip_configuration.nil?
-            nic_ip_configuration_properties = nic_ip_configuration['properties']
-            hash['ip_configuration_name'] = nic_ip_configuration['name']
-            hash['ip_configuration_id'] = nic_ip_configuration['id']
-            hash['subnet_id'] = nic_ip_configuration_properties['subnet']['id'] unless nic_ip_configuration_properties['subnet'].nil?
-            hash['private_ip_allocation_method'] = nic_ip_configuration_properties['privateIPAllocationMethod']
-            hash['private_ip_address'] = nic_ip_configuration_properties['privateIPAddress']
+          hash['network_security_group_id'] = nic.network_security_group.id unless nic.network_security_group.nil?
+          ip_configuration = nic.ip_configurations[0] unless nic.ip_configurations.nil?
+          unless ip_configuration.nil?
+            hash['ip_configuration_name'] = ip_configuration.name
+            hash['ip_configuration_id'] = ip_configuration.id
+            hash['subnet_id'] = ip_configuration.subnet.id unless ip_configuration.subnet.nil?
+            hash['private_ip_allocation_method'] = ip_configuration.private_ipallocation_method
+            hash['private_ip_address'] = ip_configuration.private_ipaddress
             hash['public_ip_address_id'] = nil
-            hash['public_ip_address_id'] = nic_ip_configuration_properties['publicIPAddress']['id'] unless nic_ip_configuration_properties['publicIPAddress'].nil?
-            hash['load_balancer_backend_address_pools_ids'] = nic_ip_configuration_properties['loadBalancerBackendAddressPools'].map { |item| item['id'] } unless nic_ip_configuration_properties['loadBalancerBackendAddressPools'].nil?
-            hash['load_balancer_inbound_nat_rules_ids'] = nic_ip_configuration_properties['loadBalancerInboundNatRules'].map { |item| item['id'] } unless nic_ip_configuration_properties['loadBalancerInboundNatRules'].nil?
+            hash['public_ip_address_id'] = ip_configuration.public_ipaddress.id unless ip_configuration.public_ipaddress.nil?
+            hash['load_balancer_backend_address_pools_ids'] = ip_configuration.load_balancer_backend_address_pools.map(&:id) unless ip_configuration.load_balancer_backend_address_pools.nil?
+            hash['load_balancer_inbound_nat_rules_ids'] = ip_configuration.load_balancer_inbound_nat_rules.map(&:id) unless ip_configuration.load_balancer_inbound_nat_rules.nil?
+          end
+          nic_dns_settings = nic.dns_settings
+          unless nic_dns_settings.nil?
+            hash['dns_servers'] = nic_dns_settings.dns_servers
+            hash['applied_dns_servers'] = nic_dns_settings.applied_dns_servers
+            hash['internal_dns_name_label'] = nic_dns_settings.internal_dns_name_label
+            hash['internal_fqd'] = nic_dns_settings.internal_fqdn
           end
-
-          hash['dns_servers'] = nic_properties['dnsSettings']['dnsServers']
-          hash['applied_dns_servers'] = nic_properties['appliedDnsServers']
-          hash['internal_dns_name_label'] = nic_properties['internalDnsNameLabel']
-          hash['internal_fqd'] = nic_properties['internalFqd']
           hash
         end
 

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

@@ -14,21 +14,21 @@ module Fog
 
         def self.parse(nsg)
           hash = {}
-          hash['id'] = nsg['id']
-          hash['name'] = nsg['name']
-          hash['resource_group'] = nsg['id'].split('/')[4]
-          hash['location'] = nsg['location']
-          hash['network_interfaces_ids'] = nsg['properties']['networkInterfaces'].map { |item| item['id'] } unless nsg['properties']['networkInterfaces'].nil?
-          hash['subnets_ids'] = nsg['properties']['subnets'].map { |item| item['id'] } unless nsg['properties']['subnets'].nil?
+          hash['id'] = nsg.id
+          hash['name'] = nsg.name
+          hash['resource_group'] = get_resource_from_resource_id(nsg.id, RESOURCE_GROUP_NAME)
+          hash['location'] = nsg.location
+          hash['network_interfaces_ids'] = nsg.network_interfaces.map(&:id) unless nsg.network_interfaces.nil?
+          hash['subnets_ids'] = nsg.subnets.map(&:id) unless nsg.subnets.nil?
           hash['security_rules'] = []
           hash['default_security_rules'] = []
 
-          nsg['properties']['securityRules'].each do |sr|
+          nsg.security_rules.each do |sr|
             security_rule = Fog::Network::AzureRM::NetworkSecurityRule.new
             hash['security_rules'] << security_rule.merge_attributes(Fog::Network::AzureRM::NetworkSecurityRule.parse(sr))
-          end unless nsg['properties']['securityRules'].nil?
+          end unless nsg.security_rules.nil?
 
-          nsg['properties']['defaultSecurityRules'].each do |dsr|
+          nsg.default_security_rules.each do |dsr|
             security_rule = Fog::Network::AzureRM::NetworkSecurityRule.new
             hash['default_security_rules'] << security_rule.merge_attributes(Fog::Network::AzureRM::NetworkSecurityRule.parse(dsr))
           end

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

@@ -19,19 +19,19 @@ module Fog
 
         def self.parse(nsr)
           hash = {}
-          hash['id'] = nsr['id']
-          hash['name'] = nsr['name']
-          hash['resource_group'] = nsr['id'].split('/')[4]
-          hash['network_security_group_name'] = nsr['id'].split('/')[8]
-          hash['description'] = nsr['properties']['description']
-          hash['protocol'] = nsr['properties']['protocol']
-          hash['source_port_range'] = nsr['properties']['sourcePortRange']
-          hash['destination_port_range'] = nsr['properties']['destinationPortRange']
-          hash['source_address_prefix'] = nsr['properties']['sourceAddressPrefix']
-          hash['destination_address_prefix'] = nsr['properties']['destinationAddressPrefix']
-          hash['access'] = nsr['properties']['access']
-          hash['priority'] = nsr['properties']['priority']
-          hash['direction'] = nsr['properties']['direction']
+          hash['id'] = nsr.id
+          hash['name'] = nsr.name
+          hash['resource_group'] = get_resource_from_resource_id(nsr.id, RESOURCE_GROUP_NAME)
+          hash['network_security_group_name'] = get_resource_from_resource_id(nsr.id, RESOURCE_NAME)
+          hash['description'] = nsr.description
+          hash['protocol'] = nsr.protocol
+          hash['source_port_range'] = nsr.source_port_range
+          hash['destination_port_range'] = nsr.destination_port_range
+          hash['source_address_prefix'] = nsr.source_address_prefix
+          hash['destination_address_prefix'] = nsr.destination_address_prefix
+          hash['access'] = nsr.access
+          hash['priority'] = nsr.priority
+          hash['direction'] = nsr.direction
           hash
         end
       end

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

@@ -12,15 +12,14 @@ module Fog
         attribute :number_of_probes
 
         def self.parse(probe)
-          probe_prop = probe['properties']
           hash = {}
-          hash['id'] = probe['id']
-          hash['name'] = probe['name']
-          hash['protocol'] = probe_prop['protocol']
-          hash['port'] = probe_prop['port']
-          hash['request_path'] = probe_prop['requestPath']
-          hash['interval_in_seconds'] = probe_prop['intervalInSeconds']
-          hash['number_of_probes'] = probe_prop['numberOfProbes']
+          hash['id'] = probe.id
+          hash['name'] = probe.name
+          hash['protocol'] = probe.protocol
+          hash['port'] = probe.port
+          hash['request_path'] = probe.request_path
+          hash['interval_in_seconds'] = probe.interval_in_seconds
+          hash['number_of_probes'] = probe.number_of_probes
           hash
         end
       end

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

@@ -15,22 +15,21 @@ module Fog
         attribute :fqdn
         attribute :reverse_fqdn
 
-        def self.parse(pip)
-          pip_properties = pip['properties']
+        def self.parse(public_ip)
           hash = {}
-          hash['id'] = pip['id']
-          hash['name'] = pip['name']
-          hash['location'] = pip['location']
-          hash['resource_group'] = pip['id'].split('/')[4]
-          hash['public_ip_allocation_method'] = pip_properties['publicIPAllocationMethod']
-          hash['ip_address'] = pip_properties['ipAddress']
-          hash['idle_timeout_in_minutes'] = pip_properties['idleTimeoutInMinutes']
-          hash['ip_configuration_id'] = pip_properties['ipConfiguration']['id'] unless pip_properties['ipConfiguration'].nil?
+          hash['id'] = public_ip.id
+          hash['name'] = public_ip.name
+          hash['location'] = public_ip.location
+          hash['resource_group'] = get_resource_group_from_id(public_ip.id)
+          hash['public_ip_allocation_method'] = public_ip.public_ipallocation_method
+          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?
 
-          unless pip_properties['dnsSettings'].nil?
-            hash['domain_name_label'] = pip_properties['dnsSettings']['domainNameLabel']
-            hash['fqdn'] = pip_properties['dnsSettings']['fqdn']
-            hash['reverse_fqdn'] = pip_properties['dnsSettings']['reverseFqdn']
+          unless public_ip.dns_settings.nil?
+            hash['domain_name_label'] = public_ip.dns_settings.domain_name_label
+            hash['fqdn'] = public_ip.dns_settings.fqdn
+            hash['reverse_fqdn'] = public_ip.dns_settings.reverse_fqdn
           end
 
           hash
@@ -41,8 +40,8 @@ module Fog
           requires :public_ip_allocation_method
           requires :location
           requires :resource_group
-          pip = service.create_public_ip(resource_group, name, location, public_ip_allocation_method)
-          merge_attributes(Fog::Network::AzureRM::PublicIp.parse(pip))
+          public_ip = service.create_public_ip(resource_group, name, location, public_ip_allocation_method)
+          merge_attributes(Fog::Network::AzureRM::PublicIp.parse(public_ip))
         end
 
         def destroy