amazon-ec2 0.4.8 → 0.5.0

data/test/test_EC2_availability_zones.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 availability zones" do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @describe_availability_zones_response_body = <<-RESPONSE
     <DescribeAvailabilityZonesResponse xmlns="http://ec2.amazonaws.com/doc/2008-02-01/">

data/test/test_EC2_console.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "The EC2 console " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @get_console_output_response_body = <<-RESPONSE
     <GetConsoleOutputResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
@@ -45,9 +45,9 @@ context "The EC2 console " do
 
 
   specify "method get_console_output should raise an exception when called without nil/empty string arguments" do
-    lambda { @ec2.get_console_output() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.get_console_output(:instance_id => nil) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.get_console_output(:instance_id => "") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.get_console_output() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.get_console_output(:instance_id => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.get_console_output(:instance_id => "") }.should.raise(AWS::ArgumentError)
   end
 
 

data/test/test_EC2_elastic_ips.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 elastic IP addresses " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @allocate_address_body = <<-RESPONSE
     <AllocateAddressResponse xmlns="http://ec2.amazonaws.com/doc/2008-02-01">
@@ -68,10 +68,10 @@ context "EC2 elastic IP addresses " do
   #  @ec2.stubs(:make_request).with('CreateKeyPair', {"KeyName"=>"example-key-name"}).
   #    returns stub(:body => @create_keypair_response_body, :is_a? => true)
   #
-  #  lambda { @ec2.create_keypair( :key_name => "example-key-name" ) }.should.not.raise(EC2::ArgumentError)
-  #  lambda { @ec2.create_keypair() }.should.raise(EC2::ArgumentError)
-  #  lambda { @ec2.create_keypair( :key_name => nil ) }.should.raise(EC2::ArgumentError)
-  #  lambda { @ec2.create_keypair( :key_name => "" ) }.should.raise(EC2::ArgumentError)
+  #  lambda { @ec2.create_keypair( :key_name => "example-key-name" ) }.should.not.raise(AWS::ArgumentError)
+  #  lambda { @ec2.create_keypair() }.should.raise(AWS::ArgumentError)
+  #  lambda { @ec2.create_keypair( :key_name => nil ) }.should.raise(AWS::ArgumentError)
+  #  lambda { @ec2.create_keypair( :key_name => "" ) }.should.raise(AWS::ArgumentError)
   #end
 
 
@@ -113,10 +113,10 @@ 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)
 
-    lambda { @ec2.associate_address( :instance_id => "i-2ea64347", :public_ip => "67.202.55.255" ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.associate_address() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.associate_address( :instance_id => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.associate_address( :public_ip => "" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.associate_address( :instance_id => "i-2ea64347", :public_ip => "67.202.55.255" ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.associate_address() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.associate_address( :instance_id => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.associate_address( :public_ip => "" ) }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -135,9 +135,9 @@ 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)
 
-    lambda { @ec2.disassociate_address( :public_ip => "67.202.55.255" ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.disassociate_address() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.disassociate_address( :public_ip => "" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.disassociate_address( :public_ip => "67.202.55.255" ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.disassociate_address() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.disassociate_address( :public_ip => "" ) }.should.raise(AWS::ArgumentError)
   end
 
 

data/test/test_EC2_image_attributes.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 image_attributes " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @modify_image_attribute_response_body = <<-RESPONSE
     <ModifyImageAttributeResponse xm-lns="http://ec2.amazonaws.com/doc/2007-03-01">
@@ -130,33 +130,33 @@ context "EC2 image_attributes " do
 
   specify "should raise an exception when modify_image_attribute is called with incorrect arguments" do
     # method args can't be nil or empty
-    lambda { @ec2.modify_image_attribute() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"") }.should.raise(AWS::ArgumentError)
 
     # :image_id option must be not be empty or nil
-    lambda { @ec2.modify_image_attribute(:image_id=>nil, :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"", :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>nil, :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"", :attribute=>"launchPermission", :operation_type=>"add", :group=>["all"]) }.should.raise(AWS::ArgumentError)
 
     # :attribute currently has two options which are 'launchPermission' and 'productCodes, it should fail with any other value, nil, or empty
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil, :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo", :operation_type=>"add", :group=>["all"]) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil, :operation_type=>"add", :group=>["all"]) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"", :operation_type=>"add", :group=>["all"]) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo", :operation_type=>"add", :group=>["all"]) }.should.raise(AWS::ArgumentError)
 
     # :attribute => 'launchPermission' option should fail if neither :group nor :user_id are also provided
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group => nil) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group => "") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id => nil) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id => "") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :group => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"add", :user_id => "") }.should.raise(AWS::ArgumentError)
 
     # :attribute => 'productCodes' option should fail if :product_code isn't also provided
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes", :product_code=>nil) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes", :product_code=>"") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes", :product_code=>nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"productCodes", :product_code=>"") }.should.raise(AWS::ArgumentError)
 
     # :operation_type currently has two options which are 'add' and 'remove', and it should fail with any other, nil or empty
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>nil, :group=>["all"]) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"", :group=>["all"]) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"foo", :group=>["all"]) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>nil, :group=>["all"]) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"", :group=>["all"]) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.modify_image_attribute(:image_id=>"ami-61a54008", :attribute=>"launchPermission", :operation_type=>"foo", :group=>["all"]) }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -191,22 +191,22 @@ context "EC2 image_attributes " do
 
   specify "should raise an exception when describe_image_attribute is called with incorrect arguments" do
     # method args can't be nil or empty
-    lambda { @ec2.describe_image_attribute() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.describe_image_attribute(:image_id=>"") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.describe_image_attribute() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>"") }.should.raise(AWS::ArgumentError)
 
     # :image_id option must be not be empty or nil w/ launchPermission
-    lambda { @ec2.describe_image_attribute(:image_id=>nil, :attribute=>"launchPermission") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.describe_image_attribute(:image_id=>"", :attribute=>"launchPermission") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>nil, :attribute=>"launchPermission") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>"", :attribute=>"launchPermission") }.should.raise(AWS::ArgumentError)
 
     # :image_id option must be not be empty or nil w/ productCodes
-    lambda { @ec2.describe_image_attribute(:image_id=>nil, :attribute=>"productCodes") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.describe_image_attribute(:image_id=>"", :attribute=>"productCodes") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>nil, :attribute=>"productCodes") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>"", :attribute=>"productCodes") }.should.raise(AWS::ArgumentError)
 
     # :attribute currently has two options which are 'launchPermission' and 'productCodes', it should fail with any other values,
     # nil, or empty
-    lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.describe_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo") }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -221,17 +221,17 @@ context "EC2 image_attributes " do
 
   specify "should raise an exception when reset_image_attribute is called with incorrect arguments" do
     # method args can't be nil or empty
-    lambda { @ec2.reset_image_attribute() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.reset_image_attribute(:image_id=>"") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.reset_image_attribute() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_image_attribute(:image_id=>"") }.should.raise(AWS::ArgumentError)
 
     # :image_id option must be not be empty or nil
-    lambda { @ec2.reset_image_attribute(:image_id=>nil, :attribute=>"launchPermission") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.reset_image_attribute(:image_id=>"", :attribute=>"launchPermission") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.reset_image_attribute(:image_id=>nil, :attribute=>"launchPermission") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_image_attribute(:image_id=>"", :attribute=>"launchPermission") }.should.raise(AWS::ArgumentError)
 
     # :attribute currently has one option which is 'launchPermission', it should fail with any other value, nil, or empty
-    lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reset_image_attribute(:image_id=>"ami-61a54008", :attribute=>"foo") }.should.raise(AWS::ArgumentError)
   end
 
 

data/test/test_EC2_images.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "An EC2 image " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @register_image_response_body = <<-RESPONSE
     <RegisterImageResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
@@ -65,8 +65,8 @@ context "An EC2 image " do
 
 
   specify "method register_image should raise an exception when called without nil/empty string arguments" do
-    lambda { @ec2.register_image() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.register_image(:image_location => "") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.register_image() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.register_image(:image_location => "") }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -188,9 +188,9 @@ context "An EC2 image " do
 
 
   specify "method deregister_image should raise an exception when called without nil/empty string arguments" do
-    lambda { @ec2.deregister_image() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.deregister_image( :image_id => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.deregister_image( :image_id => "" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.deregister_image() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.deregister_image( :image_id => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.deregister_image( :image_id => "" ) }.should.raise(AWS::ArgumentError)
   end
 
 

data/test/test_EC2_instances.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 instances " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @run_instances_response_body = <<-RESPONSE
     <RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-08-29">
@@ -193,30 +193,30 @@ 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)
 
-    lambda { @ec2.run_instances() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "" ) }.should.raise(EC2::ArgumentError)
-
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1 ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 0 ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => "" ) }.should.raise(EC2::ArgumentError)
-
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => 1 ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => 0 ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => "" ) }.should.raise(EC2::ArgumentError)
-
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "public" ) }.should.not.raise(EC2::ArgumentError)
-    #lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "direct" ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "" ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "foo" ) }.should.raise(EC2::ArgumentError)
-
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => true ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => false ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => "" ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => "foo" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.run_instances() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "" ) }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 1 ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => 0 ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :min_count => "" ) }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => 1 ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => 0 ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :max_count => "" ) }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "public" ) }.should.not.raise(AWS::ArgumentError)
+    #lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "direct" ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "" ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :addressing_type => "foo" ) }.should.raise(AWS::ArgumentError)
+
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => true ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => false ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => "" ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.run_instances( :image_id => "ami-60a54009", :base64_encoded => "foo" ) }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -243,15 +243,15 @@ context "EC2 instances " do
       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 Hash
   end
-  
+
   specify "should get no user data for when options has no user_data key" do
     @ec2.extract_user_data({}).should == nil
   end
-  
+
   specify "should get plain string user data when options has user_data and no base64 key" do
     @ec2.extract_user_data({:user_data => "foo\nbar"}).should == "foo\nbar"
   end
-  
+
   specify "should strip new lines and base64 encode when options has both user_data and base64" do
     @ec2.extract_user_data({:user_data => "binary\ndata\nhere\n", :base64_encoded => true}).should == "YmluYXJ5CmRhdGEKaGVyZQo="
   end
@@ -305,9 +305,9 @@ context "EC2 instances " do
 
 
   specify "method reboot_instances should raise an exception when called without nil/empty string arguments" do
-    lambda { @ec2.reboot_instances() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.reboot_instances( :instance_id => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.reboot_instances( :instance_id => "" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.reboot_instances() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reboot_instances( :instance_id => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.reboot_instances( :instance_id => "" ) }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -319,9 +319,9 @@ context "EC2 instances " do
 
 
   specify "method terminate_instances should raise an exception when called without nil/empty string arguments" do
-    lambda { @ec2.terminate_instances() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.terminate_instances( :instance_id => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.terminate_instances( :instance_id => "" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.terminate_instances() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.terminate_instances( :instance_id => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.terminate_instances( :instance_id => "" ) }.should.raise(AWS::ArgumentError)
   end
 
 

data/test/test_EC2_keypairs.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 keypairs " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @create_keypair_response_body = <<-RESPONSE
       <CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
@@ -83,10 +83,10 @@ context "EC2 keypairs " do
     @ec2.stubs(:make_request).with('CreateKeyPair', {"KeyName"=>"example-key-name"}).
       returns stub(:body => @create_keypair_response_body, :is_a? => true)
 
-    lambda { @ec2.create_keypair( :key_name => "example-key-name" ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.create_keypair() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.create_keypair( :key_name => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.create_keypair( :key_name => "" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.create_keypair( :key_name => "example-key-name" ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.create_keypair() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.create_keypair( :key_name => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.create_keypair( :key_name => "" ) }.should.raise(AWS::ArgumentError)
   end
 
 
@@ -113,10 +113,10 @@ context "EC2 keypairs " do
     @ec2.stubs(:make_request).with('DeleteKeyPair', {"KeyName"=>"example-key-name"}).
       returns stub(:body => @delete_keypair_body, :is_a? => true)
 
-    lambda { @ec2.delete_keypair( :key_name => "example-key-name" ) }.should.not.raise(EC2::ArgumentError)
-    lambda { @ec2.delete_keypair() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.delete_keypair( :key_name => nil ) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.delete_keypair( :key_name => "" ) }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.delete_keypair( :key_name => "example-key-name" ) }.should.not.raise(AWS::ArgumentError)
+    lambda { @ec2.delete_keypair() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.delete_keypair( :key_name => nil ) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.delete_keypair( :key_name => "" ) }.should.raise(AWS::ArgumentError)
   end
 
 

data/test/test_EC2_products.rb

@@ -12,8 +12,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "An EC2 instance " do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @confirm_product_instance_response_body = <<-RESPONSE
     <ConfirmProductInstanceResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
@@ -37,11 +37,11 @@ context "An EC2 instance " do
 
 
   specify "method get_console_output should raise an exception when called without nil/empty string arguments" do
-    lambda { @ec2.confirm_product_instance() }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.confirm_product_instance(:product_code => "774F4FF8", :instance_id => nil) }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.confirm_product_instance(:product_code => "774F4FF8", :instance_id => "") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.confirm_product_instance(:product_code => nil, :instance_id => "i-10a64379") }.should.raise(EC2::ArgumentError)
-    lambda { @ec2.confirm_product_instance(:product_code => "", :instance_id => "i-10a64379") }.should.raise(EC2::ArgumentError)
+    lambda { @ec2.confirm_product_instance() }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => "774F4FF8", :instance_id => nil) }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => "774F4FF8", :instance_id => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => nil, :instance_id => "i-10a64379") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.confirm_product_instance(:product_code => "", :instance_id => "i-10a64379") }.should.raise(AWS::ArgumentError)
   end
 
 

data/test/test_EC2_responses.rb

@@ -13,14 +13,14 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 context "The Response classes " do
 
 
-  setup do
+  before do
     @http_xml = <<-RESPONSE
     <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </RebootInstancesResponse>
     RESPONSE
 
-    @response = EC2::Response.parse(:xml => @http_xml)
+    @response = AWS::Response.parse(:xml => @http_xml)
   end
 
 

data/test/test_EC2_s3_xmlsimple.rb

@@ -16,8 +16,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 context "EC2 aws-s3 compat test" do
 
-  setup do
-    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
 
     @describe_instances_response_body = <<-RESPONSE
     <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-08-29">