amazon-ec2 0.2.15 → 0.3.1

data/test/test_EC2_keypairs.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'
@@ -69,7 +69,7 @@ context "EC2 keypairs " 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
+    @ec2.create_keypair( :key_name => "example-key-name" ).should.be.an.instance_of Hash
 
     response = @ec2.create_keypair( :key_name => "example-key-name" )
     response.keyName.should.equal "example-key-name"
@@ -93,7 +93,7 @@ context "EC2 keypairs " do
   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)
-    @ec2.describe_keypairs( :key_name => "example-key-name" ).should.be.an.instance_of EC2::Response
+    @ec2.describe_keypairs( :key_name => "example-key-name" ).should.be.an.instance_of Hash
     response = @ec2.describe_keypairs( :key_name => "example-key-name" )
     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"
@@ -103,7 +103,7 @@ context "EC2 keypairs " do
   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)
-    @ec2.delete_keypair( :key_name => "example-key-name" ).should.be.an.instance_of EC2::Response
+    @ec2.delete_keypair( :key_name => "example-key-name" ).should.be.an.instance_of Hash
     response = @ec2.delete_keypair( :key_name => "example-key-name" )
     response.return.should.equal "true"
   end

data/test/test_EC2_products.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'
@@ -29,7 +29,7 @@ context "An EC2 instance " do
     @ec2.stubs(:make_request).with('ConfirmProductInstance', {"ProductCode"=>"774F4FF8", "InstanceId"=>"i-10a64379"}).
        returns stub(:body => @confirm_product_instance_response_body, :is_a? => true)
 
-    @ec2.confirm_product_instance( :product_code => "774F4FF8", :instance_id => "i-10a64379" ).should.be.an.instance_of EC2::Response
+    @ec2.confirm_product_instance( :product_code => "774F4FF8", :instance_id => "i-10a64379" ).should.be.an.instance_of Hash
     response = @ec2.confirm_product_instance( :product_code => "774F4FF8", :instance_id => "i-10a64379" )
     response.ownerId.should.equal "254933287430"
     response.result.should.equal "true"

data/test/test_EC2_responses.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'
@@ -21,82 +21,32 @@ context "The Response classes " do
     RESPONSE
 
     @response = EC2::Response.parse(:xml => @http_xml)
-
-    # test out adding arbitrary new values to the OpenStruct
-    @response.name = "foo"
-    @response.number = '123'
-  end
-
-
-  specify "should properly run the to_string(short) method for the short version" do
-    # sample response looks like: "#<EC2::Response:0x100A45F2E ...>".  Our response should look
-    # exactly the same, except it should have different hex digits in the middle (after 0x)
-    # that are nine chars long.
-    @response.to_string(true).should =~ /^#<EC2::Response:0x[0-9A-F]{1,9} ...>/
   end
 
 
-  specify "should properly run the to_string(false) method for the long version" do
-    @response.to_string(false).should =~ /^#<EC2::Response:0x[0-9A-F]{1,9} name=\"foo\" number=\"123\" parent=nil return=\"true\"/
+  specify "should show the response as a formatted string when calling #inspect" do
+    @response.inspect.should.equal %{{"return"=>"true", "xmlns"=>"http://ec2.amazonaws.com/doc/2007-03-01"}}
   end
 
 
-  specify "should properly run the to_string(false) method for the long version when called with no params" do
-    @response.to_string.should =~ /^#<EC2::Response:0x[0-9A-F]{1,9} name=\"foo\" number=\"123\" parent=nil return=\"true\"/
-  end
-
-
-  specify "should provide the same results from to_s as from to_string(false) " do
-    @response.to_s.should =~ /^#<EC2::Response:0x[0-9A-F]{1,9} name=\"foo\" number=\"123\" parent=nil return=\"true\"/
-  end
-
-
-  specify "should be a kind of type OpenStruct" do
-    @response.kind_of?(OpenStruct).should.equal true
-    @response.kind_of?(Enumerable).should.equal true
+  specify "should be a Hash" do
+    @response.kind_of?(Hash).should.equal true
   end
 
 
   specify "should return its members" do
-    @response.members.length.should.equal 6
-    test_array = ["return", "xmlns", "number", "name", "parent", "xml"].sort
-    @response.members.sort.should.equal test_array
-  end
-
-
-  specify "should properly respond to its 'each' method" do
-    answer = @response.each do |f| f ; end
-    answer.name.should.equal "foo"
-    answer.number.should.equal '123'
-  end
-
-
-  specify "should respond to the '[]' method" do
-    @response[:name].should.equal "foo"
+    @response.keys.length.should.equal 2
+    test_array = ["return", "xmlns"].sort
+    @response.keys.sort.should.equal test_array
   end
 
 
-  specify "should respond correctly to the '[]=' method and set a variable" do
-    @response[:name].should.equal "foo"
-    @response[:name]="bar"
-    @response[:name].should.equal "bar"
-  end
-
-
-  specify "should respond correctly to the 'each_pair' method" do
-    @response.each_pair {|k,v|
-      case k
-      when "name"
-        v.should.equal "foo"
-      when "number"
-        v.should.equal '123'
-      end
-    }
-  end
-
-  specify "should return the original amazon XML response in the 'xml' attribute of the response object." do
-    @response.xml.should.equal @http_xml
-  end
+  # Note: since we are now returning a hash of the xml, there should be no need for anyone to re-parse the xml.
+  # Therefore storing the xml on the object is a waste of memory, and is not done.
+  #
+  # specify "should return the original amazon XML response in the 'xml' attribute of the response object." do
+  #  @response.xml.should.equal @http_xml
+  # end
 
 
 end

data/test/test_EC2_security_groups.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'
@@ -84,7 +84,7 @@ context "EC2 security groups " do
   specify "should be able to be created" do
     @ec2.stubs(:make_request).with('CreateSecurityGroup', {"GroupName"=>"WebServers", "GroupDescription"=>"Web"}).
       returns stub(:body => @create_security_group_response_body, :is_a? => true)
-    @ec2.create_security_group( :group_name => "WebServers", :group_description => "Web" ).should.be.an.instance_of EC2::Response
+    @ec2.create_security_group( :group_name => "WebServers", :group_description => "Web" ).should.be.an.instance_of Hash
   end
 
 
@@ -108,7 +108,7 @@ context "EC2 security groups " do
   specify "should be able to be deleted" do
     @ec2.stubs(:make_request).with('DeleteSecurityGroup', {"GroupName"=>"WebServers"}).
       returns stub(:body => @delete_security_group_response_body, :is_a? => true)
-    @ec2.delete_security_group( :group_name => "WebServers" ).should.be.an.instance_of EC2::Response
+    @ec2.delete_security_group( :group_name => "WebServers" ).should.be.an.instance_of Hash
   end
 
 
@@ -128,7 +128,7 @@ context "EC2 security groups " do
   specify "should be able to be described with describe_security_groups" do
     @ec2.stubs(:make_request).with('DescribeSecurityGroups', { "GroupName.1" => "WebServers", "GroupName.2" => "RangedPortsBySource" }).
       returns stub(:body => @describe_security_groups_response_body, :is_a? => true)
-    @ec2.describe_security_groups( :group_name => ["WebServers", "RangedPortsBySource"] ).should.be.an.instance_of EC2::Response
+    @ec2.describe_security_groups( :group_name => ["WebServers", "RangedPortsBySource"] ).should.be.an.instance_of Hash
 
     response = @ec2.describe_security_groups( :group_name => ["WebServers", "RangedPortsBySource"] )
 
@@ -178,7 +178,7 @@ context "EC2 security groups " do
                                            :cidr_ip => "0.0.0.0/24",
                                            :source_security_group_name => "Source SG Name",
                                            :source_security_group_owner_id => "123"
-                                           ).should.be.an.instance_of EC2::Response
+                                           ).should.be.an.instance_of Hash
   end
 
 
@@ -199,7 +199,7 @@ context "EC2 security groups " do
                                         :cidr_ip => "0.0.0.0/24",
                                         :source_security_group_name => "Source SG Name",
                                         :source_security_group_owner_id => "123"
-                                        ).should.be.an.instance_of EC2::Response
+                                        ).should.be.an.instance_of Hash
   end
 
 end

data/test/test_EC2_snapshots.rb

@@ -0,0 +1,83 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library, EBS snapshots 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
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "EC2 snaphots " do
+
+  setup do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @describe_snapshots_response_body = <<-RESPONSE
+    <DescribeSnapshotsResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <snapshotId>snap-78a54011</snapshotId>
+      <volumeId>vol-4d826724</volumeId>
+      <status>pending</status>
+      <startTime>2008-05-07T12:51:50.000Z</startTime>
+      <progress>80%</progress>
+    </DescribeSnapshotsResponse>
+    RESPONSE
+
+    @create_snapshot_response_body = <<-RESPONSE
+    <CreateSnapshotResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <snapshotId>snap-78a54011</snapshotId>
+      <volumeId>vol-4d826724</volumeId>
+      <status>pending</status>
+      <startTime>2008-05-07T12:51:50.000Z</startTime>
+      <progress></progress>
+    </CreateSnapshotResponse>
+    RESPONSE
+
+    @delete_snapshot_response_body = <<-RESPONSE
+    <DeleteSnapshotResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <return>true</return>
+    </DeleteSnapshotResponse>
+    RESPONSE
+
+  end
+
+
+  specify "should be able to be described with describe_snapshots" do
+    @ec2.stubs(:make_request).with('DescribeSnapshots', {"SnapshotId.1"=>"snap-78a54011"}).
+      returns stub(:body => @describe_snapshots_response_body, :is_a? => true)
+
+    @ec2.describe_snapshots( :snapshot_id => "snap-78a54011" ).should.be.an.instance_of Hash
+
+    response = @ec2.describe_snapshots( :snapshot_id => "snap-78a54011" )
+    response.snapshotId.should.equal "snap-78a54011"
+    response.volumeId.should.equal "vol-4d826724"
+    response.status.should.equal "pending"
+    response.progress.should.equal "80%"
+  end
+
+  specify "should be able to be created with a volume_id" do
+    @ec2.stubs(:make_request).with('CreateSnapshot', {"VolumeId" => "vol-4d826724"}).
+      returns stub(:body => @create_snapshot_response_body, :is_a? => true)
+
+    @ec2.create_snapshot( :volume_id => "vol-4d826724" ).should.be.an.instance_of Hash
+
+    response = @ec2.create_snapshot( :volume_id => "vol-4d826724" )
+    response.snapshotId.should.equal "snap-78a54011"
+    response.volumeId.should.equal "vol-4d826724"
+    response.status.should.equal "pending"
+    response.progress.should.equal nil
+  end
+
+  specify "should be able to be deleted with a snapsot_id" do
+    @ec2.stubs(:make_request).with('DeleteSnapshot', {"SnapshotId" => "snap-78a54011"}).
+      returns stub(:body => @delete_snapshot_response_body, :is_a? => true)
+
+    @ec2.delete_snapshot( :snapshot_id => "snap-78a54011" ).should.be.an.instance_of Hash
+
+    response = @ec2.delete_snapshot( :snapshot_id => "snap-78a54011" )
+    response.return.should.equal "true"
+  end
+
+end

data/test/test_EC2_volumes.rb

@@ -0,0 +1,142 @@
+#--
+# 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
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "EC2 volumes " do
+
+  setup do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @describe_volumes_response_body = <<-RESPONSE
+    <DescribeVolumesResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeSet>
+        <item>
+          <volumeId>vol-4282672b</volumeId>
+          <size>800</size>
+          <status>in-use</status>
+          <createTime>2008-05-07T11:51:50.000Z</createTime>
+          <attachmentSet>
+            <item>
+              <volumeId>vol-4282672b</volumeId>
+              <instanceId>i-6058a509</instanceId>
+              <size>800</size>
+              <status>attached</status>
+              <attachTime>2008-05-07T12:51:50.000Z</attachTime>
+            </item>
+          </attachmentSet>
+        </item>
+      </volumeSet>
+    </DescribeVolumesResponse>
+    RESPONSE
+
+    @create_volume_response_body = <<-RESPONSE
+    <CreateVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeId>vol-4d826724</volumeId>
+      <size>800</size>
+      <status>creating</status>
+      <createTime>2008-05-07T11:51:50.000Z</createTime>
+      <zone>us-east-1a</zone>
+      <snapshotId></snapshotId>
+    </CreateVolumeResponse>
+    RESPONSE
+
+    @delete_volume_response_body = <<-RESPONSE
+    <ReleaseAddressResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <return>true</return>
+    </ReleaseAddressResponse>
+    RESPONSE
+
+    @attach_volume_response_body = <<-RESPONSE
+    <AttachVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeId>vol-4d826724</volumeId>
+      <instanceId>i-6058a509</instanceId>
+      <device>/dev/sdh</device>
+      <status>attaching</status>
+      <attachTime>2008-05-07T11:51:50.000Z</attachTime>
+    </AttachVolumeResponse>
+    RESPONSE
+
+    @detach_volume_response_body = <<-RESPONSE
+    <DetachVolumeResponse xmlns="http://ec2.amazonaws.com/doc/2008-05-05">
+      <volumeId>vol-4d826724</volumeId>
+      <instanceId>i-6058a509</instanceId>
+      <device>/dev/sdh</device>
+      <status>detaching</status>
+      <attachTime>2008-05-08T11:51:50.000Z</attachTime>
+    </DetachVolumeResponse>
+    RESPONSE
+
+  end
+
+
+  specify "should be able to be described with describe_volumes" do
+    @ec2.stubs(:make_request).with('DescribeVolumes', {"VolumeId.1"=>"vol-4282672b"}).
+      returns stub(:body => @describe_volumes_response_body, :is_a? => true)
+
+    @ec2.describe_volumes( :volume_id => ["vol-4282672b"] ).should.be.an.instance_of Hash
+
+    response = @ec2.describe_volumes( :volume_id => ["vol-4282672b"] )
+    response.volumeSet.item[0].volumeId.should.equal "vol-4282672b"
+    response.volumeSet.item[0].attachmentSet.item[0]['size'].should.equal "800"
+    response.volumeSet.item[0].attachmentSet.item[0].volumeId.should.equal "vol-4282672b"
+    response.volumeSet.item[0].attachmentSet.item[0].instanceId.should.equal "i-6058a509"
+  end
+
+  specify "should be able to be created with an availability_zone with size" do
+    @ec2.stubs(:make_request).with('CreateVolume', {"AvailabilityZone" => "us-east-1a", "Size"=>"800", "SnapshotId"=>""}).
+      returns stub(:body => @create_volume_response_body, :is_a? => true)
+
+    @ec2.create_volume( :availability_zone => "us-east-1a", :size => "800" ).should.be.an.instance_of Hash
+
+    response = @ec2.create_volume( :availability_zone => "us-east-1a", :size => "800" )
+    response.volumeId.should.equal "vol-4d826724"
+    response['size'].should.equal "800"
+    response.status.should.equal "creating"
+    response.zone.should.equal "us-east-1a"
+  end
+
+  specify "should be able to be deleted with a volume_id" do
+    @ec2.stubs(:make_request).with('DeleteVolume', {"VolumeId" => "vol-4282672b"}).
+      returns stub(:body => @delete_volume_response_body, :is_a? => true)
+
+    @ec2.delete_volume( :volume_id => "vol-4282672b" ).should.be.an.instance_of Hash
+
+    response = @ec2.delete_volume( :volume_id => "vol-4282672b" )
+    response.return.should.equal "true"
+  end
+
+  specify "should be able to be attached with a volume_id with an instance_id with a device" do
+    @ec2.stubs(:make_request).with('AttachVolume', {"VolumeId" => "vol-4d826724", "InstanceId"=>"i-6058a509", "Device"=>"/dev/sdh"}).
+      returns stub(:body => @attach_volume_response_body, :is_a? => true)
+
+    @ec2.attach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509", :device => "/dev/sdh" ).should.be.an.instance_of Hash
+
+    response = @ec2.attach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509", :device => "/dev/sdh" )
+    response.volumeId.should.equal "vol-4d826724"
+    response.instanceId.should.equal "i-6058a509"
+    response.device.should.equal "/dev/sdh"
+    response.status.should.equal "attaching"
+  end
+
+  specify "should be able to be detached with a volume_id with an instance_id" do
+    @ec2.stubs(:make_request).with('DetachVolume', {"VolumeId" => "vol-4d826724", "InstanceId"=>"i-6058a509", "Device"=>"", "Force"=>""}).
+      returns stub(:body => @detach_volume_response_body, :is_a? => true)
+
+    @ec2.detach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509" ).should.be.an.instance_of Hash
+
+    response = @ec2.detach_volume( :volume_id => "vol-4d826724", :instance_id => "i-6058a509" )
+    response.volumeId.should.equal "vol-4d826724"
+    response.instanceId.should.equal "i-6058a509"
+    response.device.should.equal "/dev/sdh"
+    response.status.should.equal "detaching"
+  end
+
+end