fog 0.0.56 → 0.0.57

data/lib/fog/aws/requests/ec2/delete_volume.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/basic'
 
         # Delete an EBS volume
         #
@@ -15,26 +16,21 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def delete_volume(volume_id)
-          request({
-            'Action' => 'DeleteVolume',
-            'VolumeId' => volume_id
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'    => 'DeleteVolume',
+            'VolumeId'  => volume_id,
+            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def delete_volume(volume_id)
           response = Excon::Response.new
-          if volume = Fog::AWS::EC2.data[:volumes][volume_id]
-            Fog::AWS::EC2.data[:deleted_at][volume_id] = Time.now
+          if volume = @data[:volumes][volume_id]
+            @data[:deleted_at][volume_id] = Time.now
             volume['status'] = 'deleting'
             response.status = 200
             response.body = {
@@ -51,5 +47,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_addresses.rb

@@ -1,8 +1,9 @@
-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.
         #
@@ -19,27 +20,22 @@ unless Fog.mocking?
         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
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         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
@@ -57,5 +53,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_availability_zones.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_availability_zones'
 
         # Describe all or specified availability zones
         #
@@ -20,19 +21,14 @@ unless Fog.mocking?
         def describe_availability_zones(zone_name = [])
           params = AWS.indexed_param('ZoneName', zone_name)
           request({
-            'Action' => 'DescribeAvailabilityZones'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeAvailabilityZones.new)
+            'Action'  => 'DescribeAvailabilityZones',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeAvailabilityZones.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_availability_zones(zone_name = [])
           response = Excon::Response.new
@@ -60,5 +56,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_images.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_images'
 
         # Describe all or specified images.
         #
@@ -34,19 +35,14 @@ unless Fog.mocking?
             options.merge!(AWS.indexed_param('ImageId', image_id))
           end
           request({
-            'Action' => 'DescribeImages'
-          }.merge!(options), Fog::Parsers::AWS::EC2::DescribeImages.new)
+            'Action'  => 'DescribeImages',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeImages.new
+          }.merge!(options))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_images(options = {})
           response = Excon::Response.new
@@ -67,5 +63,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_instances'
 
         # Describe all or specified instances
         #
@@ -52,31 +53,26 @@ unless Fog.mocking?
         def describe_instances(instance_id = [])
           params = AWS.indexed_param('InstanceId', instance_id)
           request({
-            'Action' => 'DescribeInstances'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeInstances.new)
+            'Action'  => 'DescribeInstances',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeInstances.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_instances(instance_id = {})
           response = Excon::Response.new
           instance_id = [*instance_id]
           if instance_id != []
-            instance_set = Fog::AWS::EC2.data[:instances].reject {|key,value| !instance_id.include?(key)}.values
+            instance_set = @data[:instances].reject {|key,value| !instance_id.include?(key)}.values
           else
-            instance_set = Fog::AWS::EC2.data[:instances].values
+            instance_set = @data[:instances].values
           end
 
           instance_set.each do |instance|
-            case instance['instanceState']
+            case instance['instanceState']['name']
             when 'pending'
               if Time.now - instance['launchTime'] > 2
                 instance['instanceState'] = { :code => 16, :name => 'running' }
@@ -84,13 +80,13 @@ else
             when 'rebooting'
               instance['instanceState'] = { :code => 16, :name => 'running' }
             when 'shutting-down'
-              if Time.now - Fog::AWS::EC2.data[:deleted_at][instance['instanceId']] > 2
+              if Time.now - @data[:deleted_at][instance['instanceId']] > 2
                 instance['instanceState'] = { :code => 16, :name => 'terminating' }
               end
             when 'terminating'
-              if Time.now - Fog::AWS::EC2.data[:deleted_at][instance['instanceId']] > 4
-                Fog::AWS::EC2.data[:deleted_at].delete(instance['instanceId'])
-                Fog::AWS::EC2.data[:instances].delete(instance['instanceId'])
+              if Time.now - @data[:deleted_at][instance['instanceId']] > 4
+                @data[:deleted_at].delete(instance['instanceId'])
+                @data[:instances].delete(instance['instanceId'])
               end
             end
           end
@@ -106,7 +102,7 @@ else
                 'ownerId'       => instance['ownerId'],
                 'reservationId' => instance['reservationId']
               }
-              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason'].include?(key)}
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
             end
 
             response.body = {
@@ -123,5 +119,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_key_pairs.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_key_pairs'
 
         # Describe all or specified key pairs
         #
@@ -19,27 +20,22 @@ unless Fog.mocking?
         def describe_key_pairs(key_name = [])
           params = AWS.indexed_param('KeyName', key_name)
           request({
-            'Action' => 'DescribeKeyPairs'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeKeyPairs.new)
+            'Action'  => 'DescribeKeyPairs',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeKeyPairs.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_key_pairs(key_name = [])
           response = Excon::Response.new
           key_name = [*key_name]
           if key_name != []
-            key_set = Fog::AWS::EC2.data[:key_pairs].reject {|key, value| !key_name.include?(key)}.values
+            key_set = @data[:key_pairs].reject {|key, value| !key_name.include?(key)}.values
           else
-            key_set = Fog::AWS::EC2.data[:key_pairs].values
+            key_set = @data[:key_pairs].values
           end
           if key_name.length == 0 || key_name.length == key_set.length
             response.status = 200
@@ -59,5 +55,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_regions.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_regions'
 
         # Describe all or specified regions
         #
@@ -19,19 +20,14 @@ unless Fog.mocking?
         def describe_regions(region_name = [])
           params = AWS.indexed_param('RegionName', region_name)
           request({
-            'Action' => 'DescribeRegions'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeRegions.new)
+            'Action'  => 'DescribeRegions',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeRegions.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_regions(region_name = [])
           response = Excon::Response.new
@@ -57,5 +53,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_reserved_instances.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_reserved_instances'
 
         # Describe all or specified reserved instances
         #
@@ -27,19 +28,14 @@ unless Fog.mocking?
         def describe_reserved_instances(reserved_instances_id = [])
           params = AWS.indexed_param('ReservedInstancesId', reserved_instances_id)
           request({
-            'Action' => 'DescribeReservedInstances'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeReservedInstances.new)
+            'Action'  => 'DescribeReservedInstances',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeReservedInstances.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_reserved_instances(reserved_instances_id = {})
           raise MockNotImplemented.new("Contributions welcome!")
@@ -48,5 +44,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_security_groups.rb

@@ -1,8 +1,9 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
 
-  module Fog
-    module AWS
-      class EC2
+        require 'fog/aws/parsers/ec2/describe_security_groups'
 
         # Describe all or specified security groups
         #
@@ -29,27 +30,22 @@ unless Fog.mocking?
         def describe_security_groups(group_name = [])
           params = AWS.indexed_param('GroupName', group_name)
           request({
-            'Action' => 'DescribeSecurityGroups',
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeSecurityGroups.new)
+            'Action'  => 'DescribeSecurityGroups',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeSecurityGroups.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_security_groups(group_name = [])
           response = Excon::Response.new
           group_name = [*group_name]
           if group_name != []
-            security_group_info = Fog::AWS::EC2.data[:security_groups].reject {|key, value| !group_name.include?(key)}.values
+            security_group_info = @data[:security_groups].reject {|key, value| !group_name.include?(key)}.values
           else
-            security_group_info = Fog::AWS::EC2.data[:security_groups].values
+            security_group_info = @data[:security_groups].values
           end
           if group_name.length == 0 || group_name.length == security_group_info.length
             response.status = 200
@@ -67,5 +63,4 @@ else
       end
     end
   end
-
 end