fog-azure-rm 0.0.4 → 0.0.5

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

@@ -5,28 +5,24 @@ module Fog
       class Real
         def create_public_ip(resource_group, name, location, public_ip_allocation_method)
           Fog::Logger.debug "Creating PublicIP #{name} in Resource Group #{resource_group}."
-          properties = Azure::ARM::Network::Models::PublicIPAddressPropertiesFormat.new
-          properties.public_ipallocation_method = public_ip_allocation_method
           public_ip = Azure::ARM::Network::Models::PublicIPAddress.new
           public_ip.name = name
           public_ip.location = location
-          public_ip.properties = properties
+          public_ip.public_ipallocation_method = public_ip_allocation_method
           begin
-            promise = @network_client.public_ipaddresses.create_or_update(resource_group, name, public_ip)
-            result = promise.value!
-            Fog::Logger.debug "PublicIP #{name} Created Successfully!"
-            Azure::ARM::Network::Models::PublicIPAddress.serialize_object(result.body)
+            public_ip = @network_client.public_ipaddresses.create_or_update(resource_group, name, public_ip)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception creating Public IP #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, "Creating PublicIP #{name} in Resource Group #{resource_group}")
           end
+          Fog::Logger.debug "PublicIP #{name} Created Successfully!"
+          public_ip
         end
       end
 
       # Mock class for Network Request
       class Mock
         def create_public_ip(resource_group, name, location, public_ip_allocation_method)
-          {
+          public_ip = {
             'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/publicIPAddresses/#{name}",
             'name' => name,
             'type' => 'Microsoft.Network/publicIPAddresses',
@@ -40,6 +36,8 @@ module Fog
                 'provisioningState' => 'Succeeded'
               }
           }
+          public_ip_mapper = Azure::ARM::Network::Models::PublicIPAddress.mapper
+          @network_client.deserialize(public_ip_mapper, public_ip, 'result.body')
         end
       end
     end

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

@@ -4,35 +4,31 @@ module Fog
       # Real class for Network Request
       class Real
         def create_subnet(resource_group, subnet_name, virtual_network_name, address_prefix, network_security_group_id, route_table_id)
-          Fog::Logger.debug "Creating Subnet: #{subnet_name}."
-
+          msg = "Creating Subnet: #{subnet_name}"
+          Fog::Logger.debug msg
           subnet = get_subnet_object(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 "Subnet #{subnet_name} created successfully."
-            Azure::ARM::Network::Models::Subnet.serialize_object(result.body)
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception creating Subnet #{subnet_name} in Resource Group: #{resource_group}. #{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 "Subnet #{subnet_name} created successfully."
+          subnet_obj
         end
 
         private
 
         def get_subnet_object(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
 
-          subnet_properties.address_prefix = address_prefix
+          subnet.address_prefix = address_prefix
           network_security_group.id = network_security_group_id
           route_table.id = route_table_id
 
-          subnet_properties.network_security_group = network_security_group unless network_security_group_id.nil?
-          subnet_properties.route_table = route_table unless route_table_id.nil?
-          subnet.properties = subnet_properties
+          subnet.network_security_group = network_security_group unless network_security_group_id.nil?
+          subnet.route_table = route_table unless route_table_id.nil?
           subnet
         end
       end
@@ -40,7 +36,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def create_subnet(*)
-          {
+          subnet = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet/subnets/fog-subnet',
             'properties' =>
               {
@@ -49,6 +45,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/delete_express_route_circuit.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Network Request
+      class Real
+        def delete_express_route_circuit(resource_group_name, circuit_name)
+          msg = "Deleting Express Route Circuit #{circuit_name} from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+          begin
+            @network_client.express_route_circuits.delete(resource_group_name, circuit_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Express Route Circuit #{circuit_name} Deleted Successfully."
+          true
+        end
+      end
+
+      # Mock class for Network Request
+      class Mock
+        def delete_express_route_circuit(*)
+          Fog::Logger.debug 'Express Route Circuit {circuit_name} from Resource group {resource_group_name} deleted successfully.'
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Network Request
+      class Real
+        def delete_express_route_circuit_peering(resource_group_name, peering_name, circuit_name)
+          msg = "Deleting Express Route Circuit Peering #{peering_name} from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+          begin
+            @network_client.express_route_circuit_peerings.delete(resource_group_name, circuit_name, peering_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Express Route Circuit Peering #{peering_name} Deleted Successfully."
+          true
+        end
+      end
+
+      # Mock class for Network Request
+      class Mock
+        def delete_express_route_circuit_peering(*)
+          Fog::Logger.debug 'Express Route Circuit Peering {peering_name} from Resource group {resource_group_name} deleted successfully.'
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -4,22 +4,23 @@ module Fog
       # Real class for Network Request
       class Real
         def delete_load_balancer(resource_group, name)
-          Fog::Logger.debug "Deleting Load_Balancer #{name} from Resource Group #{resource_group}."
+          msg = "Deleting Load_Balancer #{name} from Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.load_balancers.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Load_Balancer #{name} Deleted Successfully."
-            true
+            @network_client.load_balancers.delete(resource_group, name)
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting 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} Deleted Successfully."
+          true
         end
       end
 
       # Mock class for Network Request
       class Mock
         def delete_load_balancer(_resource_group, _name)
+          Fog::Logger.debug "Load_Balancer #{name} Deleted Successfully."
+          true
         end
       end
     end

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

@@ -4,16 +4,15 @@ module Fog
       # Real class for Network Request
       class Real
         def delete_network_interface(resource_group, name)
-          Fog::Logger.debug "Deleting NetworkInterface #{name} from Resource Group #{resource_group}."
+          msg = "Deleting NetworkInterface #{name} from Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.network_interfaces.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "NetworkInterface #{name} Deleted Successfully."
-            true
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Network Interface #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            @network_client.network_interfaces.delete(resource_group, name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "NetworkInterface #{name} Deleted Successfully."
+          true
         end
       end
 

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

@@ -4,16 +4,17 @@ module Fog
       # Real class for Network Request
       class Real
         def delete_network_security_group(resource_group, name)
-          Fog::Logger.debug "Deleting Network Security Group: #{name}..."
+          msg = "Deleting Network Security Group: #{name}"
+          Fog::Logger.debug msg
+
           begin
-            promise = @network_client.network_security_groups.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Network Security Group #{name} deleted successfully."
-            true
+            @network_client.network_security_groups.delete(resource_group, name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Network Security Group #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+
+          Fog::Logger.debug "Network Security Group #{name} deleted successfully."
+          true
         end
       end
 

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

@@ -6,14 +6,12 @@ module Fog
         def delete_public_ip(resource_group, name)
           Fog::Logger.debug "Deleting PublicIP #{name} from Resource Group #{resource_group}."
           begin
-            promise = @network_client.public_ipaddresses.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "PublicIP #{name} Deleted Successfully."
-            true
+            @network_client.public_ipaddresses.delete(resource_group, name)
           rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Public IP #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, "Deleting PublicIP #{name} from Resource Group #{resource_group}")
           end
+          Fog::Logger.debug "PublicIP #{name} Deleted Successfully."
+          true
         end
       end
 

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

@@ -4,16 +4,15 @@ module Fog
       # Real class for Network Request
       class Real
         def delete_subnet(resource_group, name, virtual_network_name)
-          Fog::Logger.debug "Deleting Subnet: #{name}..."
+          msg = "Deleting Subnet: #{name}"
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.subnets.delete(resource_group, virtual_network_name, name)
-            promise.value!
-            Fog::Logger.debug "Subnet #{name} deleted successfully."
-            true
+            @network_client.subnets.delete(resource_group, virtual_network_name, name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Subnet #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Subnet #{name} of Virtual Network #{virtual_network_name} from Resource group #{resource_group} deleted successfully."
+          true
         end
       end
 

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

@@ -4,16 +4,15 @@ module Fog
       # Real class for Network Request
       class Real
         def delete_virtual_network(resource_group, name)
-          Fog::Logger.debug "Deleting Virtual Network: #{name}..."
+          msg = "Deleting Virtual Network: #{name}"
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.virtual_networks.delete(resource_group, name)
-            promise.value!
-            Fog::Logger.debug "Virtual Network #{name} deleted successfully."
-            true
+            @network_client.virtual_networks.delete(resource_group, name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception deleting Virtual Network #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Virtual Network #{name} deleted successfully."
+          true
         end
       end
 

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

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Network Request
+      class Real
+        def delete_virtual_network_gateway(resource_group_name, virtual_network_gateway_name)
+          msg = "Deleting Virtual Network Gateway #{virtual_network_gateway_name} from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+          begin
+            @network_client.virtual_network_gateways.delete(resource_group_name, virtual_network_gateway_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Virtual Network Gateway #{virtual_network_gateway_name} Deleted Successfully."
+          true
+        end
+      end
+
+      # Mock class for Network Request
+      class Mock
+        def delete_virtual_network_gateway(resource_group_name, virtual_network_gateway_name)
+          Fog::Logger.debug "Virtual Network Gateway #{virtual_network_gateway_name} from Resource group #{resource_group_name} deleted successfully."
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -4,32 +4,28 @@ module Fog
       # Real class for Network Request
       class Real
         def detach_network_security_group_from_subnet(resource_group, subnet_name, virtual_network_name, address_prefix, route_table_id)
-          Fog::Logger.debug "Detaching Network Security Group from Subnet: #{subnet_name}."
-
-          subnet = define_subnet_object_for_detach_network_security_group(address_prefix, route_table_id)
+          msg = "Detaching Network Security Group from Subnet: #{subnet_name}"
+          Fog::Logger.debug msg
+          subnet = get_subnet_object_for_detach_network_security_group(address_prefix, 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 detached successfully.'
-            Azure::ARM::Network::Models::Subnet.serialize_object(result.body)
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception detaching Network Security Group from Subnet: #{subnet_name}. #{e.body['error']['message']}"
-            raise msg
+            subnet = @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 detached successfully.'
+          subnet
         end
 
         private
 
-        def define_subnet_object_for_detach_network_security_group(address_prefix, route_table_id)
+        def get_subnet_object_for_detach_network_security_group(address_prefix, route_table_id)
           subnet = Azure::ARM::Network::Models::Subnet.new
-          subnet_properties = Azure::ARM::Network::Models::SubnetPropertiesFormat.new
           route_table = Azure::ARM::Network::Models::RouteTable.new
 
           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 = nil
-          subnet.properties = subnet_properties
+          subnet.address_prefix = address_prefix
+          subnet.route_table = route_table unless route_table_id.nil?
+          subnet.network_security_group = nil
           subnet
         end
       end
@@ -37,7 +33,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def detach_network_security_group_from_subnet(*)
-          {
+          subnet = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet/subnets/fog-subnet',
             'properties' =>
               {
@@ -46,6 +42,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/detach_resource_from_nic.rb

@@ -4,38 +4,37 @@ module Fog
       # Real class for Network Request
       class Real
         def detach_resource_from_nic(resource_group_name, nic_name, resource_type)
-          Fog::Logger.debug "Removing #{resource_type} from Network Interface #{nic_name}."
+          msg = "Removing #{resource_type} from Network Interface #{nic_name}"
+          Fog::Logger.debug msg
           begin
             nic = get_network_interface_with_detached_resource(nic_name, resource_group_name, resource_type)
 
-            promise = @network_client.network_interfaces.create_or_update(resource_group_name, nic_name, nic)
-            result = promise.value!
-            Fog::Logger.debug "#{resource_type} deleted from Network Interface #{nic_name} successfully!"
-            Azure::ARM::Network::Models::NetworkInterface.serialize_object(result.body)
+            nic_obj = @network_client.network_interfaces.create_or_update(resource_group_name, nic_name, nic)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception removing #{resource_type} from Network Interface #{nic_name} . #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "#{resource_type} deleted from Network Interface #{nic_name} successfully!"
+          nic_obj
         end
 
+        private
+
         def get_network_interface_with_detached_resource(nic_name, resource_group_name, 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 PUBLIC_IP
-            nic.properties.ip_configurations[0].properties.public_ipaddress = nil unless nic.properties.ip_configurations.empty?
+            network_interface.ip_configurations[0].public_ipaddress = nil unless network_interface.ip_configurations.empty?
           when NETWORK_SECURITY_GROUP
-            nic.properties.network_security_group = nil
+            network_interface.network_security_group = nil
           end
-          nic
+          network_interface
         end
       end
 
       # Mock class for Network Request
       class Mock
         def detach_resource_from_nic(resource_group_name, nic_name, _resource_type)
-          {
+          nic = {
             'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group_name}/providers/Microsoft.Network/networkInterfaces/#{nic_name}",
             'name' => nic_name,
             'type' => 'Microsoft.Network/networkInterfaces',
@@ -73,6 +72,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