amazon-ec2 0.2.5 → 0.2.6

data/test/test_EC2_instances.rb

@@ -11,12 +11,12 @@
 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" )
-    
+
     @run_instances_response_body = <<-RESPONSE
-    <RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
+    <RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-08-29">
       <reservationId>r-47a5402e</reservationId>
       <ownerId>495219933132</ownerId>
       <groupSet>
@@ -30,40 +30,49 @@ context "EC2 instances " do
           <imageId>ami-60a54009</imageId>
           <instanceState>
             <code>0</code>
-            <name>pending</name>
+    	<name>pending</name>
           </instanceState>
-          <privateDnsName/>
-          <dnsName/>
+          <privateDnsName></privateDnsName>
+          <dnsName></dnsName>
           <keyName>example-key-name</keyName>
+           <amiLaunchIndex>0</amiLaunchIndex>
+          <instanceType>m1.small</instanceType>
+          <launchTime>2007-08-07T11:51:50.000Z</launchTime>
         </item>
         <item>
           <instanceId>i-2bc64242</instanceId>
           <imageId>ami-60a54009</imageId>
           <instanceState>
             <code>0</code>
-            <name>pending</name>
+    	<name>pending</name>
           </instanceState>
-          <privateDnsName/>
-          <dnsName/>
+          <privateDnsName></privateDnsName>
+          <dnsName></dnsName>
           <keyName>example-key-name</keyName>
+          <amiLaunchIndex>1</amiLaunchIndex>
+          <instanceType>m1.small</instanceType>
+          <launchTime>2007-08-07T11:51:50.000Z</launchTime>
         </item>
         <item>
           <instanceId>i-2be64332</instanceId>
           <imageId>ami-60a54009</imageId>
           <instanceState>
             <code>0</code>
-            <name>pending</name>
+    	<name>pending</name>
           </instanceState>
-          <privateDnsName/>
-          <dnsName/>
+          <privateDnsName></privateDnsName>
+          <dnsName></dnsName>
           <keyName>example-key-name</keyName>
+          <amiLaunchIndex>2</amiLaunchIndex>
+          <instanceType>m1.small</instanceType>
+          <launchTime>2007-08-07T11:51:50.000Z</launchTime>
         </item>
       </instancesSet>
     </RunInstancesResponse>
     RESPONSE
-    
+
     @describe_instances_response_body = <<-RESPONSE
-    <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
+    <DescribeInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-08-29">
       <reservationSet>
         <item>
           <reservationId>r-44a5402d</reservationId>
@@ -82,72 +91,72 @@ context "EC2 instances " do
                 <name>running</name>
               </instanceState>
               <privateDnsName>domU-12-31-35-00-1E-01.z-2.compute-1.internal</privateDnsName>
-              <dnsName>ec2-72-44-33-4.z-2.compute-1.amazonaws.com</dnsName>
+        <dnsName>ec2-72-44-33-4.z-2.compute-1.amazonaws.com</dnsName>
               <keyName>example-key-name</keyName>
               <productCodesSet>
-                <item>
-                  <productCode>774F4FF8</productCode>
-                </item>
+                <item><productCode>774F4FF8</productCode></item>
               </productCodesSet>
+              <instanceType>m1.small</instanceType>
+        <launchTime>2007-08-07T11:54:42.000Z</launchTime>
             </item>
           </instancesSet>
         </item>
       </reservationSet>
     </DescribeInstancesResponse>
     RESPONSE
-    
+
     @reboot_instances_response_body = <<-RESPONSE
     <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </RebootInstancesResponse>
     RESPONSE
-    
+
     @terminate_instances_response_body = <<-RESPONSE
-    <TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
-      <instancesSet> 
-        <item> 
-          <instanceId>i-28a64341</instanceId> 
-          <shutdownState> 
-            <code>32</code> 
-            <name>shutting-down</name> 
-          </shutdownState> 
-          <previousState> 
-            <code>0</code> 
-            <name>pending</name> 
-          </previousState> 
-        </item> 
-        <item> 
-          <instanceId>i-21a64348</instanceId> 
-          <shutdownState> 
-            <code>32</code> 
-            <name>shutting-down</name> 
-          </shutdownState> 
-          <previousState> 
-            <code>0</code> 
-            <name>pending</name> 
-          </previousState> 
-        </item> 
-      </instancesSet> 
+    <TerminateInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
+      <instancesSet>
+        <item>
+          <instanceId>i-28a64341</instanceId>
+          <shutdownState>
+            <code>32</code>
+            <name>shutting-down</name>
+          </shutdownState>
+          <previousState>
+            <code>0</code>
+            <name>pending</name>
+          </previousState>
+        </item>
+        <item>
+          <instanceId>i-21a64348</instanceId>
+          <shutdownState>
+            <code>32</code>
+            <name>shutting-down</name>
+          </shutdownState>
+          <previousState>
+            <code>0</code>
+            <name>pending</name>
+          </previousState>
+        </item>
+      </instancesSet>
     </TerminateInstancesResponse>
     RESPONSE
   end
-  
-  
+
+
   specify "should be able to be run" do
-    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "AddressingType" => 'public').
+    @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
-    
+
     response = @ec2.run_instances( :image_id => "ami-60a54009" )
-    
+
     response.reservationId.should.equal "r-47a5402e"
     response.ownerId.should.equal "495219933132"
-    
+
     response.groupSet.item[0].groupId.should.equal "default"
-    
+
     response.instancesSet.item.length.should.equal 3
-    
+
     response.instancesSet.item[0].instanceId.should.equal "i-2ba64342"
     response.instancesSet.item[0].imageId.should.equal "ami-60a54009"
     response.instancesSet.item[0].instanceState.code.should.equal "0"
@@ -155,7 +164,9 @@ context "EC2 instances " do
     response.instancesSet.item[0].privateDnsName
     response.instancesSet.item[0].dnsName.should.be.nil
     response.instancesSet.item[0].keyName.should.equal "example-key-name"
-    
+    response.instancesSet.item[0].instanceType.should.equal "m1.small"
+    response.instancesSet.item[0].launchTime.should.equal "2007-08-07T11:51:50.000Z"
+
     response.instancesSet.item[1].instanceId.should.equal "i-2bc64242"
     response.instancesSet.item[1].imageId.should.equal "ami-60a54009"
     response.instancesSet.item[1].instanceState.code.should.equal "0"
@@ -163,7 +174,9 @@ context "EC2 instances " do
     response.instancesSet.item[1].privateDnsName
     response.instancesSet.item[1].dnsName.should.be.nil
     response.instancesSet.item[1].keyName.should.equal "example-key-name"
-    
+    response.instancesSet.item[1].instanceType.should.equal "m1.small"
+    response.instancesSet.item[1].launchTime.should.equal "2007-08-07T11:51:50.000Z"
+
     response.instancesSet.item[2].instanceId.should.equal "i-2be64332"
     response.instancesSet.item[2].imageId.should.equal "ami-60a54009"
     response.instancesSet.item[2].instanceState.code.should.equal "0"
@@ -171,54 +184,56 @@ context "EC2 instances " do
     response.instancesSet.item[2].privateDnsName
     response.instancesSet.item[2].dnsName.should.be.nil
     response.instancesSet.item[2].keyName.should.equal "example-key-name"
+    response.instancesSet.item[2].instanceType.should.equal "m1.small"
+    response.instancesSet.item[2].launchTime.should.equal "2007-08-07T11:51:50.000Z"
   end
-  
-  
+
+
   specify "method 'run_instances' should reject invalid arguments" do
-    @ec2.stubs(:make_request).with('RunInstances', "ImageId" => "ami-60a54009", "MinCount" => '1', "MaxCount" => '1', "AddressingType" => 'public').
+    @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)
   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').
+    @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
   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').
+    @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
   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)
@@ -226,8 +241,8 @@ context "EC2 instances " do
     response = @ec2.describe_instances
     response.reservationSet.item[0].reservationId.should.equal "r-44a5402d"
   end
-  
-  
+
+
   specify "should be able to be described with no params and return an array of Items" do
     @ec2.stubs(:make_request).with('DescribeInstances', {}).
       returns stub(:body => @describe_instances_response_body, :is_a? => true)
@@ -245,8 +260,8 @@ context "EC2 instances " do
     response.reservationSet.item[0].instancesSet.item[0].keyName.should.equal "example-key-name"
     response.reservationSet.item[0].instancesSet.item[0].productCodesSet.item[0].productCode.should.equal "774F4FF8"
   end
-  
-  
+
+
   specify "should be able to be described with params of Array of :instance_id's and return an array of Items" do
     @ec2.stubs(:make_request).with('DescribeInstances', {"InstanceId.1" => "i-28a64341"}).
       returns stub(:body => @describe_instances_response_body, :is_a? => true)
@@ -264,47 +279,47 @@ context "EC2 instances " do
     response.reservationSet.item[0].instancesSet.item[0].keyName.should.equal "example-key-name"
     response.reservationSet.item[0].instancesSet.item[0].productCodesSet.item[0].productCode.should.equal "774F4FF8"
   end
-  
-  
+
+
   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)
   end
-  
-  
+
+
   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
   end
-  
-  
+
+
   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)
   end
-  
-  
+
+
   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
-    
+
     @response = @ec2.terminate_instances( :instance_id => ["i-28a64341", "i-21a64348"] )
-    
+
     @response.instancesSet.item[0].instanceId.should.equal "i-28a64341"
     @response.instancesSet.item[0].shutdownState.code.should.equal "32"
     @response.instancesSet.item[0].shutdownState.name.should.equal "shutting-down"
     @response.instancesSet.item[0].previousState.code.should.equal "0"
     @response.instancesSet.item[0].previousState.name.should.equal "pending"
-    
+
     @response.instancesSet.item[1].instanceId.should.equal "i-21a64348"
     @response.instancesSet.item[1].shutdownState.code.should.equal "32"
     @response.instancesSet.item[1].shutdownState.name.should.equal "shutting-down"
     @response.instancesSet.item[1].previousState.code.should.equal "0"
     @response.instancesSet.item[1].previousState.name.should.equal "pending"
   end
-  
+
 end

data/test/test_EC2_keypairs.rb

@@ -11,14 +11,14 @@
 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" )
-    
+
     @create_keypair_response_body = <<-RESPONSE
-      <CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01"> 
-      <keyName>example-key-name</keyName> 
-      <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint> 
+      <CreateKeyPairResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
+      <keyName>example-key-name</keyName>
+      <keyFingerprint>1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f</keyFingerprint>
       <keyMaterial>-----BEGIN RSA PRIVATE KEY-----
       MIIEoQIBAAKCAQBuLFg5ujHrtm1jnutSuoO8Xe56LlT+HM8v/xkaa39EstM3/aFxTHgElQiJLChp
       HungXQ29VTc8rc1bW0lkdi23OH5eqkMHGhvEwqa0HWASUMll4o3o/IX+0f2UcPoKCOVUR+jx71Sg
@@ -44,7 +44,7 @@ context "EC2 keypairs " do
       -----END RSA PRIVATE KEY-----</keyMaterial>
       </CreateKeyPairResponse>
     RESPONSE
-    
+
     @describe_keypairs_response_body = <<-RESPONSE
     <DescribeKeyPairsResponse xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <keySet>
@@ -55,41 +55,41 @@ context "EC2 keypairs " do
       </keySet>
     </DescribeKeyPairsResponse>
     RESPONSE
-    
+
     @delete_keypair_body = <<-RESPONSE
     <DeleteKeyPair xmlns="http://ec2.amazonaws.com/doc/2007-03-01">
       <return>true</return>
     </DeleteKeyPair>
     RESPONSE
-    
+
   end
-  
-  
+
+
   specify "should be able to be created" do
     @ec2.stubs(:make_request).with('CreateKeyPair', {"KeyName"=>"example-key-name"}).
       returns stub(:body => @create_keypair_response_body, :is_a? => true)
-    
+
     @ec2.create_keypair( :key_name => "example-key-name" ).should.be.an.instance_of EC2::Response
-    
+
     response = @ec2.create_keypair( :key_name => "example-key-name" )
     response.keyName.should.equal "example-key-name"
     response.keyFingerprint.should.equal "1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f"
     response.keyMaterial.should.not.equal ""
     response.keyMaterial.should.not.be.nil
   end
-  
-  
+
+
   specify "method create_keypair should reject bad arguments" 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)
   end
-  
-  
+
+
   specify "should be able to be described with describe_keypairs" do
     @ec2.stubs(:make_request).with('DescribeKeyPairs', {"KeyName.1"=>"example-key-name"}).
       returns stub(:body => @describe_keypairs_response_body, :is_a? => true)
@@ -98,8 +98,8 @@ context "EC2 keypairs " do
     response.keySet.item[0].keyName.should.equal "example-key-name"
     response.keySet.item[0].keyFingerprint.should.equal "1f:51:ae:28:bf:89:e9:d8:1f:25:5d:37:2d:7d:b8:ca:9f:f5:f1:6f"
   end
-  
-  
+
+
   specify "should be able to be deleted with delete_keypairs" do
     @ec2.stubs(:make_request).with('DeleteKeyPair', {"KeyName"=>"example-key-name"}).
       returns stub(:body => @delete_keypair_body, :is_a? => true)
@@ -107,17 +107,17 @@ context "EC2 keypairs " do
     response = @ec2.delete_keypair( :key_name => "example-key-name" )
     response.return.should.equal "true"
   end
-  
-  
+
+
   specify "method delete_keypair should reject bad argument" 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)
   end
-  
-  
+
+
 end