right_aws 1.9.0 → 3.1.0

data/lib/awsbase/support.rb

@@ -1,7 +1,3 @@
-# If ActiveSupport is loaded, then great - use it.  But we don't 
-# want a dependency on it, so if it's not present, define the few
-# extensions that we want to use...
-unless defined? ActiveSupport::CoreExtensions
   # These are ActiveSupport-;like extensions to do a few handy things in the gems
   # Derived from ActiveSupport, so the AS copyright notice applies:
   #
@@ -32,80 +28,8 @@ unless defined? ActiveSupport::CoreExtensions
   #
   class String #:nodoc:
 
-    # Constantize tries to find a declared constant with the name specified
-    # in the string. It raises a NameError when the name is not in CamelCase
-    # or is not initialized.
-    #
-    # Examples
-    #   "Module".constantize #=> Module
-    #   "Class".constantize #=> Class
-    def constantize()
-      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ self
-        raise NameError, "#{self.inspect} is not a valid constant name!"
-      end
-
-      Object.module_eval("::#{$1}", __FILE__, __LINE__)
-    end
-
-  end
-
-
-  class Object #:nodoc:
-    # "", "   ", nil, [], and {} are blank
-    def blank?
-      if respond_to?(:empty?) && respond_to?(:strip)
-        empty? or strip.empty?
-      elsif respond_to?(:empty?)
-        empty?
-      else
-        !self
-      end
-    end
-  end
-
-  class NilClass #:nodoc:
-    def blank?
-      true
+    def right_underscore
+      self.gsub(/[A-Z]/){|match| "#{$`=='' ? '' : '_'}#{match.downcase}" }
     end
-  end
-
-  class FalseClass #:nodoc:
-    def blank?
-      true
-    end
-  end
-
-  class TrueClass #:nodoc:
-    def blank?
-      false
-    end
-  end
-
-  class Array #:nodoc:
-    alias_method :blank?, :empty?
-  end
-
-  class Hash #:nodoc:
-    alias_method :blank?, :empty?
     
-    # Return a new hash with all keys converted to symbols.
-    def symbolize_keys
-      inject({}) do |options, (key, value)|
-        options[key.to_sym] = value
-        options
-      end
-    end
-  end
-
-  class String #:nodoc:
-    def blank?
-      empty? || strip.empty?
-    end
-  end
-
-  class Numeric #:nodoc:
-    def blank?
-      false
-    end
   end
-end

data/lib/awsbase/version.rb

@@ -0,0 +1,9 @@
+module RightAws #:nodoc:
+  module VERSION #:nodoc:
+    MAJOR = 3  unless defined?(MAJOR)
+    MINOR = 1  unless defined?(MINOR)
+    TINY  = 0  unless defined?(TINY)
+
+    STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)
+  end
+end

data/lib/ec2/right_ec2.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007-2008 RightScale Inc
+# Copyright (c) 2007-2009 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -68,7 +68,7 @@ module RightAws
     include RightAwsBaseInterface
     
     # Amazon EC2 API version being used
-    API_VERSION       = "2008-08-08"
+    API_VERSION       = "2011-02-28"
     DEFAULT_HOST      = "ec2.amazonaws.com"
     DEFAULT_PATH      = '/'
     DEFAULT_PROTOCOL  = 'https'
@@ -81,7 +81,25 @@ module RightAws
     # Amazon EC2 Instance Types : http://www.amazon.com/b?ie=UTF8&node=370375011
     # Default EC2 instance type (platform) 
     DEFAULT_INSTANCE_TYPE   =  'm1.small' 
-    INSTANCE_TYPES          = ['m1.small','c1.medium','m1.large','m1.xlarge','c1.xlarge']
+    INSTANCE_TYPES          = [  't1.micro'  ,
+                                 'm1.small'  ,
+                                 'm1.medium' ,
+                                 'm1.large'  ,
+                                 'm1.xlarge' ,
+                                 'c1.medium' ,
+                                 'c1.xlarge' ,
+                                 'm2.xlarge' ,
+                                 'm2.2xlarge',
+                                 'm2.4xlarge',
+                                 'm3.xlarge' ,
+                                 'm3.2xlarge',
+                                 'cc1.4xlarge',
+                                 'cg1.4xlarge',
+                                 'cc2.8xlarge',
+                                 'hi1.4xlarge',
+                                 'hs1.8xlarge',
+                                 'cr1.8xlarge'
+                              ]
     
     @@bench = AwsBenchmarkingBlock.new
     def self.bench_xml
@@ -100,769 +118,141 @@ module RightAws
     # Create a new handle to an EC2 account. All handles share the same per process or per thread
     # HTTP connection to Amazon EC2. Each handle is for a specific account. The params have the
     # following options:
+    # * <tt>:endpoint_url</tt> a fully qualified url to Amazon API endpoint (this overwrites: :server, :port, :service, :protocol and :region). Example: 'https://eu-west-1.ec2.amazonaws.com/'
     # * <tt>:server</tt>: EC2 service host, default: DEFAULT_HOST
+    # * <tt>:region</tt>: EC2 region (North America by default)
     # * <tt>:port</tt>: EC2 service port, default: DEFAULT_PORT
     # * <tt>:protocol</tt>: 'http' or 'https', default: DEFAULT_PROTOCOL
-    # * <tt>:multi_thread</tt>: true=HTTP connection per thread, false=per process
     # * <tt>:logger</tt>: for log messages, default: RAILS_DEFAULT_LOGGER else STDOUT
-    # * <tt>:signature_version</tt>:  The signature version : '0' or '1'(default)
+    # * <tt>:signature_version</tt>:  The signature version : '0','1' or '2'(default)
     # * <tt>:cache</tt>: true/false: caching for: ec2_describe_images, describe_instances,
+    # * <tt>:token</tt>: Option SecurityToken for temporary credentials
     # describe_images_by_owner, describe_images_by_executable_by, describe_availability_zones,
     # describe_security_groups, describe_key_pairs, describe_addresses, 
     # describe_volumes, describe_snapshots methods, default: false.
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
-      init({ :name             => 'EC2', 
-             :default_host     => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).host   : DEFAULT_HOST, 
-             :default_port     => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).port   : DEFAULT_PORT,
-             :default_service  => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).path   : DEFAULT_PATH,             
-             :default_protocol => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).scheme : DEFAULT_PROTOCOL }, 
+      init({ :name                => 'EC2',
+             :default_host        => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).host   : DEFAULT_HOST,
+             :default_port        => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).port   : DEFAULT_PORT,
+             :default_service     => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).path   : DEFAULT_PATH,
+             :default_protocol    => ENV['EC2_URL'] ? URI.parse(ENV['EC2_URL']).scheme : DEFAULT_PROTOCOL,
+             :default_api_version => @@api },
            aws_access_key_id    || ENV['AWS_ACCESS_KEY_ID'] , 
            aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
            params)
+      # Eucalyptus supports some yummy features but Amazon does not
+      #if @params[:eucalyptus]
+      #  @params[:port_based_group_ingress] = true unless @params.has_key?(:port_based_group_ingress)
+      #end
     end
 
-
-    def generate_request(action, params={}) #:nodoc:
-      service_hash = {"Action"            => action,
-                      "AWSAccessKeyId"    => @aws_access_key_id,
-                      "Version"           => @@api,
-                      "Timestamp"         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z"),
-                      "SignatureVersion"  => signature_version }
-      service_hash.update(params)
-      # prepare string to sign
-      string_to_sign = case signature_version
-                       when '0' then service_hash["Action"] + service_hash["Timestamp"]
-                       when '1' then service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-                       end
-      service_hash.update('Signature' =>  AwsUtils::sign(@aws_secret_access_key, string_to_sign))
-      request_params = service_hash.to_a.collect{|key,val| key + "=" + CGI::escape(val) }.join("&")
-      request        = Net::HTTP::Get.new("#{@params[:service]}?#{request_params}")
-        # prepare output hash
-      { :request  => request, 
-        :server   => @params[:server],
-        :port     => @params[:port],
-        :protocol => @params[:protocol] }
+    def generate_request(action, params={}, custom_options={}) #:nodoc:
+      generate_request_impl(:get, action, params, custom_options)
     end
 
       # Sends request to Amazon and parses the response
       # Raises AwsError if any banana happened
     def request_info(request, parser)  #:nodoc:
-      thread = @params[:multi_thread] ? Thread.current : Thread.main
-      thread[:ec2_connection] ||= Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
-      request_info_impl(thread[:ec2_connection], @@bench, request, parser)
-    end
-
-    def hash_params(prefix, list) #:nodoc:
-      groups = {}
-      list.each_index{|i| groups.update("#{prefix}.#{i+1}"=>list[i])} if list
-      return groups
-    end
-
-  #-----------------------------------------------------------------
-  #      Images
-  #-----------------------------------------------------------------
-
-    # 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! hash_params(list_by, list.to_a)
-      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_owner => "522821470517",
-      #      :aws_id => "ami-e4b6538d",
-      #      :aws_state => "available",
-      #      :aws_location => "marcins_cool_public_images/ubuntu-6.10.manifest.xml",
-      #      :aws_is_public => true,
-      #      :aws_architecture => "i386",
-      #      :aws_image_type => "machine"},
-      #     {...},
-      #     {...} ]
-      #
-      # If +list+ param is set, then retrieve information about the listed images only:
-      #
-      #  ec2.describe_images(['ami-e4b6538d']) #=>
-      #    [{:aws_owner => "522821470517",
-      #      :aws_id => "ami-e4b6538d",
-      #      :aws_state => "available",
-      #      :aws_location => "marcins_cool_public_images/ubuntu-6.10.manifest.xml",
-      #      :aws_is_public => true,
-      #      :aws_architecture => "i386",
-      #      :aws_image_type => "machine"}]
-      #
-    def describe_images(list=[], image_type=nil)
-      list = list.to_a
-      cache_for = list.empty? && !image_type ? :describe_images : nil
-      ec2_describe_images({ 'ImageId' => list }, image_type, cache_for)
-    end
-
-      #
-      #  Example:
-      #
-      #   ec2.describe_images_by_owner('522821470517')
-      #   ec2.describe_images_by_owner('self')
-      #
-    def describe_images_by_owner(list=['self'], image_type=nil)
-      list = list.to_a
-      cache_for = list==['self'] && !image_type ? :describe_images_by_owner : nil
-      ec2_describe_images({ 'Owner' => list }, 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(list=['self'], image_type=nil)
-      list = list.to_a
-      cache_for = list==['self'] && !image_type ? :describe_images_by_executable_by : nil
-      ec2_describe_images({ 'ExecutableBy' => list }, image_type, cache_for)
-    end
-
-
-      # Register new image at Amazon. 
-      # Returns new image id or an exception.
-      #
-      #  ec2.register_image('bucket/key/manifest') #=> 'ami-e444444d'
-      #
-    def register_image(image_location)
-      link = generate_request("RegisterImage", 
-                              'ImageLocation' => image_location.to_s)
-      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(hash_params('UserId',      vars[:user_id].to_a))    if vars[:user_id]
-      params.update(hash_params('UserGroup',   vars[:user_group].to_a)) if vars[:user_group]
-      params.update(hash_params('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 +userId+ 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.to_a)
-    end
-
-      # Revokes image launch permissions for users. +userId+ 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.to_a)
-    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.to_a)
-    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.to_a)
-    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.to_a)
-    end
-
-  #-----------------------------------------------------------------
-  #      Instances
-  #-----------------------------------------------------------------
-    
-    def get_desc_instances(instances)  # :nodoc:
-      result = []
-      instances.each do |reservation|
-        reservation[:instances_set].each do |instance|
-          # Parse and remove timestamp from the reason string. The timestamp is of
-          # the request, not when EC2 took action, thus confusing & useless...
-          instance[:aws_reason]         = instance[:aws_reason].sub(/\(\d[^)]*GMT\) */, '')
-          instance[:aws_owner]          = reservation[:aws_owner]
-          instance[:aws_reservation_id] = reservation[:aws_reservation_id]
-          instance[:aws_groups]         = reservation[:aws_groups]
-          result << instance
+      request_info_impl(:ec2_connection, @@bench, request, parser)
+    end
+
+    def describe_resources_with_list_and_options(remote_function_name, remote_item_name, parser_class, list_and_options, &block) # :nodoc:
+      # 'RemoteFunctionName' -> :remote_funtion_name
+      cache_name = remote_function_name.right_underscore.to_sym
+      list, options = AwsUtils::split_items_and_params(list_and_options)
+      custom_options = {}
+      # Resource IDs to fetch
+      request_hash  = amazonize_list(remote_item_name, list)
+      # Other custom options
+      options.each do |key, values|
+        next if values.right_blank?
+        case key
+        when :options
+          custom_options = values
+        when :filters then
+          request_hash.merge!(amazonize_list(['Filter.?.Name', 'Filter.?.Value.?'], values))
+        else
+          request_hash.merge!(amazonize_list(key.to_s.right_camelize, values))
         end
       end
-      result
-    rescue Exception
-      on_exception
-    end
-    
-      # Retrieve information about EC2 instances. If +list+ is omitted then returns the
-      # list of all instances.
-      #
-      #  ec2.describe_instances #=> 
-      #    [{:aws_image_id       => "ami-e444444d",
-      #      :aws_reason         => "",
-      #      :aws_state_code     => "16",
-      #      :aws_owner          => "000000000888",
-      #      :aws_instance_id    => "i-123f1234",
-      #      :aws_reservation_id => "r-aabbccdd",
-      #      :aws_state          => "running",
-      #      :dns_name           => "domU-12-34-67-89-01-C9.usma2.compute.amazonaws.com",
-      #      :ssh_key_name       => "staging",
-      #      :aws_groups         => ["default"],
-      #      :private_dns_name   => "domU-12-34-67-89-01-C9.usma2.compute.amazonaws.com",
-      #      :aws_instance_type  => "m1.small",
-      #      :aws_launch_time    => "2008-1-1T00:00:00.000Z"},
-      #      :aws_availability_zone => "us-east-1b",
-      #      :aws_kernel_id      => "aki-ba3adfd3",
-      #      :aws_ramdisk_id     => "ari-badbad00",
-      #       ..., {...}]
-      #
-    def describe_instances(list=[])
-      link = generate_request("DescribeInstances", hash_params('InstanceId',list.to_a))
-      request_cache_or_info(:describe_instances, link,  QEc2DescribeInstancesParser, @@bench, list.blank?) do |parser|
-        get_desc_instances(parser.result)
-      end
-    rescue Exception
-      on_exception
-    end
-    
-      # Return the product code attached to instance or +nil+ otherwise.
-      #
-      #  ec2.confirm_product_instance('ami-e444444d','12345678') #=> nil
-      #  ec2.confirm_product_instance('ami-e444444d','00001111') #=> "000000000888"
-      #
-    def confirm_product_instance(instance, product_code)
-      link = generate_request("ConfirmProductInstance", { 'ProductCode' => product_code,
-                                'InstanceId'  => instance })
-      request_info(link, QEc2ConfirmProductInstanceParser.new(:logger => @logger))
-    end
-    
-      # Launch new EC2 instances. Returns a list of launched instances or an exception.
-      #
-      #  ec2.run_instances('ami-e444444d',1,1,['my_awesome_group'],'my_awesome_key', 'Woohoo!!!', 'public') #=>
-      #   [{:aws_image_id       => "ami-e444444d",
-      #     :aws_reason         => "",
-      #     :aws_state_code     => "0",
-      #     :aws_owner          => "000000000888",
-      #     :aws_instance_id    => "i-123f1234",
-      #     :aws_reservation_id => "r-aabbccdd",
-      #     :aws_state          => "pending",
-      #     :dns_name           => "",
-      #     :ssh_key_name       => "my_awesome_key",
-      #     :aws_groups         => ["my_awesome_group"],
-      #     :private_dns_name   => "",
-      #     :aws_instance_type  => "m1.small",
-      #     :aws_launch_time    => "2008-1-1T00:00:00.000Z"
-      #     :aws_ramdisk_id     => "ari-8605e0ef"
-      #     :aws_kernel_id      => "aki-9905e0f0",
-      #     :ami_launch_index   => "0",
-      #     :aws_availability_zone => "us-east-1b"
-      #     }]
-      #
-    def run_instances(image_id, min_count, max_count, group_ids, key_name, user_data='',  
-                      addressing_type = nil, instance_type = nil,
-                      kernel_id = nil, ramdisk_id = nil, availability_zone = nil, 
-                      block_device_mappings = nil) 
- 	    launch_instances(image_id, { :min_count       => min_count, 
- 	                                 :max_count       => max_count, 
- 	                                 :user_data       => user_data, 
-                                   :group_ids       => group_ids, 
-                                   :key_name        => key_name, 
-                                   :instance_type   => instance_type, 
-                                   :addressing_type => addressing_type,
-                                   :kernel_id       => kernel_id,
-                                   :ramdisk_id      => ramdisk_id,
-                                   :availability_zone     => availability_zone,
-                                   :block_device_mappings => block_device_mappings
-                                 }) 
-    end
-    
-     
-      # Launch new EC2 instances. Returns a list of launched instances or an exception. 
-      #
-      # +lparams+ keys (default values in parenthesis):
-      #  :min_count              fixnum, (1)
-      #  :max_count              fixnum, (1)
-      #  :group_ids              array or string ([] == 'default')
-      #  :instance_type          string (DEFAULT_INSTACE_TYPE)
-      #  :addressing_type        string (DEFAULT_ADDRESSING_TYPE 
-      #  :key_name               string
-      #  :kernel_id              string
-      #  :ramdisk_id             string 
-      #  :availability_zone      string
-      #  :block_device_mappings  string
-      #  :user_data              string
-      # 
-      #  ec2.launch_instances('ami-e444444d', :group_ids => 'my_awesome_group', 
-      #                                       :user_data => "Woohoo!!!", 
-      #                                       :addressing_type => "public", 
-      #                                       :key_name => "my_awesome_key", 
-      #                                       :availability_zone => "us-east-1c") #=> 
-      #   [{:aws_image_id       => "ami-e444444d", 
-      #     :aws_reason         => "", 
-      #     :aws_state_code     => "0", 
-      #     :aws_owner          => "000000000888", 
-      #     :aws_instance_id    => "i-123f1234", 
-      #     :aws_reservation_id => "r-aabbccdd", 
-      #     :aws_state          => "pending", 
-      #     :dns_name           => "", 
-      #     :ssh_key_name       => "my_awesome_key", 
-      #     :aws_groups         => ["my_awesome_group"], 
-      #     :private_dns_name   => "", 
-      #     :aws_instance_type  => "m1.small",
-      #     :aws_launch_time    => "2008-1-1T00:00:00.000Z",
-      #     :aws_ramdisk_id     => "ari-8605e0ef"
-      #     :aws_kernel_id      => "aki-9905e0f0",
-      #     :ami_launch_index   => "0",
-      #     :aws_availability_zone => "us-east-1c"
-      #     }] 
-      #     
-    def launch_instances(image_id, lparams={}) 
-      @logger.info("Launching instance of image #{image_id} for #{@aws_access_key_id}, " + 
-                   "key: #{lparams[:key_name]}, groups: #{(lparams[:group_ids]).to_a.join(',')}")
-      # careful: keyName and securityGroups may be nil
-      params = hash_params('SecurityGroup', lparams[:group_ids].to_a)
-      params.update( {'ImageId'        => image_id,
-                      'MinCount'       => (lparams[:min_count] || 1).to_s, 
-                      'MaxCount'       => (lparams[:max_count] || 1).to_s, 
-                      'AddressingType' => lparams[:addressing_type] || DEFAULT_ADDRESSING_TYPE, 
-                      'InstanceType'   => lparams[:instance_type]   || DEFAULT_INSTANCE_TYPE })
-      # optional params
-      params['KeyName']                    = lparams[:key_name]              unless lparams[:key_name].blank? 
-      params['KernelId']                   = lparams[:kernel_id]             unless lparams[:kernel_id].blank? 
-      params['RamdiskId']                  = lparams[:ramdisk_id]            unless lparams[:ramdisk_id].blank? 
-      params['Placement.AvailabilityZone'] = lparams[:availability_zone]     unless lparams[:availability_zone].blank? 
-      params['BlockDeviceMappings']        = lparams[:block_device_mappings] unless lparams[:block_device_mappings].blank?
-      unless lparams[:user_data].blank? 
-        lparams[: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(lparams[:user_data]).delete("\n") unless lparams[:user_data].blank?
-      end
-      link = generate_request("RunInstances", params)
-        #debugger
-      instances = request_info(link, QEc2DescribeInstancesParser.new(:logger => @logger))
-      get_desc_instances(instances)
-    rescue Exception
-      on_exception
-    end
-    
-      # Terminates EC2 instances. Returns a list of termination params or an exception.
-      #
-      #  ec2.terminate_instances(['i-f222222d','i-f222222e']) #=>
-      #    [{:aws_shutdown_state      => "shutting-down", 
-      #      :aws_instance_id         => "i-f222222d", 
-      #      :aws_shutdown_state_code => 32, 
-      #      :aws_prev_state          => "running", 
-      #      :aws_prev_state_code     => 16}, 
-      #     {:aws_shutdown_state      => "shutting-down", 
-      #      :aws_instance_id         => "i-f222222e", 
-      #      :aws_shutdown_state_code => 32, 
-      #      :aws_prev_state          => "running", 
-      #      :aws_prev_state_code     => 16}]
-      #
-    def terminate_instances(list=[])
-      link = generate_request("TerminateInstances", hash_params('InstanceId',list.to_a))
-      request_info(link, QEc2TerminateInstancesParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-
-      # Retreive EC2 instance OS logs. Returns a hash of data or an exception.
-      #
-      #  ec2.get_console_output('i-f222222d') =>
-      #    {:aws_instance_id => 'i-f222222d',
-      #     :aws_timestamp   => "2007-05-23T14:36:07.000-07:00",
-      #     :timestamp       => Wed May 23 21:36:07 UTC 2007,          # Time instance
-      #     :aws_output      => "Linux version 2.6.16-xenU (builder@patchbat.amazonsa) (gcc version 4.0.1 20050727 ..."
-    def get_console_output(instance_id)
-      link = generate_request("GetConsoleOutput", { 'InstanceId.1' => instance_id })
-      request_info(link, QEc2GetConsoleOutputParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-
-      # Reboot an EC2 instance. Returns +true+ or an exception.
-      #
-      #  ec2.reboot_instances(['i-f222222d','i-f222222e']) #=> true
-      #
-    def reboot_instances(list)
-      link = generate_request("RebootInstances", hash_params('InstanceId', list.to_a))
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-
-  #-----------------------------------------------------------------
-  #      Instances: Windows addons
-  #-----------------------------------------------------------------
-  
-      # Get initial Windows Server setup password from an instance console output.
-      #
-      #  my_awesome_key = ec2.create_key_pair('my_awesome_key') #=>
-      #    {:aws_key_name    => "my_awesome_key",
-      #     :aws_fingerprint => "01:02:03:f4:25:e6:97:e8:9b:02:1a:26:32:4e:58:6b:7a:8c:9f:03",
-      #     :aws_material    => "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAK...Q8MDrCbuQ=\n-----END RSA PRIVATE KEY-----"}
-      #
-      #  my_awesome_instance = ec2.run_instances('ami-a000000a',1,1,['my_awesome_group'],'my_awesome_key', 'WindowsInstance!!!') #=>
-      #   [{:aws_image_id       => "ami-a000000a",
-      #     :aws_instance_id    => "i-12345678",
-      #     ...
-      #     :aws_availability_zone => "us-east-1b"
-      #     }]
-      #
-      #  # wait until instance enters 'operational' state and get it's initial password
-      #
-      #  puts ec2.get_initial_password(my_awesome_instance[:aws_instance_id], my_awesome_key[:aws_material]) #=> "MhjWcgZuY6"
-      #
-    def get_initial_password(instance_id, private_key)
-      console_output = get_console_output(instance_id)
-      crypted_password = console_output[:aws_output][%r{<Password>(.+)</Password>}m] && $1
-      unless crypted_password
-        raise AwsError.new("Initial password was not found in console output for #{instance_id}")
-      else
-        OpenSSL::PKey::RSA.new(private_key).private_decrypt(Base64.decode64(crypted_password))
-      end
+      cache_for = (list.right_blank? && options.right_blank?) ? cache_name : nil
+      link = generate_request(remote_function_name, request_hash, custom_options)
+      request_cache_or_info(cache_for, link,  parser_class, @@bench, cache_for, &block)
     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
-    # S3. After bundling completes, Rightaws::Ec2#register_image may be used to
-    # register the new Windows AMI for subsequent launches.
+    # Incrementally lists given API call.
     #
-    #   ec2.bundle_instance('i-e3e24e8a', 'my-awesome-bucket', 'my-win-image-1') #=>
-    #    [{:aws_update_time => "2008-10-16T13:58:25.000Z",
-    #      :s3_bucket       => "kd-win-1",
-    #      :s3_prefix       => "win2pr",
-    #      :aws_state       => "pending",
-    #      :aws_id          => "bun-26a7424f",
-    #      :aws_instance_id => "i-878a25ee",
-    #      :aws_start_time  => "2008-10-16T13:58:02.000Z"}]
+    # All params are the same as for describe_resources_with_list_and_options call.
     #
-    def bundle_instance(instance_id, s3_bucket, s3_prefix, 
-                        s3_owner_aws_access_key_id=nil, s3_owner_aws_secret_access_key=nil,
-                        s3_expires = S3Interface::DEFAULT_EXPIRES_AFTER,
-                        s3_upload_policy='ec2-bundle-read')
-      # S3 access and signatures
-      s3_owner_aws_access_key_id     ||= @aws_access_key_id
-      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'),
-                 'conditions' => [ { 'bucket' => s3_bucket },
-                                   { 'acl'    => s3_upload_policy },
-                                   [ 'starts-with', '$key', s3_prefix ] ] }.to_json
-      policy64        = Base64.encode64(policy).gsub("\n","")
-      signed_policy64 = AwsUtils.sign(s3_owner_aws_secret_access_key, policy64)
-      # fill request params
-      params = { 'InstanceId'                       => instance_id,
-                 'Storage.S3.AWSAccessKeyId'        => s3_owner_aws_access_key_id,
-                 'Storage.S3.UploadPolicy'          => policy64,
-                 'Storage.S3.UploadPolicySignature' => signed_policy64,
-                 'Storage.S3.Bucket'                => s3_bucket,
-                 'Storage.S3.Prefix'                => s3_prefix,
-                 }
-      link = generate_request("BundleInstance", params)
-      request_info(link, QEc2BundleInstanceParser.new)
-    rescue Exception
-      on_exception
-    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']) #=>
-      #    [{:s3_bucket         => "my-awesome-bucket"
-      #      :aws_id            => "bun-0fa70206",
-      #      :s3_prefix         => "win1pr",
-      #      :aws_start_time    => "2008-10-14T16:27:57.000Z",
-      #      :aws_update_time   => "2008-10-14T16:37:10.000Z",
-      #      :aws_error_code    => "Client.S3Error",
-      #      :aws_error_message =>
-      #       "AccessDenied(403)- Invalid according to Policy: Policy Condition failed: [\"eq\", \"$acl\", \"aws-exec-read\"]",
-      #      :aws_state         => "failed",
-      #      :aws_instance_id   => "i-e3e24e8a"}]
-      #
-    def describe_bundle_tasks(list=[])
-      link = generate_request("DescribeBundleTasks", hash_params('BundleId', list.to_a))
-      request_info(link, QEc2DescribeBundleTasksParser.new)
-    rescue Exception
-      on_exception
+    # Block is called on every chunk of resources received. If you need to stop the loop
+    # just make the block to return nil or false.
+    #
+    # The API call should support 'NextToken' parameter and the response should return :next_token
+    # as well.
+    #
+    # Returns the last response from the cloud.
+    #
+    def incrementally_list_items(remote_function_name, remote_item_name, parser_class, list_and_options, &block) # :nodoc:
+      last_response = nil
+      loop do
+        last_response = describe_resources_with_list_and_options(remote_function_name, remote_item_name, parser_class, list_and_options)
+        break unless block && block.call(last_response) && !last_response[:next_token].right_blank?
+        list, options = AwsUtils::split_items_and_params(list_and_options)
+        options[:next_token] = last_response[:next_token]
+        list_and_options = list + [options]
+      end
+      last_response
     end
 
-      # Cancel an in‐progress or pending bundle task by id.
-      #
-      #  ec2.cancel_bundle_task('bun-73a7421a') #=>
-      #   [{:s3_bucket         => "my-awesome-bucket"
-      #     :aws_id            => "bun-0fa70206",
-      #     :s3_prefix         => "win02",
-      #     :aws_start_time    => "2008-10-14T13:00:29.000Z",
-      #     :aws_error_message => "User has requested bundling operation cancellation",
-      #     :aws_state         => "failed",
-      #     :aws_update_time   => "2008-10-14T13:01:31.000Z",
-      #     :aws_error_code    => "Client.Cancelled",
-      #     :aws_instance_id   => "i-e3e24e8a"}
-      #
-    def cancel_bundle_task(bundle_id)
-      link = generate_request("CancelBundleTask", { 'BundleId' => bundle_id })
-      request_info(link, QEc2BundleInstanceParser.new)
-    rescue Exception
-      on_exception
+    def merge_new_options_into_list_and_options(list_and_options, new_options)
+      list, options = AwsUtils::split_items_and_params(list_and_options)
+      list << options.merge(new_options)
     end
 
   #-----------------------------------------------------------------
-  #      Security groups
+  #      Keys
   #-----------------------------------------------------------------
-
-      # Retrieve Security Group information. If +list+ is omitted the returns the whole list of groups.
-      #
-      #  ec2.describe_security_groups #=>
-      #    [{:aws_group_name  => "default-1",
-      #      :aws_owner       => "000000000888",
-      #      :aws_description => "Default allowing SSH, HTTP, and HTTPS ingress",
-      #      :aws_perms       =>
-      #        [{:owner => "000000000888", :group => "default"},
-      #         {:owner => "000000000888", :group => "default-1"},
-      #         {:to_port => "-1",  :protocol => "icmp", :from_port => "-1",  :cidr_ips => "0.0.0.0/0"},
-      #         {:to_port => "22",  :protocol => "tcp",  :from_port => "22",  :cidr_ips => "0.0.0.0/0"},
-      #         {:to_port => "80",  :protocol => "tcp",  :from_port => "80",  :cidr_ips => "0.0.0.0/0"},
-      #         {:to_port => "443", :protocol => "tcp",  :from_port => "443", :cidr_ips => "0.0.0.0/0"}]},
-      #    ..., {...}]
-      #
-    def describe_security_groups(list=[])
-      link = generate_request("DescribeSecurityGroups", hash_params('GroupName',list.to_a))
-      request_cache_or_info( :describe_security_groups, link,  QEc2DescribeSecurityGroupsParser, @@bench, list.blank?) do |parser|
-        result = []     
-        parser.result.each do |item|
-          perms = []
-          item.ipPermissions.each do |perm|
-            perm.groups.each do |ngroup|
-              perms << {:group => ngroup.groupName,
-                        :owner => ngroup.userId}
-            end
-            perm.ipRanges.each do |cidr_ip|
-              perms << {:from_port => perm.fromPort, 
-                        :to_port   => perm.toPort, 
-                        :protocol  => perm.ipProtocol,
-                        :cidr_ips  => cidr_ip}
-            end
-          end
-
-             # delete duplication
-          perms.each_index do |i|
-            (0...i).each do |j|
-              if perms[i] == perms[j] then perms[i] = nil; break; end
-            end
-          end
-          perms.compact!
-
-          result << {:aws_owner       => item.ownerId, 
-                     :aws_group_name  => item.groupName, 
-                     :aws_description => item.groupDescription,
-                     :aws_perms       => perms}
-        
-        end
-        result
-      end
-    rescue Exception
-      on_exception
-    end
-    
-      # Create new Security Group. Returns +true+ or an exception.
-      #
-      #  ec2.create_security_group('default-1',"Default allowing SSH, HTTP, and HTTPS ingress") #=> true
+  
+      # Retrieve a list of SSH keys.
       #
-    def create_security_group(name, description)
-      # EC2 doesn't like an empty description...
-      description = " " if description.blank?
-      link = generate_request("CreateSecurityGroup", 
-                              'GroupName'        => name.to_s,
-                              'GroupDescription' => description.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-
-      # Remove Security Group. Returns +true+ or an exception.
+      # Accepts a list of ssh keys and/or a set of filters as the last parameter.
       #
-      #  ec2.delete_security_group('default-1') #=> true
+      # Filters: fingerprint, key-name
       #
-    def delete_security_group(name)
-      link = generate_request("DeleteSecurityGroup", 
-                              'GroupName' => name.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-    
-      # Authorize named ingress for security group. Allows instances that are member of someone
-      # else's security group to open connections to instances in my group.
+      # Returns an array of keys or an exception. Each key is represented as a two-element hash.
       #
-      #  ec2.authorize_security_group_named_ingress('my_awesome_group', '7011-0219-8268', 'their_group_name') #=> true
+      #  ec2.describe_key_pairs #=>
+      #    [{:aws_fingerprint=> "01:02:03:f4:25:e6:97:e8:9b:02:1a:26:32:4e:58:6b:7a:8c:9f:03", :aws_key_name=>"key-1"},
+      #     {:aws_fingerprint=> "1e:29:30:47:58:6d:7b:8c:9f:08:11:20:3c:44:52:69:74:80:97:08", :aws_key_name=>"key-2"},
+      #      ..., {...} ]
       #
-    def authorize_security_group_named_ingress(name, owner, group)
-      link = generate_request("AuthorizeSecurityGroupIngress", 
-                              'GroupName'                  => name.to_s,
-                                'SourceSecurityGroupName'    => group.to_s,
-                              'SourceSecurityGroupOwnerId' => owner.to_s.gsub(/-/,''))
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-    
-      # Revoke named ingress for security group.
+      #  ec2.describe_key_pairs(:filters => {'fingerprint' => ["53:0b:73:c9:c8:18:98:6e:bc:98:9e:51:97:04:74:4b:07:f9:00:00",
+      #                                                        "9f:57:a5:bb:4b:e8:a7:f8:3c:fe:d6:db:41:f5:7e:97:b5:b2:00:00"]})
       #
-      #  ec2.revoke_security_group_named_ingress('my_awesome_group', aws_user_id, 'another_group_name') #=> true
+      # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html
       #
-    def revoke_security_group_named_ingress(name, owner, group)
-      link = generate_request("RevokeSecurityGroupIngress", 
-                              'GroupName'                  => name.to_s,
-                              'SourceSecurityGroupName'    => group.to_s,
-                              'SourceSecurityGroupOwnerId' => owner.to_s.gsub(/-/,''))
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
+    def describe_key_pairs(*list_and_options)
+      describe_resources_with_list_and_options('DescribeKeyPairs', 'KeyName', QEc2DescribeKeyPairParser, list_and_options)
     end
-    
-      # Add permission to a security group. Returns +true+ or an exception. +protocol+ is one of :'tcp'|'udp'|'icmp'.
-      #
-      #  ec2.authorize_security_group_IP_ingress('my_awesome_group', 80, 82, 'udp', '192.168.1.0/8') #=> true
-      #  ec2.authorize_security_group_IP_ingress('my_awesome_group', -1, -1, 'icmp') #=> true
-      #
-    def authorize_security_group_IP_ingress(name, from_port, to_port, protocol='tcp', cidr_ip='0.0.0.0/0')
-      link = generate_request("AuthorizeSecurityGroupIngress", 
-                              'GroupName'  => name.to_s,
-                              'IpProtocol' => protocol.to_s,
-                              'FromPort'   => from_port.to_s,
-                              'ToPort'     => to_port.to_s,
-                              'CidrIp'     => cidr_ip.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-    
-      # Remove permission from a security group. Returns +true+ or an exception. +protocol+ is one of :'tcp'|'udp'|'icmp' ('tcp' is default). 
+      
+      # Import new SSH key. Returns a hash of the key's data or an exception.
       #
-      #  ec2.revoke_security_group_IP_ingress('my_awesome_group', 80, 82, 'udp', '192.168.1.0/8') #=> true
+      #  ec2.import_key_pair('my_awesome_key', 'C:\keys\myfavoritekeypair_public.ppk') #=>
+      #    {:aws_key_name    => "my_awesome_key",
+      #     :aws_fingerprint => "01:02:03:f4:25:e6:97:e8:9b:02:1a:26:32:4e:58:6b:7a:8c:9f:03"}
       #
-    def revoke_security_group_IP_ingress(name, from_port, to_port, protocol='tcp', cidr_ip='0.0.0.0/0')
-      link = generate_request("RevokeSecurityGroupIngress", 
-                              'GroupName'  => name.to_s,
-                              'IpProtocol' => protocol.to_s,
-                              'FromPort'   => from_port.to_s,
-                              'ToPort'     => to_port.to_s,
-                              'CidrIp'     => cidr_ip.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    def import_key_pair(name, public_key_material)
+      link = generate_request("ImportKeyPair",
+                              'KeyName' => name.to_s,
+                              'PublicKeyMaterial' => Base64.encode64(public_key_material.to_s))
+      request_info(link, QEc2ImportKeyPairParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
 
-  #-----------------------------------------------------------------
-  #      Keys
-  #-----------------------------------------------------------------
-  
-      # Retrieve a list of SSH keys. Returns an array of keys or an exception. Each key is
-      # represented as a two-element hash.
-      #
-      #  ec2.describe_key_pairs #=>
-      #    [{:aws_fingerprint=> "01:02:03:f4:25:e6:97:e8:9b:02:1a:26:32:4e:58:6b:7a:8c:9f:03", :aws_key_name=>"key-1"},
-      #     {:aws_fingerprint=> "1e:29:30:47:58:6d:7b:8c:9f:08:11:20:3c:44:52:69:74:80:97:08", :aws_key_name=>"key-2"},
-      #      ..., {...} ]
-      #
-    def describe_key_pairs(list=[])
-      link = generate_request("DescribeKeyPairs", hash_params('KeyName',list.to_a))
-      request_cache_or_info :describe_key_pairs, link,  QEc2DescribeKeyPairParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
-    end
-      
       # Create new SSH key. Returns a hash of the key's data or an exception.
       #
       #  ec2.create_key_pair('my_awesome_key') #=>
@@ -871,7 +261,7 @@ module RightAws
       #     :aws_material    => "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAK...Q8MDrCbuQ=\n-----END RSA PRIVATE KEY-----"}
       #
     def create_key_pair(name)
-      link = generate_request("CreateKeyPair", 
+      link = generate_request("CreateKeyPair",
                               'KeyName' => name.to_s)
       request_info(link, QEc2CreateKeyPairParser.new(:logger => @logger))
     rescue Exception
@@ -895,68 +285,112 @@ module RightAws
   #-----------------------------------------------------------------
 
     # Acquire a new elastic IP address for use with your account.
-    # Returns allocated IP address or an exception.
+    # Options: :domain.
+    # Returns allocated IP address or or an exception.
     #
-    #  ec2.allocate_address #=> '75.101.154.140'
+    #  ec2.allocate_address #=>
+    #    { :public_ip => "50.19.214.224",
+    #      :domain    => "standard"}
     #
-    def allocate_address
-      link = generate_request("AllocateAddress")
+    #  ec2.allocate_address(:domain => 'vpc') #=>
+    #    { :allocation_id => "eipalloc-c6abfeaf",
+    #      :domain        => "vpc",
+    #      :public_ip     => "184.72.112.39"}
+    #
+    def allocate_address(options={})
+      request_hash = {}
+      request_hash['Domain'] = options[:domain] unless options[:domain].right_blank?
+      link = generate_request("AllocateAddress", request_hash)
       request_info(link, QEc2AllocateAddressParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
 
     # Associate an elastic IP address with an instance.
-    # Returns +true+ or an exception.
+    # Options: :public_ip, :allocation_id.
+    # Returns a hash of data or an exception.
     #
-    #  ec2.associate_address('i-d630cbbf', '75.101.154.140') #=> true
+    #  ec2.associate_address('i-d630cbbf', :public_ip => '75.101.154.140') #=>
+    #    { :return => true }
     #
-    def associate_address(instance_id, public_ip)
-      link = generate_request("AssociateAddress", 
-                              "InstanceId" => instance_id.to_s,
-                              "PublicIp"   => public_ip.to_s)
-      request_info(link, RightBoolResponseParser.new(:logger => @logger))
+    #  ec2.associate_address(inst, :allocation_id => "eipalloc-c6abfeaf") #=>
+    #    { :return         => true,
+    #      :association_id => 'eipassoc-fc5ca095'}
+    #
+    def associate_address(instance_id, options={})
+      request_hash = { "InstanceId" => instance_id.to_s }
+      request_hash['PublicIp']     = options[:public_ip]     unless options[:public_ip].right_blank?
+      request_hash['AllocationId'] = options[:allocation_id] unless options[:allocation_id].right_blank?
+      link = generate_request("AssociateAddress", request_hash)
+      request_info(link, QEc2AssociateAddressParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
 
-    # List elastic IP addresses assigned to your account.
+    # List elastic IPs by public addresses.
+    #
+    # Accepts a list of addresses and/or a set of filters as the last parameter.
+    #
+    # Filters: instance-id, public-ip
+    #
     # Returns an array of 2 keys (:instance_id and :public_ip) hashes:
     #
-    #  ec2.describe_addresses  #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140"},
-    #                               {:instance_id=>nil, :public_ip=>"75.101.154.141"}]
+    #  ec2.describe_addresses  #=> [{:instance_id=>"i-75ebd41b", :domain=>"standard", :public_ip=>"50.17.211.96"},
+    #                                :domain=>"vpc", :public_ip=>"184.72.112.39",  :allocation_id=>"eipalloc-c6abfeaf"}]
     #
-    #  ec2.describe_addresses('75.101.154.140') #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140"}]
+    #  ec2.describe_addresses('75.101.154.140') #=> [{:instance_id=>"i-d630cbbf", :public_ip=>"75.101.154.140", :domain=>"standard"}]
     #
-    def describe_addresses(list=[])
-      link = generate_request("DescribeAddresses", 
-                              hash_params('PublicIp',list.to_a))
-      request_cache_or_info :describe_addresses, link,  QEc2DescribeAddressesParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
+    #  ec2.describe_addresses(:filters => { 'public-ip' => "75.101.154.140" })
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeAddresses.html
+    #
+    def describe_addresses(*list_and_options)
+      describe_resources_with_list_and_options('DescribeAddresses', 'PublicIp', QEc2DescribeAddressesParser, list_and_options)
+    end
+
+
+    # List elastic IPs by allocation ids.
+    #
+    # Accepts a list of allocations and/or a set of filters as the last parameter.
+    #
+    #  describe_addresses_by_allocation_ids("eipalloc-c6abfeaf") #=>
+    #    [{:domain=>"vpc",
+    #      :public_ip=>"184.72.112.39",
+    #      :allocation_id=>"eipalloc-c6abfeaf"}]
+    #
+    #  P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeAddresses.html
+    #
+    def describe_addresses_by_allocation_ids(*list_and_options)
+      describe_resources_with_list_and_options('DescribeAddresses', 'AllocationId', QEc2DescribeAddressesParser, list_and_options)
     end
 
     # Disassociate the specified elastic IP address from the instance to which it is assigned.
+    # Options: :public_ip, :association_id.
     # Returns +true+ or an exception.
     # 
-    #  ec2.disassociate_address('75.101.154.140') #=> true
+    #  ec2.disassociate_address(:public_ip => '75.101.154.140') #=> true
     #
-    def disassociate_address(public_ip)
-      link = generate_request("DisassociateAddress", 
-                              "PublicIp" => public_ip.to_s)
+    def disassociate_address(options = {})
+      request_hash = {}
+      request_hash['PublicIp']      = options[:public_ip]      unless options[:public_ip].right_blank?
+      request_hash['AssociationId'] = options[:association_id] unless options[:association_id].right_blank?
+      link = generate_request("DisassociateAddress", request_hash)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
       on_exception
     end
 
     # Release an elastic IP address associated with your account.
+    # Options: :public_ip, :allocation_id.
     # Returns +true+ or an exception.
     #
-    #  ec2.release_address('75.101.154.140') #=> true
+    #  ec2.release_address(:public_ip => '75.101.154.140') #=> true
     #
-    def release_address(public_ip)
-      link = generate_request("ReleaseAddress", 
-                              "PublicIp" => public_ip.to_s)
+    def release_address(options = {})
+      request_hash = {}
+      request_hash['PublicIp']     = options[:public_ip]     unless options[:public_ip].right_blank?
+      request_hash['AllocationId'] = options[:allocation_id] unless options[:allocation_id].right_blank?
+      link = generate_request("ReleaseAddress", request_hash)
       request_info(link, RightBoolResponseParser.new(:logger => @logger))
     rescue Exception
       on_exception
@@ -967,193 +401,69 @@ module RightAws
   #-----------------------------------------------------------------
     
     # Describes availability zones that are currently available to the account and their states.
-    # Returns an array of 2 keys (:zone_name and :zone_state) hashes:
     #
-    #  ec2.describe_availability_zones  #=> [{:zone_state=>"available", :zone_name=>"us-east-1a"}, 
-    #                                        {:zone_state=>"available", :zone_name=>"us-east-1b"}, 
-    #                                        {:zone_state=>"available", :zone_name=>"us-east-1c"}]
+    # Accepts a list of availability zones and/or a set of filters as the last parameter.
     #
-    #  ec2.describe_availability_zones('us-east-1c') #=> [{:zone_state=>"available", :zone_name=>"us-east-1c"}]
+    # Filters: message, region-name, state, zone-name
     #
-    def describe_availability_zones(list=[])
-      link = generate_request("DescribeAvailabilityZones", 
-                              hash_params('ZoneName',list.to_a))
-      request_cache_or_info :describe_availability_zones, link,  QEc2DescribeAvailabilityZonesParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
-    end
-
-  #-----------------------------------------------------------------
-  #      EBS: Volumes
-  #-----------------------------------------------------------------
-  
-    # Describe all EBS volumes.
+    # Returns an array of 2 keys (:zone_name and :zone_state) hashes:
     #
-    #  ec2.describe_volumes #=> 
-    #      [{:aws_size              => 94,
-    #        :aws_device            => "/dev/sdc",
-    #        :aws_attachment_status => "attached",
-    #        :zone                  => "merlot",
-    #        :snapshot_id           => nil,
-    #        :aws_attached_at       => Wed Jun 18 08:19:28 UTC 2008,
-    #        :aws_status            => "in-use",
-    #        :aws_id                => "vol-60957009",
-    #        :aws_created_at        => Wed Jun 18 08:19:20s UTC 2008,
-    #        :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,}, ... ]
+    #  ec2.describe_availability_zones  #=> [{:region_name=>"us-east-1",
+    #                                         :zone_name=>"us-east-1a",
+    #                                         :zone_state=>"available"}, ... ]
     #
-    def describe_volumes(list=[])
-      link = generate_request("DescribeVolumes", 
-                              hash_params('VolumeId',list.to_a))
-      request_cache_or_info :describe_volumes, link,  QEc2DescribeVolumesParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
-    end
-    
-    # Create new EBS volume based on previously created snapshot. 
-    # +Size+ in Gigabytes.
+    #  ec2.describe_availability_zones('us-east-1c') #=> [{:region_name=>"us-east-1", 
+    #                                                      :zone_state=>"available",
+    #                                                      :zone_name=>"us-east-1c"}]
     #
-    #  ec2.create_volume('snap-000000', 10, zone) #=> 
-    #      {:snapshot_id    => "snap-e21df98b",
-    #       :aws_status     => "creating",
-    #       :aws_id         => "vol-fc9f7a95",
-    #       :zone           => "merlot",
-    #       :aws_created_at => Tue Jun 24 18:13:32 UTC 2008,
-    #       :aws_size       => 94}
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeAvailabilityZones.html
     #
-    def create_volume(snapshot_id, size, zone)
-      link = generate_request("CreateVolume", 
-                              "SnapshotId"        => snapshot_id.to_s,
-                              "Size"              => size.to_s,
-                              "AvailabilityZone"  => zone.to_s )
-      request_info(link, QEc2CreateVolumeParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
+    def describe_availability_zones(*list_and_options)
+      describe_resources_with_list_and_options('DescribeAvailabilityZones', 'ZoneName', QEc2DescribeAvailabilityZonesParser, list_and_options)
     end
 
-    # Delete the specified EBS volume. 
-    # This does not deletes any snapshots created from this volume.
+  #-----------------------------------------------------------------
+  #      Regions
+  #-----------------------------------------------------------------
+
+    # Describe regions.
     #
-    #  ec2.delete_volume('vol-b48a6fdd') #=> true
+    # Accepts a list of regions and/or a set of filters as the last parameter.
     #
-    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.
+    # Filters: endpoint, region-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" }
+    #  ec2.describe_regions  #=>
+    #   [{:region_endpoint=>"ec2.eu-west-1.amazonaws.com",      :region_name=>"eu-west-1"},
+    #    {:region_endpoint=>"ec2.us-east-1.amazonaws.com",      :region_name=>"us-east-1"},
+    #    {:region_endpoint=>"ec2.ap-northeast-1.amazonaws.com", :region_name=>"ap-northeast-1"},
+    #    {:region_endpoint=>"ec2.us-west-1.amazonaws.com",      :region_name=>"us-west-1"},
+    #    {:region_endpoint=>"ec2.ap-southeast-1.amazonaws.com", :region_name=>"ap-southeast-1"}]
     #
-    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"}
+    # P.S. filters: http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html
     #
-    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
+    def describe_regions(*list_and_options)
+      describe_resources_with_list_and_options('DescribeRegions', 'RegionName', QEc2DescribeRegionsParser, list_and_options)
     end
 
-    
-  #-----------------------------------------------------------------
-  #      EBS: Snapshots
-  #-----------------------------------------------------------------
-
-     # Describe all EBS snapshots.
-     #
-     # ec2.describe_snapshots #=> 
-     #   [ { :aws_progress   => "100%",
-     #       :aws_status     => "completed",
-     #       :aws_id         => "snap-72a5401b",
-     #       :aws_volume_id  => "vol-5582673c",
-     #       :aws_started_at => "2008-02-23T02:50:48.000Z"},
-     #     { :aws_progress   => "100%",
-     #       :aws_status     => "completed",
-     #       :aws_id         => "snap-75a5401c",
-     #       :aws_volume_id  => "vol-5582673c",
-     #       :aws_started_at => "2008-02-23T16:23:19.000Z" },...]
-     #
-    def describe_snapshots(list=[])
-      link = generate_request("DescribeSnapshots", 
-                              hash_params('SnapshotId',list.to_a))
-      request_cache_or_info :describe_snapshots, link,  QEc2DescribeSnapshotsParser, @@bench, list.blank?
-    rescue Exception
-      on_exception
-    end
+    #-----------------------------------------------------------------
+    #      Accounts
+    #-----------------------------------------------------------------
 
-    # Create a snapshot of specified volume.
+    # Describe the specified attribute of your AWS account.
     #
-    #  ec2.create_snapshot('vol-898a6fe0') #=> 
-    #      {:aws_volume_id  => "vol-fd9f7a94",
-    #       :aws_started_at => Tue Jun 24 18:40:40 UTC 2008,
-    #       :aws_progress   => "",
-    #       :aws_status     => "pending",
-    #       :aws_id         => "snap-d56783bc"}
+    #  ec2.describe_account_attributes(:attribute_name => ['default-vpc','supported-platforms']) #=> 
+    #    {"default-vpc"         => "vpc-8c3b00e7",
+    #     "supported-platforms" => "VPC"}
     #
-    def create_snapshot(volume_id)
-      link = generate_request("CreateSnapshot", 
-                              "VolumeId" => volume_id.to_s)
-      request_info(link, QEc2CreateSnapshotParser.new(:logger => @logger))
-    rescue Exception
-      on_exception
-    end
-
-    # Delete the specified snapshot.
+    #  ec2.describe_account_attributes #=>
+    #    {"vpc-max-security-groups-per-interface" => "5",
+    #     "max-instances"                         => "150",
+    #     "supported-platforms"                   => ["EC2", "VPC"],
+    #     "default-vpc"                           => "none"}
     #
-    #  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: Boolean Response Parser
-  #-----------------------------------------------------------------
-    
-    class RightBoolResponseParser < RightAWSParser #:nodoc:
-      def tagend(name)
-        @result = @text=='true' ? true : false if name == 'return'
-      end
+    def describe_account_attributes(*list_and_options)
+      list_and_options = merge_new_options_into_list_and_options(list_and_options, :options => {:api_version => VPC_API_VERSION})
+      describe_resources_with_list_and_options('DescribeAccountAttributes', 'accountAttributeValues', QEc2DescribeAccountAttributesParser, list_and_options)
     end
 
   #-----------------------------------------------------------------
@@ -1189,252 +499,28 @@ module RightAws
       end
     end
 
-  #-----------------------------------------------------------------
-  #      PARSERS: Security Groups
-  #-----------------------------------------------------------------
-
-    class QEc2UserIdGroupPairType #:nodoc:
-      attr_accessor :userId
-      attr_accessor :groupName
-    end
-
-    class QEc2IpPermissionType #:nodoc:
-      attr_accessor :ipProtocol
-      attr_accessor :fromPort
-      attr_accessor :toPort
-      attr_accessor :groups
-      attr_accessor :ipRanges
-    end
-
-    class QEc2SecurityGroupItemType #:nodoc:
-      attr_accessor :groupName
-      attr_accessor :groupDescription
-      attr_accessor :ownerId
-      attr_accessor :ipPermissions
-    end
-
-
-    class QEc2DescribeSecurityGroupsParser < RightAWSParser #:nodoc:
-      def tagstart(name, attributes)
-        case name
-          when 'item' 
-            if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo'
-              @group = QEc2SecurityGroupItemType.new 
-              @group.ipPermissions = []
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions'
-              @perm = QEc2IpPermissionType.new
-              @perm.ipRanges = []
-              @perm.groups   = []
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups'
-              @sgroup = QEc2UserIdGroupPairType.new
-            end
-        end
-      end
-      def tagend(name)
-        case name
-          when 'ownerId'          then @group.ownerId   = @text
-          when 'groupDescription' then @group.groupDescription = @text
-          when 'groupName'
-            if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item'
-              @group.groupName  = @text 
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups/item'
-              @sgroup.groupName = @text 
-            end
-          when 'ipProtocol'       then @perm.ipProtocol = @text
-          when 'fromPort'         then @perm.fromPort   = @text
-          when 'toPort'           then @perm.toPort     = @text
-          when 'userId'           then @sgroup.userId   = @text
-          when 'cidrIp'           then @perm.ipRanges  << @text
-          when 'item'
-            if @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions/item/groups'
-              @perm.groups << @sgroup
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo/item/ipPermissions'
-              @group.ipPermissions << @perm
-            elsif @xmlpath=='DescribeSecurityGroupsResponse/securityGroupInfo'
-              @result << @group
-            end
-        end
-      end
-      def reset
-        @result = []
-      end
-    end
-
-  #-----------------------------------------------------------------
-  #      PARSERS: Images
-  #-----------------------------------------------------------------
-    
-    class QEc2DescribeImagesParser < RightAWSParser #:nodoc:
-      def tagstart(name, attributes)
-        if name == 'item' && @xmlpath[%r{.*/imagesSet$}]
-          @image = {}
-        end
-      end
-      def tagend(name)
-        case name
-          when 'imageId'       then @image[:aws_id]       = @text
-          when 'imageLocation' then @image[:aws_location] = @text
-          when 'imageState'    then @image[:aws_state]    = @text
-          when 'imageOwnerId'  then @image[:aws_owner]    = @text
-          when 'isPublic'      then @image[:aws_is_public]= @text == 'true' ? true : false
-          when 'productCode'   then (@image[:aws_product_codes] ||= []) << @text
-          when 'architecture'  then @image[:aws_architecture] = @text
-          when 'imageType'     then @image[:aws_image_type] = @text
-          when 'kernelId'      then @image[:aws_kernel_id]  = @text
-          when 'ramdiskId'     then @image[:aws_ramdisk_id] = @text
-          when 'item'          then @result << @image if @xmlpath[%r{.*/imagesSet$}]
-        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
-          when 'blockDeviceMapping' then @result[:block_device_mapping] = @text
-        end
-      end
-      def reset
-        @result = {}
-      end
-    end
-
-  #-----------------------------------------------------------------
-  #      PARSERS: Instances
-  #-----------------------------------------------------------------
-
-    class QEc2DescribeInstancesParser < RightAWSParser #:nodoc:
-      def tagstart(name, attributes)
-           # DescribeInstances property
-        if (name == 'item' && @xmlpath == 'DescribeInstancesResponse/reservationSet') || 
-           # RunInstances property
-           (name == 'RunInstancesResponse')  
-            @reservation = { :aws_groups    => [],
-                             :instances_set => [] }
-              
-        elsif (name == 'item') && 
-                # DescribeInstances property
-              ( @xmlpath=='DescribeInstancesResponse/reservationSet/item/instancesSet' ||
-               # RunInstances property
-                @xmlpath=='RunInstancesResponse/instancesSet' )
-              # the optional params (sometimes are missing and we dont want them to be nil) 
-            @instance = { :aws_reason       => '',
-                          :dns_name         => '',
-                          :private_dns_name => '',
-                          :ami_launch_index => '',
-                          :ssh_key_name     => '',
-                          :aws_state        => '',
-                          :aws_product_codes => [] }
-        end
-      end
-      def tagend(name)
-        case name 
-          # reservation
-          when 'reservationId'    then @reservation[:aws_reservation_id] = @text
-          when 'ownerId'          then @reservation[:aws_owner]          = @text
-          when 'groupId'          then @reservation[:aws_groups]        << @text
-          # instance  
-          when 'instanceId'       then @instance[:aws_instance_id]    = @text
-          when 'imageId'          then @instance[:aws_image_id]       = @text
-          when 'dnsName'          then @instance[:dns_name]           = @text
-          when 'privateDnsName'   then @instance[:private_dns_name]   = @text
-          when 'reason'           then @instance[:aws_reason]         = @text
-          when 'keyName'          then @instance[:ssh_key_name]       = @text
-          when 'amiLaunchIndex'   then @instance[:ami_launch_index]   = @text
-          when 'code'             then @instance[:aws_state_code]     = @text
-          when 'name'             then @instance[:aws_state]          = @text
-          when 'productCode'      then @instance[:aws_product_codes] << @text
-          when 'instanceType'     then @instance[:aws_instance_type]  = @text
-          when 'launchTime'       then @instance[:aws_launch_time]    = @text
-          when 'kernelId'         then @instance[:aws_kernel_id]      = @text
-          when 'ramdiskId'        then @instance[:aws_ramdisk_id]     = @text
-          when 'platform'         then @instance[:aws_platform]       = @text
-          when 'availabilityZone' then @instance[:aws_availability_zone] = @text
-          when 'item'
-            if @xmlpath == 'DescribeInstancesResponse/reservationSet/item/instancesSet' || # DescribeInstances property
-               @xmlpath == 'RunInstancesResponse/instancesSet'            # RunInstances property
-              @reservation[:instances_set] << @instance
-            elsif @xmlpath=='DescribeInstancesResponse/reservationSet'    # DescribeInstances property
-              @result << @reservation
-            end
-          when 'RunInstancesResponse' then @result << @reservation            # RunInstances property
-        end
-      end
-      def reset
-        @result = []
-      end
-    end
-
-    class QEc2ConfirmProductInstanceParser < RightAWSParser #:nodoc:
-      def tagend(name)
-        @result = @text if name == 'ownerId'
-      end
-    end
-
-    class QEc2TerminateInstancesParser < RightAWSParser #:nodoc:
+    class QEc2ImportKeyPairParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @instance = {} if name == 'item'
+        @result = {} if name == 'ImportKeyPairResponse'
       end
       def tagend(name)
         case name
-        when 'instanceId' then @instance[:aws_instance_id] = @text
-        when 'code'
-          if @xmlpath == 'TerminateInstancesResponse/instancesSet/item/shutdownState'
-               @instance[:aws_shutdown_state_code] = @text.to_i
-          else @instance[:aws_prev_state_code]     = @text.to_i end
-        when 'name'
-          if @xmlpath == 'TerminateInstancesResponse/instancesSet/item/shutdownState'
-               @instance[:aws_shutdown_state] = @text
-          else @instance[:aws_prev_state]     = @text end
-        when 'item'       then @result << @instance
+          when 'keyName'        then @result[:aws_key_name]    = @text
+          when 'keyFingerprint' then @result[:aws_fingerprint] = @text
         end
       end
-      def reset
-        @result = []
-      end
     end
 
   #-----------------------------------------------------------------
-  #      PARSERS: Console
+  #      PARSERS: Elastic IPs
   #-----------------------------------------------------------------
-
-    class QEc2GetConsoleOutputParser < RightAWSParser #:nodoc:
+  
+    class QEc2AllocateAddressParser < RightAWSParser #:nodoc:
       def tagend(name)
         case name
-        when 'instanceId' then @result[:aws_instance_id] = @text
-        when 'timestamp'  then @result[:aws_timestamp]   = @text
-                               @result[:timestamp]       = (Time.parse(@text)).utc
-        when 'output'     then @result[:aws_output]      = Base64.decode64(@text)
+        when 'publicIp'     then @result[:public_ip]     = @text
+        when 'allocationId' then @result[:allocation_id] = @text
+        when 'domain'       then @result[:domain]        = @text
         end
       end
       def reset
@@ -1442,48 +528,11 @@ module RightAws
       end
     end
 
-  #-----------------------------------------------------------------
-  #      Instances: Wondows related part
-  #-----------------------------------------------------------------
-    class QEc2DescribeBundleTasksParser < RightAWSParser #:nodoc:
-      def tagstart(name, attributes)
-        @bundle = {} if name == 'item'
-      end
+    class QEc2AssociateAddressParser < RightAWSParser #:nodoc:
       def tagend(name)
         case name
-#        when 'requestId'  then @bundle[:request_id]    = @text
-        when 'instanceId' then @bundle[:aws_instance_id]   = @text
-        when 'bundleId'   then @bundle[:aws_id]            = @text
-        when 'bucket'     then @bundle[:s3_bucket]         = @text
-        when 'prefix'     then @bundle[:s3_prefix]         = @text
-        when 'startTime'  then @bundle[:aws_start_time]    = @text
-        when 'updateTime' then @bundle[:aws_update_time]   = @text
-        when 'state'      then @bundle[:aws_state]         = @text
-        when 'progress'   then @bundle[:aws_progress]      = @text
-        when 'code'       then @bundle[:aws_error_code]    = @text
-        when 'message'    then @bundle[:aws_error_message] = @text
-        when 'item'       then @result                    << @bundle
-        end
-      end
-      def reset
-        @result = []
-      end
-    end
-
-    class QEc2BundleInstanceParser < RightAWSParser #:nodoc:
-      def tagend(name)
-        case name
-#        when 'requestId'  then @result[:request_id]    = @text
-        when 'instanceId' then @result[:aws_instance_id]   = @text
-        when 'bundleId'   then @result[:aws_id]            = @text
-        when 'bucket'     then @result[:s3_bucket]         = @text
-        when 'prefix'     then @result[:s3_prefix]         = @text
-        when 'startTime'  then @result[:aws_start_time]    = @text
-        when 'updateTime' then @result[:aws_update_time]   = @text
-        when 'state'      then @result[:aws_state]         = @text
-        when 'progress'   then @result[:aws_progress]      = @text
-        when 'code'       then @result[:aws_error_code]    = @text
-        when 'message'    then @result[:aws_error_message] = @text
+        when 'return'        then @result[:return]         = @text == 'true'
+        when 'associationId' then @result[:association_id] = @text
         end
       end
       def reset
@@ -1491,25 +540,18 @@ module RightAws
       end
     end
 
-  #-----------------------------------------------------------------
-  #      PARSERS: Elastic IPs
-  #-----------------------------------------------------------------
-  
-    class QEc2AllocateAddressParser < RightAWSParser #:nodoc:
-      def tagend(name)
-        @result = @text if name == 'publicIp'
-      end
-    end
-    
     class QEc2DescribeAddressesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @address = {} if name == 'item'
+        @item = {} if name == 'item'
       end
       def tagend(name)
         case name
-        when 'instanceId' then @address[:instance_id] = @text.blank? ? nil : @text 
-        when 'publicIp'   then @address[:public_ip]   = @text
-        when 'item'       then @result << @address
+        when 'instanceId'    then (@item[:instance_id]    = @text unless @text.right_blank?)
+        when 'publicIp'      then @item[:public_ip]       = @text
+        when 'allocationId'  then @item[:allocation_id]   = @text
+        when 'associationId' then @item[:association_id]  = @text
+        when 'domain'        then @item[:domain]          = @text
+        when 'item'          then @result                << @item
         end
       end
       def reset
@@ -1523,13 +565,20 @@ module RightAws
 
     class QEc2DescribeAvailabilityZonesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @zone = {} if name == 'item'
+        case full_tag_name
+        when %r{/availabilityZoneInfo/item$} then @item = {}
+        end
       end
       def tagend(name)
         case name
-        when 'zoneName'  then @zone[:zone_name]  = @text
-        when 'zoneState' then @zone[:zone_state] = @text
-        when 'item'      then @result << @zone
+        when 'regionName' then @item[:region_name] = @text
+        when 'zoneName'   then @item[:zone_name]   = @text
+        when 'zoneState'  then @item[:zone_state]  = @text
+        else
+          case full_tag_name
+          when %r{/messageSet/item/message$}   then (@item[:messages] ||= []) << @text
+          when %r{/availabilityZoneInfo/item$} then @result << @item
+          end
         end
       end
       def reset
@@ -1538,71 +587,18 @@ module RightAws
     end
 
   #-----------------------------------------------------------------
-  #      PARSERS: EBS - Volumes
+  #      PARSERS: Regions
   #-----------------------------------------------------------------
- 
-    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] = Time.parse(@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]       = Time.parse(@text)
-        end
-      end
-      def reset
-        @result = {}
-      end
-    end
-      
-    class QEc2DescribeVolumesParser < RightAWSParser #:nodoc:
+
+    class QEc2DescribeRegionsParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        case name
-        when 'item'
-          case @xmlpath
-            when 'DescribeVolumesResponse/volumeSet' then @volume = {}
-          end
-        end
+        @item = {} if name == 'item'
       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]  = Time.parse(@text)
-          when 'instanceId'       then @volume[:aws_instance_id] = @text
-          when 'device'           then @volume[:aws_device]      = @text
-          when 'attachTime'       then @volume[:aws_attached_at] = Time.parse(@text)
-          when 'snapshotId'       then @volume[:snapshot_id]     = @text.blank? ? nil : @text
-          when 'availabilityZone' then @volume[:zone]            = @text
-          when 'item' 
-            case @xmlpath
-            when 'DescribeVolumesResponse/volumeSet' then @result << @volume
-            end
+        case name
+        when 'regionName'     then @item[:region_name]     = @text
+        when 'regionEndpoint' then @item[:region_endpoint] = @text
+        when 'item'           then @result                << @item
         end
       end
       def reset
@@ -1611,43 +607,27 @@ module RightAws
     end
 
   #-----------------------------------------------------------------
-  #      PARSERS: EBS - Snapshots
+  #      PARSERS: Account
   #-----------------------------------------------------------------
-  
-    class QEc2DescribeSnapshotsParser < RightAWSParser #:nodoc:
+
+    class QEc2DescribeAccountAttributesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @snapshot = {} if name == 'item'
-      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] = Time.parse(@text)
-          when 'progress'   then @snapshot[:aws_progress]   = @text
-          when 'item'       then @result                   << @snapshot
+        case name
+        when 'attributeValueSet' then @values = []
         end
       end
-      def reset
-        @result = []
-      end
-    end
-
-    class QEc2CreateSnapshotParser < RightAWSParser #:nodoc:
       def tagend(name)
-        case name 
-          when 'volumeId'   then @result[:aws_volume_id]  = @text
-          when 'snapshotId' then @result[:aws_id]         = @text
-          when 'status'     then @result[:aws_status]     = @text
-          when 'startTime'  then @result[:aws_started_at] = Time.parse(@text)
-          when 'progress'   then @result[:aws_progress]   = @text
+        case name
+        when 'attributeName'     then @name    = @text
+        when 'attributeValue'    then @values << @text
+        when 'attributeValueSet' then @result[@name] = (@values.size == 1) ? @values.first : @values
         end
       end
       def reset
         @result = {}
       end
     end
-    
+
   end
       
 end