fog-azure-rm 0.0.4 → 0.0.5

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

@@ -4,35 +4,31 @@ module Fog
       # Real class for Network Request
       class Real
         def attach_network_security_group_to_subnet(resource_group, subnet_name, virtual_network_name, address_prefix, route_table_id, network_security_group_id)
-          Fog::Logger.debug "Attaching Network Security Group with Subnet: #{subnet_name}."
-
+          msg = "Attaching Network Security Group with Subnet: #{subnet_name}"
+          Fog::Logger.debug msg
           subnet = get_subnet_object_for_attach_network_security_group(address_prefix, network_security_group_id, route_table_id)
           begin
-            promise = @network_client.subnets.create_or_update(resource_group, virtual_network_name, subnet_name, subnet)
-            result = promise.value!
-            Fog::Logger.debug 'Network Security Group attached successfully.'
-            Azure::ARM::Network::Models::Subnet.serialize_object(result.body)
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception Attaching Network Security Group with Subnet: #{subnet_name}. #{e.body['error']['message']}"
-            raise msg
+            subnet_obj = @network_client.subnets.create_or_update(resource_group, virtual_network_name, subnet_name, subnet)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug 'Network Security Group attached to Subnet #{subnet_name} successfully.'
+          subnet_obj
         end
 
         private
 
         def get_subnet_object_for_attach_network_security_group(address_prefix, network_security_group_id, route_table_id)
           subnet = Azure::ARM::Network::Models::Subnet.new
-          subnet_properties = Azure::ARM::Network::Models::SubnetPropertiesFormat.new
           network_security_group = Azure::ARM::Network::Models::NetworkSecurityGroup.new
           route_table = Azure::ARM::Network::Models::RouteTable.new
 
           network_security_group.id = network_security_group_id
           route_table.id = route_table_id
 
-          subnet_properties.address_prefix = address_prefix
-          subnet_properties.route_table = route_table unless route_table_id.nil?
-          subnet_properties.network_security_group = network_security_group
-          subnet.properties = subnet_properties
+          subnet.address_prefix = address_prefix
+          subnet.route_table = route_table unless route_table_id.nil?
+          subnet.network_security_group = network_security_group
           subnet
         end
       end
@@ -40,7 +36,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def attach_network_security_group_to_subnet(*)
-          {
+          subnet = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet/subnets/fog-subnet',
             'properties' =>
               {
@@ -52,6 +48,8 @@ module Fog
               },
             'name' => 'fog-subnet'
           }
+          subnet_mapper = Azure::ARM::Network::Models::Subnet.mapper
+          @network_client.deserialize(subnet_mapper, subnet, 'result.body')
         end
       end
     end

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

@@ -4,46 +4,45 @@ module Fog
       # Real class for Network Request
       class Real
         def attach_resource_to_nic(resource_group_name, nic_name, resource_type, resource_id)
-          Fog::Logger.debug "Updating #{resource_type} in Network Interface #{nic_name}."
+          msg = "Updating #{resource_type} in Network Interface #{nic_name}"
+          Fog::Logger.debug msg
           begin
             nic = get_network_interface_with_attached_resource(nic_name, resource_group_name, resource_id, resource_type)
-
-            promise = @network_client.network_interfaces.create_or_update(resource_group_name, nic_name, nic)
-            result = promise.value!
-            Fog::Logger.debug "#{resource_type} updated in Network Interface #{nic_name} successfully!"
-            Azure::ARM::Network::Models::NetworkInterface.serialize_object(result.body)
+            network_interface = @network_client.network_interfaces.create_or_update(resource_group_name, nic_name, nic)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception updating #{resource_type} in Network Interface #{nic_name} . #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "#{resource_type} updated in Network Interface #{nic_name} successfully!"
+          network_interface
         end
 
+        private
+
         def get_network_interface_with_attached_resource(nic_name, resource_group_name, resource_id, resource_type)
-          promise = @network_client.network_interfaces.get(resource_group_name, nic_name)
-          result = promise.value!
-          nic = result.body
+          network_interface = @network_client.network_interfaces.get(resource_group_name, nic_name)
+
           case resource_type
           when SUBNET
             subnet = Azure::ARM::Network::Models::Subnet.new
             subnet.id = resource_id
-            nic.properties.ip_configurations[0].properties.subnet = subnet
+            network_interface.ip_configurations[0].subnet = subnet
           when PUBLIC_IP
             public_ip_address = Azure::ARM::Network::Models::PublicIPAddress.new
             public_ip_address.id = resource_id
-            nic.properties.ip_configurations[0].properties.public_ipaddress = public_ip_address
+            network_interface.ip_configurations[0].public_ipaddress = public_ip_address
           when NETWORK_SECURITY_GROUP
             network_security_group = Azure::ARM::Network::Models::NetworkSecurityGroup.new
             network_security_group.id = resource_id
-            nic.properties.network_security_group = network_security_group
+            network_interface.network_security_group = network_security_group
           end
-          nic
+          network_interface
         end
       end
 
       # Mock class for Network Request
       class Mock
         def attach_resource_to_nic(resource_group_name, nic_name, _resource_type, _resource_id)
-          {
+          nic = {
             'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group_name}/providers/Microsoft.Network/networkInterfaces/#{nic_name}",
             'name' => nic_name,
             'type' => 'Microsoft.Network/networkInterfaces',
@@ -81,6 +80,8 @@ module Fog
                 'provisioningState' => 'Succeeded'
               }
           }
+          network_interface_mapper = Azure::ARM::Network::Models::NetworkInterface.mapper
+          @network_client.deserialize(network_interface_mapper, nic, 'result.body')
         end
       end
     end

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

@@ -4,35 +4,31 @@ module Fog
       # Real class for Network Request
       class Real
         def attach_route_table_to_subnet(resource_group, subnet_name, virtual_network_name, address_prefix, network_security_group_id, route_table_id)
-          Fog::Logger.debug "Attaching Route Table with Subnet: #{subnet_name}."
-
+          msg = "Attaching Route Table to Subnet: #{subnet_name}"
+          Fog::Logger.debug msg
           subnet = get_subnet_object_for_attach_route_table(address_prefix, network_security_group_id, route_table_id)
           begin
-            promise = @network_client.subnets.create_or_update(resource_group, virtual_network_name, subnet_name, subnet)
-            result = promise.value!
-            Fog::Logger.debug 'Route Table attached successfully.'
-            Azure::ARM::Network::Models::Subnet.serialize_object(result.body)
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception Attaching Route Table with Subnet: #{subnet_name}. #{e.body['error']['message']}"
-            raise msg
+            subnet_obj = @network_client.subnets.create_or_update(resource_group, virtual_network_name, subnet_name, subnet)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug 'Route Table attached to Subnet #{subnet_name} successfully.'
+          subnet_obj
         end
 
         private
 
         def get_subnet_object_for_attach_route_table(address_prefix, network_security_group_id, route_table_id)
           subnet = Azure::ARM::Network::Models::Subnet.new
-          subnet_properties = Azure::ARM::Network::Models::SubnetPropertiesFormat.new
           network_security_group = Azure::ARM::Network::Models::NetworkSecurityGroup.new
           route_table = Azure::ARM::Network::Models::RouteTable.new
 
           network_security_group.id = network_security_group_id
           route_table.id = route_table_id
 
-          subnet_properties.address_prefix = address_prefix
-          subnet_properties.network_security_group = network_security_group unless network_security_group_id.nil?
-          subnet_properties.route_table = route_table
-          subnet.properties = subnet_properties
+          subnet.address_prefix = address_prefix
+          subnet.network_security_group = network_security_group unless network_security_group_id.nil?
+          subnet.route_table = route_table
           subnet
         end
       end
@@ -40,7 +36,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def attach_route_table_to_subnet(*)
-          {
+          subnet = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet/subnets/fog-subnet',
             'properties' =>
               {
@@ -52,6 +48,8 @@ module Fog
               },
             'name' => 'fog-subnet'
           }
+          subnet_mapper = Azure::ARM::Network::Models::Subnet.mapper
+          @network_client.deserialize(subnet_mapper, subnet, 'result.body')
         end
       end
     end

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

@@ -5,12 +5,10 @@ module Fog
       class Real
         def check_for_public_ip(resource_group, name)
           begin
-            promise = @network_client.public_ipaddresses.get(resource_group, name)
-            promise.value!
+            @network_client.public_ipaddresses.get(resource_group, name)
             return true
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception checking name availability: #{e.body['error']['message']}"
-            raise msg if e.body['error']['code'] == 'ResourceGroupNotFound'
+            raise_azure_exception(e, "Checking Public IP #{name}") if e.body['error']['code'] == 'ResourceGroupNotFound'
             return false if e.body['error']['code'] == 'ResourceNotFound'
           end
         end

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

@@ -4,15 +4,15 @@ module Fog
       # Mock class for Network Request
       class Real
         def check_for_virtual_network(resource_group, name)
+          msg = "Finding Virtual Network #{name}"
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.virtual_networks.get(resource_group, name)
-            promise.value!
-            return true
+            @network_client.virtual_networks.get(resource_group, name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception checking name availability: #{e.body['error']['message']}"
-            raise msg if e.body['error']['code'] == 'ResourceGroupNotFound'
+            raise_azure_exception(e, msg) if e.body['error']['code'] == 'ResourceGroupNotFound'
             return false if e.body['error']['code'] == 'ResourceNotFound'
           end
+          true
         end
       end
 

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

@@ -4,68 +4,59 @@ module Fog
       # Real class for Load-Balancer Request
       class Real
         def create_load_balancer(name, location, resource_group, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
-          Fog::Logger.debug "Creating Load-Balancer: #{name}..."
+          msg = "Creating Load-Balancer: #{name}"
+          Fog::Logger.debug msg
           load_balancer = define_load_balancer(name, location, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
           begin
-            promise = @network_client.load_balancers.create_or_update(resource_group, name, load_balancer)
-            result = promise.value!
-            Fog::Logger.debug "Load-Balancer #{name} created successfully."
-            Azure::ARM::Network::Models::LoadBalancer.serialize_object(result.body)
+            load_balancer = @network_client.load_balancers.create_or_update(resource_group, name, load_balancer)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception creating Load-Balancer #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Load-Balancer #{name} created successfully."
+          load_balancer
         end
 
         private
 
         def define_load_balancer(name, location, frontend_ip_configurations, backend_address_pool_names, load_balancing_rules, probes, inbound_nat_rules, inbound_nat_pools)
-          lb_props = Azure::ARM::Network::Models::LoadBalancerPropertiesFormat.new
+          load_balancer = Azure::ARM::Network::Models::LoadBalancer.new
+          load_balancer.name = name
+          load_balancer.location = location
 
           if frontend_ip_configurations
             frontend_ip_configuration_arr = define_lb_frontend_ip_configurations(frontend_ip_configurations)
-            lb_props.frontend_ipconfigurations = []
-            lb_props.frontend_ipconfigurations = frontend_ip_configuration_arr
+            load_balancer.frontend_ipconfigurations = frontend_ip_configuration_arr
           end
 
           if backend_address_pool_names
-            lb_props.backend_address_pools = []
+            load_balancer.backend_address_pools = []
             backend_address_pool_names.each do |bap|
               backend_pool = Azure::ARM::Network::Models::BackendAddressPool.new
               backend_pool.name = bap
-              lb_props.backend_address_pools.push(backend_pool)
+              load_balancer.backend_address_pools.push(backend_pool)
             end
           end
 
           if load_balancing_rules
-            lb_props.load_balancing_rules = []
             load_balancing_rule_arr = define_load_balancing_rule(load_balancing_rules)
-            lb_props.load_balancing_rules = load_balancing_rule_arr
+            load_balancer.load_balancing_rules = load_balancing_rule_arr
           end
 
           if probes
-            lb_props.probes = []
             probe_arr = define_probe(probes)
-            lb_props.probes = probe_arr
+            load_balancer.probes = probe_arr
           end
 
           if inbound_nat_rules
-            lb_props.inbound_nat_rules = []
             inbound_nat_rule_arr = define_inbound_nat_rule(inbound_nat_rules)
-            lb_props.inbound_nat_rules = inbound_nat_rule_arr
+            load_balancer.inbound_nat_rules = inbound_nat_rule_arr
           end
 
           if inbound_nat_pools
-            lb_props.inbound_nat_pools = []
             inbound_nat_pool_arr = define_inbound_nat_pool(inbound_nat_pools)
-            lb_props.inbound_nat_pools = inbound_nat_pool_arr
+            load_balancer.inbound_nat_pools = inbound_nat_pool_arr
           end
 
-          load_balancer = Azure::ARM::Network::Models::LoadBalancer.new
-          load_balancer.name = name
-          load_balancer.location = location
-          load_balancer.properties = lb_props
-
           load_balancer
         end
 
@@ -73,21 +64,19 @@ module Fog
           inbound_nat_pool_arr = []
           inbound_nat_pools.each do |inp|
             inbound_nat_pool = Azure::ARM::Network::Models::InboundNatPool.new
-            inbound_nat_pool_prop = Azure::ARM::Network::Models::InboundNatPoolPropertiesFormat.new
 
             unless inp[:frontend_ip_configuration_id].nil?
               frontend_ipconfigurations = Azure::ARM::Network::Models::FrontendIPConfiguration.new
               frontend_ipconfigurations.id = inp[:frontend_ip_configuration_id]
-              inbound_nat_pool_prop.frontend_ipconfiguration = frontend_ipconfigurations
+              inbound_nat_pool.frontend_ipconfiguration = frontend_ipconfigurations
             end
 
-            inbound_nat_pool_prop.protocol = inp[:protocol]
-            inbound_nat_pool_prop.frontend_port_range_start = inp[:frontend_port_range_start]
-            inbound_nat_pool_prop.frontend_port_range_end = inp[:frontend_port_range_end]
-            inbound_nat_pool_prop.backend_port = inp[:backend_port]
+            inbound_nat_pool.protocol = inp[:protocol]
+            inbound_nat_pool.frontend_port_range_start = inp[:frontend_port_range_start]
+            inbound_nat_pool.frontend_port_range_end = inp[:frontend_port_range_end]
+            inbound_nat_pool.backend_port = inp[:backend_port]
 
             inbound_nat_pool.name = inp[:name]
-            inbound_nat_pool.properties = inbound_nat_pool_prop
             inbound_nat_pool_arr.push(inbound_nat_pool)
           end
           inbound_nat_pool_arr
@@ -97,19 +86,17 @@ module Fog
           inbound_nat_rule_arr = []
           inbound_nat_rules.each do |inr|
             inbound_nat_rule = Azure::ARM::Network::Models::InboundNatRule.new
-            inbound_nat_rule_prop = Azure::ARM::Network::Models::InboundNatRulePropertiesFormat.new
 
             unless inr[:frontend_ip_configuration_id].nil?
               frontend_ipconfigurations = Azure::ARM::Network::Models::FrontendIPConfiguration.new
               frontend_ipconfigurations.id = inr[:frontend_ip_configuration_id]
-              inbound_nat_rule_prop.frontend_ipconfiguration = frontend_ipconfigurations
+              inbound_nat_rule.frontend_ipconfiguration = frontend_ipconfigurations
             end
-            inbound_nat_rule_prop.protocol = inr[:protocol]
-            inbound_nat_rule_prop.frontend_port = inr[:frontend_port]
-            inbound_nat_rule_prop.backend_port = inr[:backend_port]
+            inbound_nat_rule.protocol = inr[:protocol]
+            inbound_nat_rule.frontend_port = inr[:frontend_port]
+            inbound_nat_rule.backend_port = inr[:backend_port]
 
             inbound_nat_rule.name = inr[:name]
-            inbound_nat_rule.properties = inbound_nat_rule_prop
             inbound_nat_rule_arr.push(inbound_nat_rule)
           end
           inbound_nat_rule_arr
@@ -119,16 +106,14 @@ module Fog
           probe_arr = []
           probes.each do |prb|
             probe = Azure::ARM::Network::Models::Probe.new
-            probe_prop = Azure::ARM::Network::Models::ProbePropertiesFormat.new
 
-            probe_prop.protocol = prb[:protocol]
-            probe_prop.port = prb[:port]
-            probe_prop.interval_in_seconds = prb[:interval_in_seconds]
-            probe_prop.number_of_probes = prb[:number_of_probes]
-            probe_prop.request_path = prb[:request_path]
+            probe.protocol = prb[:protocol]
+            probe.port = prb[:port]
+            probe.interval_in_seconds = prb[:interval_in_seconds]
+            probe.number_of_probes = prb[:number_of_probes]
+            probe.request_path = prb[:request_path]
 
             probe.name = prb[:name]
-            probe.properties = probe_prop
             probe_arr.push(probe)
           end
           probe_arr
@@ -138,35 +123,33 @@ module Fog
           load_balancing_rule_arr = []
           load_balancing_rules.each do |lbr|
             load_balancing_rule = Azure::ARM::Network::Models::LoadBalancingRule.new
-            load_balancing_rule_prop = Azure::ARM::Network::Models::LoadBalancingRulePropertiesFormat.new
 
-            load_balancing_rule_prop.protocol = lbr[:protocol]
-            load_balancing_rule_prop.load_distribution = lbr[:load_distribution]
-            load_balancing_rule_prop.idle_timeout_in_minutes = lbr[:idle_timeout_in_minutes]
-            load_balancing_rule_prop.frontend_port = lbr[:frontend_port]
-            load_balancing_rule_prop.backend_port = lbr[:backend_port]
-            load_balancing_rule_prop.enable_floating_ip = lbr[:enable_floating_ip]
+            load_balancing_rule.protocol = lbr[:protocol]
+            load_balancing_rule.load_distribution = lbr[:load_distribution]
+            load_balancing_rule.idle_timeout_in_minutes = lbr[:idle_timeout_in_minutes]
+            load_balancing_rule.frontend_port = lbr[:frontend_port]
+            load_balancing_rule.backend_port = lbr[:backend_port]
+            load_balancing_rule.enable_floating_ip = lbr[:enable_floating_ip]
 
             unless lbr[:frontend_ip_configuration_id].nil?
               frontend_ipconfigurations = Azure::ARM::Network::Models::FrontendIPConfiguration.new
               frontend_ipconfigurations.id = lbr[:frontend_ip_configuration_id]
-              load_balancing_rule_prop.frontend_ipconfiguration = frontend_ipconfigurations
+              load_balancing_rule.frontend_ipconfiguration = frontend_ipconfigurations
             end
 
             unless lbr[:backend_address_pool_id].nil?
               backend_address_pool = Azure::ARM::Network::Models::BackendAddressPool.new
               backend_address_pool.id = lbr[:backend_address_pool_id]
-              load_balancing_rule_prop.backend_address_pool = backend_address_pool
+              load_balancing_rule.backend_address_pool = backend_address_pool
             end
 
             unless lbr[:probe_id].nil?
               probe = Azure::ARM::Network::Models::Probe.new
               probe.id = lbr[:probe_id]
-              load_balancing_rule_prop.probe = probe
+              load_balancing_rule.probe = probe
             end
 
             load_balancing_rule.name = lbr[:name]
-            load_balancing_rule.properties = load_balancing_rule_prop
             load_balancing_rule_arr.push(load_balancing_rule)
           end
           load_balancing_rule_arr
@@ -176,22 +159,20 @@ module Fog
           frontend_ip_configuration_arr = []
           frontend_ip_configurations.each do |fic|
             frontend_ip_configuration = Azure::ARM::Network::Models::FrontendIPConfiguration.new
-            frontend_ip_configuration_prop = Azure::ARM::Network::Models::FrontendIPConfigurationPropertiesFormat.new
-            frontend_ip_configuration_prop.private_ipaddress = fic[:private_ipaddress]
-            frontend_ip_configuration_prop.private_ipallocation_method = fic[:private_ipallocation_method]
+            frontend_ip_configuration.private_ipaddress = fic[:private_ipaddress]
+            frontend_ip_configuration.private_ipallocation_method = fic[:private_ipallocation_method]
             unless fic[:subnet_id].nil?
               snet = Azure::ARM::Network::Models::Subnet.new
               snet.id = fic[:subnet_id]
-              frontend_ip_configuration_prop.subnet = snet
+              frontend_ip_configuration.subnet = snet
             end
             unless fic[:public_ipaddress_id].nil?
               pip = Azure::ARM::Network::Models::PublicIPAddress.new
               pip.id = fic[:public_ipaddress_id]
-              frontend_ip_configuration_prop.public_ipaddress = pip
+              frontend_ip_configuration.public_ipaddress = pip
             end
 
             frontend_ip_configuration.name = fic[:name]
-            frontend_ip_configuration.properties = frontend_ip_configuration_prop
             frontend_ip_configuration_arr.push(frontend_ip_configuration)
           end
           frontend_ip_configuration_arr