amazon-ec2 0.2.15 → 0.3.1

data/lib/EC2/volumes.rb

@@ -0,0 +1,170 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library, EBS volumes support
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Yann Klis  (mailto:yann.klis@novelys.com)
+# Copyright:: Copyright (c) 2008 Yann Klis
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
+#++
+
+module EC2
+
+  class Base
+
+    #Amazon Developer Guide Docs:
+    #
+    # The DescribeVolumes operation lists one or more Amazon EBS volumes that you own, If you do not specify any volumes, Amazon EBS returns all volumes that you own.
+    #
+    #Required Arguments:
+    #
+    # none
+    #
+    #Optional Arguments:
+    #
+    # :volume_id => Array (default : [])
+    #
+
+    def describe_volumes( options = {} )
+
+      options = { :volume_id => [] }.merge(options)
+
+      params = pathlist("VolumeId", options[:volume_id] )
+
+      return response_generator(:action => "DescribeVolumes", :params => params)
+
+    end
+
+    #Amazon Developer Guide Docs:
+    #
+    # The CreateVolume operation creates a new Amazon EBS volume that you can mount from any Amazon EC2 instance.
+    #
+    #Required Arguments:
+    #
+    # :availability_zone => String (default : '')
+    #
+    #Optional Arguments:
+    #
+    # :size => String (default : '')
+    # :snapshot_id => String (default : '')
+    #
+
+    def create_volume( options = {} )
+
+      # defaults
+      options = { :availability_zone => '' }.merge(options)
+
+      raise ArgumentError, "No :availability_zone provided" if options[:availability_zone].nil? || options[:availability_zone].empty?
+
+      options = { :size => '' }.merge(options)
+      options = { :snapshot_id => '' }.merge(options)
+
+      params = {
+        "AvailabilityZone" => options[:availability_zone],
+        "Size" => options[:size],
+        "SnapshotId" => options[:snapshot_id]
+      }
+
+      return response_generator(:action => "CreateVolume", :params => params)
+
+    end
+
+    #Amazon Developer Guide Docs:
+    #
+    # The DeleteVolume operation deletes an Amazon EBS volume.
+    #
+    #Required Arguments:
+    #
+    # :volume_id => String (default : '')
+    #
+    #Optional Arguments:
+    #
+    # none
+    #
+
+    def delete_volume( options = {} )
+
+      options = { :volume_id => '' }.merge(options)
+
+      raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
+
+      params = {
+        "VolumeId" => options[:volume_id]
+      }
+
+      return response_generator(:action => "DeleteVolume", :params => params)
+
+    end
+
+    #Amazon Developer Guide Docs:
+    #
+    # The AttachVolume operation attaches an Amazon EBS volume to an instance.
+    #
+    #Required Arguments:
+    #
+    # :volume_id => String (default : '')
+    # :instance_id => String (default : '')
+    # :device => String (default : '')
+    #
+    #Optional Arguments:
+    #
+    # none
+    #
+
+    def attach_volume( options = {} )
+
+      options = { :volume_id => '' }.merge(options)
+      options = { :instance_id => '' }.merge(options)
+      options = { :device => '' }.merge(options)
+
+      raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
+      raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
+      raise ArgumentError, "No :device provided" if options[:device].nil? || options[:device].empty?
+
+      params = {
+        "VolumeId" => options[:volume_id],
+        "InstanceId" => options[:instance_id],
+        "Device" => options[:device]
+      }
+
+      return response_generator(:action => "AttachVolume", :params => params)
+
+    end
+
+    #Amazon Developer Guide Docs:
+    #
+    # The DetachVolume operation detaches an Amazon EBS volume from an instance.
+    #
+    #Required Arguments:
+    #
+    # :volume_id => String (default : '')
+    #
+    #Optional Arguments:
+    #
+    # :instance_id => String (default : '')
+    # :device => String (default : '')
+    # :force => Boolean (default : '')
+    #
+
+    def detach_volume( options = {} )
+
+      options = { :volume_id => '' }.merge(options)
+
+      raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
+
+      options = { :instance_id => '' }.merge(options)
+      options = { :device => '' }.merge(options)
+      options = { :force => '' }.merge(options)
+
+      params = {
+        "VolumeId" => options[:volume_id],
+        "InstanceId" => options[:instance_id],
+        "Device" => options[:device],
+        "Force" => options[:force]
+      }
+
+      return response_generator(:action => "DetachVolume", :params => params)
+
+    end
+  end
+end

data/test/test_EC2.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 require File.dirname(__FILE__) + '/test_helper.rb'

data/test/test_EC2_availability_zones.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 require File.dirname(__FILE__) + '/test_helper.rb'
@@ -28,14 +28,14 @@ context "EC2 availability zones" do
         </item>
       </availabilityZoneInfo>
     </DescribeAvailabilityZonesResponse>
-	 RESPONSE
+    RESPONSE
 
  end
 
   specify "should be able to be described with describe_availability_zones" do
     @ec2.stubs(:make_request).with('DescribeAvailabilityZones', { "ZoneName.1" => "us-east-1a", "ZoneName.2" => "us-east-1b" }).
       returns stub(:body => @describe_availability_zones_response_body, :is_a? => true)
-    @ec2.describe_availability_zones( :zone_name => ["us-east-1a", "us-east-1b"] ).should.be.an.instance_of EC2::Response
+    @ec2.describe_availability_zones( :zone_name => ["us-east-1a", "us-east-1b"] ).should.be.an.instance_of Hash
 
     response = @ec2.describe_availability_zones( :zone_name => ["us-east-1a", "us-east-1b"] )
 

data/test/test_EC2_console.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 require File.dirname(__FILE__) + '/test_helper.rb'
@@ -37,7 +37,7 @@ context "The EC2 console " do
   specify "should return info written to a specific instances console" do
     @ec2.stubs(:make_request).with('GetConsoleOutput', {"InstanceId"=>"i-2ea64347"}).
        returns stub(:body => @get_console_output_response_body, :is_a? => true)
-    @ec2.get_console_output( :instance_id => "i-2ea64347" ).should.be.an.instance_of EC2::Response
+    @ec2.get_console_output( :instance_id => "i-2ea64347" ).should.be.an.instance_of Hash
     response = @ec2.get_console_output( :instance_id => "i-2ea64347" )
     response.instanceId.should.equal "i-28a64341"
     response.timestamp.should.equal "2007-01-03 15:00:00"
@@ -51,4 +51,4 @@ context "The EC2 console " do
   end
 
 
-end
+end

data/test/test_EC2_elastic_ips.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 require File.dirname(__FILE__) + '/test_helper.rb'
@@ -57,7 +57,7 @@ context "EC2 elastic IP addresses " do
     @ec2.stubs(:make_request).with('AllocateAddress', {}).
       returns stub(:body => @allocate_address_body, :is_a? => true)
 
-    @ec2.allocate_address.should.be.an.instance_of EC2::Response
+    @ec2.allocate_address.should.be.an.instance_of Hash
 
     response = @ec2.allocate_address
     response.publicIp.should.equal "67.202.55.255"
@@ -79,7 +79,7 @@ context "EC2 elastic IP addresses " do
     @ec2.stubs(:make_request).with('DescribeAddresses', {"PublicIp.1"=>"67.202.55.255"}).
       returns stub(:body => @describe_addresses_response_body, :is_a? => true)
 
-    @ec2.describe_addresses( :public_ip => "67.202.55.255" ).should.be.an.instance_of EC2::Response
+    @ec2.describe_addresses( :public_ip => "67.202.55.255" ).should.be.an.instance_of Hash
 
     response = @ec2.describe_addresses( :public_ip => "67.202.55.255" )
     response.addressesSet.item[0].instanceId.should.equal "i-28a64341"
@@ -91,7 +91,7 @@ context "EC2 elastic IP addresses " do
     @ec2.stubs(:make_request).with('ReleaseAddress', {"PublicIp" => "67.202.55.255"}).
       returns stub(:body => @release_address_response_body, :is_a? => true)
 
-    @ec2.release_address( :public_ip => "67.202.55.255" ).should.be.an.instance_of EC2::Response
+    @ec2.release_address( :public_ip => "67.202.55.255" ).should.be.an.instance_of Hash
 
     response = @ec2.release_address( :public_ip => "67.202.55.255" )
     response.return.should.equal "true"
@@ -102,7 +102,7 @@ context "EC2 elastic IP addresses " do
     @ec2.stubs(:make_request).with('AssociateAddress', {"InstanceId" => "i-2ea64347", "PublicIp"=>"67.202.55.255"}).
       returns stub(:body => @associate_address_response_body, :is_a? => true)
 
-    @ec2.associate_address( :instance_id => "i-2ea64347", :public_ip => "67.202.55.255" ).should.be.an.instance_of EC2::Response
+    @ec2.associate_address( :instance_id => "i-2ea64347", :public_ip => "67.202.55.255" ).should.be.an.instance_of Hash
 
     response = @ec2.associate_address( :instance_id => "i-2ea64347", :public_ip => "67.202.55.255" )
     response.return.should.equal "true"
@@ -124,7 +124,7 @@ context "EC2 elastic IP addresses " do
     @ec2.stubs(:make_request).with('DisassociateAddress', {'PublicIp' => '67.202.55.255'}).
       returns stub(:body => @disassociate_address_response_body, :is_a? => true)
 
-    @ec2.disassociate_address( :public_ip => "67.202.55.255" ).should.be.an.instance_of EC2::Response
+    @ec2.disassociate_address( :public_ip => "67.202.55.255" ).should.be.an.instance_of Hash
 
     response = @ec2.disassociate_address( :public_ip => "67.202.55.255" )
     response.return.should.equal "true"

data/test/test_EC2_image_attributes.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 require File.dirname(__FILE__) + '/test_helper.rb'
@@ -62,7 +62,7 @@ context "EC2 image_attributes " do
                                                             "UserId.1"=>"123",
                                                             "Group.1"=>"all"}).
        returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
-    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id=>["123"], :group=>["all"]).should.be.an.instance_of EC2::Response
+    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id=>["123"], :group=>["all"]).should.be.an.instance_of Hash
   end
 
 
@@ -72,7 +72,7 @@ context "EC2 image_attributes " do
                                                             "OperationType"=>"add",
                                                             "Group.1"=>"all"}).
        returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
-    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]).should.be.an.instance_of EC2::Response
+    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]).should.be.an.instance_of Hash
   end
 
 
@@ -82,7 +82,7 @@ context "EC2 image_attributes " do
                                                             "OperationType"=>"remove",
                                                             "Group.1"=>"all"}).
        returns stub(:body => @modify_image_attribute_response_body, :is_a? => true)
-    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"remove", :group=>["all"]).should.be.an.instance_of EC2::Response
+    @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"remove", :group=>["all"]).should.be.an.instance_of Hash
   end
 
 
@@ -95,7 +95,7 @@ context "EC2 image_attributes " do
     @ec2.modify_image_attribute(:image_id=>"ami-61a54008",
                                 :attribute=>"launchPermission",
                                 :operation_type=>"add",
-                                :user_id=>["123"]).should.be.an.instance_of EC2::Response
+                                :user_id=>["123"]).should.be.an.instance_of Hash
   end
 
 
@@ -107,7 +107,7 @@ context "EC2 image_attributes " do
 
     @ec2.modify_image_attribute(:image_id=>"ami-61a54008",
                                 :attribute=>"productCodes",
-                                :product_code=>["774F4FF8"]).should.be.an.instance_of EC2::Response
+                                :product_code=>["774F4FF8"]).should.be.an.instance_of Hash
   end
 
 
@@ -124,7 +124,7 @@ context "EC2 image_attributes " do
                                 :attribute=>"launchPermission",
                                 :operation_type=>"add",
                                 :user_id=>["123", "345"],
-                                :group=>["123", "all"]).should.be.an.instance_of EC2::Response
+                                :group=>["123", "all"]).should.be.an.instance_of Hash
   end
 
 
@@ -166,7 +166,7 @@ context "EC2 image_attributes " do
       returns stub(:body => @describe_image_attribute_response_body_launch_permissions, :is_a? => true)
 
     @ec2.describe_image_attribute(:image_id => "ami-61a54008", :attribute => "launchPermission").
-      should.be.an.instance_of EC2::Response
+      should.be.an.instance_of Hash
 
     response = @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission")
     response.imageId.should.equal "ami-61a54008"
@@ -181,7 +181,7 @@ context "EC2 image_attributes " do
       returns stub(:body => @describe_image_attribute_response_body_product_codes, :is_a? => true)
 
     @ec2.describe_image_attribute(:image_id => "ami-61a54008", :attribute => "productCodes").
-      should.be.an.instance_of EC2::Response
+      should.be.an.instance_of Hash
 
     response = @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes")
     response.imageId.should.equal "ami-61a54008"
@@ -214,7 +214,7 @@ context "EC2 image_attributes " do
     @ec2.stubs(:make_request).with('ResetImageAttribute', {"ImageId"=>"ami-61a54008",
                                                             "Attribute"=>"launchPermission"}).
        returns stub(:body => @reset_image_attribute_response_body, :is_a? => true)
-    @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission").should.be.an.instance_of EC2::Response
+    @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission").should.be.an.instance_of Hash
     @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission").return.should.equal "true"
   end
 
@@ -235,4 +235,4 @@ context "EC2 image_attributes " do
   end
 
 
-end
+end

data/test/test_EC2_images.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 require File.dirname(__FILE__) + '/test_helper.rb'
@@ -60,7 +60,7 @@ context "An EC2 image " do
     @ec2.stubs(:make_request).with('RegisterImage', {"ImageLocation"=>"mybucket-myimage.manifest.xml"}).
       returns stub(:body => @register_image_response_body, :is_a? => true)
     @ec2.register_image(:image_location => "mybucket-myimage.manifest.xml").imageId.should.equal "ami-61a54008"
-    @ec2.register_image(:image_location => "mybucket-myimage.manifest.xml").should.be.an.instance_of EC2::Response
+    @ec2.register_image(:image_location => "mybucket-myimage.manifest.xml").should.be.an.instance_of Hash
   end
 
 
@@ -73,9 +73,9 @@ context "An EC2 image " do
   specify "should be able to be described and return the correct Ruby response class for parent and members" do
     @ec2.stubs(:make_request).with('DescribeImages', {}).
       returns stub(:body => @describe_image_response_body, :is_a? => true)
-    @ec2.describe_images.should.be.an.instance_of EC2::Response
+    @ec2.describe_images.should.be.an.instance_of Hash
     response = @ec2.describe_images
-    response.should.be.an.instance_of EC2::Response
+    response.should.be.an.instance_of Hash
   end
 
 
@@ -182,7 +182,7 @@ context "An EC2 image " do
   specify "should be able to be de-registered" do
     @ec2.stubs(:make_request).with('DeregisterImage', {"ImageId"=>"ami-61a54008"}).
       returns stub(:body => @deregister_image_response_body, :is_a? => true)
-    @ec2.deregister_image(:image_id => "ami-61a54008" ).should.be.an.instance_of EC2::Response
+    @ec2.deregister_image(:image_id => "ami-61a54008" ).should.be.an.instance_of Hash
     @ec2.deregister_image(:image_id => "ami-61a54008" ).return.should.equal "true"
   end
 

data/test/test_EC2_instances.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 require File.dirname(__FILE__) + '/test_helper.rb'
@@ -30,7 +30,7 @@ context "EC2 instances " do
           <imageId>ami-60a54009</imageId>
           <instanceState>
             <code>0</code>
-    	<name>pending</name>
+            <name>pending</name>
           </instanceState>
           <privateDnsName></privateDnsName>
           <dnsName></dnsName>
@@ -44,7 +44,7 @@ context "EC2 instances " do
           <imageId>ami-60a54009</imageId>
           <instanceState>
             <code>0</code>
-    	<name>pending</name>
+            <name>pending</name>
           </instanceState>
           <privateDnsName></privateDnsName>
           <dnsName></dnsName>
@@ -58,7 +58,7 @@ context "EC2 instances " do
           <imageId>ami-60a54009</imageId>
           <instanceState>
             <code>0</code>
-    	<name>pending</name>
+     <name>pending</name>
           </instanceState>
           <privateDnsName></privateDnsName>
           <dnsName></dnsName>
@@ -146,7 +146,7 @@ context "EC2 instances " do
     @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
 
-    @ec2.run_instances( :image_id => "ami-60a54009" ).should.be.an.instance_of EC2::Response
+    @ec2.run_instances( :image_id => "ami-60a54009" ).should.be.an.instance_of Hash
 
     response = @ec2.run_instances( :image_id => "ami-60a54009" )
 
@@ -223,27 +223,32 @@ context "EC2 instances " do
   specify "should be able specify an availability_zone" do
     @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "Placement.AvailabilityZone" => "zone123", "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
-    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :availability_zone => "zone123", :group_id => [], :user_data => "foo", :base64_encoded => true ).should.be.an.instance_of EC2::Response
+    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :availability_zone => "zone123", :group_id => [], :user_data => "foo", :base64_encoded => true ).should.be.an.instance_of Hash
   end
 
   specify "should be able to call run_instances with :user_data and :base64_encoded => true (default is false)" do
     @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
-    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :group_id => [], :user_data => "foo", :base64_encoded => true ).should.be.an.instance_of EC2::Response
+    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :group_id => [], :user_data => "foo", :base64_encoded => true ).should.be.an.instance_of Hash
   end
 
+  specify "should be able specify an kernel_id" do
+    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "Placement.AvailabilityZone" => "zone123", "UserData" => "foo", "AddressingType" => 'public', 'InstanceType' => 'm1.small', 'KernelId' => 'kernfoo').
+      returns stub(:body => @run_instances_response_body, :is_a? => true)
+    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :availability_zone => "zone123", :group_id => [], :user_data => "foo", :base64_encoded => true, :kernel_id => 'kernfoo' ).should.be.an.instance_of Hash
+  end
 
   specify "should be able to call run_instances with :user_data and :base64_encoded => false" do
     @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "UserData" => "Zm9v", "AddressingType" => 'public', 'InstanceType' => 'm1.small').
       returns stub(:body => @run_instances_response_body, :is_a? => true)
-    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :group_id => [], :user_data => "foo", :base64_encoded => false ).should.be.an.instance_of EC2::Response
+    @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1, :max_count => 1, :group_id => [], :user_data => "foo", :base64_encoded => false ).should.be.an.instance_of Hash
   end
 
 
   specify "should be able to be described and return the correct Ruby response class" do
     @ec2.stubs(:make_request).with('DescribeInstances', {}).
       returns stub(:body => @describe_instances_response_body, :is_a? => true)
-    @ec2.describe_instances.should.be.an.instance_of EC2::Response
+    @ec2.describe_instances.should.be.an.instance_of Hash
     response = @ec2.describe_instances
     response.reservationSet.item[0].reservationId.should.equal "r-44a5402d"
   end
@@ -297,7 +302,7 @@ context "EC2 instances " do
   specify "should be able to be rebooted when provided with an :instance_id" do
     @ec2.expects(:make_request).with('RebootInstances', {"InstanceId.1"=>"i-2ea64347", "InstanceId.2"=>"i-21a64348"}).
       returns stub(:body => @reboot_instances_response_body, :is_a? => true)
-    @ec2.reboot_instances( :instance_id => ["i-2ea64347", "i-21a64348"] ).class.should.equal EC2::Response
+    @ec2.reboot_instances( :instance_id => ["i-2ea64347", "i-21a64348"] ).class.should.equal Hash
   end
 
 
@@ -311,7 +316,7 @@ context "EC2 instances " do
   specify "should be able to be terminated when provided with an :instance_id" do
     @ec2.stubs(:make_request).with('TerminateInstances', {"InstanceId.1"=>"i-28a64341", "InstanceId.2"=>"i-21a64348"}).
       returns stub(:body => @terminate_instances_response_body, :is_a? => true)
-    @ec2.terminate_instances( :instance_id => ["i-28a64341", "i-21a64348"] ).class.should.equal EC2::Response
+    @ec2.terminate_instances( :instance_id => ["i-28a64341", "i-21a64348"] ).class.should.equal Hash
 
     @response = @ec2.terminate_instances( :instance_id => ["i-28a64341", "i-21a64348"] )