revans_right_aws 2.0.1

data/lib/ec2/right_ec2_ebs.rb

@@ -0,0 +1,452 @@
+#
+# Copyright (c) 2009 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module RightAws
+
+  class Ec2
+
+    #-----------------------------------------------------------------
+    #      EBS: Volumes
+    #-----------------------------------------------------------------
+
+    # Describe all EBS volumes.
+    #
+    #  ec2.describe_volumes #=>
+    #      [{:aws_size              => 94,
+    #        :aws_device            => "/dev/sdc",
+    #        :aws_attachment_status => "attached",
+    #        :zone                  => "merlot",
+    #        :snapshot_id           => nil,
+    #        :aws_attached_at       => "2008-06-18T08:19:28.000Z",
+    #        :aws_status            => "in-use",
+    #        :aws_id                => "vol-60957009",
+    #        :aws_created_at        => "2008-06-18T08:19:20.000Z",
+    #        :aws_instance_id       => "i-c014c0a9"},
+    #       {:aws_size       => 1,
+    #        :zone           => "merlot",
+    #        :snapshot_id    => nil,
+    #        :aws_status     => "available",
+    #        :aws_id         => "vol-58957031",
+    #        :aws_created_at => Wed Jun 18 08:19:21 UTC 2008,}, ... ]
+    #
+    def describe_volumes(*volumes)
+      volumes = volumes.flatten
+      link = generate_request("DescribeVolumes", amazonize_list('VolumeId', volumes))
+      request_cache_or_info :describe_volumes, link,  QEc2DescribeVolumesParser, @@bench, volumes.blank?
+    rescue Exception
+      on_exception
+    end
+
+    # Create new EBS volume based on previously created snapshot.
+    # +Size+ in Gigabytes.
+    #
+    #  ec2.create_volume('snap-000000', 10, zone) #=>
+    #      {:snapshot_id    => "snap-e21df98b",
+    #       :aws_status     => "creating",
+    #       :aws_id         => "vol-fc9f7a95",
+    #       :zone           => "merlot",
+    #       :aws_created_at => "2008-06-24T18:13:32.000Z",
+    #       :aws_size       => 94}
+    #
+    def create_volume(snapshot_id, size, zone)
+      hash = { "Size"              => size.to_s,
+               "AvailabilityZone"  => zone.to_s }
+      # Get rig of empty snapshot: e8s guys do not like it
+      hash["SnapshotId"] = snapshot_id.to_s unless snapshot_id.blank?
+      link = generate_request("CreateVolume", hash )
+      request_info(link, QEc2CreateVolumeParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Delete the specified EBS volume.
+    # This does not deletes any snapshots created from this volume.
+    #
+    #  ec2.delete_volume('vol-b48a6fdd') #=> true
+    #
+    def delete_volume(volume_id)
+      link = generate_request("DeleteVolume",
+                              "VolumeId" => volume_id.to_s)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Attach the specified EBS volume to a specified instance, exposing the
+    # volume using the specified device name.
+    #
+    #  ec2.attach_volume('vol-898a6fe0', 'i-7c905415', '/dev/sdh') #=>
+    #    { :aws_instance_id => "i-7c905415",
+    #      :aws_device      => "/dev/sdh",
+    #      :aws_status      => "attaching",
+    #      :aws_attached_at => "2008-03-28T14:14:39.000Z",
+    #      :aws_id          => "vol-898a6fe0" }
+    #
+    def attach_volume(volume_id, instance_id, device)
+      link = generate_request("AttachVolume",
+                              "VolumeId"   => volume_id.to_s,
+                              "InstanceId" => instance_id.to_s,
+                              "Device"     => device.to_s)
+      request_info(link, QEc2AttachAndDetachVolumeParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Detach the specified EBS volume from the instance to which it is attached.
+    #
+    #   ec2.detach_volume('vol-898a6fe0') #=>
+    #     { :aws_instance_id => "i-7c905415",
+    #       :aws_device      => "/dev/sdh",
+    #       :aws_status      => "detaching",
+    #       :aws_attached_at => "2008-03-28T14:38:34.000Z",
+    #       :aws_id          => "vol-898a6fe0"}
+    #
+    def detach_volume(volume_id, instance_id=nil, device=nil, force=nil)
+      hash = { "VolumeId" => volume_id.to_s }
+      hash["InstanceId"] = instance_id.to_s unless instance_id.blank?
+      hash["Device"]     = device.to_s      unless device.blank?
+      hash["Force"]      = 'true'           if     force
+      #
+      link = generate_request("DetachVolume", hash)
+      request_info(link, QEc2AttachAndDetachVolumeParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+
+    #-----------------------------------------------------------------
+    #      EBS: Snapshots
+    #-----------------------------------------------------------------
+
+    # Describe all EBS snapshots.
+    #
+    # ec2.describe_snapshots #=>
+    #   [ {:aws_volume_id=>"vol-545fac3d",
+    #      :aws_description=>"Wikipedia XML Backups (Linux)",
+    #      :aws_progress=>"100%",
+    #      :aws_started_at=>"2009-09-28T23:49:50.000Z",
+    #      :aws_owner=>"amazon",
+    #      :aws_id=>"snap-8041f2e9",
+    #      :aws_volume_size=>500,
+    #      :aws_status=>"completed"},
+    #     {:aws_volume_id=>"vol-185fac71",
+    #      :aws_description=>"Sloan Digital Sky Survey DR6 Subset (Linux)",
+    #      :aws_progress=>"100%",
+    #      :aws_started_at=>"2009-09-28T23:56:10.000Z",
+    #      :aws_owner=>"amazon",
+    #      :aws_id=>"snap-3740f35e",
+    #      :aws_volume_size=>180,
+    #      :aws_status=>"completed"}, ...]
+    #
+    def describe_snapshots(*snapshots)
+      snapshots = snapshots.flatten
+      link = generate_request("DescribeSnapshots", amazonize_list('SnapshotId', snapshots))
+      request_cache_or_info :describe_snapshots, link,  QEc2DescribeSnapshotsParser, @@bench, snapshots.blank?
+    rescue Exception
+      on_exception
+    end
+
+    # Create a snapshot of specified volume.
+    #
+    #  ec2.create_snapshot('vol-898a6fe0', 'KD: WooHoo!!') #=>
+    #    {:aws_volume_id=>"vol-e429db8d",
+    #     :aws_started_at=>"2009-10-01T09:23:38.000Z",
+    #     :aws_description=>"KD: WooHoo!!",
+    #     :aws_owner=>"648770000000",
+    #     :aws_progress=>"",
+    #     :aws_status=>"pending",
+    #     :aws_volume_size=>1,
+    #     :aws_id=>"snap-3df54854"}
+    #
+    def create_snapshot(volume_id, description='')
+      link = generate_request("CreateSnapshot",
+                              "VolumeId" => volume_id.to_s,
+                              "Description" => description)
+      request_info(link, QEc2DescribeSnapshotsParser.new(:logger => @logger)).first
+    rescue Exception
+      on_exception
+    end
+
+    # Create a snapshot of specified volume, but with the normal retry algorithms disabled.
+    # This method will return immediately upon error.  The user can specify connect and read timeouts (in s)
+    # for the connection to AWS.  If the user does not specify timeouts, try_create_snapshot uses the default values
+    # in Rightscale::HttpConnection.
+    #
+    #  ec2.try_create_snapshot('vol-898a6fe0', 'KD: WooHoo!!') #=>
+    #    {:aws_volume_id=>"vol-e429db8d",
+    #     :aws_started_at=>"2009-10-01T09:23:38.000Z",
+    #     :aws_description=>"KD: WooHoo!!",
+    #     :aws_owner=>"648770000000",
+    #     :aws_progress=>"",
+    #     :aws_status=>"pending",
+    #     :aws_volume_size=>1,
+    #     :aws_id=>"snap-3df54854"}
+    #
+    def try_create_snapshot(volume_id, connect_timeout = nil, read_timeout = nil, description='')
+      # For safety in the ensure block...we don't want to restore values
+      # if we never read them in the first place
+      orig_reiteration_time = nil
+      orig_http_params = nil
+
+      orig_reiteration_time = RightAws::AWSErrorHandler::reiteration_time
+      RightAws::AWSErrorHandler::reiteration_time = 0
+
+      orig_http_params = Rightscale::HttpConnection::params()
+      new_http_params = orig_http_params.dup
+      new_http_params[:http_connection_retry_count] = 0
+      new_http_params[:http_connection_open_timeout] = connect_timeout if !connect_timeout.nil?
+      new_http_params[:http_connection_read_timeout] = read_timeout if !read_timeout.nil?
+      Rightscale::HttpConnection::params = new_http_params
+
+      link = generate_request("CreateSnapshot",
+                              "VolumeId"    => volume_id.to_s,
+                              "Description" => description)
+      request_info(link, QEc2DescribeSnapshotsParser.new(:logger => @logger)).first
+
+    rescue Exception
+      on_exception
+    ensure
+      RightAws::AWSErrorHandler::reiteration_time = orig_reiteration_time if orig_reiteration_time
+      Rightscale::HttpConnection::params = orig_http_params if orig_http_params
+    end
+
+    # Describe snapshot attribute.
+    #
+    #  ec2.describe_snapshot_attribute('snap-36fe435f') #=>
+    #    {:create_volume_permission=>
+    #       {:users=>["826690000000", "826690000001"], :groups=>['all']}}
+    #
+    def describe_snapshot_attribute(snapshot_id, attribute='createVolumePermission')
+      link = generate_request("DescribeSnapshotAttribute",
+                              'SnapshotId'=> snapshot_id,
+                              'Attribute' => attribute)
+      request_info(link, QEc2DescribeSnapshotAttributeParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Reset permission settings for the specified snapshot.
+    #
+    #  ec2.reset_snapshot_attribute('snap-cecd29a7') #=> true
+    #
+    def reset_snapshot_attribute(snapshot_id, attribute='createVolumePermission')
+      link = generate_request("ResetSnapshotAttribute",
+                              'SnapshotId' => snapshot_id,
+                              'Attribute'  => attribute)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Modify snapshot attribute.
+    #
+    #  attribute      : currently, only 'createVolumePermission' is supported.
+    #  operation_type : currently, only 'add' & 'remove' are supported.
+    #  vars:
+    #    :user_group  : currently, only 'all' is supported.
+    #    :user_id     : an array of user ids
+    #
+    def modify_snapshot_attribute(snapshot_id, attribute='createVolumePermission', operation_type='add', vars = {})
+      params =  {'SnapshotId'    => snapshot_id,
+                 'Attribute'     => attribute,
+                 'OperationType' => operation_type}
+      params.update(amazonize_list('UserId',    Array(vars[:user_id])))    if vars[:user_id]
+      params.update(amazonize_list('UserGroup', Array(vars[:user_group]))) if vars[:user_group]
+      link = generate_request("ModifySnapshotAttribute", params)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Grant create volume permission for a list of users.
+    #
+    #  ec2.modify_snapshot_attribute_create_volume_permission_add_users('snap-36fe435f', '000000000000', '000000000001') #=> true
+    #
+    def modify_snapshot_attribute_create_volume_permission_add_users(snapshot_id, *user_id)
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'add', :user_id => user_id.flatten )
+    end
+    
+    # Revoke create volume permission for a list of users.
+    #
+    #  ec2.modify_snapshot_attribute_create_volume_permission_remove_users('snap-36fe435f', '000000000000', '000000000001') #=> true
+    #
+    def modify_snapshot_attribute_create_volume_permission_remove_users(snapshot_id, *user_id)
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'remove', :user_id => user_id.flatten )
+    end
+
+    # Grant create volume permission for user groups (currently only 'all' is supported).
+    #
+    #  ec2.modify_snapshot_attribute_create_volume_permission_add_groups('snap-36fe435f') #=> true
+    #
+    def modify_snapshot_attribute_create_volume_permission_add_groups(snapshot_id, *user_group)
+      user_group.flatten!
+      user_group = ['all'] if user_group.blank?
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'add', :user_group => user_group )
+    end
+
+    # Remove create volume permission for user groups (currently only 'all' is supported).
+    #
+    #  ec2.modify_snapshot_attribute_create_volume_permission_remove_groups('snap-36fe435f') #=> true
+    #
+    def modify_snapshot_attribute_create_volume_permission_remove_groups(snapshot_id, *user_group)
+      user_group.flatten!
+      user_group = ['all'] if user_group.blank?
+      modify_snapshot_attribute(snapshot_id, 'createVolumePermission', 'remove', :user_group => user_group )
+    end
+
+    # Delete the specified snapshot.
+    #
+    #  ec2.delete_snapshot('snap-55a5403c') #=> true
+    #
+    def delete_snapshot(snapshot_id)
+      link = generate_request("DeleteSnapshot",
+                              "SnapshotId" => snapshot_id.to_s)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: EBS - Volumes
+    #-----------------------------------------------------------------
+
+    class QEc2CreateVolumeParser < RightAWSParser #:nodoc:
+      def tagend(name)
+        case name
+        when 'volumeId'         then @result[:aws_id]         = @text
+        when 'status'           then @result[:aws_status]     = @text
+        when 'createTime'       then @result[:aws_created_at] = @text
+        when 'size'             then @result[:aws_size]       = @text.to_i ###
+        when 'snapshotId'       then @result[:snapshot_id]    = @text.blank? ? nil : @text ###
+        when 'availabilityZone' then @result[:zone]           = @text ###
+        end
+      end
+      def reset
+        @result = {}
+      end
+    end
+
+    class QEc2AttachAndDetachVolumeParser < RightAWSParser #:nodoc:
+      def tagend(name)
+        case name
+        when 'volumeId'   then @result[:aws_id]                = @text
+        when 'instanceId' then @result[:aws_instance_id]       = @text
+        when 'device'     then @result[:aws_device]            = @text
+        when 'status'     then @result[:aws_attachment_status] = @text
+        when 'attachTime' then @result[:aws_attached_at]       = @text
+        end
+      end
+      def reset
+        @result = {}
+      end
+    end
+
+    class QEc2DescribeVolumesParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case name
+        when 'item'
+          case @xmlpath
+          when 'DescribeVolumesResponse/volumeSet' then @volume = {}
+          end
+        end
+      end
+      def tagend(name)
+        case name
+        when 'volumeId'
+          case @xmlpath
+          when 'DescribeVolumesResponse/volumeSet/item' then @volume[:aws_id] = @text
+          end
+        when 'status'
+          case @xmlpath
+          when 'DescribeVolumesResponse/volumeSet/item' then @volume[:aws_status] = @text
+          when 'DescribeVolumesResponse/volumeSet/item/attachmentSet/item' then @volume[:aws_attachment_status] = @text
+          end
+        when 'size'             then @volume[:aws_size]        = @text.to_i
+        when 'createTime'       then @volume[:aws_created_at]  = @text
+        when 'instanceId'       then @volume[:aws_instance_id] = @text
+        when 'device'           then @volume[:aws_device]      = @text
+        when 'attachTime'       then @volume[:aws_attached_at] = @text
+        when 'snapshotId'       then @volume[:snapshot_id]     = @text.blank? ? nil : @text
+        when 'availabilityZone' then @volume[:zone]            = @text
+        when 'deleteOnTermination' then @volume[:delete_on_termination] = (@text == 'true')
+        when 'item'
+          case @xmlpath
+          when 'DescribeVolumesResponse/volumeSet' then @result << @volume
+          end
+        end
+      end
+      def reset
+        @result = []
+      end
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: EBS - Snapshots
+    #-----------------------------------------------------------------
+
+    class QEc2DescribeSnapshotsParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case name
+        when *@each then @snapshot = {}
+        end
+      end
+      def tagend(name)
+        case name
+        when 'volumeId'    then @snapshot[:aws_volume_id]   = @text
+        when 'snapshotId'  then @snapshot[:aws_id]          = @text
+        when 'status'      then @snapshot[:aws_status]      = @text
+        when 'startTime'   then @snapshot[:aws_started_at]  = @text
+        when 'progress'    then @snapshot[:aws_progress]    = @text
+        when 'description' then @snapshot[:aws_description] = @text
+        when 'ownerId'     then @snapshot[:aws_owner]       = @text
+        when 'volumeSize'  then @snapshot[:aws_volume_size] = @text.to_i
+        when *@each        then @result << @snapshot
+        end
+      end
+      def reset
+        @each = ['item', 'CreateSnapshotResponse']
+        @result = []
+      end
+    end
+
+    class QEc2DescribeSnapshotAttributeParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case name
+        when 'createVolumePermission' then @result[:create_volume_permission] = { :groups => [], :users => [] }
+        end
+      end
+      def tagend(name)
+        case full_tag_name
+        when "#{@create_volume_permission}/group"  then @result[:create_volume_permission][:groups] << @text
+        when "#{@create_volume_permission}/userId" then @result[:create_volume_permission][:users]  << @text
+        end
+      end
+      def reset
+        @create_volume_permission = "DescribeSnapshotAttributeResponse/createVolumePermission/item"
+        @result = {}
+      end
+    end
+
+  end
+  
+end

data/lib/ec2/right_ec2_images.rb

@@ -0,0 +1,373 @@
+#
+# Copyright (c) 2009 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module RightAws
+
+  class Ec2
+
+    #-----------------------------------------------------------------
+    #      Images
+    #-----------------------------------------------------------------
+
+    # Describe images helper
+    # params:
+    #   { 'ImageId'      => ['id1', ..., 'idN'],
+    #     'Owner'        => ['self', ..., 'userN'],
+    #     'ExecutableBy' => ['self', 'all', ..., 'userN']
+    #   }
+    def ec2_describe_images(params={}, image_type=nil, cache_for=nil) #:nodoc:
+      request_hash = {}
+      params.each do |list_by, list|
+        request_hash.merge! amazonize_list(list_by, Array(list))
+      end
+      request_hash['ImageType'] = image_type if image_type
+      link = generate_request("DescribeImages", request_hash)
+      request_cache_or_info cache_for, link,  QEc2DescribeImagesParser, @@bench, cache_for
+    rescue Exception
+      on_exception
+    end
+
+    # Retrieve a list of images. Returns array of hashes describing the images or an exception:
+    # +image_type+ = 'machine' || 'kernel' || 'ramdisk'
+    #
+    #  ec2.describe_images #=>
+    #    [{:aws_id=>"ami-b0a1f7a6",
+    #      :aws_image_type=>"machine",
+    #      :root_device_name=>"/dev/sda1",
+    #      :image_class=>"static",
+    #      :aws_owner=>"826693181925",
+    #      :aws_location=>"bucket_for_k_dzreyev/image_bundles/kd__CentOS_1_10_2009_10_21_13_30_43_MSD/image.manifest.xml",
+    #      :aws_state=>"available",
+    #      :aws_is_public=>false,
+    #      :aws_architecture=>"i386"},
+    #     {:description=>"EBS backed Fedora core 8 i386",
+    #      :aws_architecture=>"i386",
+    #      :aws_id=>"ami-c2a3f5d4",
+    #      :aws_image_type=>"machine",
+    #      :root_device_name=>"/dev/sda1",
+    #      :image_class=>"elastic",
+    #      :aws_owner=>"937766719418",
+    #      :aws_location=>"937766719418/EBS backed FC8 i386",
+    #      :aws_state=>"available",
+    #      :block_device_mappings=>
+    #       [{:ebs_snapshot_id=>"snap-829a20eb",
+    #         :ebs_delete_on_termination=>true,
+    #         :device_name=>"/dev/sda1"}],
+    #      :name=>"EBS backed FC8 i386",
+    #      :aws_is_public=>true}, ... ]
+    #      
+    # If +list+ param is set, then retrieve information about the listed images only:
+    #
+    #  ec2.describe_images(['ami-5aa1f74c'])
+    #
+    def describe_images(images=[], image_type=nil)
+      images = Array(images)
+      cache_for = images.empty? && !image_type ? :describe_images : nil
+      ec2_describe_images({ 'ImageId' => images }, image_type, cache_for)
+    end
+
+    #  Example:
+    #
+    #   ec2.describe_images_by_owner('522821470517')
+    #   ec2.describe_images_by_owner('self')
+    #
+    def describe_images_by_owner(owners=['self'], image_type=nil)
+      owners = Array(owners)
+      cache_for = (owners == ['self']) && (!image_type ? :describe_images_by_owner : nil)
+      ec2_describe_images({ 'Owner' => owners }, image_type, cache_for)
+    end
+
+    #  Example:
+    #
+    #   ec2.describe_images_by_executable_by('522821470517')
+    #   ec2.describe_images_by_executable_by('self')
+    #   ec2.describe_images_by_executable_by('all')
+    #
+    def describe_images_by_executable_by(executable_by=['self'], image_type=nil)
+      executable_by = Array(executable_by)
+      cache_for = (executable_by==['self']) && (!image_type ? :describe_images_by_executable_by : nil)
+      ec2_describe_images({ 'ExecutableBy' => executable_by }, image_type, cache_for)
+    end
+
+
+    # Register new image at Amazon.
+    # Options: :image_location, :name, :description, :architecture, :kernel_id, :ramdisk_id, :root_device_name, :block_device_mappings.
+    #
+    # Returns new image id.
+    #
+    #  # Register S3 image
+    #  ec2.register_image('bucket_for_k_dzreyev/image_bundles/kd__CentOS_1_10_2009_10_21_13_30_43_MSD/image.manifest.xml') #=> 'ami-e444444d'
+    #
+    #  # or
+    #  image_reg_params = {  :image_location => 'bucket_for_k_dzreyev/image_bundles/kd__CentOS_1_10_2009_10_21_13_30_43_MSD/image.manifest.xml',
+    #                        :name => 'my-test-one-1',
+    #                        :description => 'My first test image' }
+    #  ec2.register_image(image_reg_params) #=> "ami-bca1f7aa"
+    #
+    #  # Register EBS image
+    #  image_reg_params = { :name        => 'my-test-image',
+    #                       :description => 'My first test image',
+    #                       :root_device_name => "/dev/sda1",
+    #                       :block_device_mappings => [ { :ebs_snapshot_id=>"snap-7360871a",
+    #                                                     :ebs_delete_on_termination=>true,
+    #                                                     :device_name=>"/dev/sda1"} ] }
+    #  ec2.register_image(image_reg_params) #=> "ami-b2a1f7a4"
+    #
+    def register_image(options)
+      case
+      when options.is_a?(String)
+        options = { :image_location => options }
+      when !options.is_a?(Hash)
+        raise "Unsupported options type"
+      end
+      params = {}
+      params['ImageLocation']  = options[:image_location]   if options[:image_location]
+      params['Name']           = options[:name]             if options[:name]
+      params['Description']    = options[:description]      if options[:description]
+      params['Architecture']   = options[:architecture]     if options[:architecture]
+      params['KernelId']       = options[:kernel_id]        if options[:kernel_id]
+      params['RamdiskId']      = options[:ramdisk_id]       if options[:ramdisk_id]
+      params['RootDeviceName'] = options[:root_device_name] if options[:root_device_name]
+#      params['SnapshotId']     = options[:snapshot_id]      if options[:snapshot_id]
+      params.merge!(amazonize_block_device_mappings(options[:block_device_mappings]))
+      link = generate_request("RegisterImage", params)
+      request_info(link, QEc2RegisterImageParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Deregister image at Amazon. Returns +true+ or an exception.
+    #
+    #  ec2.deregister_image('ami-e444444d') #=> true
+    #
+    def deregister_image(image_id)
+      link = generate_request("DeregisterImage",
+                              'ImageId' => image_id.to_s)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Describe image attributes. Currently 'launchPermission', 'productCodes', 'kernel', 'ramdisk' and 'blockDeviceMapping'  are supported.
+    #
+    #  ec2.describe_image_attribute('ami-e444444d') #=> {:groups=>["all"], :users=>["000000000777"]}
+    #
+    def describe_image_attribute(image_id, attribute='launchPermission')
+      link = generate_request("DescribeImageAttribute",
+                              'ImageId'   => image_id,
+                              'Attribute' => attribute)
+      request_info(link, QEc2DescribeImageAttributeParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Reset image attribute. Currently, only 'launchPermission' is supported. Returns +true+ or an exception.
+    #
+    #  ec2.reset_image_attribute('ami-e444444d') #=> true
+    #
+    def reset_image_attribute(image_id, attribute='launchPermission')
+      link = generate_request("ResetImageAttribute",
+                              'ImageId'   => image_id,
+                              'Attribute' => attribute)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Modify an image's attributes. It is recommended that you use
+    # modify_image_launch_perm_add_users, modify_image_launch_perm_remove_users, etc.
+    # instead of modify_image_attribute because the signature of
+    # modify_image_attribute may change with EC2 service changes.
+    #
+    #  attribute      : currently, only 'launchPermission' is supported.
+    #  operation_type : currently, only 'add' & 'remove' are supported.
+    #  vars:
+    #    :user_group  : currently, only 'all' is supported.
+    #    :user_id
+    #    :product_code
+    def modify_image_attribute(image_id, attribute, operation_type = nil, vars = {})
+      params =  {'ImageId'   => image_id,
+                 'Attribute' => attribute}
+      params['OperationType'] = operation_type if operation_type
+      params.update(amazonize_list('UserId',      vars[:user_id]))      if vars[:user_id]
+      params.update(amazonize_list('UserGroup',   vars[:user_group]))   if vars[:user_group]
+      params.update(amazonize_list('ProductCode', vars[:product_code])) if vars[:product_code]
+      link = generate_request("ModifyImageAttribute", params)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Grant image launch permissions to users.
+    # Parameter +user_id+ is a list of user AWS account ids.
+    # Returns +true+ or an exception.
+    #
+    #  ec2.modify_image_launch_perm_add_users('ami-e444444d',['000000000777','000000000778']) #=> true
+    def modify_image_launch_perm_add_users(image_id, user_id=[])
+      modify_image_attribute(image_id, 'launchPermission', 'add', :user_id => user_id)
+    end
+
+    # Revokes image launch permissions for users. +user_id+ is a list of users AWS accounts ids. Returns +true+ or an exception.
+    #
+    #  ec2.modify_image_launch_perm_remove_users('ami-e444444d',['000000000777','000000000778']) #=> true
+    #
+    def modify_image_launch_perm_remove_users(image_id, user_id=[])
+      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_id => user_id)
+    end
+
+    # Add image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
+    # Returns +true+ or an exception.
+    #
+    #  ec2.modify_image_launch_perm_add_groups('ami-e444444d') #=> true
+    #
+    def modify_image_launch_perm_add_groups(image_id, user_group=['all'])
+      modify_image_attribute(image_id, 'launchPermission', 'add', :user_group => user_group)
+    end
+
+    # Remove image launch permissions for users groups (currently only 'all' is supported, which gives public launch permissions).
+    #
+    #  ec2.modify_image_launch_perm_remove_groups('ami-e444444d') #=> true
+    #
+    def modify_image_launch_perm_remove_groups(image_id, user_group=['all'])
+      modify_image_attribute(image_id, 'launchPermission', 'remove', :user_group => user_group)
+    end
+
+    # Add product code to image
+    #
+    #  ec2.modify_image_product_code('ami-e444444d','0ABCDEF') #=> true
+    #
+    def modify_image_product_code(image_id, product_code=[])
+      modify_image_attribute(image_id, 'productCodes', nil, :product_code => product_code)
+    end
+
+    # Create a new image.
+    # Options: :name, :description, :no_reboot(bool)
+    #
+    #  ec2.create_image(instance, :description => 'KD: test#1',
+    #                             :no_reboot => true,
+    #                             :name => 'kd-1' ) #=> "ami-84a1f792"
+    #
+    def create_image(instance_aws_id, options={})
+      params = { 'InstanceId' => instance_aws_id }
+      params['Name']        = options[:name]            unless options[:name].blank?
+      params['Description'] = options[:description]     unless options[:description].blank?
+      params['NoReboot']    = options[:no_reboot].to_s  unless options[:no_reboot].nil?
+      link = generate_request("CreateImage", params)
+      request_info(link, QEc2RegisterImageParser.new(:logger => @logger))
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Images
+    #-----------------------------------------------------------------
+
+    class QEc2DescribeImagesParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case full_tag_name
+        when %r{/imagesSet/item$}          then @item = {}
+        when %r{/blockDeviceMapping/item$}
+          @item[:block_device_mappings] ||= []
+          @block_device_mapping = {}
+        end
+      end
+      def tagend(name)
+        case name
+        when 'imageId'         then @item[:aws_id]            = @text
+        when 'imageLocation'   then @item[:aws_location]      = @text
+        when 'imageState'      then @item[:aws_state]         = @text
+        when 'imageOwnerId'    then @item[:aws_owner]         = @text
+        when 'isPublic'        then @item[:aws_is_public]     = @text == 'true' ? true : false
+        when 'productCode'     then (@item[:aws_product_codes] ||= []) << @text
+        when 'architecture'    then @item[:aws_architecture]  = @text
+        when 'imageType'       then @item[:aws_image_type]    = @text
+        when 'kernelId'        then @item[:aws_kernel_id]     = @text
+        when 'ramdiskId'       then @item[:aws_ramdisk_id]    = @text
+        when 'platform'        then @item[:aws_platform]      = @text
+        when 'imageOwnerAlias' then @item[:image_owner_alias] = @text
+        when 'name'            then @item[:name]              = @text
+        when 'description'     then @item[:description]       = @text
+        when 'rootDeviceType'  then @item[:root_device_type]  = @text
+        when 'rootDeviceName'  then @item[:root_device_name]  = @text
+        when 'imageClass'      then @item[:image_class]       = @text
+        else
+          case full_tag_name
+          when %r{/stateReason/code$}    then @item[:state_reason_code]    = @text.to_i
+          when %r{/stateReason/message$} then @item[:state_reason_message] = @text
+          when %r{/blockDeviceMapping/item} # no trailing $
+            case name
+            when 'deviceName'          then @block_device_mapping[:device_name]                = @text
+            when 'virtualName'         then @block_device_mapping[:virtual_name]               = @text
+            when 'volumeSize'          then @block_device_mapping[:ebs_volume_size]            = @text.to_i
+            when 'snapshotId'          then @block_device_mapping[:ebs_snapshot_id]            = @text
+            when 'deleteOnTermination' then @block_device_mapping[:ebs_delete_on_termination]  = @text == 'true' ? true : false
+            when 'item'                then @item[:block_device_mappings]                    << @block_device_mapping
+            end
+          when %r{/imagesSet/item$}    then @result << @item
+          end
+        end
+      end
+      def reset
+        @result = []
+      end
+    end
+
+    class QEc2RegisterImageParser < RightAWSParser #:nodoc:
+      def tagend(name)
+        @result = @text if name == 'imageId'
+      end
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Image Attribute
+    #-----------------------------------------------------------------
+
+    class QEc2DescribeImageAttributeParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case name
+          when 'launchPermission'
+            @result[:groups] = []
+            @result[:users]  = []
+          when 'productCodes'
+            @result[:aws_product_codes] = []
+        end
+      end
+      def tagend(name)
+          # right now only 'launchPermission' is supported by Amazon.
+          # But nobody know what will they xml later as attribute. That is why we
+          # check for 'group' and 'userId' inside of 'launchPermission/item'
+        case name
+          when 'imageId'            then @result[:aws_id] = @text
+          when 'group'              then @result[:groups] << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
+          when 'userId'             then @result[:users]  << @text if @xmlpath == 'DescribeImageAttributeResponse/launchPermission/item'
+          when 'productCode'        then @result[:aws_product_codes] << @text
+          when 'kernel'             then @result[:aws_kernel]  = @text
+          when 'ramdisk'            then @result[:aws_ramdisk] = @text
+        end
+      end
+      def reset
+        @result = {}
+      end
+    end
+
+  end
+  
+end