fog-azure-rm 0.1.0 → 0.1.1

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

@@ -23,7 +23,7 @@ module Fog
         def save
           requires :name, :resource_group, :circuit_name
           circuit_authorization = service.create_or_update_express_route_circuit_authorization(express_route_circuit_authorization_params)
-          merge_attributes(ExpressRouteCircuitAuthorization.parse(circuit_authorization))
+          merge_attributes(Fog::Network::AzureRM::ExpressRouteCircuitAuthorization.parse(circuit_authorization))
         end
 
         def destroy

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

@@ -3,20 +3,20 @@ module Fog
     class AzureRM
       # ExpressRouteCircuitAuthorization collection class for Network Service
       class ExpressRouteCircuitAuthorizations < Fog::Collection
-        model ExpressRouteCircuitAuthorization
+        model Fog::Network::AzureRM::ExpressRouteCircuitAuthorization
         attribute :resource_group
         attribute :circuit_name
 
         def all
           requires :resource_group, :circuit_name
-          circuit_authorizations = service.list_express_route_circuit_authorizations(resource_group, circuit_name).map { |circuit_authorization| ExpressRouteCircuitAuthorization.parse(circuit_authorization) }
+          circuit_authorizations = service.list_express_route_circuit_authorizations(resource_group, circuit_name).map { |circuit_authorization| Fog::Network::AzureRM::ExpressRouteCircuitAuthorization.parse(circuit_authorization) }
           load(circuit_authorizations)
         end
 
         def get(resource_group_name, circuit_name, authorization_name)
           circuit_authorization = service.get_express_route_circuit_authorization(resource_group_name, circuit_name, authorization_name)
-          express_route_circuit_authorization = ExpressRouteCircuitAuthorization.new(service: service)
-          express_route_circuit_authorization.merge_attributes(ExpressRouteCircuitAuthorization.parse(circuit_authorization))
+          express_route_circuit_authorization = Fog::Network::AzureRM::ExpressRouteCircuitAuthorization.new(service: service)
+          express_route_circuit_authorization.merge_attributes(Fog::Network::AzureRM::ExpressRouteCircuitAuthorization.parse(circuit_authorization))
         end
       end
     end

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

@@ -29,7 +29,7 @@ module Fog
           express_route_circuit_peering['id'] = circuit_peering.id
           express_route_circuit_peering['name'] = circuit_peering.name
           express_route_circuit_peering['resource_group'] = get_resource_group_from_id(circuit_peering.id)
-          express_route_circuit_peering['circuit_name'] = circuit_peering.id.split('/')[8]
+          express_route_circuit_peering['circuit_name'] = get_circuit_name_from_id(circuit_peering.id)
           express_route_circuit_peering['provisioning_state'] = circuit_peering.provisioning_state
           express_route_circuit_peering['peering_type'] = circuit_peering.peering_type
           express_route_circuit_peering['peer_asn'] = circuit_peering.peer_asn
@@ -59,8 +59,7 @@ module Fog
         def save
           requires :name, :resource_group, :circuit_name, :peering_type, :peer_asn, :primary_peer_address_prefix, :secondary_peer_address_prefix, :vlan_id
           requires :advertised_public_prefixes if peering_type.casecmp(MICROSOFT_PEERING) == 0
-          circuit_peering_parameters = express_route_circuit_peering_params
-          circuit_peering = service.create_or_update_express_route_circuit_peering(circuit_peering_parameters)
+          circuit_peering = service.create_or_update_express_route_circuit_peering(express_route_circuit_peering_params)
           merge_attributes(Fog::Network::AzureRM::ExpressRouteCircuitPeering.parse(circuit_peering))
         end
 
@@ -71,7 +70,7 @@ module Fog
         private
 
         def express_route_circuit_peering_params
-          circuit_peering_parameters = {
+          {
             resource_group_name: resource_group,
             peering_name: name,
             circuit_name: circuit_name,
@@ -85,7 +84,6 @@ module Fog
             customer_asn: customer_asn,
             routing_registry_name: routing_registry_name
           }
-          circuit_peering_parameters
         end
       end
     end

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

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # ExpressRouteCircuitPeering collection class for Network Service
       class ExpressRouteCircuitPeerings < Fog::Collection
-        model ExpressRouteCircuitPeering
+        model Fog::Network::AzureRM::ExpressRouteCircuitPeering
         attribute :resource_group
         attribute :circuit_name
 
@@ -11,15 +11,15 @@ module Fog
           requires :resource_group, :circuit_name
           circuit_peerings = []
           service.list_express_route_circuit_peerings(resource_group, circuit_name).each do |circuit_peering|
-            circuit_peerings << ExpressRouteCircuitPeering.parse(circuit_peering)
+            circuit_peerings << Fog::Network::AzureRM::ExpressRouteCircuitPeering.parse(circuit_peering)
           end
           load(circuit_peerings)
         end
 
         def get(resource_group_name, peering_name, circuit_name)
           circuit_peering = service.get_express_route_circuit_peering(resource_group_name, peering_name, circuit_name)
-          express_route_circuit_peering = ExpressRouteCircuitPeering.new(service: service)
-          express_route_circuit_peering.merge_attributes(ExpressRouteCircuitPeering.parse(circuit_peering))
+          express_route_circuit_peering = Fog::Network::AzureRM::ExpressRouteCircuitPeering.new(service: service)
+          express_route_circuit_peering.merge_attributes(Fog::Network::AzureRM::ExpressRouteCircuitPeering.parse(circuit_peering))
         end
       end
     end

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

@@ -3,22 +3,22 @@ module Fog
     class AzureRM
       # ExpressRouteCircuit collection class for Network Service
       class ExpressRouteCircuits < Fog::Collection
-        model ExpressRouteCircuit
+        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 << ExpressRouteCircuit.parse(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 = ExpressRouteCircuit.new(service: service)
-          express_route_circuit.merge_attributes(ExpressRouteCircuit.parse(circuit))
+          express_route_circuit = Fog::Network::AzureRM::ExpressRouteCircuit.new(service: service)
+          express_route_circuit.merge_attributes(Fog::Network::AzureRM::ExpressRouteCircuit.parse(circuit))
         end
       end
     end

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

@@ -3,12 +3,12 @@ module Fog
     class AzureRM
       # ExpressRouteServiceProvider collection class for Network Service
       class ExpressRouteServiceProviders < Fog::Collection
-        model ExpressRouteServiceProvider
+        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 << ExpressRouteServiceProvider.parse(service_provider)
+            express_route_service_providers << Fog::Network::AzureRM::ExpressRouteServiceProvider.parse(service_provider)
           end
           load(express_route_service_providers)
         end

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

@@ -3,22 +3,22 @@ module Fog
     class AzureRM
       # LoadBalancers collection class for Network Service
       class LoadBalancers < Fog::Collection
-        model LoadBalancer
+        model Fog::Network::AzureRM::LoadBalancer
         attribute :resource_group
 
         def all
           requires :resource_group
           load_balancers = []
           service.list_load_balancers(resource_group).each do |load_balancer|
-            load_balancers << LoadBalancer.parse(load_balancer)
+            load_balancers << Fog::Network::AzureRM::LoadBalancer.parse(load_balancer)
           end
           load(load_balancers)
         end
 
         def get(resource_group_name, load_balancer_name)
-          lb = service.get_load_balancer(resource_group_name, load_balancer_name)
-          load_balancer = LoadBalancer.new(service: service)
-          load_balancer.merge_attributes(LoadBalancer.parse(lb))
+          load_balancer = service.get_load_balancer(resource_group_name, load_balancer_name)
+          load_balancer_fog = Fog::Network::AzureRM::LoadBalancer.new(service: service)
+          load_balancer_fog.merge_attributes(Fog::Network::AzureRM::LoadBalancer.parse(load_balancer))
         end
       end
     end

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

@@ -33,7 +33,7 @@ module Fog
         def save
           requires :name, :location, :resource_group, :local_network_address_space_prefixes, :gateway_ip_address, :asn, :bgp_peering_address, :peer_weight
           local_network_gateway = service.create_or_update_local_network_gateway(local_network_gateway_parameters)
-          merge_attributes(LocalNetworkGateway.parse(local_network_gateway))
+          merge_attributes(Fog::Network::AzureRM::LocalNetworkGateway.parse(local_network_gateway))
         end
 
         def destroy

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

@@ -3,19 +3,19 @@ module Fog
     class AzureRM
       # LocalNetworkGateways collection class for Network Service
       class LocalNetworkGateways < Fog::Collection
-        model LocalNetworkGateway
+        model Fog::Network::AzureRM::LocalNetworkGateway
         attribute :resource_group
 
         def all
           requires :resource_group
-          local_network_gateways = service.list_local_network_gateways(resource_group).map { |gateway| LocalNetworkGateway.parse(gateway) }
+          local_network_gateways = service.list_local_network_gateways(resource_group).map { |gateway| Fog::Network::AzureRM::LocalNetworkGateway.parse(gateway) }
           load(local_network_gateways)
         end
 
         def get(resource_group_name, name)
           local_network_gateway = service.get_local_network_gateway(resource_group_name, name)
-          local_network_gateway_obj = LocalNetworkGateway.new(service: service)
-          local_network_gateway_obj.merge_attributes(LocalNetworkGateway.parse(local_network_gateway))
+          local_network_gateway_fog = Fog::Network::AzureRM::LocalNetworkGateway.new(service: service)
+          local_network_gateway_fog.merge_attributes(Fog::Network::AzureRM::LocalNetworkGateway.parse(local_network_gateway))
         end
       end
     end

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

@@ -3,22 +3,22 @@ module Fog
     class AzureRM
       # NetworkInterfaces collection class for Network Service
       class NetworkInterfaces < Fog::Collection
-        model NetworkInterface
+        model Fog::Network::AzureRM::NetworkInterface
         attribute :resource_group
 
         def all
           requires :resource_group
           network_interfaces = []
           service.list_network_interfaces(resource_group).each do |nic|
-            network_interfaces << NetworkInterface.parse(nic)
+            network_interfaces << Fog::Network::AzureRM::NetworkInterface.parse(nic)
           end
           load(network_interfaces)
         end
 
         def get(resource_group_name, name)
-          nic = service.get_network_interface(resource_group_name, name)
-          network_interface_card = NetworkInterface.new(service: service)
-          network_interface_card.merge_attributes(NetworkInterface.parse(nic))
+          network_interface_card = service.get_network_interface(resource_group_name, name)
+          network_interface_card_fog = Fog::Network::AzureRM::NetworkInterface.new(service: service)
+          network_interface_card_fog.merge_attributes(Fog::Network::AzureRM::NetworkInterface.parse(network_interface_card))
         end
       end
     end

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

@@ -3,22 +3,22 @@ module Fog
     class AzureRM
       # collection class for Network Security Group
       class NetworkSecurityGroups < Fog::Collection
-        model NetworkSecurityGroup
+        model Fog::Network::AzureRM::NetworkSecurityGroup
         attribute :resource_group
 
         def all
           requires :resource_group
           network_security_groups = []
           service.list_network_security_groups(resource_group).each do |nsg|
-            network_security_groups << NetworkSecurityGroup.parse(nsg)
+            network_security_groups << Fog::Network::AzureRM::NetworkSecurityGroup.parse(nsg)
           end
           load(network_security_groups)
         end
 
         def get(resource_group, name)
-          nsg = service.get_network_security_group(resource_group, name)
-          network_security_group = NetworkSecurityGroup.new(service: service)
-          network_security_group.merge_attributes(NetworkSecurityGroup.parse(nsg))
+          network_security_group = service.get_network_security_group(resource_group, name)
+          network_security_group_fog = Fog::Network::AzureRM::NetworkSecurityGroup.new(service: service)
+          network_security_group_fog.merge_attributes(Fog::Network::AzureRM::NetworkSecurityGroup.parse(network_security_group))
         end
       end
     end

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

@@ -21,7 +21,7 @@ module Fog
           hash = {}
           hash['id'] = nsr.id
           hash['name'] = nsr.name
-          hash['resource_group'] = get_resource_from_resource_id(nsr.id, RESOURCE_GROUP_NAME)
+          hash['resource_group'] = get_resource_group_from_id(nsr.id)
           hash['network_security_group_name'] = get_resource_from_resource_id(nsr.id, RESOURCE_NAME)
           hash['description'] = nsr.description
           hash['protocol'] = nsr.protocol
@@ -37,12 +37,11 @@ module Fog
 
         def save
           requires :name, :network_security_group_name, :resource_group, :protocol, :source_port_range, :destination_port_range, :source_address_prefix, :destination_address_prefix, :access, :priority, :direction
-          security_rule_params = get_security_rule_params
           network_security_rule = service.create_or_update_network_security_rule(security_rule_params)
-          merge_attributes(NetworkSecurityRule.parse(network_security_rule))
+          merge_attributes(Fog::Network::AzureRM::NetworkSecurityRule.parse(network_security_rule))
         end
 
-        def get_security_rule_params
+        def security_rule_params
           {
             name: name,
             resource_group: resource_group,

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

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # collection class for Network Security Rule
       class NetworkSecurityRules < Fog::Collection
-        model NetworkSecurityRule
+        model Fog::Network::AzureRM::NetworkSecurityRule
         attribute :resource_group
         attribute :network_security_group_name
 
@@ -11,15 +11,15 @@ module Fog
           requires :resource_group, :network_security_group_name
           network_security_rules = []
           service.list_network_security_rules(resource_group, network_security_group_name).each do |nsr|
-            network_security_rules << NetworkSecurityRule.parse(nsr)
+            network_security_rules << Fog::Network::AzureRM::NetworkSecurityRule.parse(nsr)
           end
           load(network_security_rules)
         end
 
         def get(resource_group, network_security_group_name, name)
           network_security_rule = service.get_network_security_rule(resource_group, network_security_group_name, name)
-          network_security_rule_obj = NetworkSecurityRule.new(service: service)
-          network_security_rule_obj.merge_attributes(NetworkSecurityRule.parse(network_security_rule))
+          network_security_rule_fog = Fog::Network::AzureRM::NetworkSecurityRule.new(service: service)
+          network_security_rule_fog.merge_attributes(Fog::Network::AzureRM::NetworkSecurityRule.parse(network_security_rule))
         end
       end
     end

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

@@ -3,22 +3,22 @@ module Fog
     class AzureRM
       # PublicIPs collection class for Network Service
       class PublicIps < Fog::Collection
-        model PublicIp
+        model Fog::Network::AzureRM::PublicIp
         attribute :resource_group
 
         def all
           requires :resource_group
           public_ips = []
           service.list_public_ips(resource_group).each do |pip|
-            public_ips << PublicIp.parse(pip)
+            public_ips << Fog::Network::AzureRM::PublicIp.parse(pip)
           end
           load(public_ips)
         end
 
         def get(resource_group_name, public_ip_name)
           public_ip = service.get_public_ip(resource_group_name, public_ip_name)
-          public_ip_object = PublicIp.new(service: service)
-          public_ip_object.merge_attributes(PublicIp.parse(public_ip))
+          public_ip_fog = Fog::Network::AzureRM::PublicIp.new(service: service)
+          public_ip_fog.merge_attributes(Fog::Network::AzureRM::PublicIp.parse(public_ip))
         end
 
         def check_if_exists(resource_group, name)

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

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # Subnet collection for network service
       class Subnets < Fog::Collection
-        model Subnet
+        model Fog::Network::AzureRM::Subnet
         attribute :resource_group
         attribute :virtual_network_name
 
@@ -11,15 +11,15 @@ module Fog
           requires :resource_group, :virtual_network_name
           subnets = []
           service.list_subnets(resource_group, virtual_network_name).each do |subnet|
-            subnets << Subnet.parse(subnet)
+            subnets << Fog::Network::AzureRM::Subnet.parse(subnet)
           end
           load(subnets)
         end
 
         def get(resource_group, virtual_network_name, subnet_name)
           subnet = service.get_subnet(resource_group, virtual_network_name, subnet_name)
-          subnet_object = Subnet.new(service: service)
-          subnet_object.merge_attributes(Subnet.parse(subnet))
+          subnet_fog = Fog::Network::AzureRM::Subnet.new(service: service)
+          subnet_fog.merge_attributes(Fog::Network::AzureRM::Subnet.parse(subnet))
         end
       end
     end

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

@@ -52,13 +52,13 @@ module Fog
 
           hash['ip_configurations'] = []
           network_gateway.ip_configurations.each do |ip_config|
-            ip_configuration = FrontendIPConfiguration.new
-            hash['ip_configurations'] << ip_configuration.merge_attributes(FrontendIPConfiguration.parse(ip_config))
+            ip_configuration = Fog::Network::AzureRM::FrontendIPConfiguration.new
+            hash['ip_configurations'] << ip_configuration.merge_attributes(Fog::Network::AzureRM::FrontendIPConfiguration.parse(ip_config))
           end unless network_gateway.ip_configurations.nil?
 
           unless network_gateway.vpn_client_configuration.nil?
-            vpn_client_configuration = VpnClientConfiguration.new
-            hash['vpn_client_configuration'] = vpn_client_configuration.merge_attributes(VpnClientConfiguration.parse(network_gateway.vpn_client_configuration))
+            vpn_client_configuration = Fog::Network::AzureRM::VpnClientConfiguration.new
+            hash['vpn_client_configuration'] = vpn_client_configuration.merge_attributes(Fog::Network::AzureRM::VpnClientConfiguration.parse(network_gateway.vpn_client_configuration))
           end
 
           hash
@@ -67,9 +67,8 @@ module Fog
         def save
           requires :name, :location, :resource_group, :gateway_type, :enable_bgp
           validate_ip_configurations(ip_configurations) unless ip_configurations.nil?
-          virtual_network_params = virtual_gateway_parameters
-          network_gateway = service.create_or_update_virtual_network_gateway(virtual_network_params)
-          merge_attributes(VirtualNetworkGateway.parse(network_gateway))
+          network_gateway = service.create_or_update_virtual_network_gateway(virtual_gateway_parameters)
+          merge_attributes(Fog::Network::AzureRM::VirtualNetworkGateway.parse(network_gateway))
         end
 
         def destroy

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

@@ -27,13 +27,13 @@ module Fog
           connection = get_hash_from_object(gateway_connection)
 
           unless gateway_connection.virtual_network_gateway1.nil?
-            gateway1 = VirtualNetworkGateway.new
-            connection['virtual_network_gateway1'] = gateway1.merge_attributes(VirtualNetworkGateway.parse(gateway_connection.virtual_network_gateway1))
+            gateway1 = Fog::Network::AzureRM::VirtualNetworkGateway.new
+            connection['virtual_network_gateway1'] = gateway1.merge_attributes(Fog::Network::AzureRM::VirtualNetworkGateway.parse(gateway_connection.virtual_network_gateway1))
           end
 
           unless gateway_connection.virtual_network_gateway2.nil?
-            gateway2 = VirtualNetworkGateway.new
-            connection['virtual_network_gateway2'] = gateway2.merge_attributes(VirtualNetworkGateway.parse(gateway_connection.virtual_network_gateway2))
+            gateway2 = Fog::Network::AzureRM::VirtualNetworkGateway.new
+            connection['virtual_network_gateway2'] = gateway2.merge_attributes(Fog::Network::AzureRM::VirtualNetworkGateway.parse(gateway_connection.virtual_network_gateway2))
           end
           connection['resource_group'] = get_resource_group_from_id(gateway_connection.id)
           connection
@@ -42,7 +42,7 @@ module Fog
         def save
           requires :name, :location, :resource_group, :connection_type
           gateway_connection = service.create_or_update_virtual_network_gateway_connection(gateway_connection_parameters)
-          merge_attributes(VirtualNetworkGatewayConnection.parse(gateway_connection))
+          merge_attributes(Fog::Network::AzureRM::VirtualNetworkGatewayConnection.parse(gateway_connection))
         end
 
         def destroy

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

@@ -3,19 +3,19 @@ module Fog
     class AzureRM
       # VirtualNetworkGatewayConnections collection class for Network Service
       class VirtualNetworkGatewayConnections < Fog::Collection
-        model VirtualNetworkGatewayConnection
+        model Fog::Network::AzureRM::VirtualNetworkGatewayConnection
         attribute :resource_group
 
         def all
           requires :resource_group
-          gateway_connections = service.list_virtual_network_gateway_connections(resource_group).map { |connection| VirtualNetworkGatewayConnection.parse(connection) }
+          gateway_connections = service.list_virtual_network_gateway_connections(resource_group).map { |connection| Fog::Network::AzureRM::VirtualNetworkGatewayConnection.parse(connection) }
           load(gateway_connections)
         end
 
         def get(resource_group_name, name)
           connection = service.get_virtual_network_gateway_connection(resource_group_name, name)
-          gateway_connection = VirtualNetworkGatewayConnection.new(service: service)
-          gateway_connection.merge_attributes(VirtualNetworkGatewayConnection.parse(connection))
+          gateway_connection = Fog::Network::AzureRM::VirtualNetworkGatewayConnection.new(service: service)
+          gateway_connection.merge_attributes(Fog::Network::AzureRM::VirtualNetworkGatewayConnection.parse(connection))
         end
       end
     end