fog-azure-rm 0.0.4 → 0.0.5

data/test/api_stub/requests/network/network_interface.rb

@@ -2,7 +2,7 @@ module ApiStub
   module Requests
     module Network
       class NetworkInterface
-        def self.create_network_interface_response
+        def self.create_network_interface_response(network_client)
           body = '{
             "name":"fog-test-network-interface",
             "id":"/subscriptions/{guid}/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkInterfaces/fog-test-network-interface",
@@ -63,12 +63,11 @@ module ApiStub
               }
             }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::NetworkInterface.deserialize_object(JSON.load(body))
-          result
+          network_interface_mapper = Azure::ARM::Network::Models::NetworkInterface.mapper
+          network_client.deserialize(network_interface_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.detach_pip_from_nic_response
+        def self.detach_pip_from_nic_response(network_client)
           body = '{
             "name":"fog-test-network-interface",
             "id":"/subscriptions/{guid}/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkInterfaces/fog-test-network-interface",
@@ -126,12 +125,11 @@ module ApiStub
               }
             }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::NetworkInterface.deserialize_object(JSON.load(body))
-          result
+          network_interface_mapper = Azure::ARM::Network::Models::NetworkInterface.mapper
+          network_client.deserialize(network_interface_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.detach_nsg_from_nic_response
+        def self.detach_nsg_from_nic_response(network_client)
           body = '{
             "name":"fog-test-network-interface",
             "id":"/subscriptions/{guid}/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkInterfaces/fog-test-network-interface",
@@ -186,12 +184,11 @@ module ApiStub
               }
             }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::NetworkInterface.deserialize_object(JSON.load(body))
-          result
+          network_interface_mapper = Azure::ARM::Network::Models::NetworkInterface.mapper
+          network_client.deserialize(network_interface_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.list_network_interfaces_response
+        def self.list_network_interfaces_response(network_client)
           body = '{
             "value": [ {
               "name":"mynic1",
@@ -254,9 +251,8 @@ module ApiStub
               }
             } ]
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::NetworkInterfaceListResult.deserialize_object(JSON.load(body))
-          result
+          network_interface_list_mapper = Azure::ARM::Network::Models::NetworkInterfaceListResult.mapper
+          network_client.deserialize(network_interface_list_mapper, JSON.load(body), 'result.body')
         end
 
         def self.delete_network_interface_response

data/test/api_stub/requests/network/network_security_group.rb

@@ -3,15 +3,11 @@ module ApiStub
     module Network
       # Mock class for Network Security Group Requests
       class NetworkSecurityGroup
-        def self.create_network_security_group_response
-          body = '{
+        def self.create_network_security_group_response(network_client)
+          nsg = '{
              "name":"fog-test-nsg",
              "id":"/subscriptions/#####/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkSecurityGroups/fog-test-nsg",
              "location":"West US",
-             "tags":{
-                "key":"value"
-             },
-             "etag":"W/\"00000000-0000-0000-0000-000000000000\"",
              "properties":{
                 "resourceGuid":"AF6A2C41-9F74-46B3-9F65-F5286FFEE3DE",
                 "provisioningState":"Succeeded",
@@ -68,20 +64,15 @@ module ApiStub
                 ]
              }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::NetworkSecurityGroup.deserialize_object(JSON.load(body))
-          result
+          result_mapper = Azure::ARM::Network::Models::NetworkSecurityGroup.mapper
+          network_client.deserialize(result_mapper, JSON.load(nsg), 'result.body')
         end
 
-        def self.add_security_rules_response
-          body = '{
+        def self.add_security_rules_response(network_client)
+          nsg = '{
              "name":"fog-test-nsg",
              "id":"/subscriptions/#####/resourceGroups/fog-test-rg/providers/Microsoft.Network/networkSecurityGroups/fog-test-nsg",
              "location":"West US",
-             "tags":{
-                "key":"value"
-             },
-             "etag":"W/\"00000000-0000-0000-0000-000000000000\"",
              "properties":{
                 "resourceGuid":"AF6A2C41-9F74-46B3-9F65-F5286FFEE3DE",
                 "provisioningState":"Succeeded",
@@ -152,13 +143,12 @@ module ApiStub
                 ]
              }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::NetworkSecurityGroup.deserialize_object(JSON.load(body))
-          result
+          result_mapper = Azure::ARM::Network::Models::NetworkSecurityGroup.mapper
+          network_client.deserialize(result_mapper, JSON.load(nsg), 'result.body')
         end
 
-        def self.list_network_security_group_response
-          body = '{
+        def self.list_network_security_group_response(network_client)
+          nsg_list = '{
             "value":[
               {
                 "name":"fog-test-nsg",
@@ -226,13 +216,8 @@ module ApiStub
              }
             ]
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::NetworkSecurityGroupListResult.deserialize_object(JSON.load(body))
-          result
-        end
-
-        def self.delete_network_security_group_response
-          MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
+          result_mapper = Azure::ARM::Network::Models::NetworkInterfaceListResult.mapper
+          network_client.deserialize(result_mapper, JSON.load(nsg_list), 'result.body')
         end
       end
     end

data/test/api_stub/requests/network/public_ip.rb

@@ -2,10 +2,10 @@ module ApiStub
   module Requests
     module Network
       class PublicIp
-        def self.create_public_ip_response
+        def self.create_public_ip_response(network_client)
           body = '{
              "name": "fog-test-public-ip",
-             "id": "/subscriptions/{guid}/resourceGroups/fog-test-rg/Microsoft.Network/publicIpAddresses/fog-test-public-ip",
+             "id": "/subscriptions/{guid}/resourceGroups/fog-test-rg/providers/Microsoft.Network/publicIpAddresses/fog-test-public-ip",
              "location": "West US",
              "tags": {
                 "key": "value"
@@ -27,12 +27,11 @@ module ApiStub
                 }
              }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::PublicIPAddress.deserialize_object(JSON.load(body))
-          result
+          public_ip_mapper = Azure::ARM::Network::Models::PublicIPAddress.mapper
+          network_client.deserialize(public_ip_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.list_public_ips_response
+        def self.list_public_ips_response(network_client)
           body = '{
             "value": [ {
               "name": "myPublicIP1",
@@ -59,9 +58,8 @@ module ApiStub
               }
             } ]
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::PublicIPAddressListResult.deserialize_object(JSON.load(body))
-          result
+          public_ip_mapper = Azure::ARM::Network::Models::PublicIPAddressListResult.mapper
+          network_client.deserialize(public_ip_mapper, JSON.load(body), 'result.body')
         end
 
         def self.delete_public_ip_response

data/test/api_stub/requests/network/subnet.rb

@@ -2,7 +2,7 @@ module ApiStub
   module Requests
     module Network
       class Subnet
-        def self.create_subnet_response
+        def self.create_subnet_response(network_client)
           body = '{
              "name":"fog-test-subnet",
              "id":"/subscriptions/{guid}/resourceGroups/fog-test-rg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/fog-test-subnet",
@@ -27,12 +27,11 @@ module ApiStub
                 ]
              }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::Subnet.deserialize_object(JSON.load(body))
-          result
+          subnet_mapper = Azure::ARM::Network::Models::Subnet.mapper
+          network_client.deserialize(subnet_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.list_subnets_response
+        def self.list_subnets_response(network_client)
           body = '{
             "value": [{
               "name":"mysubnet1",
@@ -59,9 +58,8 @@ module ApiStub
               }
             } ]
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::SubnetListResult.deserialize_object(JSON.load(body))
-          result
+          subnet_mapper = Azure::ARM::Network::Models::SubnetListResult.mapper
+          network_client.deserialize(subnet_mapper, JSON.load(body), 'result.body')
         end
 
         def self.delete_subnet_response

data/test/api_stub/requests/network/virtual_network.rb

@@ -2,7 +2,7 @@ module ApiStub
   module Requests
     module Network
       class VirtualNetwork
-        def self.create_virtual_network_response
+        def self.create_virtual_network_response(network_client)
           body = '{
              "name":" fog-test-virtual-network",
              "id":"/subscriptions/{guid}/resourceGroups/fog-test-rg/providers/Microsoft.Network/virtualNetworks/fog-test-virtual-network",
@@ -53,12 +53,11 @@ module ApiStub
                 ]
              }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::VirtualNetwork.deserialize_object(JSON.load(body))
-          result
+          vnet_mapper = Azure::ARM::Network::Models::VirtualNetwork.mapper
+          network_client.deserialize(vnet_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.list_virtual_networks_response
+        def self.list_virtual_networks_response(network_client)
           body = '
             {
               "value": [ {
@@ -113,9 +112,8 @@ module ApiStub
               }
             } ]
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Network::Models::VirtualNetworkListResult.deserialize_object(JSON.load(body))
-          result
+          vnet_mapper = Azure::ARM::Network::Models::VirtualNetworkListResult.mapper
+          network_client.deserialize(vnet_mapper, JSON.load(body), 'result.body')
         end
 
         def self.delete_virtual_network_response

data/test/api_stub/requests/network/virtual_network_gateway.rb

@@ -0,0 +1,49 @@
+module ApiStub
+  module Requests
+    module Network
+      class VirtualNetworkGateway
+        def self.create_virtual_network_gateway_response(network_client)
+          network_gateway = '{
+            "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::VirtualNetworkGateway.mapper
+          network_client.deserialize(gateway_mapper, JSON.load(network_gateway), 'result.body')
+        end
+
+        def self.list_virtual_network_gateway_response(network_client)
+          network_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, JSON.load(network_gateway), 'result.body')
+        end
+
+        def self.delete_virtual_network_gateway_response
+          MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
+        end
+      end
+    end
+  end
+end

data/test/api_stub/requests/resources/deployment.rb

@@ -3,19 +3,64 @@ module ApiStub
     module Resources
       # Mock class for Deployment Requests
       class Deployment
-        def self.create_deployment_response
-          body = ApiStub::Models::Resources::Deployment.create_deployment_response
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Resources::Models::DeploymentExtended.deserialize_object(body)
-          result
+        def self.create_deployment_response(client)
+          ApiStub::Models::Resources::Deployment.create_deployment_response(client)
         end
 
-        def self.list_deployment_response
-          body = ApiStub::Models::Resources::Deployment.list_deployments_response
-          body = { 'value' => body }
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Resources::Models::DeploymentListResult.deserialize_object(body)
-          result
+        def self.list_deployment_response(client)
+          deployments = {
+            'value' => [
+              {
+                'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/microsoft.resources/deployments/fog-test-deployment',
+                'name' => 'fog-test-deployment',
+                'properties' => {
+                  'templateLink' => {
+                    'uri' => 'https://test.com/template.json',
+                    'contentVersion' => '1.0.0.0'
+                  },
+                  'parametersLink' => {
+                    'uri' => 'https://test.com/parameters.json',
+                    'contentVersion' => '1.0.0.0'
+                  },
+                  'parameters' => {
+                    'parameter1' => {
+                      'type' => 'string',
+                      'value' => 'parameter1'
+                    }
+                  },
+                  'mode' => 'Incremental',
+                  'provisioningState' => 'Accepted',
+                  'timestamp' => '2015-01-01T18:26:20.6229141Z',
+                  'correlationId' => 'd5062e45-6e9f-4fd3-a0a0-6b2c56b15757',
+                  'outputs' => {
+                    'key1' => {
+                      'type' => 'string',
+                      'value' => 'output1'
+                    }
+                  },
+                  'providers' => [{
+                    'namespace' => 'namespace1',
+                    'resourceTypes' => [{
+                      'resourceType' => 'resourceType1',
+                      'locations' => ['westus']
+                    }]
+                  }],
+                  'dependencies' => [{
+                    'dependsOn' => [{
+                      'id' => 'resourceid1',
+                      'resourceType' => 'namespace1/resourcetype1',
+                      'resourceName' => 'resourcename1'
+                    }],
+                    'id' => 'resourceid2',
+                    'resourceType' => 'namespace1/resourcetype2',
+                    'resourceName' => 'resourcename2'
+                  }]
+                }
+              }
+            ]
+          }
+          result_mapper = Azure::ARM::Resources::Models::DeploymentListResult.mapper
+          client.deserialize(result_mapper, deployments, 'result.body')
         end
       end
     end

data/test/api_stub/requests/resources/resource.rb

@@ -3,7 +3,7 @@ module ApiStub
     module Resources
       # Mock class for Tag Requests
       class AzureResource
-        def self.azure_resource_response
+        def self.azure_resource_response(client)
           body = '{
             "id": "/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}",
             "name": "your-resource-name",
@@ -16,12 +16,11 @@ module ApiStub
                 "name": "free"
             }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Resources::Models::GenericResource.deserialize_object(JSON.load(body))
-          result
+          result_mapper = Azure::ARM::Resources::Models::GenericResource.mapper
+          client.deserialize(result_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.list_tagged_resources_response
+        def self.list_tagged_resources_response(client)
           body = '{
             "value": [ {
               "id": "/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}",
@@ -37,9 +36,8 @@ module ApiStub
           } ],
             "nextLink": "https://management.azure.com/subscriptions/########-####-####-####-############/resourcegroups?api-version=2015-01-01&$skiptoken=######"
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Resources::Models::ResourceListResult.deserialize_object(JSON.load(body))
-          result
+          result_mapper = Azure::ARM::Resources::Models::ResourceListResult.mapper
+          client.deserialize(result_mapper, JSON.load(body), 'result.body')
         end
       end
     end

data/test/api_stub/requests/resources/resource_group.rb

@@ -3,7 +3,7 @@ module ApiStub
     module Resources
       # Mock class for Resource Group Requests
       class ResourceGroup
-        def self.create_resource_group_response
+        def self.create_resource_group_response(client)
           body = '{
             "id": "/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg",
             "name": "fog-test-rg",
@@ -15,12 +15,11 @@ module ApiStub
               "provisioning_state": "Succeeded"
             }
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Resources::Models::ResourceGroup.deserialize_object(JSON.load(body))
-          result
+          result_mapper = Azure::ARM::Resources::Models::ResourceGroup.mapper
+          client.deserialize(result_mapper, JSON.load(body), 'result.body')
         end
 
-        def self.list_resource_group_response
+        def self.list_resource_group_response(client)
           body = '{
             "value": [ {
               "id": "/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg",
@@ -35,9 +34,8 @@ module ApiStub
             } ],
             "nextLink": "https://management.azure.com/subscriptions/########-####-####-####-############/resourcegroups?api-version=2015-01-01&$skiptoken=######"
           }'
-          result = MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
-          result.body = Azure::ARM::Resources::Models::ResourceGroupListResult.deserialize_object(JSON.load(body))
-          result
+          result_mapper = Azure::ARM::Resources::Models::ResourceGroupListResult.mapper
+          client.deserialize(result_mapper, JSON.load(body), 'result.body')
         end
 
         def self.list_resource_groups_for_zones