icehouse-right_aws 1.11.0 → 2.2.0

data/lib/ec2/right_ec2_instances.rb

@@ -47,8 +47,18 @@ module RightAws
       on_exception
     end
 
-    # Retrieve information about EC2 instances. If +list+ is omitted then returns the
-    # list of all instances.
+    # Retrieve information about EC2 instances.
+    #
+    # Accepts a list of instances and/or a set of filters as the last parameter.
+    # 
+    # Filters: architecture, availability-zone, block-device-mapping.attach-time, block-device-mapping.delete-on-termination,
+    # block-device-mapping.device-name, block-device-mapping.status, block-device-mapping.volume-id, client-token, dns-name,
+    # group-id, image-id, instance-id, instance-lifecycle, instance-state-code, instance-state-name, instance-type, ip-address,
+    # kernel-id, key-name, launch-index, launch-time, monitoring-state, owner-id, placement-group-name, platform,
+    # private-dns-name, private-ip-address, product-code, ramdisk-id, reason, requester-id, reservation-id, root-device-name,
+    # root-device-type, spot-instance-request-id, state-reason-code, state-reason-message, subnet-id, tag-key, tag-value,
+    # tag:key, virtualization-type, vpc-id,
+    #
     #
     #  ec2.describe_instances #=>
     #    [{:private_ip_address=>"10.240.7.99",
@@ -84,13 +94,15 @@ module RightAws
     #         :ebs_volume_id=>"vol-f900f990"}],
     #      :aws_instance_id=>"i-8ce84ae4"} , ... ]
     #
-    def describe_instances(list=[])
-      link = generate_request("DescribeInstances", amazonize_list('InstanceId',list.to_a))
-      request_cache_or_info(:describe_instances, link,  QEc2DescribeInstancesParser, @@bench, list.blank?) do |parser|
+    #   ec2.describe_instances("i-8ce84ae6", "i-8ce84ae8", "i-8ce84ae0")
+    #   ec2.describe_instances(:filters => { 'availability-zone' => 'us-east-1a', 'instance-type' => 'c1.medium' })
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeInstances.html
+    #
+    def describe_instances(*list_and_options)
+      describe_resources_with_list_and_options('DescribeInstances', 'InstanceId', QEc2DescribeInstancesParser, list_and_options) do |parser|
         get_desc_instances(parser.result)
       end
-    rescue Exception
-      on_exception
     end
 
     # Return the product code attached to instance or +nil+ otherwise.
@@ -130,7 +142,8 @@ module RightAws
                       addressing_type = nil, instance_type = nil,
                       kernel_id = nil, ramdisk_id = nil, availability_zone = nil,
                       monitoring_enabled = nil, subnet_id = nil, disable_api_termination = nil,
-                      instance_initiated_shutdown_behavior = nil, block_device_mappings = nil)
+                      instance_initiated_shutdown_behavior = nil, block_device_mappings = nil,
+                      placement_group_name = nil, client_token = nil)
  	    launch_instances(image_id, { :min_count                            => min_count,
  	                                 :max_count                            => max_count,
  	                                 :user_data                            => user_data,
@@ -145,14 +158,16 @@ module RightAws
                                    :subnet_id                            => subnet_id,
                                    :disable_api_termination              => disable_api_termination,
                                    :instance_initiated_shutdown_behavior => instance_initiated_shutdown_behavior,
-                                   :block_device_mappings                =>  block_device_mappings
+                                   :block_device_mappings                => block_device_mappings,
+                                   :placement_group_name                 => placement_group_name,
+                                   :client_token                         => client_token
                                  })
     end
 
     # Launch new EC2 instances.
     # Options: :image_id, :addressing_type, :min_count, max_count, :key_name, :kernel_id, :ramdisk_id,
     # :availability_zone, :monitoring_enabled, :subnet_id, :disable_api_termination, :instance_initiated_shutdown_behavior,
-    # :block_device_mappings
+    # :block_device_mappings, :placement_group_name, :license_pool
     # 
     # Returns a list of launched instances or an exception.
     #
@@ -190,12 +205,12 @@ module RightAws
     #      :aws_instance_id=>"i-8ce84ae4"}]
     #
     def launch_instances(image_id, options={})
-      @logger.info("Launching instance of image #{image_id} for #{@aws_access_key_id}, " +
-                   "key: #{options[:key_name]}, groups: #{(options[:group_ids]).to_a.join(',')}")
       options[:image_id]    = image_id
       options[:min_count] ||= 1
       options[:max_count] ||= options[:min_count]
       params = prepare_instance_launch_params(options)
+      # Log debug information
+      @logger.info("Launching instance of image #{image_id}. Options: #{params.inspect}")
       link = generate_request("RunInstances", params)
       instances = request_info(link, QEc2DescribeInstancesParser.new(:logger => @logger))
       get_desc_instances(instances)
@@ -203,47 +218,39 @@ module RightAws
       on_exception
     end
 
-=begin
-    # TODO: API does not support this call yet
-    def create_instance(options={})
-      @logger.info("Creating instance #{@aws_access_key_id}, " +
-                   "key: #{options[:key_name]}, groups: #{(options[:group_ids]).to_a.join(',')}")
-      params = prepare_instance_launch_params(options)
-      link = generate_request("CreateInstance", params)
-      instances = request_info(link, QEc2DescribeInstancesParser.new(:logger => @logger))
-      get_desc_instances(instances).first
-    rescue Exception
-      on_exception
-    end
-=end
-
     def prepare_instance_launch_params(options={}) # :nodoc:
-      params = amazonize_list('SecurityGroup', options[:group_ids].to_a)
+      params = amazonize_list('SecurityGroup', Array(options[:group_ids]))
       params['InstanceType']                      = options[:instance_type] || DEFAULT_INSTANCE_TYPE
-      params['ImageId']                           = options[:image_id]                             unless options[:image_id].blank?
-      params['AddressingType']                    = options[:addressing_type]                      unless options[:addressing_type].blank?
-      params['MinCount']                          = options[:min_count]                            unless options[:min_count].blank?
-      params['MaxCount']                          = options[:max_count]                            unless options[:max_count].blank?
-      params['KeyName']                           = options[:key_name]                             unless options[:key_name].blank?
-      params['KernelId']                          = options[:kernel_id]                            unless options[:kernel_id].blank?
-      params['RamdiskId']                         = options[:ramdisk_id]                           unless options[:ramdisk_id].blank?
-      params['Placement.AvailabilityZone']        = options[:availability_zone]                    unless options[:availability_zone].blank?
+      params['ImageId']                           = options[:image_id]                             unless options[:image_id].right_blank?
+      params['AddressingType']                    = options[:addressing_type]                      unless options[:addressing_type].right_blank?
+      params['MinCount']                          = options[:min_count]                            unless options[:min_count].right_blank?
+      params['MaxCount']                          = options[:max_count]                            unless options[:max_count].right_blank?
+      params['KeyName']                           = options[:key_name]                             unless options[:key_name].right_blank?
+      params['KernelId']                          = options[:kernel_id]                            unless options[:kernel_id].right_blank?
+      params['RamdiskId']                         = options[:ramdisk_id]                           unless options[:ramdisk_id].right_blank?
+      params['Placement.AvailabilityZone']        = options[:availability_zone]                    unless options[:availability_zone].right_blank?
       params['Monitoring.Enabled']                = options[:monitoring_enabled].to_s              if     options[:monitoring_enabled]
-      params['SubnetId']                          = options[:subnet_id]                            unless options[:subnet_id].blank?
-      params['AdditionalInfo']                    = options[:additional_info]                      unless options[:additional_info].blank?
+      params['SubnetId']                          = options[:subnet_id]                            unless options[:subnet_id].right_blank?
+      params['AdditionalInfo']                    = options[:additional_info]                      unless options[:additional_info].right_blank?
       params['DisableApiTermination']             = options[:disable_api_termination].to_s         unless options[:disable_api_termination].nil?
-      params['InstanceInitiatedShutdownBehavior'] = options[:instance_initiated_shutdown_behavior] unless options[:instance_initiated_shutdown_behavior].blank?
-#     params['VolumeId']                          = options[:volume_id]                            unless options[:volume_id].blank?
-#     params['RootDeviceName']                    = options[:root_device_name]                     unless options[:root_device_name].blank?
-#     params['RootDeviceType']                    = options[:root_device_type]                     unless options[:root_device_type].blank?
+      params['InstanceInitiatedShutdownBehavior'] = options[:instance_initiated_shutdown_behavior] unless options[:instance_initiated_shutdown_behavior].right_blank?
+      params['Placement.GroupName']               = options[:placement_group_name]                 unless options[:placement_group_name].right_blank?
+      params['License.Pool']                      = options[:license_pool]                         unless options[:license_pool].right_blank?
+      # Client token: do not set it automatically for Euca clouds (but let it go if it was set by a user)
+      client_token          = options[:client_token]
+      client_token        ||= AwsUtils::generate_unique_token unless @params[:eucalyptus]
+      params['ClientToken'] = client_token                    if     client_token
+      #
       params.merge!(amazonize_block_device_mappings(options[:block_device_mappings]))
-      unless options[:user_data].blank?
-        options[:user_data].strip!
-          # Do not use CGI::escape(encode64(...)) as it is done in Amazons EC2 library.
-          # Amazon 169.254.169.254 does not like escaped symbols!
-          # And it doesn't like "\n" inside of encoded string! Grrr....
-          # Otherwise, some of UserData symbols will be lost...
-        params['UserData'] = Base64.encode64(options[:user_data]).delete("\n") unless options[:user_data].blank?
+      # KD: https://github.com/rightscale/right_aws/issues#issue/11
+      # Do not modify user data and pass it as is: one may pass there a hex-binary data
+      options[:user_data] = options[:user_data].to_s
+      unless options[:user_data].empty?
+        # Do not use CGI::escape(encode64(...)) as it is done in Amazons EC2 library.
+        # Amazon 169.254.169.254 does not like escaped symbols!
+        # And it doesn't like "\n" inside of encoded string! Grrr....
+        # Otherwise, some of UserData symbols will be lost...
+        params['UserData'] = Base64.encode64(options[:user_data]).delete("\n")
       end
       params
     end
@@ -313,8 +320,9 @@ module RightAws
     #
     #  ec2.reboot_instances(['i-f222222d','i-f222222e']) #=> true
     #
-    def reboot_instances(list)
-      link = generate_request("RebootInstances", amazonize_list('InstanceId', list.to_a))
+    def reboot_instances(*instances)
+      instances = instances.flatten
+      link = generate_request("RebootInstances", amazonize_list('InstanceId', instances))
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
       on_exception
@@ -431,6 +439,25 @@ module RightAws
       on_exception
     end
 
+    # Get Initial windows instance password using Amazon API call GetPasswordData.
+    #
+    #  puts ec2.get_initial_password_v2(my_awesome_instance[:aws_instance_id], my_awesome_key[:aws_material]) #=> "MhjWcgZuY6"
+    #
+    # P.S. To say the truth there is absolutely no any speedup if to compare to the old get_initial_password method... ;(
+    #
+    def get_initial_password_v2(instance_id, private_key)
+      link = generate_request('GetPasswordData',
+                              'InstanceId' => instance_id )
+      response = request_info(link, QEc2GetPasswordDataParser.new(:logger => @logger))
+      if response[:password_data].right_blank?
+        raise AwsError.new("Initial password is not yet created for #{instance_id}")
+      else
+        OpenSSL::PKey::RSA.new(private_key).private_decrypt(Base64.decode64(response[:password_data]))
+      end
+    rescue Exception
+      on_exception
+    end
+
     # Bundle a Windows image.
     # Internally, it queues the bundling task and shuts down the instance.
     # It then takes a snapshot of the Windows volume bundles it, and uploads it to
@@ -455,7 +482,7 @@ module RightAws
       s3_owner_aws_secret_access_key ||= @aws_secret_access_key
       s3_expires = Time.now.utc + s3_expires if s3_expires.is_a?(Fixnum) && (s3_expires < S3Interface::ONE_YEAR_IN_SECONDS)
       # policy
-      policy = { 'expiration' => s3_expires.strftime('%Y-%m-%dT%H:%M:%SZ'),
+      policy = { 'expiration' => AwsUtils::utc_iso8601(s3_expires),
                  'conditions' => [ { 'bucket' => s3_bucket },
                                    { 'acl'    => s3_upload_policy },
                                    [ 'starts-with', '$key', s3_prefix ] ] }.to_json
@@ -476,9 +503,13 @@ module RightAws
     end
 
     # Describe the status of the Windows AMI bundlings.
-    # If +list+ is omitted the returns the whole list of tasks.
     #
-    #  ec2.describe_bundle_tasks(['bun-4fa74226']) #=>
+    # Accepts a list of tasks and/or a set of filters as the last parameter.
+    #
+    # Filters" bundle-id, error-code, error-message, instance-id, progress, s3-aws-access-key-id, s3-bucket, s3-prefix,
+    # start-time, state, update-time
+    #
+    #  ec2.describe_bundle_tasks('bun-4fa74226') #=>
     #    [{:s3_bucket         => "my-awesome-bucket"
     #      :aws_id            => "bun-0fa70206",
     #      :s3_prefix         => "win1pr",
@@ -490,11 +521,12 @@ module RightAws
     #      :aws_state         => "failed",
     #      :aws_instance_id   => "i-e3e24e8a"}]
     #
-    def describe_bundle_tasks(list=[])
-      link = generate_request("DescribeBundleTasks", amazonize_list('BundleId', list.to_a))
-      request_info(link, QEc2DescribeBundleTasksParser.new)
-    rescue Exception
-      on_exception
+    #   ec2.describe_bundle_tasks(:filters => { 'state' => 'pending' })
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeBundleTasks.html
+    #
+    def describe_bundle_tasks(*list_and_options)
+      describe_resources_with_list_and_options('DescribeBundleTasks', 'BundleId', QEc2DescribeBundleTasksParser, list_and_options)
     end
 
     # Cancel an in‐progress or pending bundle task by id.
@@ -517,35 +549,6 @@ module RightAws
       on_exception
     end
 
-    #-----------------------------------------------------------------
-    #      Helpers
-    #-----------------------------------------------------------------
-
-    BLOCK_DEVICE_KEY_MAPPING = {                               # :nodoc:
-      :device_name               => 'DeviceName',
-      :virtual_name              => 'VirtualName',
-      :no_device                 => 'NoDevice',
-      :ebs_snapshot_id           => 'Ebs.SnapshotId',
-      :ebs_volume_size           => 'Ebs.VolumeSize',
-      :ebs_delete_on_termination => 'Ebs.DeleteOnTermination' }
-
-    def amazonize_block_device_mappings(block_device_mappings) # :nodoc:
-      result = {}
-      unless block_device_mappings.blank?
-        block_device_mappings = [block_device_mappings] unless block_device_mappings.is_a?(Array)
-        block_device_mappings.each_with_index do |b, idx|
-          BLOCK_DEVICE_KEY_MAPPING.each do |local_name, remote_name|
-            value = b[local_name]
-            case local_name
-            when :no_device then value = value ? '' : nil   # allow to pass :no_device as boolean
-            end
-            result["BlockDeviceMapping.#{idx+1}.#{remote_name}"] = value unless value.nil?
-          end
-        end
-      end
-      result
-    end
-
     #-----------------------------------------------------------------
     #      PARSERS: Instances
     #-----------------------------------------------------------------
@@ -566,10 +569,13 @@ module RightAws
                     :ami_launch_index => '',
                     :ssh_key_name     => '',
                     :aws_state        => '',
-                    :aws_product_codes => [] }
+                    :aws_product_codes => [],
+                    :tags              => {} }
         when %r{blockDeviceMapping/item$}
           @item[:block_device_mappings] ||= []
           @block_device_mapping = {}
+        when %r{/tagSet/item$}
+          @aws_tag = {}
         end
       end
       def tagend(name)
@@ -599,13 +605,20 @@ module RightAws
         when 'rootDeviceType'   then @item[:root_device_type]      = @text
         when 'rootDeviceName'   then @item[:root_device_name]      = @text
         when 'instanceClass'    then @item[:instance_class]        = @text
+        when 'instanceLifecycle'     then @item[:instance_lifecycle]       = @text
+        when 'spotInstanceRequestId' then @item[:spot_instance_request_id] = @text
+        when 'requesterId'           then @item[:requester_id]             = @text
+        when 'groupName'             then @item[:placement_group_name]     = @text 
+        when 'virtualizationType'    then @item[:virtualization_type]      = @text
+        when 'clientToken'           then @item[:client_token]     = @text
         else
           case full_tag_name
-          when %r{/stateReason/code$}    then @item[:state_reason_code]    = @text.to_i
+          when %r{/stateReason/code$}    then @item[:state_reason_code]    = @text
           when %r{/stateReason/message$} then @item[:state_reason_message] = @text
           when %r{/instanceState/code$}  then @item[:aws_state_code]       = @text.to_i
           when %r{/instanceState/name$}  then @item[:aws_state]            = @text
           when %r{/monitoring/state$}    then @item[:monitoring_state]     = @text
+          when %r{/license/pool$}        then @item[:license_pool]         = @text
           when %r{/blockDeviceMapping/item} # no trailing $
             case name
             when 'deviceName'          then @block_device_mapping[:device_name]                = @text
@@ -617,6 +630,9 @@ module RightAws
             when 'item'                then @item[:block_device_mappings]                     << @block_device_mapping
             end
           when %r{/instancesSet/item$} then @reservation[:instances_set] << @item
+          when %r{/tagSet/item/key$}   then @aws_tag[:key]               = @text
+          when %r{/tagSet/item/value$} then @aws_tag[:value]             = @text
+          when %r{/tagSet/item$}       then @item[:tags][@aws_tag[:key]] = @aws_tag[:value]
           when 'DescribeInstancesResponse/reservationSet/item',
                'RunInstancesResponse'
             @result << @reservation
@@ -755,6 +771,19 @@ module RightAws
       end
     end
 
+    class QEc2GetPasswordDataParser < RightAWSParser #:nodoc:
+      def tagend(name)
+        case name
+        when 'instanceId'   then @result[:aws_instance_id] = @text
+        when 'timestamp'    then @result[:timestamp]       = @text
+        when 'passwordData' then @result[:password_data]   = @text
+        end
+      end
+      def reset
+        @result = {}
+      end
+    end
+
   end
 
 end

data/lib/ec2/right_ec2_placement_groups.rb

@@ -0,0 +1,108 @@
+#
+# Copyright (c) 2010 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
+
+    #-----------------------------------------------------------------
+    #      Placement Groups
+    #-----------------------------------------------------------------
+
+    # Describe placement groups.
+    #
+    # Accepts a list of placement groups and/or a set of filters as the last parameter.
+    #
+    # Filters: group-name, state, strategy
+    #
+    # If you don’t specify a particular placement group, the response includes
+    # information about all of them. The information includes the group name, the strategy,
+    # and the group state (e.g., pending, available, etc.).
+    #
+    #  ec2.describe_placement_groups #=>
+    #    [{:state=>"available", :strategy=>"cluster", :group_name=>"kd_first"},
+    #     {:state=>"available", :strategy=>"cluster", :group_name=>"kd_second"}]
+    #
+    #  ec2.describe_placement_groups('kd_second') #=>
+    #    [{:strategy=>"cluster", :group_name=>"kd_second", :state=>"available"}]
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference_query_DescribePlacementGroups.html
+    #
+    def describe_placement_groups(*list_and_options)
+      describe_resources_with_list_and_options('DescribePlacementGroups', 'GroupName', QEc2DescribePlacementGroupsParser, list_and_options)
+    end
+
+    # Create placement group creates a placement group (i.e. logical cluster group)
+    # into which you can then launch instances. You must provide a name for the group
+    # that is unique within the scope of your account. You must also provide a strategy
+    # value. Currently the only value accepted is cluster.
+    #
+    #   ec2.create_placement_group('kd_second') #=> true
+    #
+    def create_placement_group(placement_group_name, strategy = 'cluster')
+      link = generate_request('CreatePlacementGroup',
+                              'GroupName' => placement_group_name.to_s,
+                              'Strategy'  => strategy.to_s)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Delete placement group deletes a placement group that you own. The group must not
+    # contain any instances.
+    #
+    #   ec2.delete_placement_group('kd_second') #=> true
+    #
+    def delete_placement_group(placement_group_name)
+      link = generate_request('DeletePlacementGroup',
+                              'GroupName' => placement_group_name.to_s)
+      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Placement Groups
+    #-----------------------------------------------------------------
+
+    class QEc2DescribePlacementGroupsParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case name
+        when 'item' then @item = {}
+        end
+      end
+      def tagend(name)
+        case name
+        when 'groupName' then @item[:group_name] = @text
+        when 'strategy'  then @item[:strategy]   = @text
+        when 'state'     then @item[:state]      = @text
+        when 'item'      then @result           << @item
+        end
+      end
+      def reset
+        @result = []
+      end
+    end
+
+  end
+end

data/lib/ec2/right_ec2_reserved_instances.rb

@@ -30,7 +30,11 @@ module RightAws
   #-----------------------------------------------------------------
 
     # Retrieve reserved instances list.
-    # Returns a list of Reserved Instances.
+    #
+    # Accepts a list of reserved instances and/or a set of filters as the last parameter.
+    #
+    # Filters: availability-zone, duration, fixed-price, instance-type, product-description,
+    # reserved-instances-id, start, state, tag-key, tag-value, tag:key, usage-price
     #
     # ec2.describe_reserved_instances #=>
     #    [{:aws_id=>"1ba8e2e3-1c40-434c-a741-5ff16a4c542e",
@@ -41,22 +45,22 @@ module RightAws
     #      :aws_state=>"payment-pending",
     #      :aws_product_description=>"Test",
     #      :aws_fixed_price=>325.0,
+    #      :aws_start=>"2009-12-18T20:39:39.569Z"
     #      :aws_instance_count=>1}]
     #
-    def describe_reserved_instances(list=[])
-      link = generate_request("DescribeReservedInstances", amazonize_list('ReservedInstancesId',list.to_a))
-      request_cache_or_info(:describe_reserved_instances, link,  QEc2DescribeReservedInstancesParser, @@bench, list.blank?)
-    rescue Exception
-      on_exception
+    #  ec2.describe_reserved_instances(:filters => {'availability-zone' => 'us-east-1a'})
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeReservedInstances.html
+    #
+    def describe_reserved_instances(*list_and_options)
+      describe_resources_with_list_and_options('DescribeReservedInstances', 'ReservedInstancesId', QEc2DescribeReservedInstancesParser, list_and_options)
     end
 
     # Retrieve reserved instances offerings.
-    # Returns a set of available offerings.
+    # 
+    # Accepts a list of reserved instances offerings and/or a set of filters as the last parameter.
     #
-    # Optional params:
-    #  :aws_instance_type       => String
-    #  :aws_availability_zone   => String
-    #  :aws_product_description => String
+    # Filters: availability-zone, duration, fixed-price, instance-type, product-description, reserved-instances-offering-id, usage-price
     #
     #  ec2.describe_reserved_instances_offerings #=>
     #    [{:aws_instance_type=>"c1.medium",
@@ -75,19 +79,12 @@ module RightAws
     #      :aws_usage_price=>0.24,
     #      :aws_fixed_price=>2600.0}]
     #
-    def describe_reserved_instances_offerings(*list_and_params)
-      list, params = AwsUtils::split_items_and_params(list_and_params)
-      # backward compartibility with the old way
-      list ||= params[:aws_ids].to_a
-      rparams = {}
-      rparams.update(amazonize_list('ReservedInstancesOfferingId', list)) unless list.blank?
-      rparams['InstanceType']       = params[:aws_instance_type]       if params[:aws_instance_type]
-      rparams['AvailabilityZone']   = params[:aws_availability_zone]   if params[:aws_availability_zone]
-      rparams['ProductDescription'] = params[:aws_product_description] if params[:aws_product_description]
-      link = generate_request("DescribeReservedInstancesOfferings", rparams)
-      request_cache_or_info(:describe_reserved_instances_offerings, link,  QEc2DescribeReservedInstancesOfferingsParser, @@bench, list.blank?)
-    rescue Exception
-      on_exception
+    #  ec2.describe_reserved_instances_offerings(:filters => {'availability-zone' => 'us-east-1c'})
+    #
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeReservedInstancesOfferings.html
+    #
+    def describe_reserved_instances_offerings(*list_and_options)
+      describe_resources_with_list_and_options('DescribeReservedInstancesOfferings', 'ReservedInstancesOfferingId', QEc2DescribeReservedInstancesOfferingsParser, list_and_options)
     end
 
     # Purchase a Reserved Instance.
@@ -109,20 +106,30 @@ module RightAws
 
     class QEc2DescribeReservedInstancesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @item = {} if name == 'item'
+        case full_tag_name
+        when %r{/reservedInstancesSet/item$} then @item    = { :tags => {} }
+        when %r{/tagSet/item$}                        then @aws_tag = {}
+        end
       end
       def tagend(name)
         case name
-          when 'reservedInstancesId' then @item[:aws_id]                  = @text
-          when 'instanceType'        then @item[:aws_instance_type]       = @text
-          when 'availabilityZone'    then @item[:aws_availability_zone]   = @text
-          when 'duration'            then @item[:aws_duration]            = @text.to_i
-          when 'usagePrice'          then @item[:aws_usage_price]         = @text.to_f
-          when 'fixedPrice'          then @item[:aws_fixed_price]         = @text.to_f
-          when 'instanceCount'       then @item[:aws_instance_count]      = @text.to_i
-          when 'productDescription'  then @item[:aws_product_description] = @text
-          when 'state'               then @item[:aws_state]               = @text
-          when 'item'                then @result << @item
+        when 'reservedInstancesId' then @item[:aws_id]                  = @text
+        when 'instanceType'        then @item[:aws_instance_type]       = @text
+        when 'availabilityZone'    then @item[:aws_availability_zone]   = @text
+        when 'duration'            then @item[:aws_duration]            = @text.to_i
+        when 'usagePrice'          then @item[:aws_usage_price]         = @text.to_f
+        when 'fixedPrice'          then @item[:aws_fixed_price]         = @text.to_f
+        when 'instanceCount'       then @item[:aws_instance_count]      = @text.to_i
+        when 'productDescription'  then @item[:aws_product_description] = @text
+        when 'state'               then @item[:aws_state]               = @text
+        when 'start'               then @item[:aws_start]               = @text
+        else
+          case full_tag_name
+          when %r{/tagSet/item/key$}           then @aws_tag[:key]               = @text
+          when %r{/tagSet/item/value$}         then @aws_tag[:value]             = @text
+          when %r{/tagSet/item$}               then @item[:tags][@aws_tag[:key]] = @aws_tag[:value]
+          when %r{/reservedInstancesSet/item$} then @result << @item
+          end
         end
       end
       def reset
@@ -133,19 +140,19 @@ module RightAws
     class QEc2DescribeReservedInstancesOfferingsParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
         @item = {} if name == 'item'
-      end
+        end
       def tagend(name)
         case name
-          when 'reservedInstancesOfferingId' then @item[:aws_id]                  = @text
-          when 'instanceType'                then @item[:aws_instance_type]       = @text
-          when 'availabilityZone'            then @item[:aws_availability_zone]   = @text
-          when 'duration'                    then @item[:aws_duration]            = @text.to_i
-          when 'usagePrice'                  then @item[:aws_usage_price]         = @text.to_f
-          when 'fixedPrice'                  then @item[:aws_fixed_price]         = @text.to_f
-          when 'productDescription'          then @item[:aws_product_description] = @text
+        when 'reservedInstancesOfferingId' then @item[:aws_id]                  = @text
+        when 'instanceType'                then @item[:aws_instance_type]       = @text
+        when 'availabilityZone'            then @item[:aws_availability_zone]   = @text
+        when 'duration'                    then @item[:aws_duration]            = @text.to_i
+        when 'usagePrice'                  then @item[:aws_usage_price]         = @text.to_f
+        when 'fixedPrice'                  then @item[:aws_fixed_price]         = @text.to_f
+        when 'productDescription'          then @item[:aws_product_description] = @text
           when 'item'                        then @result << @item
+          end
         end
-      end
       def reset
         @result = []
       end