right_aws 3.0.5 → 3.1.0

data/History.txt

@@ -340,7 +340,6 @@ the source key.
     - S3 Content-Type not set in Ruby 1.9.2
     - error in rds_interface describe_db_snapshots in Ruby 1.9.2
 
-
 === 3.0.4
   Release Notes:
   - Fixed:
@@ -356,3 +355,18 @@ the source key.
     - Support for "ami_version" added in emr interface (https://github.com/rightscale/right_aws/pull/129)
     - S3: Added block references to several methods (https://github.com/rightscale/right_aws/pull/130)
     - Some other minor changes
+
+=== 3.1.0
+  Release Notes:
+  - Added:
+    - EC2:
+      - hs1.8xlarge, cr1.8xlarge instance types
+      - API version '2012-10-01' support for ReservedInstances and ReservedInstancesOfferings
+      - API version '2012-10-15' for some of VPC calls (including new DescribeAccountAttributes)
+  - Removed:  UUID dependency
+  - Fixed:
+    - EC2:
+      - describe_reserved_instances_offerings was fixed to support pagination
+      - typo in create_vpc
+    - RDS: instances types list
+    - Some other minor bugs

data/README.txt

@@ -2,6 +2,9 @@
 
 Published by RightScale, Inc. under the MIT License.
 For information about RightScale, see http://www.rightscale.com
+Maintained by the RightScale “Orange_team”
+
+ Maintained by the RightScale "Orange_team"
 
 == DESCRIPTION:
 
@@ -141,7 +144,7 @@ sudo gem install right_aws
 
 == LICENSE:
 
-Copyright (c) 2007-2009 RightScale, Inc. 
+Copyright (c) 2007-2013 RightScale, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/awsbase/version.rb

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

data/lib/ec2/right_ec2.rb

@@ -93,10 +93,13 @@ module RightAws
                                  'm2.4xlarge',
                                  'm3.xlarge' ,
                                  'm3.2xlarge',
-                                'cc1.4xlarge',
-                                'cg1.4xlarge',
-                                'cc2.8xlarge',
-                                'hi1.4xlarge' ]
+                                 'cc1.4xlarge',
+                                 'cg1.4xlarge',
+                                 'cc2.8xlarge',
+                                 'hi1.4xlarge',
+                                 'hs1.8xlarge',
+                                 'cr1.8xlarge'
+                              ]
     
     @@bench = AwsBenchmarkingBlock.new
     def self.bench_xml
@@ -180,6 +183,30 @@ module RightAws
       on_exception
     end
 
+    # Incrementally lists given API call.
+    #
+    # All params are the same as for describe_resources_with_list_and_options call.
+    #
+    # 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
+
     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)
@@ -418,6 +445,27 @@ module RightAws
       describe_resources_with_list_and_options('DescribeRegions', 'RegionName', QEc2DescribeRegionsParser, list_and_options)
     end
 
+    #-----------------------------------------------------------------
+    #      Accounts
+    #-----------------------------------------------------------------
+
+    # Describe the specified attribute of your AWS account.
+    #
+    #  ec2.describe_account_attributes(:attribute_name => ['default-vpc','supported-platforms']) #=> 
+    #    {"default-vpc"         => "vpc-8c3b00e7",
+    #     "supported-platforms" => "VPC"}
+    #
+    #  ec2.describe_account_attributes #=>
+    #    {"vpc-max-security-groups-per-interface" => "5",
+    #     "max-instances"                         => "150",
+    #     "supported-platforms"                   => ["EC2", "VPC"],
+    #     "default-vpc"                           => "none"}
+    #
+    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
+
   #-----------------------------------------------------------------
   #      PARSERS: Key Pair
   #-----------------------------------------------------------------
@@ -557,7 +605,29 @@ module RightAws
         @result = []
       end
     end
-    
+
+  #-----------------------------------------------------------------
+  #      PARSERS: Account
+  #-----------------------------------------------------------------
+
+    class QEc2DescribeAccountAttributesParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case name
+        when 'attributeValueSet' then @values = []
+        end
+      end
+      def tagend(name)
+        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

data/lib/ec2/right_ec2_reserved_instances.rb

@@ -25,6 +25,8 @@ module RightAws
 
   class Ec2
 
+    RESERVED_INSTANCE_API_VERSION = (API_VERSION > '2012-10-01') ? API_VERSION : '2012-10-01'
+
   #-----------------------------------------------------------------
   #      Reserved instances
   #-----------------------------------------------------------------
@@ -37,25 +39,27 @@ module RightAws
     # reserved-instances-id, start, state, tag-key, tag-value, tag:key, usage-price
     #
     # ec2.describe_reserved_instances #=>
-    #  [{:currency_code=>"USD",
-    #    :aws_fixed_price=>350.0,
-    #    :aws_availability_zone=>"us-east-1c",
-    #    :aws_instance_count=>1,
-    #    :tags=>{},
-    #    :aws_id=>"4357912c-ad94-4f57-8625-15ca71a8e66d",
-    #    :aws_product_description=>"Linux/UNIX",
-    #    :aws_state=>"active",
-    #    :aws_start=>"2010-03-18T20:39:39.569Z",
-    #    :aws_duration=>94608000,
-    #    :aws_instance_type=>"m1.small",
-    #    :instance_tenancy=>"default",
-    #    :aws_usage_price=>0.03}]
+    #    [{:tags=>{},
+    #      :aws_id=>"4357912c-0000-0000-0000-15ca71a8e66d",
+    #      :aws_instance_type=>"m1.small",
+    #      :aws_availability_zone=>"us-east-1c",
+    #      :aws_start=>"2010-03-18T20:39:39.569Z",
+    #      :aws_duration=>94608000,
+    #      :aws_fixed_price=>350.0,
+    #      :aws_usage_price=>0.03,
+    #      :aws_instance_count=>1,
+    #      :aws_product_description=>"Linux/UNIX",
+    #      :aws_state=>"active",
+    #      :instance_tenancy=>"default",
+    #      :currency_code=>"USD",
+    #      :offering_type=>"Medium Utilization"}]
     #
     #  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)
+      list_and_options = merge_new_options_into_list_and_options(list_and_options, :options => {:api_version => RESERVED_INSTANCE_API_VERSION})
       describe_resources_with_list_and_options('DescribeReservedInstances', 'ReservedInstancesId', QEc2DescribeReservedInstancesParser, list_and_options)
     end
 
@@ -66,31 +70,60 @@ module RightAws
     # Filters: availability-zone, duration, fixed-price, instance-type, product-description, reserved-instances-offering-id, usage-price
     #
     #  ec2.describe_reserved_instances_offerings #=>
-    #    [{:currency_code=>"USD",
-    #      :aws_fixed_price=>700.0,
-    #      :aws_id=>"248e7b75-933c-451b-b126-be25865e02a5",
-    #      :aws_product_description=>"Linux/UNIX",
+    #    [{:recurring_charges=>[{:frequency=>"Hourly", :amount=>"0.095"}],
+    #      :pricing_details_set=>[],
+    #      :aws_id=>"438012d3-4031-43ff-9241-2964d1bf71d8",
     #      :aws_instance_type=>"c1.medium",
+    #      :aws_availability_zone=>"us-east-1e",
     #      :aws_duration=>94608000,
+    #      :aws_fixed_price=>775.0,
+    #      :aws_usage_price=>0.0,
+    #      :aws_product_description=>"Red Hat Enterprise Linux",
     #      :instance_tenancy=>"default",
-    #      :aws_usage_price=>0.06,
-    #      :aws_availability_zone=>"us-east-1a"},
-    #     {:currency_code=>"USD",
-    #      :aws_fixed_price=>700.0,
-    #      :aws_id=>"c48ab04c-7e03-46b2-891a-2df1116e51a3",
-    #      :aws_product_description=>"Linux/UNIX (Amazon VPC)",
+    #      :currency_code=>"USD",
+    #      :offering_type=>"Heavy Utilization",
+    #      :marketplace=>false},
+    #    { :recurring_charges=>[{:frequency=>"Hourly", :amount=>"0.095"}],
+    #      :pricing_details_set=>[],
+    #      :aws_id=>"649fd0c8-6cb4-47bf-83db-7a844016afa7",
     #      :aws_instance_type=>"c1.medium",
+    #      :aws_availability_zone=>"us-east-1e",
     #      :aws_duration=>94608000,
+    #      :aws_fixed_price=>775.0,
+    #      :aws_usage_price=>0.0,
+    #      :aws_product_description=>"Red Hat Enterprise Linux (Amazon VPC)",
     #      :instance_tenancy=>"default",
-    #      :aws_usage_price=>0.06,
-    #      :aws_availability_zone=>"us-east-1a"}, ... ]
-    #      
+    #      :currency_code=>"USD",
+    #      :offering_type=>"Heavy Utilization",
+    #      :marketplace=>false}, ... ]
+    #
     #  ec2.describe_reserved_instances_offerings(:filters => {'availability-zone' => 'us-east-1c'})
     #
+    #  # Get all ReservedInstancesOfferings (list by 50 items)
+    #  result = ec2.describe_reserved_instances_offerings(:max_results => 50) do |response|
+    #    puts response[:items].count
+    #    true
+    #  end
+    #
+    #  # Get first 400 ReservedInstancesOfferings.
+    #  # P.S. it stops making calls one the block below returns false.
+    #  max_count_to_get = 400
+    #  counter          = 0
+    #  result = ec2.describe_reserved_instances_offerings do |response|
+    #    counter += response[:items].count
+    #    max_count_to_get <= counter
+    #  end
+    #
     # 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)
+    def describe_reserved_instances_offerings(*list_and_options, &block)
+      result = []
+      list_and_options = merge_new_options_into_list_and_options(list_and_options, :options => {:api_version => RESERVED_INSTANCE_API_VERSION})
+      incrementally_list_items('DescribeReservedInstancesOfferings', 'ReservedInstancesOfferingId', QEc2DescribeReservedInstancesOfferingsParser, list_and_options) do |response|
+        result += response[:items]
+        block ? block.call(response) : true
+      end
+      result
     end
 
     # Purchase a Reserved Instance.
@@ -98,9 +131,14 @@ module RightAws
     #
     #  ec2.purchase_reserved_instances_offering('e5a2ff3b-f6eb-4b4e-83f8-b879d7060257', 3) # => '4b2293b4-5813-4cc8-9ce3-1957fc1dcfc8'
     #
-    def purchase_reserved_instances_offering(reserved_instances_offering_id, instance_count=1)
-      link = generate_request("PurchaseReservedInstancesOffering", { 'ReservedInstancesOfferingId' => reserved_instances_offering_id,
-                                                                     'InstanceCount'               => instance_count  })
+    def purchase_reserved_instances_offering(reserved_instances_offering_id, instance_count=1, options={})
+      options[:options]               ||= {}
+      options[:options][:api_version] ||= RESERVED_INSTANCE_API_VERSION
+
+      api_params = { 'ReservedInstancesOfferingId' => reserved_instances_offering_id,
+                     'InstanceCount'               => instance_count  }
+
+      link = generate_request("PurchaseReservedInstancesOffering", api_params, options)
       request_info(link, QEc2PurchaseReservedInstancesOfferingParser.new)
     rescue Exception
       on_exception
@@ -113,8 +151,9 @@ module RightAws
     class QEc2DescribeReservedInstancesParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
         case full_tag_name
-        when %r{/reservedInstancesSet/item$} then @item    = { :tags => {} }
-        when %r{/tagSet/item$}                        then @aws_tag = {}
+        when %r{/recurringCharges/item$}     then @recurring_charge = {}
+        when %r{/tagSet/item$}               then @aws_tag = {}
+        when %r{/reservedInstancesSet/item$} then @item    = { :tags=> {} }
         end
       end
       def tagend(name)
@@ -131,12 +170,16 @@ module RightAws
         when 'start'               then @item[:aws_start]               = @text
         when 'instanceTenancy'     then @item[:instance_tenancy]        = @text
         when 'currencyCode'        then @item[:currency_code]           = @text
+        when 'offeringType'        then @item[:offering_type]           = @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
+          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{/recurringCharges/item/frequency$} then @recurring_charge[:frequency] = @text
+          when %r{/recurringCharges/item/amount$}    then @recurring_charge[:amount]    = @text
+          when %r{/recurringCharges/item$}           then (@item[:recurring_charges]  ||= []) << @recurring_charge
+          when %r{/reservedInstancesSet/item$}       then @result                      << @item
           end
         end
       end
@@ -147,10 +190,15 @@ module RightAws
 
     class QEc2DescribeReservedInstancesOfferingsParser < RightAWSParser #:nodoc:
       def tagstart(name, attributes)
-        @item = {} if name == 'item'
+        case full_tag_name
+        when %r{/pricingDetailsSet/item$}             then @pricing_details  = {}
+        when %r{/recurringCharges/item$}              then @recurring_charge = {}
+        when %r{/reservedInstancesOfferingsSet/item$} then @item             = {}
         end
+      end
       def tagend(name)
         case name
+        when 'nextToken'                   then @result[:next_token]            = @text
         when 'reservedInstancesOfferingId' then @item[:aws_id]                  = @text
         when 'instanceType'                then @item[:aws_instance_type]       = @text
         when 'availabilityZone'            then @item[:aws_availability_zone]   = @text
@@ -160,11 +208,22 @@ module RightAws
         when 'instanceTenancy'             then @item[:instance_tenancy]        = @text
         when 'currencyCode'                then @item[:currency_code]           = @text
         when 'productDescription'          then @item[:aws_product_description] = @text
-        when 'item'                        then @result << @item
-        end
+        when 'offeringType'                then @item[:offering_type]           = @text
+        when 'marketplace'                 then @item[:marketplace]             = (@text == 'true')
+        else
+          case full_tag_name
+          when %r{/recurringCharges/item/frequency$}    then @recurring_charge[:frequency]  = @text
+          when %r{/recurringCharges/item/amount$}       then @recurring_charge[:amount]     = @text
+          when %r{/recurringCharges/item$}              then (@item[:recurring_charges]   ||= []) << @recurring_charge
+          when %r{/pricingDetailsSet/item/price$}       then @pricing_details[:price]       = @text
+          when %r{/pricingDetailsSet/item/count$}       then @pricing_details[:count]       = @text
+          when %r{/pricingDetailsSet/item$}             then (@item[:pricing_details_set] ||= []) << @pricing_details
+          when %r{/reservedInstancesOfferingsSet/item$} then @result[:items] << @item
+          end
         end
+      end
       def reset
-        @result = []
+        @result = { :items => [] }
       end
     end
 

data/lib/ec2/right_ec2_vpc.rb

@@ -25,6 +25,9 @@ module RightAws
 
   class Ec2
 
+
+    VPC_API_VERSION = (API_VERSION > '2012-10-15') ? API_VERSION : '2012-10-15'
+
   public
 
     #-----------------
@@ -54,6 +57,7 @@ module RightAws
     # P.S. filters: http://docs.amazonwebservices.com/AmazonVPC/latest/APIReference/index.html?ApiReference-query-DescribeVpcs.html
     #
     def describe_vpcs(*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('DescribeVpcs', 'VpcId', QEc2DescribeVpcsParser, list_and_options)
     end
 
@@ -67,7 +71,7 @@ module RightAws
     #
     def create_vpc(cidr_block, options = {})
       request_hash = {'CidrBlock' => cidr_block}
-      request_hash['instanceTenancy'] = options[:instance_tenancy] unless options[:instance_tenancy].right_blank?
+      request_hash['InstanceTenancy'] = options[:instance_tenancy] unless options[:instance_tenancy].right_blank?
       link = generate_request("CreateVpc", request_hash )
       request_info(link, QEc2DescribeVpcsParser.new(:logger => @logger)).first
     rescue Exception
@@ -108,6 +112,7 @@ module RightAws
     # P.S. filters: http://docs.amazonwebservices.com/AmazonVPC/latest/APIReference/index.html?ApiReference-query-DescribeSubnets.html
     #
     def describe_subnets(*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('DescribeSubnets', 'SubnetId', QEc2DescribeSubnetsParser, list_and_options)
     end
 
@@ -418,6 +423,7 @@ module RightAws
         when 'dhcpOptionsId'   then @item[:dhcp_options_id] = @text
         when 'cidrBlock'       then @item[:cidr_block]      = @text
         when 'instanceTenancy' then @item[:instance_tenancy] = @text
+        when 'isDefault'       then @item[:is_default]      = @text == 'true'
         else
           case full_tag_name
           when %r{/tagSet/item/key$}   then @aws_tag[:key]               = @text
@@ -447,6 +453,8 @@ module RightAws
         when 'cidrBlock'               then @item[:cidr_block]                 = @text
         when 'availabilityZone'        then @item[:availability_zone]          = @text
         when 'availableIpAddressCount' then @item[:available_ip_address_count] = @text
+        when 'defaultForAz'            then @item[:default_for_az]             = @text == 'true'
+        when 'mapPublicIpOnLaunch'     then @item[:map_public_ip_on_launch]    = @text == 'true'
         else
           case full_tag_name
           when %r{/tagSet/item/key$}   then @aws_tag[:key]               = @text

data/lib/rds/right_rds_interface.rb

@@ -27,14 +27,21 @@ module RightAws
     
     include RightAwsBaseInterface
 
-    API_VERSION      = "2011-04-01"
+    API_VERSION      = "2012-09-17"
     DEFAULT_HOST     = 'rds.amazonaws.com'
     DEFAULT_PORT     = 443
     DEFAULT_PROTOCOL = 'https'
     DEFAULT_PATH     = '/'
 
     DEFAULT_INSTANCE_CLASS   =  'db.m1.small'
-    INSTANCE_CLASSES         = ['db.m1.small', 'db.m1.large', 'db.m1.xlarge', 'db.m2.2xlarge', 'db.m2.2xlarge', 'db.m2.4xlarge']
+    INSTANCE_CLASSES         = [ 'db.t1.micro',
+                                 'db.m1.small',
+                                 'db.m1.medium',
+                                 'db.m1.large',
+                                 'db.m1.xlarge',
+                                 'db.m2.xlarge',
+                                 'db.m2.2xlarge',
+                                 'db.m2.4xlarge']
     LICENSE_MODELS           = ['bring-your-own-license', 'license-included', 'general-public-license']
 
     @@bench = AwsBenchmarkingBlock.new
@@ -177,7 +184,7 @@ module RightAws
     # Optional params: +:allocated_storage+ (25 by def), +:instance_class+, +:engine+ ('MySQL' by def),
     # +:endpoint_port+, +:db_name+, +:db_security_groups+, +:db_parameter_group+,  +:availability_zone+, +:preferred_maintenance_window+
     # +:backup_retention_period+, +:preferred_backup_window+, +:multi_az+, +:engine_version+, +:auto_minor_version_upgrade+,
-    # +:license_model+
+    # +:license_model+, +:iops+, +:db_subnet_group_name+, +:character_set_name+, +:option_group_name+
     #
     #   rds.create_db_instance('kd-delete-me-01', 'username', 'password',
     #                           :instance_class    => 'db.m1.small',
@@ -222,6 +229,10 @@ module RightAws
       request_hash['EngineVersion']              = params[:engine_version]                  unless params[:engine_version].right_blank?
       request_hash['AutoMinorVersionUpgrade']    = params[:auto_minor_version_upgrade].to_s unless params[:auto_minor_version_upgrade].nil?
       request_hash['LicenseModel']               = params[:license_model]                   unless params[:license_model].right_blank?
+      request_hash['CharacterSetName']           = params[:character_set_name]              unless params[:character_set_name].right_blank?
+      request_hash['DBSubnetGroupName']          = params[:db_subnet_group_name]            unless params[:db_subnet_group_name].right_blank?
+      request_hash['Iops']                       = params[:iops]                            unless params[:iops].right_blank?
+      request_hash['OptionGroupName']            = params[:option_group_name]               unless params[:option_group_name].right_blank?
       request_hash.merge!(amazonize_list('DBSecurityGroups.member',  params[:db_security_groups]))
       link = generate_request('CreateDBInstance', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
@@ -233,7 +244,7 @@ module RightAws
     # Optional params: +:master_user_password+, +:instance_class+, +:db_security_groups+,
     # +:db_parameter_group+, +:preferred_maintenance_window+, +:allocated_storage+, +:apply_immediately+,
     # +:backup_retention_period+, +:preferred_backup_window+, +:multi_az+, +:engine_version+,
-    # +:auto_minor_version_upgrade+, +:allow_major_version_upgrade+
+    # +:auto_minor_version_upgrade+, +:allow_major_version_upgrade+, +:iops+, +::option_group_name+
     #
     #    rds.modify_db_instance('kd-delete-me-01',
     #                           :master_user_password => 'newpassword',
@@ -286,12 +297,16 @@ module RightAws
       request_hash['ApplyImmediately']           = params[:apply_immediately].to_s          unless params[:apply_immediately].right_blank?
       request_hash.merge!(amazonize_list('DBSecurityGroups.member',  params[:db_security_groups]))
       request_hash['DBParameterGroupName']       = params[:db_parameter_group]              unless params[:db_parameter_group].right_blank?
+      request_hash['Iops']                       = params[:iops]                            unless params[:iops].right_blank?
+      request_hash['OptionGroupName']            = params[:option_group_name]               unless params[:option_group_name].right_blank?
       link = generate_request('ModifyDBInstance', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
     end
 
     # Reboot Db instance.
     #
+    # Options: +:force_failover+
+    #
     #  rds.reboot_db_instance('kd-my-awesome-db') #=>
     #    {:status=>"rebooting",
     #     :pending_modified_values=>{},
@@ -305,9 +320,12 @@ module RightAws
     #     :engine=>"MySQL5.1",
     #     :preferred_maintenance_window=>"Sun:05:00-Sun:09:00"}
     #
+    # P.S. http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_RebootDBInstance.html
+    #
     def reboot_db_instance(aws_id, params={})
       params = params.dup
       params['DBInstanceIdentifier'] = aws_id
+      params['ForceFailover']        = !!params[:force_failover] if params.has_key?(:force_failover)
       link = generate_request('RebootDBInstance', params)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
     end
@@ -382,6 +400,8 @@ module RightAws
     # Create a database security group so that ingress to an RDS Instance can be controlled.
     # A new security group cannot have the same name as an existing group.
     #
+    # Options: :vpc_id
+    #
     #  ds.create_db_security_group('kd3', 'kd') #=>
     #    {:ec2_security_groups=>[],
     #     :description=>"kd",
@@ -389,9 +409,11 @@ module RightAws
     #     :name=>"kd3",
     #     :owner_id=>"82...25"}
     #
-    def create_db_security_group(db_security_group_name, db_security_group_description)
-      link = generate_request('CreateDBSecurityGroup', 'DBSecurityGroupName'        => db_security_group_name,
-                                                       'DBSecurityGroupDescription' => db_security_group_description)
+    def create_db_security_group(db_security_group_name, db_security_group_description, params={})
+      request_hash = { 'DBSecurityGroupName'        => db_security_group_name,
+                       'DBSecurityGroupDescription' => db_security_group_description }
+      request_hash['EC2VpcId'] = params[:vpc_id] unless params[:vpc_id].right_blank?
+      link = generate_request('CreateDBSecurityGroup', request_hash)
       request_info(link, DescribeDbSecurityGroupsParser.new(:logger => @logger))[:db_security_groups].first
     end
 
@@ -400,6 +422,7 @@ module RightAws
       request_hash['CIDRIP']                  = params[:cidrip]                   unless params[:cidrip].right_blank?
       request_hash['EC2SecurityGroupName']    = params[:ec2_security_group_name]  unless params[:ec2_security_group_name].right_blank?
       request_hash['EC2SecurityGroupOwnerId'] = params[:ec2_security_group_owner] unless params[:ec2_security_group_owner].right_blank?
+      request_hash['EC2SecurityGroupId']      = params[:ec2_security_group_id]    unless params[:ec2_security_group_id].right_blank?
       link = generate_request(action, request_hash)
       request_info(link, DescribeDbSecurityGroupsParser.new(:logger => @logger))[:db_security_groups].first
     end
@@ -640,7 +663,7 @@ module RightAws
     end
 
     # Describe a list of orderable DB Instance options for the specified engine.
-    # Optionals: +:instance_class+, +:engine_version+ , +:license_model+
+    # Optionals: +:instance_class+, +:engine_version+ , +:license_model+, +:vpc+
     #
     #  rds.describe_orderable_db_instance_options('oracle-ee', :engine_version => '11.2.0.2.v2') #=>
     #    [{:read_replica_capable=>false,
@@ -654,8 +677,9 @@ module RightAws
     def describe_orderable_db_instance_options(engine, params={}, &block)
       request_hash = { 'Engine' => engine }
       request_hash['DBInstanceClass'] = params[:instance_class] unless params[:instance_class].right_blank?
-      request_hash['EngineVersion']   = params[:engine_version]    unless params[:engine_version].right_blank?
-      request_hash['LicenseModel']    = params[:license_model]     unless params[:license_model].right_blank?
+      request_hash['EngineVersion']   = params[:engine_version] unless params[:engine_version].right_blank?
+      request_hash['LicenseModel']    = params[:license_model]  unless params[:license_model].right_blank?
+      request_hash['Vpc']             = !!params[:vpc]          if     params.has_key?(:vpc)
       result = []
       incrementally_list_items('DescribeOrderableDBInstanceOptions', DescribeOrderableDBInstanceOptionsParser, request_hash) do |response|
         result += response[:items]
@@ -745,7 +769,8 @@ module RightAws
     # in the "Available" state. The new RDS instance is created with the Default security group.
     #
     # Optional params: +:instance_class+, +:endpoint_port+, +:availability_zone+, +:multi_az+,
-    # +:auto_minor_version_upgrade+, +:license_model+, +:db_name+, +:engine+
+    # +:auto_minor_version_upgrade+, +:license_model+, +:db_name+, +:engine+, +:db_subnet_group_name+,
+    # +:iops+, +:option_group_name+
     #
     #  rds.restore_db_instance_from_db_snapshot('ahahahaha-final-snapshot-20090828081159', 'q1') #=>
     #    {:status=>"creating",
@@ -772,6 +797,9 @@ module RightAws
       request_hash['LicenseModel']            = params[:license_model]              unless params[:license_model].right_blank?
       request_hash['DBName']                  = params[:db_name]                    unless params[:db_name].right_blank?
       request_hash['Engine']                  = params[:engine]                     unless params[:enginel].right_blank?
+      request_hash['DBSubnetGroupName']       = params[:db_subnet_group_name]       unless params[:db_subnet_group_name].right_blank?
+      request_hash['Iops']                    = params[:iops]                       unless params[:iops].right_blank?
+      request_hash['OptionGroupName']         = params[:option_group_name]          unless params[:option_group_name].right_blank?
       link = generate_request('RestoreDBInstanceFromDBSnapshot', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
     end
@@ -783,6 +811,7 @@ module RightAws
     #
     # Optional params: +:instance_class+, +:endpoint_port+, +:availability_zone+, +:multi_az+, +:restore_time+,
     # +:auto_minor_version_upgrade+, +:use_latest_restorable_time+, +:license_model+, +:db_name+, +:engine+
+    # +:db_subnet_group_name+, +:iops+, +:option_group_name+
     #
     def restore_db_instance_to_point_in_time(instance_aws_id, new_instance_aws_id, params={})
       request_hash = { 'SourceDBInstanceIdentifier' => instance_aws_id,
@@ -797,6 +826,9 @@ module RightAws
       request_hash['LicenseModel']            = params[:license_model]              unless params[:license_model].right_blank?
       request_hash['DBName']                  = params[:db_name]                    unless params[:db_name].right_blank?
       request_hash['Engine']                  = params[:engine]                     unless params[:enginel].right_blank?
+      request_hash['DBSubnetGroupName']       = params[:db_subnet_group_name]       unless params[:db_subnet_group_name].right_blank?
+      request_hash['Iops']                    = params[:iops]                       unless params[:iops].right_blank?
+      request_hash['OptionGroupName']         = params[:option_group_name]          unless params[:option_group_name].right_blank?
       link = generate_request('RestoreDBInstanceToPointInTime', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
     end
@@ -875,7 +907,7 @@ module RightAws
     # --------------------------------------------
 
     # Get a list of the available DB engines.
-    # Optional params: +:db_parameter_group_family+, +:default_only+, +:engine+, +:engine_version+
+    # Optional params: +:db_parameter_group_family+, +:default_only+, +:engine+, +:engine_version+. +:engine_version+
     #
     #  rds.describe_db_engine_versions #=>
     #    [{:db_parameter_group_family=>"mysql5.1",
@@ -890,12 +922,41 @@ module RightAws
     #       "Oracle Standard Edition One - DB Engine Version 11.2.0.2.v2",
     #      :engine_version=>"11.2.0.2.v2"}]
     #
+    #  rds.describe_db_engine_versions(:list_supported_character_sets => true) #=> 
+    #    [{:db_parameter_group_family=>"mysql5.1",
+    #      :engine=>"mysql",
+    #      :db_engine_description=>"MySQL Community Edition",
+    #      :engine_version=>"5.1.45",
+    #      :db_engine_version_description=>"MySQL 5.1.45"},
+    #     {:db_parameter_group_family=>"oracle-ee-11.2",
+    #      :engine=>"oracle-ee",
+    #      :supported_character_sets=>
+    #       [{:name=>"AL32UTF8",
+    #         :description=>"Unicode 5.0 UTF-8 Universal character set"},
+    #        {:name=>"JA16EUC", :description=>"EUC 24-bit Japanese"},
+    #        {:name=>"JA16EUCTILDE",
+    #         :description=>
+    #          "The same as JA16EUC except for the way that the wave dash and the tilde are mapped to and from Unicode."},
+    #        {:name=>"JA16SJIS", :description=>"Shift-JIS 16-bit Japanese"},
+    #        {:name=>"WE8ISO8859P9",
+    #         :description=>"ISO 8859-9 West European and Turkish"},
+    #        {:name=>"US7ASCII", :description=>"ASCII 7-bit American"}],
+    #      :db_engine_description=>"Oracle Database Enterprise Edition",
+    #      :default_character_set=>
+    #       {:name=>"AL32UTF8",
+    #        :description=>"Unicode 5.0 UTF-8 Universal character set"},
+    #      :engine_version=>"11.2.0.2.v3",
+    #      :db_engine_version_description=>"Oracle 11.2.0.2.v3"}, ... ]
+    #
+    # P.S. http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_DescribeDBEngineVersions.html
+    #
     def describe_db_engine_versions(params={}, &block)
       params = params.dup
       params['DBParameterGroupFamily'] = params.delete(:db_parameter_group_family) unless params[:db_parameter_group_family].right_blank?
       params['DefaultOnly']            = params.delete(:default_only).to_s         unless params[:default_only].nil?
       params['Engine']                 = params.delete(:engine)                    unless params[:engine].right_blank?
       params['EngineVersion']          = params.delete(:engine_version)            unless params[:engine_version].right_blank?
+      params['ListSupportedCharacterSets'] = !!params.delete(:list_supported_character_sets) if params.has_key?(:list_supported_character_sets)
       result = []
       incrementally_list_items('DescribeDBEngineVersions', DescribeDBEngineVersionsParser, params) do |response|
         result += response[:db_engine_versions]
@@ -910,7 +971,8 @@ module RightAws
 
     # Create a DB Instance that acts as a Read Replica of a source DB Instance.
     #
-    # Optional params: +:endpoint_port+, +:availability_zone+, +:instance_class+, +:auto_minor_version_upgrade+
+    # Optional params: +:endpoint_port+, +:availability_zone+, +:instance_class+, +:auto_minor_version_upgrade+,
+    # +:iops+, +:option_group_name+
     #
     #    rds.create_db_instance_read_replica('kd-delete-me-01-replica-01', 'kd-delete-me-01',
     #                                        :instance_class => 'db.m1.small',
@@ -941,6 +1003,8 @@ module RightAws
       request_hash['AvailabilityZone']        = params[:availability_zone]               unless params[:availability_zone].right_blank?
       request_hash['DBInstanceClass']         = params[:instance_class]                  unless params[:instance_class].right_blank?
       request_hash['AutoMinorVersionUpgrade'] = params[:auto_minor_version_upgrade].to_s unless params[:auto_minor_version_upgrade].nil?
+      request_hash['Iops']                    = params[:iops]                            unless params[:iops].right_blank?
+      request_hash['OptionGroupName']         = params[:option_group_name]               unless params[:option_group_name].right_blank?
       link = generate_request('CreateDBInstanceReadReplica', request_hash)
       request_info(link, DescribeDbInstancesParser.new(:logger => @logger))[:db_instances].first
     end
@@ -954,22 +1018,26 @@ module RightAws
     # Options: :aws_id, :instance_class, :duration, :product_description, :multi_az
     #
     #  rds.describe_reserved_db_instances_offerings #=>
-    #    [{:usage_price=>0.262,
-    #      :offering_aws_id=>"248e7b75-2451-4381-9025-b5553d421c7b",
-    #      :multi_az=>false,
-    #      :duration=>31536000,
-    #      :currency_code=>"USD",
-    #      :instance_class=>"db.m2.xlarge",
-    #      :product_description=>"mysql",
-    #      :fixed_price=>1325.0},
-    #     {:usage_price=>0.092,
-    #      :offering_aws_id=>"248e7b75-49a7-4cd7-9a9b-354f4906a9b1",
-    #      :multi_az=>true,
-    #      :duration=>94608000,
-    #      :currency_code=>"USD",
-    #      :instance_class=>"db.m1.small",
-    #      :product_description=>"mysql",
-    #      :fixed_price=>700.0},   ...]
+    #    [{:recurring_charges=>[],
+    #        :offering_type=>"Medium Utilization",
+    #        :duration=>94608000,
+    #        :currency_code=>"USD",
+    #        :fixed_price=>82.0,
+    #        :product_description=>"oracle-se(byol)",
+    #        :usage_price=>0.01,
+    #        :aws_id=>"248e7b75-01ff-4f1d-8fad-918b76337c13",
+    #        :multi_az=>false,
+    #        :instance_class=>"db.t1.micro"},
+    #      {:recurring_charges=>[{:frequency=>"Hourly", :amount=>"0.24"}],
+    #        :offering_type=>"Heavy Utilization",
+    #        :duration=>31536000,
+    #        :currency_code=>"USD",
+    #        :fixed_price=>1040.0,
+    #        :product_description=>"sqlserver-web(li)",
+    #        :usage_price=>0.0,
+    #        :aws_id=>"248e7b75-05eb-46df-a7b8-4117b5001667",
+    #        :multi_az=>false,
+    #        :instance_class=>"db.m2.xlarge"}, ... ]
     #
     #  rds.describe_reserved_db_instances_offerings(:aws_id => "248e7b75-49a7-4cd7-9a9b-354f4906a9b1") #=>
     #    [{:duration=>94608000,
@@ -1038,7 +1106,124 @@ module RightAws
       link = generate_request('PurchaseReservedDBInstancesOffering', request_hash)
       request_info(link, DescribeReservedDBInstancesParser.new(:logger => @logger))[:reserved_db_instances].first
     end
-    
+
+    #---------------------------------------------
+    #  Subnet Groups
+    #---------------------------------------------
+
+    # Lists available DB Subnet Groups.
+    # Options: :name, :max_records, :marker
+    #
+    #  rds.describe_db_subnet_groups #=>
+    #    [{:subnets=>
+    #       [{:availability_zone=>
+    #          {:name=>"us-east-1d", :provisioned_iops_capable=>false},
+    #         :status=>"Active",
+    #         :subnet_id=>"subnet-5259d03a"},
+    #        {:availability_zone=>
+    #          {:name=>"us-east-1a", :provisioned_iops_capable=>false},
+    #         :status=>"Active",
+    #         :subnet_id=>"subnet-eb518f83"}],
+    #      :vpc_id=>"vpc-10518f78",
+    #      :status=>"Complete",
+    #      :description=>"delete me please",
+    #      :name=>"kd-subnet-group"},
+    #     {:subnets=>
+    #       [{:availability_zone=>
+    #          {:name=>"us-east-1a", :provisioned_iops_capable=>false},
+    #         :status=>"Active",
+    #         :subnet_id=>"subnet-eb518f83"},
+    #        {:availability_zone=>
+    #          {:name=>"us-east-1d", :provisioned_iops_capable=>false},
+    #         :status=>"Active",
+    #         :subnet_id=>"subnet-5259d03a"}],
+    #      :vpc_id=>"vpc-10518f78",
+    #      :status=>"Complete",
+    #      :description=>"delete me please",
+    #      :name=>"kd-subnet-group-1"}]
+    #
+    # P.S. http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_DescribeDBSubnetGroups.html
+    #
+    def describe_db_subnet_groups(params={}, &block)
+      params = params.dup
+      params['DBSubnetGroupName'] = params.delete(:name) unless params[:name].right_blank?
+      result = []
+      incrementally_list_items('DescribeDBSubnetGroups', DescribeDBSubnetGroupsParser, params) do |response|
+        result += response[:subnet_groups]
+        block ? block.call(response) : true
+      end
+      result
+    end
+
+    def get_db_subnet_group(group_name, &block)
+      describe_db_subnet_groups(:name => group_name, &block)
+    end
+
+    # Create a new DB Subnet Group.
+    #
+    #  rds.create_db_subnet_group('kd-subnet-group-1', ['subnet-5259d03a', 'subnet-eb518f83'], 'delete me please') #=>
+    #    {:subnets=>
+    #      [{:availability_zone=>
+    #         {:name=>"us-east-1a", :provisioned_iops_capable=>false},
+    #        :status=>"Active",
+    #        :subnet_id=>"subnet-eb518f83"},
+    #       {:availability_zone=>
+    #         {:name=>"us-east-1d", :provisioned_iops_capable=>false},
+    #        :status=>"Active",
+    #        :subnet_id=>"subnet-5259d03a"}],
+    #     :vpc_id=>"vpc-10518f78",
+    #     :status=>"Complete",
+    #     :description=>"delete me please",
+    #     :name=>"kd-subnet-group-1"}
+    #
+    # P.S. http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_CreateDBSubnetGroup.html
+    #
+    def create_db_subnet_group(subnet_group_name, subnets, subnet_group_description = '-')
+      request_hash = { 'DBSubnetGroupName'        => subnet_group_name,
+                       'DBSubnetGroupDescription' => subnet_group_description }
+      request_hash.merge!(amazonize_list('SubnetIds.member',  subnets))
+      link = generate_request('CreateDBSubnetGroup', request_hash)
+      request_info(link, DescribeDBSubnetGroupsParser.new(:logger => @logger))[:subnet_groups].first
+    end
+
+    # Modify an existing DB Subnet Group.
+    #
+    #  rds.modify_db_subnet_group('kd-subnet-group', ['subnet-5259d03a', 'subnet-eb518f83'], 'hahaha!') #=>
+    #    {:subnets=>
+    #      [{:availability_zone=>
+    #         {:name=>"us-east-1d", :provisioned_iops_capable=>false},
+    #        :status=>"Active",
+    #        :subnet_id=>"subnet-5259d03a"},
+    #       {:availability_zone=>
+    #         {:name=>"us-east-1a", :provisioned_iops_capable=>false},
+    #        :status=>"Active",
+    #        :subnet_id=>"subnet-eb518f83"}],
+    #     :vpc_id=>"vpc-10518f78",
+    #     :status=>"Complete",
+    #     :description=>"hahaha!",
+    #     :name=>"kd-subnet-group"}
+    #
+    # P.S. http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_ModifyDBSubnetGroup.html
+    #
+    def modify_db_subnet_group(subnet_group_name, subnets, subnet_group_description = '')
+      request_hash = { 'DBSubnetGroupName' => subnet_group_name}
+      request_hash['DBSubnetGroupDescription'] = subnet_group_description unless subnet_group_description.right_blank?
+      request_hash.merge!(amazonize_list('SubnetIds.member',  subnets))
+      link = generate_request('ModifyDBSubnetGroup', request_hash)
+      request_info(link, DescribeDBSubnetGroupsParser.new(:logger => @logger))[:subnet_groups].first
+    end
+
+    # Delete a DB Subnet Group.
+    #
+    #  rds.delete_db_subnet_group("kd-subnet-group-1") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_DeleteDBSubnetGroup.html
+    #
+    def delete_db_subnet_group(name)
+      link = generate_request('DeleteDBSubnetGroup', 'DBSubnetGroupName' => name)
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    end
+
     # --------------------------------------------
     #  Parsers
     # --------------------------------------------
@@ -1053,8 +1238,13 @@ module RightAws
       end
       def tagstart(name, attributes)
         case name
-        when 'DBInstance'             then @item = { :db_security_groups => [], :pending_modified_values => {}, :read_replica_db_instance_identifiers => [] }
+        when 'DBInstance'             then @item = { :db_security_groups                   => [],
+                                                     :pending_modified_values              => {},
+                                                     :read_replica_db_instance_identifiers => [],
+                                                     :option_group_membership              => {} }
         when 'DBSecurityGroup'        then @db_security_group = {}
+        when 'DBSubnetGroup'          then @item[:db_subnet_group] = {}
+        when 'Subnet'                 then @subnet = { :availability_zone => {} }
         when 'DBParameterGroup',
              'DBParameterGroupStatus' then @db_parameter_group = {}
         end
@@ -1074,10 +1264,10 @@ module RightAws
         when 'LatestRestorableTime'                  then @item[:latest_restorable_time] = @text
         when 'LicenseModel'                          then @item[:license_model]          = @text
         when 'DBName'                                then @item[:db_name]                = @text
+        when 'Iops'                                  then @item[:iops]                   = @text
+        when 'CharacterSetName'                      then @item[:character_set_name]     = @text
         when 'ReadReplicaSourceDBInstanceIdentifier' then @item[:read_replica_source_db_instance_identifier] = @text
         when 'ReadReplicaDBInstanceIdentifier'       then @item[:read_replica_db_instance_identifiers]      << @text
-        when 'DBSecurityGroupName'                   then @db_security_group[:name]             = @text
-        when 'Status'                                then @db_security_group[:status]           = @text
         when 'DBParameterGroupName'                  then @db_parameter_group[:name]            = @text
         when 'ParameterApplyStatus'                  then @db_parameter_group[:status]          = @text
         when 'DBSecurityGroup'                       then @item[:db_security_groups] << @db_security_group
@@ -1105,6 +1295,19 @@ module RightAws
           when %r{PendingModifiedValues/EngineVersion$}              then @item[:pending_modified_values][:engine_version]               = @text
           when %r{PendingModifiedValues/AutoMinorVersionUpgrade$}    then @item[:pending_modified_values][:auto_minor_version_upgrade]   = (@text == 'true')
           when %r{PendingModifiedValues/AllowMajorVersionUpgrade$}   then @item[:pending_modified_values][:allow_major_version_upgrade]  = (@text == 'true')
+          when %r{OptionGroupMembership/Status$}                     then @item[:option_group_membership][:status] = @text
+          when %r{OptionGroupMembership/OptionGroupName$}            then @item[:option_group_membership][:name]   = @text
+          when %r{DBSecurityGroup/Status$}                           then @db_security_group[:status]           = @text
+          when %r{DBSecurityGroup/DBSecurityGroupName$}              then @db_security_group[:name]             = @text
+          when %r{DBSubnetGroup/DBSubnetGroupDescription$}           then @item[:db_subnet_group][:description]        = @text
+          when %r{DBSubnetGroup/DBSubnetGroupName$}                  then @item[:db_subnet_group][:name]               = @text
+          when %r{DBSubnetGroup/SubnetGroupStatus$}                  then @item[:db_subnet_group][:status]             = @text
+          when %r{Subnet/SubnetIdentifier$}                          then @subnet[:subnet_id]                = @text
+          when %r{Subnet/SubnetStatus$}                              then @subnet[:status]                   = @text
+          when %r{Subnet/AvailabilityZone/Name$}                     then @subnet[:availability_zone][:name] = @text
+          when %r{Subnet/AvailabilityZone/ProvisionedIopsCapable$}   then @subnet[:availability_zone][:provisioned_iops_capable] = @text == 'true'
+          when %r{DBSubnetGroup/Subnet$}                             then (@item[:db_subnet_group][:subnets] ||= [])  << @subnet
+          when %r{DBSubnetGroup/VpcId$}                              then @item[:db_subnet_group][:vpc_id]             = @text
           end
         end
       end
@@ -1129,6 +1332,7 @@ module RightAws
         when 'LicenseModel'               then @item[:license_model]        = @text
         when 'MultiAZCapable'             then @item[:multi_az_capable]     = @text
         when 'ReadReplicaCapable'         then @item[:read_replica_capable] = @text == 'true'
+        when 'Vpc'                        then @item[:vpc]                  = @text == 'true'
         when 'Name'                       then @item[:availability_zones]  << @text
         when 'OrderableDBInstanceOption'  then @result[:items]             << @item
         end
@@ -1157,11 +1361,13 @@ module RightAws
         when 'DBSecurityGroupDescription' then @item[:description ]           = @text
         when 'OwnerId'                    then @item[:owner_id]               = @text
         when 'DBSecurityGroupName'        then @item[:name]                   = @text
+        when 'EC2SecurityGroupId'         then @ec2_security_group[:group_id] = @text
         when 'EC2SecurityGroupName'       then @ec2_security_group[:name]     = @text
         when 'EC2SecurityGroupOwnerId'    then @ec2_security_group[:owner_id] = @text
         when 'CIDRIP'                     then @ip_range[:cidrip]             = @text
         when 'IPRange'                    then @item[:ip_ranges]             << @ip_range
         when 'EC2SecurityGroup'           then @item[:ec2_security_groups]   << @ec2_security_group
+        when 'VpcId'                      then @item[:vpc_id]                 = @text
         when 'DBSecurityGroup'
           # Sort the ip_ranges and ec2_security_groups
           @item[:ip_ranges].sort!{ |i1,i2| "#{i1[:cidrip]}" <=> "#{i2[:cidrip]}" }
@@ -1262,6 +1468,9 @@ module RightAws
         when 'DBInstanceIdentifier' then @item[:instance_aws_id]      = @text
         when 'DBSnapshotIdentifier' then @item[:aws_id]               = @text
         when 'LicenseModel'         then @item[:license_model]        = @text
+        when 'Iops'                 then @item[:iops]                 = @text
+        when 'SnapshotType'         then @item[:snapshot_type]        = @text
+        when 'VpcId'                then @item[:vpc_id]               = @text
         when 'DBSnapshot'           then @result[:db_snapshots]      << @item
         end
       end
@@ -1294,7 +1503,7 @@ module RightAws
     end
 
     # --------------------------------------------
-    #  DB Events
+    #  DB Engine Versions
     # --------------------------------------------
 
     class DescribeDBEngineVersionsParser < RightAWSParser # :nodoc:
@@ -1304,6 +1513,11 @@ module RightAws
       def tagstart(name, attributes)
         case name
         when 'DBEngineVersion' then @item = {}
+        else
+          case full_tag_name
+          when %r{DefaultCharacterSet$}    then @item[:default_character_set] = {}
+          when %r{SupportedCharacterSets/CharacterSet$} then @set = {}
+          end
         end
       end
       def tagend(name)
@@ -1316,6 +1530,14 @@ module RightAws
         when 'DBEngineDescription'    then @item[:db_engine_description]     = @text
         when 'DBEngineVersionDescription' then @item[:db_engine_version_description] = @text
         when 'DBEngineVersion'        then @result[:db_engine_versions]     << @item
+        else
+          case full_tag_name
+          when %r{DefaultCharacterSet/CharacterSetDescription$}    then @item[:default_character_set][:description] = @text
+          when %r{DefaultCharacterSet/CharacterSetName$}           then @item[:default_character_set][:name]        = @text
+          when %r{SupportedCharacterSets/CharacterSet/CharacterSetDescription$} then @set[:description] = @text
+          when %r{SupportedCharacterSets/CharacterSet/CharacterSetName$}        then @set[:name]        = @text
+          when %r{SupportedCharacterSets/CharacterSet$}                         then (@item[:supported_character_sets] ||= []) << @set
+          end
         end
       end
     end
@@ -1330,7 +1552,8 @@ module RightAws
       end
       def tagstart(name, attributes)
         case name
-        when 'ReservedDBInstancesOffering' then @item = {}
+        when 'ReservedDBInstancesOffering' then @item = { :recurring_charges => [] }
+        when 'RecurringCharge'             then @recurring_charge = {}
         end
       end
       def tagend(name)
@@ -1344,8 +1567,15 @@ module RightAws
         when 'UsagePrice'                    then @item[:usage_price]         = @text.to_f
         when 'MultiAZ'                       then @item[:multi_az]            = (@text == 'true')
         when 'ProductDescription'            then @item[:product_description] = @text
+        when 'OfferingType'                  then @item[:offering_type]       = @text
         when 'ReservedDBInstancesOfferingId' then @item[:aws_id]              = @text
+        when 'RecurringCharge'               then @item[:recurring_charges]  << @recurring_charge
         when 'ReservedDBInstancesOffering'   then @result[:reserved_db_instances_offerings] << @item
+        else
+          case full_tag_name
+          when %r{RecurringCharge/RecurringChargeAmount$}    then @recurring_charge[:amount]    = @text
+          when %r{RecurringCharge/RecurringChargeFrequency$} then @recurring_charge[:frequency] = @text
+          end
         end
       end
     end
@@ -1356,7 +1586,8 @@ module RightAws
       end
       def tagstart(name, attributes)
         case name
-        when 'ReservedDBInstance' then @item = {}
+        when 'ReservedDBInstance' then @item = { :recurring_charges => [] }
+        when 'RecurringCharge'    then @recurring_charge = {}
         end
       end
       def tagend(name)
@@ -1375,7 +1606,49 @@ module RightAws
         when 'State'                         then @item[:state]               = @text
         when 'DBInstanceCount'               then @item[:instance_count]      = @text.to_i
         when 'StartTime'                     then @item[:start_time]          = @text
+        when 'OfferingType'                  then @item[:offering_type]       = @text
+        when 'RecurringCharge'               then @item[:recurring_charges]  << @recurring_charge
         when 'ReservedDBInstance'            then @result[:reserved_db_instances] << @item
+        else
+          case full_tag_name
+          when %r{RecurringCharge/RecurringChargeAmount$}    then @recurring_charge[:amount]    = @text
+          when %r{RecurringCharge/RecurringChargeFrequency$} then @recurring_charge[:frequency] = @text
+          end
+        end
+      end
+    end
+
+    # --------------------------------------------
+    #  DB Subnet Groups
+    # --------------------------------------------
+
+    class DescribeDBSubnetGroupsParser < RightAWSParser # :nodoc:
+      def reset
+        @result = { :subnet_groups => [] }
+      end
+      def tagstart(name, attributes)
+        case name
+        when 'DBSubnetGroup' then @item   = { :subnets           => [] }
+        when 'Subnet'        then @subnet = { :availability_zone => {}}
+        end
+      end
+      def tagend(name)
+        case name
+        when 'Marker'                   then @result[:marker]        = @text
+        when 'MaxRecords'               then @result[:max_records]   = @text.to_i
+        when 'DBSubnetGroupName'        then @item[:name]            = @text
+        when 'DBSubnetGroupDescription' then @item[:description]     = @text
+        when 'SubnetGroupStatus'        then @item[:status]          = @text
+        when 'Subnet'                   then @item[:subnets]         << @subnet
+        when 'VpcId'                    then @item[:vpc_id]          = @text
+        when 'DBSubnetGroup'            then @result[:subnet_groups] << @item
+        else
+          case full_tag_name
+          when %r{Subnet/SubnetIdentifier$}                 then @subnet[:subnet_id]                = @text
+          when %r{Subnet/SubnetStatus$}                     then @subnet[:status]                   = @text
+          when %r{AvailabilityZone/Name$}                   then @subnet[:availability_zone][:name] = @text
+          when %r{AvailabilityZone/ProvisionedIopsCapable$} then @subnet[:availability_zone][:provisioned_iops_capable] = @text == 'true'
+          end
         end
       end
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_aws
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 3
+  - 1
   - 0
-  - 5
-  version: 3.0.5
+  version: 3.1.0
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-05 00:00:00 -08:00
-default_executable: 
+date: 2013-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_http_connection
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 2
@@ -35,9 +37,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +51,11 @@ dependencies:
   name: rcov
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -180,7 +186,6 @@ files:
 - test/sqs/test_right_sqs_gen2.rb
 - test/test_credentials.rb
 - test/ts_right_aws.rb
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -193,25 +198,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - libxml-ruby >= 0.5.2.0 is encouraged
 rubyforge_project: rightaws
-rubygems_version: 1.3.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.