fog 0.0.56 → 0.0.57

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

@@ -1,9 +1,10 @@
-unless Fog.mocking?
+module Fog
+  module AWS
+    module EC2
+      class Real
+
+        require 'fog/aws/parsers/ec2/describe_snapshots'
 
-  module Fog
-    module AWS
-      class EC2
-      
         # Describe all or specified snapshots
         #
         # ==== Parameters
@@ -22,27 +23,22 @@ unless Fog.mocking?
         def describe_snapshots(snapshot_id = [])
           params = AWS.indexed_param('SnapshotId', snapshot_id)
           request({
-            'Action' => 'DescribeSnapshots'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeSnapshots.new)
+            'Action'  => 'DescribeSnapshots',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeSnapshots.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_snapshots(snapshot_id = [])
           response = Excon::Response.new
           snapshot_id = [*snapshot_id]
           if snapshot_id != []
-            snapshot_set = Fog::AWS::EC2.data[:snapshots].reject {|key,value| !snapshot_id.include?(key)}.values
+            snapshot_set = @data[:snapshots].reject {|key,value| !snapshot_id.include?(key)}.values
           else
-            snapshot_set = Fog::AWS::EC2.data[:snapshots].values
+            snapshot_set = @data[:snapshots].values
           end
 
           snapshot_set.each do |snapshot|
@@ -74,5 +70,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/describe_volumes.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_volumes'
 
         # Describe all or specified volumes.
         #
@@ -28,27 +29,22 @@ unless Fog.mocking?
         def describe_volumes(volume_id = [])
           params = AWS.indexed_param('VolumeId', volume_id)
           request({
-            'Action' => 'DescribeVolumes'
-          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeVolumes.new)
+            'Action'  => 'DescribeVolumes',
+            :parser   => Fog::Parsers::AWS::EC2::DescribeVolumes.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def describe_volumes(volume_id = [])
           response = Excon::Response.new
           volume_id = [*volume_id]
           if volume_id != []
-            volume_set = Fog::AWS::EC2.data[:volumes].reject {|key,value| !volume_id.include?(key)}.values
+            volume_set = @data[:volumes].reject {|key,value| !volume_id.include?(key)}.values
           else
-            volume_set = Fog::AWS::EC2.data[:volumes].values
+            volume_set = @data[:volumes].values
           end
 
           volume_set.each do |volume|
@@ -58,9 +54,9 @@ else
                 volume['status'] = 'available'
               end
             when 'deleting'
-              if Time.now - Fog::AWS::EC2.data[:deleted_at][volume['volumeId']] > 2
-                Fog::AWS::EC2.data[:deleted_at].delete(volume['volumeId'])
-                Fog::AWS::EC2.data[:volumes].delete(volume['volumeId'])
+              if Time.now - @data[:deleted_at][volume['volumeId']] > 2
+                @data[:deleted_at].delete(volume['volumeId'])
+                @data[:volumes].delete(volume['volumeId'])
               end
             end
           end
@@ -81,5 +77,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/detach_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/detach_volume'
 
         # Detach an Amazon EBS volume from a running instance
         #
@@ -24,25 +25,20 @@ unless Fog.mocking?
         #     * 'volumeId'<~String> - Reference to volume
         def detach_volume(volume_id, options = {})
           request({
-            'Action' => 'DetachVolume',
-            'VolumeId' => volume_id
-          }.merge!(options), Fog::Parsers::AWS::EC2::DetachVolume.new)
+            'Action'    => 'DetachVolume',
+            'VolumeId'  => volume_id,
+            :parser     => Fog::Parsers::AWS::EC2::DetachVolume.new
+          }.merge!(options))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def detach_volume(volume_id, options = {})
           response = Excon::Response.new
           response.status = 200
-          if volume = Fog::AWS::EC2.data[:volumes][volume_id]
+          if volume = @data[:volumes][volume_id]
             data = volume['attachmentSet'].pop
             response.status = 200
             response.body = {
@@ -58,5 +54,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/disassociate_address.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'
 
         # Disassociate an elastic IP address from its instance (if any)
         #
@@ -15,26 +16,21 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def disassociate_address(public_ip)
-          request({
-            'Action' => 'DisassociateAddress',
-            'PublicIp' => public_ip
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'    => 'DisassociateAddress',
+            'PublicIp'  => public_ip,
+            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def disassociate_address(public_ip)
           response = Excon::Response.new
           response.status = 200
-          if address = Fog::AWS::EC2.data[:addresses][public_ip]
+          if address = @data[:addresses][public_ip]
             address['instanceId'] = ''
             response.status = 200
             response.body = {
@@ -51,5 +47,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/get_console_output.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/get_console_output'
 
         # Retrieve console output for specified instance
         #
@@ -17,25 +18,20 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'timestamp'<~Time> - Timestamp of last update to output
         def get_console_output(instance_id)
-          request({
-            'Action' => 'GetConsoleOutput',
-            'InstanceId' => instance_id
-          }, Fog::Parsers::AWS::EC2::GetConsoleOutput.new)
+          request(
+            'Action'      => 'GetConsoleOutput',
+            'InstanceId'  => instance_id,
+            :parser       => Fog::Parsers::AWS::EC2::GetConsoleOutput.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def get_console_output(instance_id)
           response = Excon::Response.new
-          if instance = Fog::AWS::EC2.data[:instances][instance_id]
+          if instance = @data[:instances][instance_id]
             response.status = 200
             response.body = {
               'instanceId'    => instance_id,
@@ -53,5 +49,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/reboot_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/basic'
 
         # Reboot specified instances
         #
@@ -17,26 +18,21 @@ unless Fog.mocking?
         def reboot_instances(instance_id = [])
           params = AWS.indexed_param('InstanceId', instance_id)
           request({
-            'Action' => 'RebootInstances'
-          }.merge!(params), Fog::Parsers::AWS::EC2::Basic.new)
+            'Action'  => 'RebootInstances',
+            :parser   => Fog::Parsers::AWS::EC2::Basic.new
+          }.merge!(params))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def reboot_instances(instance_id = [])
           response = Excon::Response.new
           instance_id = [*instance_id]
-          if (Fog::AWS::EC2.data[:instances].keys & instance_id).length == instance_id.length
+          if (@data[:instances].keys & instance_id).length == instance_id.length
             for instance_id in instance_id
-              Fog::AWS::EC2.data[:instances][instance_id]['status'] = 'rebooting'
+              @data[:instances][instance_id]['status'] = 'rebooting'
             end
             response.status = 200
             response.body = {
@@ -53,5 +49,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/release_address.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'
 
         # Release an elastic IP address.
         #
@@ -12,25 +13,20 @@ unless Fog.mocking?
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
         def release_address(public_ip)
-          request({
-            'Action' => 'ReleaseAddress',
-            'PublicIp' => public_ip
-          }, Fog::Parsers::AWS::EC2::Basic.new)
+          request(
+            'Action'    => 'ReleaseAddress',
+            'PublicIp'  => public_ip,
+            :parser     => Fog::Parsers::AWS::EC2::Basic.new
+          )
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         def release_address(public_ip)
           response = Excon::Response.new
-          if (address = Fog::AWS::EC2.data[:addresses].delete(public_ip))
+          if (address = @data[:addresses].delete(public_ip))
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
@@ -46,5 +42,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/revoke_security_group_ingress.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'
 
         # Remove permissions from a security group
         #
@@ -25,19 +26,14 @@ unless Fog.mocking?
         #     * 'return'<~Boolean> - success?
         def revoke_security_group_ingress(options = {})
           request({
-            'Action' => 'RevokeSecurityGroupIngress'
-          }.merge!(options), Fog::Parsers::AWS::EC2::Basic.new)
+            'Action'  => 'RevokeSecurityGroupIngress',
+            :parser   => Fog::Parsers::AWS::EC2::Basic.new
+          }.merge!(options))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
         # TODO: handle the GroupName/Source/Source case
         def revoke_security_group_ingress(options = {})
@@ -45,7 +41,7 @@ else
             raise MockNotImplemented.new("Contributions welcome!")
           else
             response = Excon::Response.new
-            group = Fog::AWS::EC2.data[:security_groups][options['GroupName']]
+            group = @data[:security_groups][options['GroupName']]
 
             ingress = group['ipPermissions'].select {|permission|
               permission['fromPort']    == options['FromPort'] &&
@@ -68,5 +64,4 @@ else
       end
     end
   end
-
 end

data/lib/fog/aws/requests/ec2/run_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/run_instances'
 
         # Launch specified instances
         #
@@ -81,23 +82,20 @@ unless Fog.mocking?
             options['UserData'] = Base64.encode64(options['UserData'])
           end
           request({
-            'Action' => 'RunInstances',
-            'ImageId' => image_id,
-            'MinCount' => min_count,
-            'MaxCount' => max_count
-          }.merge!(options), Fog::Parsers::AWS::EC2::RunInstances.new)
+            'Action'    => 'RunInstances',
+            'ImageId'   => image_id,
+            'MinCount'  => min_count,
+            'MaxCount'  => max_count,
+            :parser     => Fog::Parsers::AWS::EC2::RunInstances.new
+          }.merge!(options))
         end
 
       end
-    end
-  end
 
-else
-
-  module Fog
-    module AWS
-      class EC2
+      class Mock
 
+        # TODO: allow for block device mapping in mocks
+        # TODO: allow for rootDeviceType specification
         def run_instances(image_id, min_count, max_count, options = {})
           response = Excon::Response.new
           response.status = 200
@@ -110,28 +108,29 @@ else
           min_count.times do |i|
             instance_id = Fog::AWS::Mock.instance_id
             data = {
-              'amiLaunchIndex'  => i,
-              'dnsName'         => '',
-              'groupSet'        => group_set,
-              'imageId'         => image_id,
-              'instanceId'      => instance_id,
-              'instanceState'   => { 'code' => 0, 'name' => 'pending' },
-              'instanceType'    => options['InstanceType'] || 'm1.small',
-              'kernelId'        => options['KernelId'] || Fog::AWS::Mock.kernel_id,
-              'keyName'         => options['KeyName'] || '',
-              'launchTime'      => Time.now,
-              'monitoring'      => { 'state' => options['Monitoring.Enabled'] || false },
-              'ownerId'         => owner_id,
-              'placement'       => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
-              'privateDnsName'  => '',
-              'productCodes'    => [],
-              'ramdiskId'       => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
-              'reason'          => '',
-              'reservationId'   => reservation_id,
-              'instanceState'   => 'pending'
+              'amiLaunchIndex'      => i,
+              'blockDeviceMapping'  => [],
+              'dnsName'             => '',
+              'groupSet'            => group_set,
+              'imageId'             => image_id,
+              'instanceId'          => instance_id,
+              'instanceState'       => { 'code' => 0, 'name' => 'pending' },
+              'instanceType'        => options['InstanceType'] || 'm1.small',
+              'kernelId'            => options['KernelId'] || Fog::AWS::Mock.kernel_id,
+              'keyName'             => options['KeyName'] || '',
+              'launchTime'          => Time.now,
+              'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
+              'ownerId'             => owner_id,
+              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
+              'privateDnsName'      => '',
+              'productCodes'        => [],
+              'ramdiskId'           => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
+              'reason'              => '',
+              'reservationId'       => reservation_id,
+              'rootDeviceType'      => 'instance-store'
             }
-            Fog::AWS::EC2.data[:instances][instance_id] = data
-            instances_set << data.reject{|key,value| !['amiLaunchIndex', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason'].include?(key)}
+            @data[:instances][instance_id] = data
+            instances_set << data.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 = {
             'groupSet'      => group_set,
@@ -146,5 +145,4 @@ else
       end
     end
   end
-
 end