fog-azure-rm 0.0.4 → 0.0.5

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

@@ -4,32 +4,28 @@ module Fog
       # Real class for Network Request
       class Real
         def detach_route_table_from_subnet(resource_group, subnet_name, virtual_network_name, address_prefix, network_security_group_id)
-          Fog::Logger.debug "Detaching Route Table from Subnet: #{subnet_name}."
-
-          subnet = define_subnet_object_for_detach_route_table(address_prefix, network_security_group_id)
+          msg = "Detaching Route Table from Subnet: #{subnet_name}"
+          Fog::Logger.debug msg
+          subnet = get_subnet_object_for_detach_route_table(address_prefix, network_security_group_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 detached successfully.'
-            Azure::ARM::Network::Models::Subnet.serialize_object(result.body)
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception detaching Route Table 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 'Route Table detached successfully.'
+          subnet
         end
 
         private
 
-        def define_subnet_object_for_detach_route_table(address_prefix, network_security_group_id)
+        def get_subnet_object_for_detach_route_table(address_prefix, network_security_group_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
 
           network_security_group.id = network_security_group_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 = nil
-          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 = nil
           subnet
         end
       end
@@ -37,7 +33,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def detach_route_table_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/get_express_route_circuit.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Express Route Circuit Request
+      class Real
+        def get_express_route_circuit(resource_group_name, circuit_name)
+          msg = "Getting Express Route Circuit#{circuit_name} from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+          begin
+            @network_client.express_route_circuits.get(resource_group_name, circuit_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+        end
+      end
+
+      # Mock class for Express Route Circuit Request
+      class Mock
+        def get_express_route_circuit(*)
+          {
+            'name' => 'circuit_name',
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroup/resource_group_name/providers/Microsoft.Network/expressRouteCircuits/circuit_name',
+            'etag' => 'W/\"00000000-0000-0000-0000-000000000000\"',
+            'location' => 'eastus',
+            'tags' => {
+              'key1' => 'value1',
+              'key2' => 'value2'
+            },
+            'sku' => {
+              'name' => 'Standard_MeteredData',
+              'tier' => 'Standard',
+              'family' => 'MeteredData'
+            },
+            'properties' => {
+              'provisioningState' => 'Succeeded',
+              'circuitProvisioningState' => 'Enabled',
+              'serviceProviderProvisioningState' => 'Provisioned',
+              'serviceProviderProperties' => {
+                'serviceProviderName' => 'Telenor',
+                'peeringLocation' => 'London',
+                'bandwidthInMbps' => 100
+              }
+            },
+            'serviceKey' => '<unique service key for circuit>',
+            'serviceProviderNotes' => '<notes set only by ServiceProvider>'
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Express Route Circuit Peering Request
+      class Real
+        def get_express_route_circuit_peering(resource_group_name, peering_name, circuit_name)
+          msg = "Getting Express Route Circuit Peering #{peering_name} from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+          begin
+            circuit_peering = @network_client.express_route_circuit_peerings.get(resource_group_name, circuit_name, peering_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          circuit_peering
+        end
+      end
+
+      # Mock class for Express Route Circuit Peering Request
+      class Mock
+        def get_express_route_circuit_peering(*)
+          {
+            'name' => 'peering_name',
+            'id' => '/subscriptions/########-####-####-####-############/resourceGroups/resource_group_name/providers/Microsoft.Network/expressRouteCircuits/circuit_name/peerings/peering_name',
+            'etag' => '',
+            'properties' => {
+              'provisioningState' => 'Succeeded',
+              'peeringType' => 'MicrosoftPeering',
+              'peerASN' => '',
+              'primaryPeerAddressPrefix' => '',
+              'secondaryPeerAddressPrefix' => '',
+              'primaryAzurePort' => 22,
+              'secondaryAzurePort' => 21,
+              'state' => 'Enabled',
+              'sharedKey' => '',
+              'vlanId' => 100,
+              'microsoftPeeringConfig' => {
+                'advertisedpublicprefixes' => %w(prefix1 prefix2),
+                'advertisedPublicPrefixState' => 'ValidationNeeded',
+                'customerAsn' => '',
+                'routingRegistryName' => ''
+              }
+            }
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -4,14 +4,12 @@ module Fog
       # Real class for Network Interface Request
       class Real
         def get_network_interface(resource_group_name, nic_name)
-          Fog::Logger.debug "Getting Network Interface#{nic_name} from Resource Group #{resource_group_name}."
+          msg = "Getting Network Interface#{nic_name} from Resource Group #{resource_group_name}"
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.network_interfaces.get(resource_group_name, nic_name)
-            result = promise.value!
-            Azure::ARM::Network::Models::NetworkInterface.serialize_object(result.body)
+            @network_client.network_interfaces.get(resource_group_name, nic_name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception getting Network Interface #{nic_name} from Resource Group '#{resource_group_name}'. #{e.body['error']['message']}."
-            raise msg
+            raise_azure_exception(e, msg)
           end
         end
       end
@@ -19,7 +17,7 @@ module Fog
       # Mock class for Network Interface Request
       class Mock
         def get_network_interface(resource_group_name, nic_name)
-          {
+          nic = {
             'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group_name}/providers/Microsoft.Network/networkInterfaces/#{nic_name}",
             'name' => nic_name,
             'type' => 'Microsoft.Network/networkInterfaces',
@@ -53,6 +51,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/get_network_security_group.rb

@@ -4,22 +4,24 @@ module Fog
       # Real class for Network Security Group Request
       class Real
         def get_network_security_group(resource_group_name, security_group_name)
-          Fog::Logger.debug "Getting Network Security Group #{security_group_name} from Resource Group #{resource_group_name}."
+          msg = "Getting Network Security Group #{security_group_name} from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+
           begin
-            promise = @network_client.network_security_groups.get(resource_group_name, security_group_name)
-            result = promise.value!
-            Azure::ARM::Network::Models::NetworkSecurityGroup.serialize_object(result.body)
+            security_group = @network_client.network_security_groups.get(resource_group_name, security_group_name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception getting Network Security Group #{security_group_name} from Resource Group '#{resource_group_name}'. #{e.body['error']['message']}."
-            raise msg
+            raise_azure_exception(e, msg)
           end
+
+          Fog::Logger.debug "Network Security Group #{security_group_name} retrieved successfully."
+          security_group
         end
       end
 
       # Mock class for Network Security Group Request
       class Mock
         def get_network_security_group(resource_group_name, security_group_name)
-          {
+          network_security_group = {
             'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group_name}/providers/Microsoft.Network/networkSecurityGroups/#{security_group_name}",
             'name' => security_group_name,
             'type' => 'Microsoft.Network/networkSecurityGroups',
@@ -154,6 +156,8 @@ module Fog
                 'provisioningState' => 'Succeeded'
               }
           }
+          nsg_mapper = Azure::ARM::Network::Models::NetworkSecurityGroup.mapper
+          @network_client.deserialize(nsg_mapper, network_security_group, 'result.body')
         end
       end
     end

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

@@ -0,0 +1,41 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Network Request
+      class Real
+        def get_public_ip(resource_group_name, public_ip_name)
+          Fog::Logger.debug "Getting Public IP #{public_ip_name} from Resource Group #{resource_group_name}"
+          begin
+            public_ip = @network_client.public_ipaddresses.get(resource_group_name, public_ip_name)
+            Fog::Logger.debug "Public IP #{public_ip_name} retrieved successfully"
+            public_ip
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, "Getting Public IP #{public_ip_name} from Resource Group #{resource_group_name}")
+          end
+        end
+      end
+
+      # Mock class for Network Request
+      class Mock
+        def get_public_ip(resource_group_name, public_ip_name)
+          public_ip = {
+            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group_name}/providers/Microsoft.Network/publicIPAddresses/#{public_ip_name}",
+            'name' => public_ip_name,
+            'type' => 'Microsoft.Network/publicIPAddresses',
+            'location' => 'westus',
+            'properties' =>
+              {
+                'publicIPAllocationMethod' => 'Dynamic',
+                'ipAddress' => '13.91.253.67',
+                'idleTimeoutInMinutes' => 4,
+                'resourceGuid' => '767b1955-94de-433c-8e4a-ea0ad25e8d0c',
+                'provisioningState' => 'Succeeded'
+              }
+          }
+          public_ip_mapper = Azure::ARM::Network::Models::PublicIPAddress.mapper
+          @network_client.deserialize(public_ip_mapper, public_ip, 'result.body')
+        end
+      end
+    end
+  end
+end

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

@@ -4,23 +4,22 @@ module Fog
       # Real class for Network Request
       class Real
         def get_subnet(resource_group, virtual_network_name, subnet_name)
-          Fog::Logger.debug "Getting Subnet: #{subnet_name}."
+          msg = "Getting Subnet: #{subnet_name}."
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.subnets.get(resource_group, virtual_network_name, subnet_name)
-            result = promise.value!
-            Fog::Logger.debug "Subnet #{subnet_name} retrieved successfully."
-            Azure::ARM::Network::Models::Subnet.serialize_object(result.body)
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception getting Subnet #{subnet_name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
-            raise msg
+            subnet = @network_client.subnets.get(resource_group, virtual_network_name, subnet_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Subnet #{subnet_name} retrieved successfully."
+          subnet
         end
       end
 
       # Mock class for Network Request
       class Mock
         def get_subnet(*)
-          {
+          subnet = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet/subnets/fog-subnet',
             'properties' =>
               {
@@ -29,6 +28,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/get_virtual_network.rb

@@ -4,29 +4,28 @@ module Fog
       # Real class for Network Request
       class Real
         def get_virtual_network(resource_group_name, virtual_network_name)
-          vnet = get_vnet(resource_group_name, virtual_network_name)
-          Azure::ARM::Network::Models::VirtualNetwork.serialize_object(vnet)
+          get_vnet(resource_group_name, virtual_network_name)
         end
 
         private
 
         def get_vnet(resource_group_name, virtual_network_name)
-          Fog::Logger.debug "Getting Virtual Network: #{virtual_network_name}."
+          msg = "Getting Virtual Network: #{virtual_network_name}."
+          Fog::Logger.debug msg
           begin
-            response = @network_client.virtual_networks.get(resource_group_name, virtual_network_name).value!
-            Fog::Logger.debug "Virtual Network #{virtual_network_name} retrieved successfully."
-            response.body
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception getting Virtual Network #{virtual_network_name} in Resource Group: #{resource_group_name}. #{e.body['error']['message']}"
-            raise msg
+            virtual_network = @network_client.virtual_networks.get(resource_group_name, virtual_network_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
           end
+          Fog::Logger.debug "Virtual Network #{virtual_network_name} retrieved successfully."
+          virtual_network
         end
       end
 
       # Mock class for Network Request
       class Mock
         def get_virtual_network(*)
-          {
+          virtual_network = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet',
             'name' => 'fog-vnet',
             'type' => 'Microsoft.Network/virtualNetworks',
@@ -36,10 +35,7 @@ module Fog
                 'addressSpace' =>
                   {
                     'addressPrefixes' =>
-                      [
-                        '10.1.0.0/16',
-                        '10.2.0.0/16'
-                      ]
+                      %w(10.1.0.0/16 10.2.0.0/16)
                   },
                 'subnets' =>
                   [
@@ -57,6 +53,8 @@ module Fog
                 'provisioningState' => 'Succeeded'
               }
           }
+          vnet_mapper = Azure::ARM::Network::Models::VirtualNetwork.mapper
+          @network_client.deserialize(vnet_mapper, virtual_network, 'result.body')
         end
       end
     end

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

@@ -0,0 +1,45 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Network Gateway Request
+      class Real
+        def get_virtual_network_gateway(resource_group_name, network_gateway_name)
+          msg = "Getting Virtual Network Gateway #{network_gateway_name} from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+          begin
+            network_gateway = @network_client.virtual_network_gateways.get(resource_group_name, network_gateway_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Virtual Network Gateway #{network_gateway_name} retrieved successfully."
+          network_gateway
+        end
+      end
+
+      # Mock class for Network Gateway Request
+      class Mock
+        def get_virtual_network_gateway(*)
+          gateway = {
+            'name' => 'myvirtualgateway1',
+            'id' => '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/microsoft.network/virtualNetworkGateways/myvirtualgateway1',
+            'location' => 'West US',
+            'tags' => { 'key1' => 'value1' },
+            'properties' => {
+              'gatewayType' => 'DynamicRouting',
+              'gatewaySize' => 'Default',
+              'subnet' => {
+                'id' => '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/microsoft.network/virtualNetworks/<virtualNetworkName>/subnets/subnet1'
+              },
+              'vipAddress' => '{vipAddress}',
+              'bgpEnabled' => true,
+              'vpnClientAddressPool' => ['{vpnClientAddressPoolPrefix}'],
+              'defaultSites' => ['mysite1']
+            }
+          }
+          gateway_mapper = Azure::ARM::Network::Models::VirtualNetworkGateway.mapper
+          @network_client.deserialize(gateway_mapper, gateway, 'result.body')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Network Request
+      class Real
+        def list_express_route_circuit_peerings(resource_group_name, circuit_name)
+          msg = "Getting list of Express Route Circuit Peerings from Resource Group #{resource_group_name}."
+          Fog::Logger.debug msg
+          begin
+            circuit_peerings = @network_client.express_route_circuit_peerings.list(resource_group_name, circuit_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          circuit_peerings
+        end
+      end
+
+      # Mock class for Network Request
+      class Mock
+        def list_express_route_circuit_peerings(*)
+          [
+            {
+              'name' => 'AzurePrivatePeering',
+              'id' => '/subscriptions/########-####-####-####-############/resourceGroups/resource_group_name/providers/Microsoft.Network/expressRouteCircuits/circuit_name/peerings/Private',
+              'etag' => 'W/\"cb87537e-fd92-48c7-905f-2efc95a47c8f\"',
+              'properties' => {
+                'provisioningState' => 'Succeeded',
+                'peeringType' => 'AzurePrivatePeering',
+                'azureASN' => 120,
+                'peerASN' => 100,
+                'primaryPeerAddressPrefix' => '192.168.1.0/30',
+                'secondaryPeerAddressPrefix' => '192.168.2.0/30',
+                'primaryAzurePort' => 'BRKAZUREIXP01-BN1-04GMR-CIS-1-PRIMARY',
+                'secondaryAzurePort' => 'BRKAZUREIXP01-DM2-04GMR-CIS-1-SECONDARY',
+                'state' => 'Enabled',
+                'vlanId' => 200
+              }
+            }
+          ]
+        end
+      end
+    end
+  end
+end