right_aws 2.1.0 → 3.0.0

data/lib/ec2/right_ec2_spot_instances.rb

@@ -81,7 +81,7 @@ module RightAws
       request_hash['EndTime']            = AwsUtils::utc_iso8601(options[:end_time])        unless options[:end_time].right_blank?
       request_hash['ProductDescription'] = options[:product_description]                   unless options[:product_description].right_blank?
       request_hash.merge!(amazonize_list('InstanceType', Array(options[:instance_types]))) unless options[:instance_types].right_blank?
-      link = generate_request("DescribeSpotPriceHistory", request_hash)
+      link = generate_request("DescribeSpotPriceHistory", request_hash, :api_version => '2011-05-15')
       request_info(link, QEc2DescribeSpotPriceHistoryParser.new)
     rescue Exception
       on_exception
@@ -98,39 +98,32 @@ module RightAws
     # spot-instance-request-id, spot-price, state, tag-key, tag-value, tag:key, type, valid-from, valid-until
     #
     #  ec2.describe_spot_instance_requests #=>
-    #    [{:type=>"one-time",
-    #      :create_time=>"2010-03-10T10:30:32.000Z",
-    #      :instance_type=>"c1.medium",
-    #      :state=>"cancelled",
-    #      :groups=>["default"],
-    #      :product_description=>"Linux/UNIX",
-    #      :spot_instance_request_id=>"sir-bfa06804",
+    #    [{:product_description=>"Linux/UNIX",
+    #      :type=>"one-time",
+    #      :availability_zone=>"us-east-1b",
+    #      :monitoring_enabled=>false,
+    #      :tags=>{},
     #      :image_id=>"ami-08f41161",
+    #      :groups=>[{:group_id=>"sg-a0b85dc9", :group_name=>"default"}],
     #      :spot_price=>0.01,
-    #      :monitoring_enabled=>false},
-    #     {:type=>"one-time",
-    #      :create_time=>"2010-03-10T10:33:29.000Z",
+    #      :create_time=>"2010-03-24T10:41:28.000Z",
     #      :instance_type=>"c1.medium",
     #      :state=>"open",
-    #      :groups=>["default", "33"],
-    #      :product_description=>"Linux/UNIX",
-    #      :spot_instance_request_id=>"sir-b1713a03",
+    #      :spot_instance_request_id=>"sir-9652a604",
+    #      :key_name=>"rightscale_test"},
+    #     {:product_description=>"Linux/UNIX",
+    #      :type=>"one-time",
+    #      :availability_zone=>"us-east-1b",
+    #      :monitoring_enabled=>false,
+    #      :tags=>{},
     #      :image_id=>"ami-08f41161",
+    #      :groups=>[{:group_id=>"sg-a0b85dc9", :group_name=>"default"}],
     #      :spot_price=>0.01,
-    #      :monitoring_enabled=>false,
-    #      :key_name=>"tim"},
-    #     {:type=>"one-time",
-    #      :instance_id=>"i-c516ceae",
-    #      :create_time=>"2010-03-10T10:43:48.000Z",
+    #      :create_time=>"2010-03-24T11:40:27.000Z",
     #      :instance_type=>"c1.medium",
-    #      :state=>"active",
-    #      :groups=>["default", "33"],
-    #      :product_description=>"Linux/UNIX",
-    #      :spot_instance_request_id=>"sir-5eb6c604",
-    #      :image_id=>"ami-08f41161",
-    #      :spot_price=>0.2,
-    #      :monitoring_enabled=>false,
-    #      :key_name=>"tim"}]
+    #      :state=>"open",
+    #      :spot_instance_request_id=>"sir-fa912802",
+    #      :key_name=>"rightscale_test"}, ... ]
     #
     #  ec2.describe_spot_instance_requests(:filters => {'type'=>"one-time", 'state'=>"open"})
     #  
@@ -153,7 +146,7 @@ module RightAws
     #    :spot_price => 0.01,
     #    :key_name => 'tim',
     #    :instance_count => 2,
-    #    :groups => ['33','default'],
+    #    :group_ids => ["sg-a0b85dc9"],
     #    :instance_type => 'c1.medium') #=>
     #    
     #    [{:product_description=>"Linux/UNIX",
@@ -163,7 +156,7 @@ module RightAws
     #      :image_id=>"ami-08f41161",
     #      :state=>"open",
     #      :spot_price=>0.01,
-    #      :groups=>["default", "33"],
+    #      :groups=>[{:group_id=>"sg-a0b85dc9", :group_name=>"default"}],
     #      :key_name=>"tim",
     #      :create_time=>"2010-03-10T10:33:09.000Z",
     #      :instance_type=>"c1.medium"},
@@ -174,7 +167,7 @@ module RightAws
     #      :image_id=>"ami-08f41161",
     #      :state=>"open",
     #      :spot_price=>0.01,
-    #      :groups=>["default", "33"],
+    #      :groups=>[{:group_id=>"sg-a0b85dc9", :group_name=>"default"}],
     #      :key_name=>"tim",
     #      :create_time=>"2010-03-10T10:33:09.000Z",
     #      :instance_type=>"c1.medium"}]
@@ -187,7 +180,7 @@ module RightAws
     #    :valid_until => 1.hour.since,
     #    :instance_count => 1,
     #    :key_name => 'tim',
-    #    :groups => ['33','default'],
+    #    :group_names => ['default'],
     #    :availability_zone => 'us-east-1a',
     #    :monitoring_enabled => true,
     #    :launch_group => 'lg1',
@@ -198,55 +191,50 @@ module RightAws
     #                                  :ebs_volume_size => 3,
     #                                  :virtual_name => 'ephemeral2'
     #                                 } ] ) #=>
-    #
-    #    [{:monitoring_enabled=>true,
-    #      :type=>"one-time",
+    #    [{:type=>"one-time",
     #      :image_id=>"ami-08f41161",
-    #      :launch_group=>"lg1",
-    #      :state=>"open",
-    #      :valid_until=>"2010-02-05T19:13:44.000Z",
-    #      :create_time=>"2010-02-05T18:13:46.000Z",
     #      :availability_zone_group=>"azg1",
-    #      :spot_price=>0.01,
+    #      :key_name=>"default",
+    #      :spot_instance_request_id=>"sir-66c79a12",
     #      :block_device_mappings=>
-    #       [{:ebs_delete_on_termination=>true,
-    #         :ebs_volume_size=>3,
+    #       [{:ebs_volume_size=>3,
     #         :virtual_name=>"ephemeral2",
     #         :device_name=>"/dev/sdk",
-    #         :ebs_snapshot_id=>"snap-145cbc7d"}],
-    #      :instance_type=>"m1.small",
-    #      :groups=>["default", "33"],
+    #         :ebs_snapshot_id=>"snap-145cbc7d",
+    #         :ebs_delete_on_termination=>true}],
+    #      :spot_price=>0.01,
     #      :product_description=>"Linux/UNIX",
-    #      :key_name=>"tim",
-    #      :valid_from=>"2010-02-05T18:23:44.000Z",
+    #      :state=>"open",
+    #      :instance_type=>"m1.small",
     #      :availability_zone=>"us-east-1a",
-    #      :spot_instance_request_id=>"sir-32da8a03"}]
+    #      :groups=>[{:group_id=>"sg-a0b85dc9", :group_name=>"default"}],
+    #      :valid_from=>"2011-07-01T14:26:33.000Z",
+    #      :tags=>{},
+    #      :monitoring_enabled=>true,
+    #      :valid_until=>"2011-07-01T14:28:03.000Z",
+    #      :create_time=>"2011-07-01T14:26:24.000Z",
+    #      :launch_group=>"lg1"}]
     #
     def request_spot_instances(options)
-      options = options.dup
-      request_hash = { 'SpotPrice'                        => options[:spot_price],
-                       'LaunchSpecification.ImageId'      => options[:image_id],
-                       'LaunchSpecification.InstanceType' => options[:instance_type]}
-      request_hash['ValidFrom']                      = AwsUtils::utc_iso8601(options[:valid_from])  unless options[:valid_from].right_blank?
-      request_hash['ValidUntil']                     = AwsUtils::utc_iso8601(options[:valid_until]) unless options[:valid_until].right_blank?
-      request_hash['InstanceCount']                      = options[:instance_count]                 unless options[:instance_count].right_blank?
-      request_hash['Type']                               = options[:type]                           unless options[:type].right_blank?
-      request_hash['LaunchGroup']                        = options[:launch_group]                   unless options[:launch_group].right_blank?
-      request_hash['AvailabilityZoneGroup']              = options[:availability_zone_group]        unless options[:availability_zone_group].right_blank?
-      request_hash['LaunchSpecification.KeyName']        = options[:key_name]                       unless options[:key_name].right_blank?
-      request_hash['LaunchSpecification.AddressingType'] = options[:addressing_type]                unless options[:addressing_type].right_blank?
-      request_hash['LaunchSpecification.KernelId']       = options[:kernel_id]                      unless options[:kernel_id].right_blank?
-      request_hash['LaunchSpecification.RamdiskId']      = options[:ramdisk_id]                     unless options[:ramdisk_id].right_blank?
-      request_hash['LaunchSpecification.SubnetId']       = options[:subnet_id]                      unless options[:subnet_id].right_blank?
-      request_hash['LaunchSpecification.Placement.AvailabilityZone'] = options[:availability_zone]  unless options[:availability_zone].right_blank?
-      request_hash['LaunchSpecification.Monitoring.Enabled']         = options[:monitoring_enabled] unless options[:monitoring_enabled].right_blank?
-      request_hash.merge!(amazonize_list('LaunchSpecification.SecurityGroup', options[:groups]))    unless options[:groups].right_blank?
-      request_hash.merge!(amazonize_block_device_mappings(options[:block_device_mappings], 'LaunchSpecification.BlockDeviceMapping'))
-      unless options[:user_data].right_blank?
-        # See RightAws::Ec2#run_instances
-        options[:user_data].strip!
-        request_hash['LaunchSpecification.UserData'] = Base64.encode64(options[:user_data]).delete("\n") unless options[:user_data].right_blank?
-      end
+      options[:user_data] = options[:user_data].to_s
+      request_hash = map_api_keys_and_values( options,
+        :spot_price, :availability_zone_group, :launch_group, :type, :instance_count,
+        :image_id              => 'LaunchSpecification.ImageId',
+        :instance_type         => 'LaunchSpecification.InstanceType',
+        :key_name              => 'LaunchSpecification.KeyName',
+        :addressing_type       => 'LaunchSpecification.AddressingType',
+        :kernel_id             => 'LaunchSpecification.KernelId',
+        :ramdisk_id            => 'LaunchSpecification.RamdiskId',
+        :subnet_id             => 'LaunchSpecification.SubnetId',
+        :availability_zone     => 'LaunchSpecification.Placement.AvailabilityZone',
+        :monitoring_enabled    => 'LaunchSpecification.Monitoring.Enabled',
+        :valid_from            => { :value => Proc.new { !options[:valid_from].right_blank?  && AwsUtils::utc_iso8601(options[:valid_from]) }},
+        :valid_until           => { :value => Proc.new { !options[:valid_until].right_blank? && AwsUtils::utc_iso8601(options[:valid_until]) }},
+        :user_data             => { :name  => 'LaunchSpecification.UserData',
+                                    :value => Proc.new { !options[:user_data].empty? && Base64.encode64(options[:user_data]).delete("\n") }},
+        :group_names           => { :amazonize_list => 'LaunchSpecification.SecurityGroup'},
+        :group_ids             => { :amazonize_list => 'LaunchSpecification.SecurityGroupId'},
+        :block_device_mappings => { :amazonize_bdm  => 'LaunchSpecification.BlockDeviceMapping'})
       link = generate_request("RequestSpotInstances", request_hash)
       request_info(link, QEc2DescribeSpotInstanceParser.new(:logger => @logger))
     end
@@ -316,6 +304,7 @@ module RightAws
         when 'productDescription' then @item[:product_description] = @text
         when 'spotPrice'          then @item[:spot_price]          = @text.to_f
         when 'timestamp'          then @item[:timestamp]           = @text
+        when 'availabilityZone'   then @item[:availability_zone]   = @text
         when 'item'               then @result                    << @item
         end
       end
@@ -329,6 +318,10 @@ module RightAws
         case full_tag_name
         when %r{spotInstanceRequestSet/item$}
           @item = { :tags => {} }
+        when %r{groupSet$}
+          @item[:groups] = []
+        when %r{groupSet/item$}
+          @group  = {}
         when %r{/blockDeviceMapping/item$}
           @item[:block_device_mappings] ||= []
           @block_device_mapping = {}
@@ -361,9 +354,14 @@ module RightAws
         when 'instanceId'            then @item[:instance_id]             = @text
         when 'createTime'            then @item[:create_time]             = @text
         when 'productDescription'    then @item[:product_description]     = @text
-        when 'groupId'               then (@item[:groups] ||= [])        << @text
         else
           case full_tag_name
+          when %r{/groupSet/item} # no trailing $
+            case name
+            when 'groupId'   then @group[:group_id]   = @text
+            when 'groupName' then @group[:group_name] = @text
+            when 'item'      then @item[:groups]     << @group
+            end
           when %r{monitoring/enabled$}
             @item[:monitoring_enabled] = @text == 'true'
           when %r{/blockDeviceMapping/item} # no trailing $
@@ -410,9 +408,8 @@ module RightAws
         when 'bucket'  then @result[:bucket]   = @text
         when 'prefix'  then @result[:prefix]   = @text
         when 'state'   then @result[:state]    = @text
-        when 'fault'   then @result[:fault]    = @text
-        when 'code'    then @result[:code]     = @text
-        when 'message' then @result[:message]  = @text
+        when 'code'    then @result[:fault_code]     = @text
+        when 'message' then @result[:fault_message]  = @text
         end
       end
       def reset

data/lib/ec2/right_ec2_vpc.rb

@@ -38,9 +38,11 @@ module RightAws
     # Filters: cidr, dchp-options-id, state, tag-key, tag-value, tag:key, vpc-id
     #
     #  ec2.describe_vpcs #=>
-    #    [{:vpc_id=>"vpc-890ce2e0",
+    #    [{:instance_tenancy=>"default",
+    #      :vpc_id=>"vpc-e16cf988",
+    #      :tags=>{},
     #      :dhcp_options_id=>"default",
-    #      :cidr_block=>"10.0.0.0/23",
+    #      :cidr_block=>"192.168.0.0/24",
     #      :state=>"available"}]
     #
     #  ec2.describe_vpcs("vpc-890ce2e0")
@@ -63,8 +65,10 @@ module RightAws
     #     :cidr_block=>"10.0.0.0/23",
     #     :state=>"pending"}
     #
-    def create_vpc(cidr_block)
-      link = generate_request("CreateVpc",'CidrBlock' => cidr_block )
+    def create_vpc(cidr_block, options = {})
+      request_hash = {'CidrBlock' => cidr_block}
+      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
       on_exception
@@ -395,6 +399,7 @@ module RightAws
       on_exception
     end
 
+
     #-----------------
     # Parsers
     #-----------------
@@ -408,10 +413,11 @@ module RightAws
       end
       def tagend(name)
         case name
-        when 'vpcId'         then @item[:vpc_id]          = @text
-        when 'state'         then @item[:state]           = @text
-        when 'dhcpOptionsId' then @item[:dhcp_options_id] = @text
-        when 'cidrBlock'     then @item[:cidr_block]      = @text
+        when 'vpcId'           then @item[:vpc_id]          = @text
+        when 'state'           then @item[:state]           = @text
+        when 'dhcpOptionsId'   then @item[:dhcp_options_id] = @text
+        when 'cidrBlock'       then @item[:cidr_block]      = @text
+        when 'instanceTenancy' then @item[:instance_tenancy] = @text
         else
           case full_tag_name
           when %r{/tagSet/item/key$}   then @aws_tag[:key]               = @text
@@ -579,5 +585,6 @@ module RightAws
       end
     end
 
+
   end
 end

data/lib/ec2/right_ec2_vpc2.rb

@@ -0,0 +1,381 @@
+#
+# Copyright (c) 2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+module RightAws
+
+  class Ec2
+
+    # VPC v2: Limits
+    #
+    # http://docs.amazonwebservices.com/AmazonVPC/latest/UserGuide/index.html?VPC_Appendix_Limits.html
+    
+    #----------------------
+    #   InternetGateways
+    #----------------------
+
+    # Create internet gateway
+    #
+    #  ec2.create_internet_gateway #=> 
+    #    { :internet_gateway_id=>"igw-6585c10c", :tags=>{}}
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-CreateInternetGateway.html
+    #
+    def create_internet_gateway
+      link = generate_request("CreateInternetGateway")
+      request_info(link, QEc2DescribeInternetGatewaysParser.new(:logger => @logger)).first
+    rescue Exception
+      on_exception
+    end
+
+    # Describe internet gateways.
+    #
+    #  ec2.describe_internet_gateways #=>
+    #    [{:state=>"available",
+    #      :internet_gateway_id=>"igw-6585c10c",
+    #      :vpc_id=>"vpc-df80a6b6",
+    #      :tags=>{}},
+    #     {:internet_gateway_id=>"igw-883503e1",
+    #      :tags=>{}}]
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-CreateInternetGateway.html
+    #
+    def describe_internet_gateways(*list_and_options)
+      describe_resources_with_list_and_options('DescribeInternetGateways', 'InternetGatewayId', QEc2DescribeInternetGatewaysParser, list_and_options)
+    rescue Exception
+      on_exception
+    end
+
+    # Delete internet gateway.
+    #
+    #  ec2.delete_internet_gateway("igw-6585c10c") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteInternetGateway.html
+    #
+    def delete_internet_gateway(internet_gateway_id)
+      link = generate_request("DeleteInternetGateway", 'InternetGatewayId' => internet_gateway_id )
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Attaches an Internet gateway to a VPC, enabling connectivity between the Internet and the VPC. 
+    # 
+    #  ec2.attach_internet_gateway("igw-6585c10c", "vpc-df80a6b6") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AttachInternetGateway.html
+    #
+    def attach_internet_gateway(internet_gateway_id, vpc_id)
+      request_hash = { 'InternetGatewayId' => internet_gateway_id,
+                       'VpcId'             => vpc_id }
+      link = generate_request("AttachInternetGateway", request_hash)
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Detaches an Internet gateway from a VPC, disabling connectivity between the Internet and the VPC.
+    # The VPC must not contain any running instances with Elastic IP addresses. 
+    #
+    #  ec2.detach_internet_gateway("igw-6585c10c", "vpc-df80a6b6") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DetachInternetGateway.html
+    #
+    def detach_internet_gateway(internet_gateway_id, vpc_id)
+      request_hash = { 'InternetGatewayId' => internet_gateway_id,
+                       'VpcId'             => vpc_id }
+      link = generate_request("DetachInternetGateway", request_hash)
+      request_info(link, RightHttp2xxParser::new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    #----------------------
+    #   RouteTables
+    #----------------------
+
+    #  Describe route tables.
+    #
+    #  # List all tables
+    #  ec2.describe_route_tables #=>
+    #    [{:route_table_id=>"rtb-be3006d7",
+    #      :route_set=>
+    #       [{:state=>"active",
+    #         :destination_cidr_block=>"10.0.3.0/24",
+    #         :gateway_id=>"local"}],
+    #      :vpc_id=>"vpc-df80a6b6",
+    #      :association_set=>[],
+    #      :tags=>{}},
+    #     {:route_table_id=>"rtb-e36cf98a",
+    #      :route_set=>
+    #       [{:state=>"active",
+    #         :destination_cidr_block=>"192.168.0.0/24",
+    #         :gateway_id=>"local"}],
+    #      :vpc_id=>"vpc-e16cf988",
+    #      :association_set=>
+    #       [{:route_table_id=>"rtb-e36cf98a",
+    #         :main=>true,
+    #         :route_table_association_id=>"rtbassoc-e26cf98b"}],
+    #      :tags=>{}}, ... ]
+    #
+    #  # Filter tables by VpcId
+    #  ec2.describe_route_tables(:filters => {'vpc-id' => "vpc-df80a6b6"})
+    #
+    #  # Custom route table
+    #  ec2.describe_route_tables("rtb-be3006d7") #=> 
+    #    [{:vpc_id=>"vpc-df80a6b6",
+    #      :route_set=>
+    #       [{:state=>"active",
+    #         :destination_cidr_block=>"0.0.0.1/32",
+    #         :gateway_id=>"igw-6585c10c"},
+    #        {:state=>"active",
+    #         :destination_cidr_block=>"10.0.3.0/24",
+    #         :gateway_id=>"local"}],
+    #      :route_table_id=>"rtb-be3006d7",
+    #      :tags=>{},
+    #      :association_set=>
+    #       [{:route_table_association_id=>"rtbassoc-a02610c9",
+    #         :subnet_id=>"subnet-b95f76d0",
+    #         :route_table_id=>"rtb-be3006d7"}]}]
+    #  
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DescribeRouteTables.html
+    # 
+    def describe_route_tables(*list_and_options)
+      describe_resources_with_list_and_options('DescribeRouteTables', 'RouteTableId', QEc2DescribeRouteTablesParser, list_and_options)
+    rescue Exception
+      on_exception
+    end
+    
+    # Creates a new route table within a VPC. After you create a new route table, you can add routes and associate the table with a subne
+    #
+    #  ec2.create_route_table("vpc-df80a6b6") #=>
+    #    {:route_table_id=>"rtb-4331072a",
+    #     :route_set=>
+    #      [{:state=>"active",
+    #        :destination_cidr_block=>"10.0.3.0/24",
+    #        :gateway_id=>"local"}],
+    #     :vpc_id=>"vpc-df80a6b6",
+    #     :association_set=>[],
+    #     :tags=>{}}
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-CreateRouteTable.html
+    #
+    def create_route_table(vpc_id)
+      link = generate_request("CreateRouteTable", 'VpcId' => vpc_id )
+      request_info(link, QEc2DescribeRouteTablesParser::new(:logger => @logger)).first
+    rescue Exception
+      on_exception
+    end
+
+    # Deletes a route table from a VPC. 
+    # The route table must not be associated with a subnet. You can't delete the main route table.
+    #
+    #  ec2.delete_route_table("rtb-4331072a") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-DeleteRouteTable.html
+    def delete_route_table(route_table_id)
+      link = generate_request("DeleteRouteTable", 'RouteTableId' => route_table_id )
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Associates a subnet with a route table. The subnet and route table must be in the same VPC. 
+    # This association causes traffic originating from the subnet to be routed according to the routes in
+    # the route table. The action returns an association ID, which you need if you want to disassociate 
+    # the route table from the subnet later. A route table can be associated with multiple subnets.
+    #
+    #  ec2.associate_route_table("rtb-be3006d7", "subnet-b95f76d0") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/index.html?ApiReference-query-AssociateRouteTable.html  
+    #
+    def associate_route_table(route_table_id, subnet_id)
+      request_hash = { 'RouteTableId' => route_table_id,
+                       'SubnetId'     => subnet_id }
+      link = generate_request("AssociateRouteTable", request_hash)
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Disassociates a subnet from a route table.
+    #
+    #  ec2.disassociate_route_table(route_table_association_id) #=> true
+    #  
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DisassociateRouteTable.html
+    #
+    def disassociate_route_table(route_table_association_id)
+      link = generate_request("DisassociateRouteTable", 'AssociationId' => route_table_association_id )
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Changes the route table associated with a given subnet in a VPC. After you execute this action, the subnet 
+    # uses the routes in the new route table it's associated with. 
+    # You can also use this action to change which table is the main route table in the VPC. You just specify 
+    # the main route table's association ID and the route table that you want to be the new main route table.
+    #
+    #  ec2.replace_route_table_association("rtb-be3006d7", "rtbassoc-a02610c9") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ReplaceRouteTableAssociation.html
+    #
+    def replace_route_table_association(route_table_id, route_table_association_id)
+      request_hash = { 'RouteTableId'  => route_table_id,
+                       'AssociationId' => route_table_association_id }
+      link = generate_request("ReplaceRouteTableAssociation", request_hash)
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+    
+    #---------------------
+    # Routes
+    #---------------------
+
+    # Creates a new route in a route table within a VPC. The route's target can be either a gateway attached to 
+    # the VPC or a NAT instance in the VPC.
+    # Options: :gateway_id, :instance_id
+    # 
+    #  ec2.create_route("rtb-be3006d7",  "0.0.0.1/32", :gateway_id => 'igw-6585c10c') #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateRoute.html
+    #
+    def create_route(route_table_id, destination_cidr_block, options = {})
+      request_hash = { 'RouteTableId'         => route_table_id,
+                       'DestinationCidrBlock' => destination_cidr_block }
+      request_hash['GatewayId']  = options[:gateway_id]  unless options[:gateway_id].right_blank?
+      request_hash['InstanceId'] = options[:instance_id] unless options[:instance_id].right_blank?      
+      link = generate_request("CreateRoute", request_hash)
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Deletes a route from a route table in a VPC.
+    #
+    #  ec2.delete_route("rtb-be3006d7",  "0.0.0.1/32") #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteRoute.html
+    #
+    def delete_route(route_table_id, destination_cidr_block)
+      link = generate_request("DeleteRoute", 'RouteTableId'         => route_table_id,
+                                             'DestinationCidrBlock' => destination_cidr_block )
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    # Replaces an existing route within a route table in a VPC
+    # Options: :gateway_id, :instance_id
+    # 
+    #  ec2.replace_route("rtb-be3006d7",  "0.0.0.2/32", :gateway_id => 'igw-6585c10c') #=> true
+    #
+    # P.S. http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ReplaceRoute.html
+    #
+    def replace_route(route_table_id, destination_cidr_block, options = {})
+      request_hash = { 'RouteTableId'         => route_table_id,
+                       'DestinationCidrBlock' => destination_cidr_block }
+      request_hash['GatewayId']  = options[:gateway_id]  unless options[:gateway_id].right_blank?
+      request_hash['InstanceId'] = options[:instance_id] unless options[:instance_id].right_blank?      
+      link = generate_request("ReplaceRoute", request_hash)
+      request_info(link, RightHttp2xxParser.new(:logger => @logger))
+    rescue Exception
+      on_exception
+    end
+
+    #---------------------
+    # InternetGateways
+    #---------------------
+
+    class QEc2DescribeInternetGatewaysParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case full_tag_name
+        when %r{/(internetGatewaySet/item|internetGateway)$} then @item = { :tags => {} }
+        when %r{/tagSet/item$} then @aws_tag = {}
+        end
+      end
+      def tagend(name)
+        case full_tag_name
+        # item
+        when %r{/(internetGatewaySet/item|internetGateway)$} then @result << @item
+        when %r{/internetGatewayId$} then @item[:internet_gateway_id] = @text
+        when %r{/vpcId$}             then @item[:vpc_id]              = @text
+        when %r{/state$}             then @item[:state]               = @text
+        # tags
+        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]
+        end
+      end
+      def reset
+        @result = []
+      end
+    end
+
+    #---------------------
+    # Routes
+    #---------------------
+
+    class QEc2DescribeRouteTablesParser < RightAWSParser #:nodoc:
+      def tagstart(name, attributes)
+        case full_tag_name
+        when %r{/(routeTableSet/item|routeTable)$}
+          @item = { :route_set       => [],
+                    :association_set => [],
+                    :tags            => {}}
+        when %r{/routeSet/item$}       then @route_set       = {}
+        when %r{/associationSet/item$} then @association_set = {}
+        end
+      end
+      def tagend(name)
+        case full_tag_name
+        # item
+        when %r{/(routeTableSet/item|routeTable)/routeTableId$} then @item[:route_table_id] = @text
+        when %r{/(routeTableSet/item|routeTable)/vpcId$}        then @item[:vpc_id]         = @text
+        when %r{/(routeTableSet/item|routeTable)$}              then @result               << @item
+        # route set
+        when %r{/routeSet/item/destinationCidrBlock$} then @route_set[:destination_cidr_block] = @text
+        when %r{/routeSet/item/gatewayId$}            then @route_set[:gateway_id]             = @text
+        when %r{/routeSet/item/instanceId$}           then @route_set[:instance_id]            = @text
+        when %r{/routeSet/item/state$}                then @route_set[:state]                  = @text
+        when %r{/routeSet/item$}                      then @item[:route_set]                  << @route_set
+        # association set
+        when %r{/associationSet/item/routeTableId$}            then @association_set[:route_table_id]             = @text
+        when %r{/associationSet/item/routeTableAssociationId$} then @association_set[:route_table_association_id] = @text
+        when %r{/associationSet/item/subnetId$}                then @association_set[:subnet_id]                  = @text
+        when %r{/associationSet/item/main}                     then @association_set[:main]                       = @text == 'true'
+        when %r{/associationSet/item$}                         then @item[:association_set]                      << @association_set
+        # tags
+        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]
+        end
+      end
+      def reset
+        @result = []
+      end
+    end
+
+end
+
+end