fog-azure-rm 0.0.4 → 0.0.5

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

@@ -6,35 +6,39 @@ module Fog
         def list_public_ips(resource_group)
           Fog::Logger.debug "Getting list of PublicIPs from Resource Group #{resource_group}."
           begin
-            promise = @network_client.public_ipaddresses.list(resource_group)
-            result = promise.value!
-            Azure::ARM::Network::Models::PublicIPAddressListResult.serialize_object(result.body)['value']
-          rescue  MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Public IPs from Resource Group '#{resource_group}'. #{e.body['error']['message']}."
-            raise msg
+            public_ips = @network_client.public_ipaddresses.list_as_lazy(resource_group)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, "Getting list of PublicIPs from Resource Group #{resource_group}")
           end
+          Fog::Logger.debug 'Public IP listed successfully'
+          public_ips.value
         end
       end
 
       # Mock class for Network Request
       class Mock
         def list_public_ips(resource_group)
-          [
-            {
-              'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/publicIPAddresses/test-PubIP",
-              'name' => 'test-PubIP',
-              'type' => 'Microsoft.Network/publicIPAddresses',
-              'location' => 'westus',
-              'properties' =>
-                {
-                  'publicIPAllocationMethod' => 'Static',
-                  'ipAddress' => '13.93.203.153',
-                  'idleTimeoutInMinutes' => 4,
-                  'resourceGuid' => 'c78f0c95-d8b9-409b-897c-74260b686392',
-                  'provisioningState' => 'Succeeded'
-                }
-            }
-          ]
+          public_ip = {
+            'value' =>
+            [
+              {
+                'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/publicIPAddresses/test-PubIP",
+                'name' => 'test-PubIP',
+                'type' => 'Microsoft.Network/publicIPAddresses',
+                'location' => 'westus',
+                'properties' =>
+                  {
+                    'publicIPAllocationMethod' => 'Static',
+                    'ipAddress' => '13.93.203.153',
+                    'idleTimeoutInMinutes' => 4,
+                    'resourceGuid' => 'c78f0c95-d8b9-409b-897c-74260b686392',
+                    'provisioningState' => 'Succeeded'
+                  }
+              }
+            ]
+          }
+          public_ip_mapper = Azure::ARM::Network::Models::PublicIPAddressListResult.mapper
+          @network_client.deserialize(public_ip_mapper, public_ip, 'result.body').value
         end
       end
     end

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

@@ -4,46 +4,50 @@ module Fog
       # Real class for Network Request
       class Real
         def list_subnets(resource_group, virtual_network_name)
+          msg = "Listing Subnets int Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            promise = @network_client.subnets.list(resource_group, virtual_network_name)
-            result = promise.value!
-            Azure::ARM::Network::Models::SubnetListResult.serialize_object(result.body)['value']
+            subnets = @network_client.subnets.list_as_lazy(resource_group, virtual_network_name)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Subnets from Resource Group '#{resource_group}' in Virtal Network #{virtual_network_name}. #{e.body['error']['message']}."
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          subnets.value
         end
       end
 
       # Mock class for Network Request
       class Mock
         def list_subnets(resource_group, virtual_network_name)
-          [
-            {
-              'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/#{virtual_network_name}/subnets/subnet_0_testVnet",
-              'properties' =>
-                {
-                  'addressPrefix' => '10.1.0.0/24',
-                  'provisioningState' => 'Succeeded'
-                },
-              'name' => 'subnet_0_testVnet'
-            },
-            {
-              'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/#{virtual_network_name}/subnets/fog-test-subnet",
-              'properties' =>
-                {
-                  'addressPrefix' => '10.2.0.0/16',
-                  'ipConfigurations' =>
-                    [
-                      {
-                        'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/test-NIC/ipConfigurations/ipconfig1"
-                      }
-                    ],
-                  'provisioningState' => 'Succeeded'
-                },
-              'name' => 'fog-test-subnet'
-            }
-          ]
+          subnet = {
+            'value' => [
+              {
+                'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/#{virtual_network_name}/subnets/subnet_0_testVnet",
+                'properties' =>
+                  {
+                    'addressPrefix' => '10.1.0.0/24',
+                    'provisioningState' => 'Succeeded'
+                  },
+                'name' => 'subnet_0_testVnet'
+              },
+              {
+                'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/#{virtual_network_name}/subnets/fog-test-subnet",
+                'properties' =>
+                  {
+                    'addressPrefix' => '10.2.0.0/16',
+                    'ipConfigurations' =>
+                      [
+                        {
+                          'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/test-NIC/ipConfigurations/ipconfig1"
+                        }
+                      ],
+                    'provisioningState' => 'Succeeded'
+                  },
+                'name' => 'fog-test-subnet'
+              }
+            ]
+          }
+          subnet_mapper = Azure::ARM::Network::Models::SubnetListResult.mapper
+          @network_client.deserialize(subnet_mapper, subnet, 'result.body').value
         end
       end
     end

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

@@ -0,0 +1,43 @@
+module Fog
+  module Network
+    class AzureRM
+      # Real class for Network Request
+      class Real
+        def list_virtual_network_gateways(resource_group)
+          msg = "Getting list of Virtual Network Gateway from Resource Group #{resource_group}."
+          Fog::Logger.debug msg
+          begin
+            network_gateways = @network_client.virtual_network_gateways.list_as_lazy(resource_group)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          network_gateways.value
+        end
+      end
+
+      # Mock class for Network Request
+      class Mock
+        def list_virtual_network_gateways(*)
+          gateway = {
+            'value' => [
+              {
+                'name' => 'myvirtualgateway1',
+                'location' => 'West US',
+                'tags' => { 'key1' => 'value1' },
+                'properties' => {
+                  'gatewayType' => 'DynamicRouting',
+                  'gatewaySize' => 'Default',
+                  'bgpEnabled' => true,
+                  'vpnClientAddressPool' => ['{vpnClientAddressPoolPrefix}'],
+                  'defaultSites' => ['mysite1']
+                }
+              }
+            ]
+          }
+          gateway_mapper = Azure::ARM::Network::Models::VirtualNetworkGatewayListResult.mapper
+          @network_client.deserialize(gateway_mapper, gateway, 'result.body').value
+        end
+      end
+    end
+  end
+end

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

@@ -4,68 +4,69 @@ module Fog
       # This class provides the actual implemention for service calls.
       class Real
         def list_virtual_networks(resource_group)
+          msg = "Listing Virtual Networks in Resource Group #{resource_group}"
+          Fog::Logger.debug msg
           begin
-            response = @network_client.virtual_networks.list(resource_group)
-            result = response.value!
-            Azure::ARM::Network::Models::VirtualNetworkListResult.serialize_object(result.body)['value']
+            virtual_networks = @network_client.virtual_networks.list_as_lazy(resource_group)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception listing Virtual Networks. #{e.body['error']['message']}."
-            raise msg
+            raise_azure_exception(e, msg)
           end
+          virtual_networks.value
         end
       end
 
       # This class provides the mock implementation for unit tests.
       class Mock
         def list_virtual_networks(resource_group)
-          [
-            {
-              'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/testVnet",
-              'name' => 'testVnet',
-              'type' => 'Microsoft.Network/virtualNetworks',
-              'location' => 'westus',
-              'properties' =>
-                {
-                  'addressSpace' =>
-                    {
-                      'addressPrefixes' =>
-                        [
-                          '10.1.0.0/16',
-                          '10.2.0.0/16'
-                        ]
-                    },
-                  'subnets' =>
-                    [
+          virtual_network = {
+            'value' => [
+              {
+                'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/testVnet",
+                'name' => 'testVnet',
+                'type' => 'Microsoft.Network/virtualNetworks',
+                'location' => 'westus',
+                'properties' =>
+                  {
+                    'addressSpace' =>
                       {
-                        'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/subnet_0_testVnet",
-                        'properties' =>
-                          {
-                            'addressPrefix' => '10.1.0.0/24',
-                            'provisioningState' => 'Succeeded'
-                          },
-                        'name' => 'subnet_0_testVnet'
+                        'addressPrefixes' =>
+                          %w(10.1.0.0/16 10.2.0.0/16)
                       },
-                      {
-                        'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/fog-test-subnet",
-                        'properties' =>
-                          {
-                            'addressPrefix' => '10.2.0.0/16',
-                            'ipConfigurations' =>
-                              [
-                                {
-                                  'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/test-NIC/ipConfigurations/ipconfig1"
-                                }
-                              ],
-                            'provisioningState' => 'Succeeded'
-                          },
-                        'name' => 'fog-test-subnet'
-                      }
-                    ],
-                  'resourceGuid' => 'c573f8e2-d916-493f-8b25-a681c31269ef',
-                  'provisioningState' => 'Succeeded'
-                }
-            }
-          ]
+                    'subnets' =>
+                      [
+                        {
+                          'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/subnet_0_testVnet",
+                          'properties' =>
+                            {
+                              'addressPrefix' => '10.1.0.0/24',
+                              'provisioningState' => 'Succeeded'
+                            },
+                          'name' => 'subnet_0_testVnet'
+                        },
+                        {
+                          'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/fog-test-subnet",
+                          'properties' =>
+                            {
+                              'addressPrefix' => '10.2.0.0/16',
+                              'ipConfigurations' =>
+                                [
+                                  {
+                                    'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/test-NIC/ipConfigurations/ipconfig1"
+                                  }
+                                ],
+                              'provisioningState' => 'Succeeded'
+                            },
+                          'name' => 'fog-test-subnet'
+                        }
+                      ],
+                    'resourceGuid' => 'c573f8e2-d916-493f-8b25-a681c31269ef',
+                    'provisioningState' => 'Succeeded'
+                  }
+              }
+            ]
+          }
+          vnet_mapper = Azure::ARM::Network::Models::VirtualNetworkListResult.mapper
+          @network_client.deserialize(vnet_mapper, virtual_network, 'result.body').value
         end
       end
     end

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

@@ -8,15 +8,15 @@ module Fog
           virtual_network = get_virtual_network_object_for_remove_address_prefixes!(resource_group_name, virtual_network_name, address_prefixes)
           virtual_network = create_or_update_vnet(resource_group_name, virtual_network_name, virtual_network)
           Fog::Logger.debug "Address Prefixes: #{address_prefixes.join(', ')} removed successfully."
-          Azure::ARM::Network::Models::VirtualNetwork.serialize_object(virtual_network)
+          virtual_network
         end
 
         private
 
         def get_virtual_network_object_for_remove_address_prefixes!(resource_group_name, virtual_network_name, address_prefixes)
           virtual_network = get_vnet(resource_group_name, virtual_network_name)
-          attached_address_prefixes = virtual_network.properties.address_space.address_prefixes
-          virtual_network.properties.address_space.address_prefixes = attached_address_prefixes - address_prefixes
+          attached_address_prefixes = virtual_network.address_space.address_prefixes
+          virtual_network.address_space.address_prefixes = attached_address_prefixes - address_prefixes
           virtual_network
         end
       end
@@ -24,7 +24,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def remove_address_prefixes_from_virtual_network(*)
-          {
+          virtual_network = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet',
             'name' => 'fog-vnet',
             'type' => 'Microsoft.Network/virtualNetworks',
@@ -60,6 +60,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/remove_dns_servers_from_virtual_network.rb

@@ -8,15 +8,15 @@ module Fog
           virtual_network = get_virtual_network_object_for_remove_dns_servers!(resource_group_name, virtual_network_name, dns_servers)
           virtual_network = create_or_update_vnet(resource_group_name, virtual_network_name, virtual_network)
           Fog::Logger.debug "DNS Servers: #{dns_servers.join(', ')} removed successfully."
-          Azure::ARM::Network::Models::VirtualNetwork.serialize_object(virtual_network)
+          virtual_network
         end
 
         private
 
         def get_virtual_network_object_for_remove_dns_servers!(resource_group_name, virtual_network_name, dns_servers)
           virtual_network = get_vnet(resource_group_name, virtual_network_name)
-          attached_dns_servers = virtual_network.properties.dhcp_options.dns_servers
-          virtual_network.properties.dhcp_options.dns_servers = attached_dns_servers - dns_servers
+          attached_dns_servers = virtual_network.dhcp_options.dns_servers
+          virtual_network.dhcp_options.dns_servers = attached_dns_servers - dns_servers
           virtual_network
         end
       end
@@ -24,7 +24,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def remove_dns_servers_from_virtual_network(*)
-          {
+          virtual_network = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet',
             'name' => 'fog-vnet',
             'type' => 'Microsoft.Network/virtualNetworks',
@@ -60,6 +60,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/remove_security_rule.rb

@@ -4,21 +4,21 @@ module Fog
       # Real class for Network Request
       class Real
         def remove_security_rule(resource_group_name, security_group_name, security_rule_name)
-          Fog::Logger.debug "Deleting security rule #{security_rule_name} from Network Security Group #{security_group_name}."
-          promise = @network_client.network_security_groups.get(resource_group_name, security_group_name)
-          result = promise.value!
-          nsg = result.body
-          updated_security_rule_list = remove_security_rule_from_list(nsg.properties.security_rules, security_rule_name)
-          nsg.properties.security_rules = updated_security_rule_list
+          msg = "Deleting security rule #{security_rule_name} from Network Security Group #{security_group_name}."
+          Fog::Logger.debug msg
+
+          nsg = @network_client.network_security_groups.get(resource_group_name, security_group_name)
+          updated_security_rule_list = remove_security_rule_from_list(nsg.security_rules, security_rule_name)
+          nsg.security_rules = updated_security_rule_list
+
           begin
-            promise = @network_client.network_security_groups.begin_create_or_update(resource_group_name, security_group_name, nsg)
-            result = promise.value!
-            Fog::Logger.debug "Security Rule #{security_rule_name} deleted from Network Security Group #{security_group_name} successfully!"
-            Azure::ARM::Network::Models::NetworkSecurityGroup.serialize_object(result.body)
+            nsg = @network_client.network_security_groups.begin_create_or_update(resource_group_name, security_group_name, nsg)
           rescue MsRestAzure::AzureOperationError => e
-            msg = "Exception in deleting Security Rule #{security_rule_name} from Network Security Group #{security_group_name} . #{e.body['error']['message']}"
-            raise msg
+            raise_azure_exception(e, msg)
           end
+
+          Fog::Logger.debug "Security Rule #{security_rule_name} deleted from Network Security Group #{security_group_name} successfully!"
+          nsg
         end
 
         def remove_security_rule_from_list(security_rule_list, rule_name)
@@ -31,7 +31,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def remove_security_rule(resource_group_name, security_group_name, _security_rule_name)
-          {
+          network_security_group = {
             'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group_name}/providers/Microsoft.Network/networkSecurityGroups/#{name}",
             'name' => security_group_name,
             'type' => 'Microsoft.Network/networkSecurityGroups',
@@ -148,6 +148,8 @@ module Fog
                 'provisioningState' => 'Updating'
               }
           }
+          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/remove_subnets_from_virtual_network.rb

@@ -8,15 +8,15 @@ module Fog
           virtual_network = get_virtual_network_object_for_remove_subnets!(resource_group_name, virtual_network_name, subnet_names)
           result = create_or_update_vnet(resource_group_name, virtual_network_name, virtual_network)
           Fog::Logger.debug "Subnets:#{subnet_names.join(', ')} removed successfully."
-          Azure::ARM::Network::Models::VirtualNetwork.serialize_object(result)
+          result
         end
 
         private
 
         def get_virtual_network_object_for_remove_subnets!(resource_group_name, virtual_network_name, subnet_names)
           virtual_network = get_vnet(resource_group_name, virtual_network_name)
-          old_subnet_objects = virtual_network.properties.subnets
-          virtual_network.properties.subnets = old_subnet_objects.reject { |subnet| subnet_names.include?(subnet.name) }
+          old_subnet_objects = virtual_network.subnets
+          virtual_network.subnets = old_subnet_objects.reject { |subnet| subnet_names.include?(subnet.name) }
           virtual_network
         end
       end
@@ -24,7 +24,7 @@ module Fog
       # Mock class for Network Request
       class Mock
         def remove_subnets_from_virtual_network(*)
-          {
+          virtual_network = {
             'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-rg/providers/Microsoft.Network/virtualNetworks/fog-vnet',
             'name' => 'fog-vnet',
             'type' => 'Microsoft.Network/virtualNetworks',
@@ -50,6 +50,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