amazon-ec2 0.9.9 → 0.9.10

data/ChangeLog

@@ -1,3 +1,9 @@
+=== 0.9.10 2010-03-26
+ * Enhancements to EC2 register_image to handle registration based on EBS snapshots (jamespharaoh)
+
+=== 0.9.9 2010-03-19
+ * Bugfix in signing algorithm (wlach)
+
 === 0.9.7 2010-03-14
  * Added EC2 describe_subnets support (petitbon)
 

data/README.rdoc

@@ -148,12 +148,7 @@ If you're not in front of a terminal shell now (perhaps you're browsing this sit
     The EC2 connection is wired to the class instance '@ec2'.  Make method calls
     on this to execute commands on EC2.  Adding a #to_s
     at the end of any command should give you a full String representation of the
-    response.  The #xml data is available for each response
-    which allows you to view the full and complete XML response returned by
-    EC2 without any parsing applied.  This is useful for viewing the
-    hierarchy of an entire response in a friendly way (if XML is friendly
-    to you!).  Understanding the hierarchy of the XML response is critical
-    to making effective use of this library.
+    response.
 
       Examples to try:
 

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2010-03-19}
+  s.date = %q{2010-03-26}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling APIs.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]

data/lib/AWS/EC2/images.rb

@@ -43,21 +43,54 @@ module AWS
       end
 
 
-      # The RegisterImage operation registers an AMI with Amazon EC2. Images must be registered before
-      # they can be launched.  Each AMI is associated with an unique ID which is provided by the EC2
-      # service via the Registerimage operation. As part of the registration process, Amazon EC2 will
-      # retrieve the specified image manifest from Amazon S3 and verify that the image is owned by the
-      # user requesting image registration.  The image manifest is retrieved once and stored within the
-      # Amazon EC2 network. Any modifications to an image in Amazon S3 invalidate this registration.
-      # If you do have to make changes and upload a new image deregister the previous image and register
-      # the new image.
+      # Registers an AMI with Amazon EC2. Images must be registered before they can be launched.
+      # To launch instances, use the RunInstances operation.  Each AMI is associated with an unique ID
+      # which is provided by the Amazon EC2 service through this operation. If needed, you can deregister
+      # an AMI at any time.
       #
-      # @option options [String] :image_location ("")
+      # AMIs backed by Amazon EBS are automatically registered when you create the image.
+      # However, you can use this to register a snapshot of an instance backed by Amazon EBS.
+      #
+      # Amazon EBS snapshots are not guaranteed to be bootable. For information on creating AMIs
+      # backed by Amazon EBS, go to the Amazon Elastic Compute Cloud Developer Guide or Amazon
+      # Elastic Compute Cloud User Guide.
+      #
+      # Any modifications to an AMI backed by Amazon S3 invalidates this registration.
+      # If you make changes to an image, deregister the previous image and register the new image.
+      #
+      # If an :image_location is specified then an old-style S3-backed AMI is created. If the other
+      # parameters are used then a new style EBS-backed AMI is created from a pre-existing snapshot.
+      #
+      # @option options [optional, String] :image_location ("") S3 URL for the XML manifest
+      # @option options [optional, String] :name ("") Name of EBS image
+      # @option options [optional, String] :description ("") Description of EBS image
+      # @option options [optional, String] :architecture ("") Architecture of EBS image, currently 'i386' or 'x86_64'
+      # @option options [optional, String] :kernel_id ("") Kernel ID of EBS image
+      # @option options [optional, String] :ramdisk_id ("") Ramdisk ID of EBS image
+      # @option options [optional, String] :root_device_name ("") Root device name of EBS image, eg '/dev/sda1'
+      # @option options [optional, Array] :block_device_mapping ([]) An array of Hashes representing the elements of the block device mapping.  e.g. [{:device_name => '/dev/sdh', :virtual_name => '', :ebs_snapshot_id => '', :ebs_volume_size => '', :ebs_delete_on_termination => ''},{},...]
       #
       def register_image( options = {} )
-        options = {:image_location => ""}.merge(options)
-        raise ArgumentError, "No :image_location provided" if options[:image_location].nil? || options[:image_location].empty?
-        params = { "ImageLocation" => options[:image_location] }
+        params = {}
+        if options.does_not_have?(:image_location) && options.does_not_have?(:root_device_name)
+          raise ArgumentError, "No :image_location or :root_device_name"
+        end
+        params["ImageLocation"] = options[:image_location].to_s unless options[:image_location].nil?
+        params["Name"] = options[:name].to_s unless options[:name].nil?
+        params["Description"] = options[:description].to_s unless options[:description].nil?
+        params["Architecture"] = options[:architecture].to_s unless options[:architecture].nil?
+        params["KernelId"] = options[:kernel_id].to_s unless options[:kernel_id].nil?
+        params["RamdiskId"] = options[:ramdisk_id].to_s unless options[:ramdisk_id].nil?
+        params["RootDeviceName"] = options[:root_device_name].to_s unless options[:root_device_name].nil?
+        if options[:block_device_mapping]
+          params.merge!(pathhashlist("BlockDeviceMapping", options[:block_device_mapping].flatten, {
+            :device_name => "DeviceName",
+            :virtual_name => "VirtualName",
+            :ebs_snapshot_id => "Ebs.SnapshotId",
+            :ebs_volume_size => "Ebs.VolumeSize",
+            :ebs_delete_on_termination => "Ebs.DeleteOnTermination"
+          }))
+        end
         return response_generator(:action => "RegisterImage", :params => params)
       end
 

data/test/test_EC2_images.rb

@@ -88,7 +88,7 @@ context "An EC2 image " do
   end
 
 
-  specify "should be able to be registered" do
+  specify "should be able to be registered with manifest" 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"
@@ -96,9 +96,37 @@ context "An EC2 image " do
   end
 
 
-  specify "method register_image should raise an exception when called without nil/empty string arguments" do
+  specify "should be able to be registered with snapshot" do
+    @ec2.stubs(:make_request).with('RegisterImage', {
+        "Name" => "image_name",
+        "Architecture" => "i386",
+        "KernelId" => "aki-01234567",
+        "RamdiskId" => "ari-01234567",
+        "RootDeviceName" => "/dev/sda1",
+        "BlockDeviceMapping.1.DeviceName" => "/dev/sda1",
+        "BlockDeviceMapping.1.Ebs.SnapshotId" => "snap-01234567",
+        "BlockDeviceMapping.1.Ebs.DeleteOnTermination" => "true",
+      }).returns stub(:body => @register_image_response_body, :is_a? => true)
+    ret = @ec2.register_image({
+      :name => "image_name",
+      :architecture => "i386",
+      :kernel_id => "aki-01234567",
+      :ramdisk_id => "ari-01234567",
+      :root_device_name => "/dev/sda1",
+      :block_device_mapping => [{
+        :device_name => "/dev/sda1",
+        :ebs_snapshot_id => "snap-01234567",
+        :ebs_delete_on_termination => true,
+      }]
+    })
+    ret.imageId.should.equal "ami-61a54008"
+    ret.should.be.an.instance_of Hash
+  end
+
+
+  specify "method register_image should raise an exception when called without :name or :root_device_name" do
     lambda { @ec2.register_image() }.should.raise(AWS::ArgumentError)
-    lambda { @ec2.register_image(:image_location => "") }.should.raise(AWS::ArgumentError)
+    lambda { @ec2.register_image(:image_location => "", :root_device_name => "") }.should.raise(AWS::ArgumentError)
   end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -07:00
+date: 2010-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency