test/api_stub/requests/network/public_ip.rb in fog-azure-rm-0.0.4 vs test/api_stub/requests/network/public_ip.rb in fog-azure-rm-0.0.5

@@ -1,13 +1,13 @@
 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"
              },
              "etag": "W/\"00000000-0000-0000-0000-000000000000\"",
@@ -25,16 +25,15 @@
                    "fqdn": "mylabel.northus.cloudapp.azure.com.",
                    "reverseFqdn": "contoso.com."
                 }
              }
           }'
-          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",
               "id": "/subscriptions/{guid}/resourceGroups/rg1/Microsoft.Network/publicIpAddresses/ip1",
               "location": "North US",
@@ -57,12 +56,11 @@
                   "reverseFqdn": "contoso.com."
                 }
               }
             } ]
           }'
-          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
           MsRestAzure::AzureOperationResponse.new(MsRest::HttpOperationRequest.new('', '', ''), Faraday::Response.new)
         end