lib/fog/aws/requests/ec2/describe_addresses.rb in fog-0.0.56 vs lib/fog/aws/requests/ec2/describe_addresses.rb in fog-0.0.57

@@ -1,10 +1,11 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_addresses'
 
         # Describe all or specified IP addresses.
         #
         # ==== Parameters
         # * public_ip<~Array> - List of ips to describe, defaults to all
@@ -17,31 +18,26 @@
         #       * 'instanceId'<~String> - instance for ip address
         #       * 'publicIp'<~String> - ip address for instance
         def describe_addresses(public_ip = [])
           params = AWS.indexed_param('PublicIp', public_ip)
           request({
-            'Action' => 'DescribeAddresses'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeAddresses.new)
+            'Action'  => 'DescribeAddresses',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeAddresses.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
+      class Mock
 
-  module Fog
-    module AWS
-      class EC2
-
         def describe_addresses(public_ip = [])
           response = Excon::Response.new
           public_ip = [*public_ip]
           if public_ip != []
-            addresses_set = Fog::AWS::EC2.data[:addresses].reject {|key, value| !public_ip.include?(key)}.values
+            addresses_set = @data[:addresses].reject {|key, value| !public_ip.include?(key)}.values
           else
-            addresses_set = Fog::AWS::EC2.data[:addresses].values
+            addresses_set = @data[:addresses].values
           end
           if public_ip.length == 0 || public_ip.length == addresses_set.length
             response.status = 200
             response.body = {
               'requestId'     => Fog::AWS::Mock.request_id,
@@ -55,7 +51,6 @@
         end
 
       end
     end
   end
-
 end