aws 1.11.38 → 2.1.0

data/README.markdown

@@ -40,14 +40,13 @@ The RightScale AWS gems have been designed to provide a robust, fast, and secure
 These gems have been used in production by RightScale since late 2006 and are being maintained to track enhancements made by Amazon.
 The RightScale AWS gems comprise:
 
-- RightAws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the associated EBS (Elastic Block Store)
-- RightAws::S3 and RightAws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
-- RightAws::Sqs and RightAws::SqsInterface -- interface to first-generation Amazon SQS (Simple Queue Service) (API version 2007-05-01)
-- RightAws::SqsGen2 and RightAws::SqsGen2Interface -- interface to second-generation Amazon SQS (Simple Queue Service) (API version 2008-01-01)
-- RightAws::SdbInterface and RightAws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
-- RightAws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
-- RightAws::ElbInterface -- interface to Amazon Load Balancing service
-- RightAws::MonInterface -- interface to Amazon CloudWatch monitoring service
+- Aws::Ec2 -- interface to Amazon EC2 (Elastic Compute Cloud) and the associated EBS (Elastic Block Store)
+- Aws::S3 and Aws::S3Interface -- interface to Amazon S3 (Simple Storage Service)
+- Aws::Sqs and Aws::SqsInterface -- interface to Amazon SQS (Simple Queue Service)
+- Aws::SdbInterface and Aws::ActiveSdb -- interface to Amazon SDB (SimpleDB)
+- Aws::AcfInterface -- interface to Amazon CloudFront, a content distribution service
+- Aws::ElbInterface -- interface to Amazon Load Balancing service
+- Aws::MonInterface -- interface to Amazon CloudWatch monitoring service
 
 
 ## FEATURES:
@@ -81,7 +80,7 @@ All RightScale AWS interfaces offer two threading options:
 1. Use a single persistent HTTP connection per process.
 2. Use a persistent HTTP connection per Ruby thread.
  
-Either way, it doesn't matter how many (for example) RightAws::S3 objects you create,
+Either way, it doesn't matter how many (for example) Aws::S3 objects you create,
 they all use the same per-program or per-thread
 connection. The purpose of sharing the connection is to keep a single
 persistent HTTP connection open to avoid paying connection
@@ -104,21 +103,19 @@ multithreaded mode.
 
 ## GETTING STARTED:
 
-* For EC2 read RightAws::Ec2 and consult the Amazon EC2 API documentation at
+* For EC2 read Aws::Ec2 and consult the Amazon EC2 API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=87
-* For S3 read RightAws::S3 and consult the Amazon S3 API documentation at
+* For S3 read Aws::S3 and consult the Amazon S3 API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=48
-* For first generation SQS read RightAws::Sqs and consult the Amazon SQS API documentation at
+* For SQS read Aws::Sqs and consult the Amazon SQS API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=31
-* For second generation SQS read RightAws::SqsGen2, RightAws::SqsGen2Interface, and consult the Amazon SQS API documentation at
-  http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1214&categoryID=31 
 
   Amazon's Migration Guide for moving from first to second generation SQS is
   avalable at:
   http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1148
-* For SDB read RightAws::SdbInterface, RightAws::ActiveSdb, and consult the Amazon SDB API documentation at
+* For SDB read Aws::SdbInterface, Aws::ActiveSdb, and consult the Amazon SDB API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=141
-* For CloudFront (ACF) read RightAws::AcfInterface and consult the Amazon CloudFront API documentation at 
+* For CloudFront (ACF) read Aws::AcfInterface and consult the Amazon CloudFront API documentation at
   http://developer.amazonwebservices.com/connect/kbcategory.jspa?categoryID=213
 
 ## KNOWN ISSUES:
@@ -140,7 +137,7 @@ multithreaded mode.
   changes the semantics of core Ruby (specifically, the String class) and thus presents a reliability
   problem for most Ruby programs.
 
-- 2/11/08: If you use RightAws in conjunction with attachment_fu, the
+- 2/11/08: If you use Aws in conjunction with attachment_fu, the
   right_aws gem must be included (using the require statement) AFTER
   attachment_fu.  If right_aws is loaded before attachment_fu, you'll
   encounter errors similar to:
@@ -158,17 +155,17 @@ multithreaded mode.
 
 - 8/07: Amazon has changed the semantics of the SQS service.  A
   new queue may not be created within 60 seconds of the destruction of any
-  older queue with the same name.  Certain methods of RightAws::Sqs and
-  RightAws::SqsInterface will fail with the message:
+  older queue with the same name.  Certain methods of Aws::Sqs and
+  Aws::SqsInterface will fail with the message:
   "AWS.SimpleQueueService.QueueDeletedRecently: You must wait 60 seconds after deleting a queue before you can create another with the same name."
   
 ## REQUIREMENTS:
 
-RightAws requires REXML and the right_http_connection gem.
+Aws requires REXML and the right_http_connection gem.
 If libxml and its Ruby bindings (distributed in the libxml-ruby gem) are
-present, RightAws can be configured to use them:
-  RightAws::RightAWSParser.xml_lib = 'libxml'
-Any error with the libxml installation will result in RightAws failing-safe to
+present, Aws can be configured to use them:
+  Aws::AwsParser.xml_lib = 'libxml'
+Any error with the libxml installation will result in Aws failing-safe to
 REXML parsing.
 
 

data/lib/acf/right_acf_interface.rb

@@ -21,9 +21,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-module RightAws
+module Aws
 
-  # = RightAws::AcfInterface -- RightScale Amazon's CloudFront interface
+  # = Aws::AcfInterface -- RightScale Amazon's CloudFront interface
   # The AcfInterface class provides a complete interface to Amazon's
   # CloudFront service.
   #
@@ -33,7 +33,7 @@ module RightAws
   #
   # Example:
   #
-  #  acf = RightAws::AcfInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX')
+  #  acf = Aws::AcfInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX')
   #
   #  list = acf.list_distributions #=>
   #    [{:status             => "Deployed",
@@ -72,9 +72,9 @@ module RightAws
   #
   #  acf.set_distribution_config(distibution[:aws_id], config) #=> true
   #
-  class AcfInterface < RightAwsBase
+  class AcfInterface < AwsBase
     
-    include RightAwsBaseInterface
+    include AwsBaseInterface
 
     API_VERSION      = "2008-06-30"
     DEFAULT_HOST     = 'cloudfront.amazonaws.com'
@@ -100,8 +100,8 @@ module RightAws
     # * <tt>:logger</tt>: for log messages, default: RAILS_DEFAULT_LOGGER else STDOUT
     # * <tt>:cache</tt>: true/false: caching for list_distributions method, default: false.
     #
-    #  acf = RightAws::AcfInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX',
-    #    {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) #=>  #<RightAws::AcfInterface::0xb7b3c30c>
+    #  acf = Aws::AcfInterface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX',
+    #    {:multi_thread => true, :logger => Logger.new('/tmp/x.log')}) #=>  #<Aws::AcfInterface::0xb7b3c30c>
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
       init({ :name             => 'ACF',
@@ -142,7 +142,7 @@ module RightAws
       # Raises AwsError if any banana happened.
     def request_info(request, parser, &block) # :nodoc:
       thread = @params[:multi_thread] ? Thread.current : Thread.main
-      thread[:acf_connection] ||= Rightscale::HttpConnection.new(:exception => RightAws::AwsError, :logger => @logger)
+      thread[:acf_connection] ||= Aws::HttpConnection.new(:exception => Aws::AwsError, :logger => @logger)
       request_info_impl(thread[:acf_connection], @@bench, request, parser, &block)
     end
 
@@ -179,7 +179,7 @@ module RightAws
     #-----------------------------------------------------------------
 
     # List distributions.
-    # Returns an array of distributions or RightAws::AwsError exception.
+    # Returns an array of distributions or Aws::AwsError exception.
     #
     #  acf.list_distributions #=>
     #    [{:status             => "Deployed",
@@ -196,7 +196,7 @@ module RightAws
     end
 
     # Create a new distribution.
-    # Returns the just created distribution or RightAws::AwsError exception.
+    # Returns the just created distribution or Aws::AwsError exception.
     #
     #  acf.create_distribution('bucket-for-k-dzreyev.s3.amazonaws.com', 'Woo-Hoo!', true, ['web1.my-awesome-site.net'] ) #=>
     #    {:comment            => "Woo-Hoo!",
@@ -233,7 +233,7 @@ module RightAws
     end
 
     # Get a distribution's information.
-    # Returns a distribution's information or RightAws::AwsError exception.
+    # Returns a distribution's information or Aws::AwsError exception.
     #
     #  acf.get_distribution('E2REJM3VUN5RSI') #=>
     #    {:enabled            => true,
@@ -253,7 +253,7 @@ module RightAws
     end
 
     # Get a distribution's configuration.
-    # Returns a distribution's configuration or RightAws::AwsError exception.
+    # Returns a distribution's configuration or Aws::AwsError exception.
     #
     #  acf.get_distribution_config('E2REJM3VUN5RSI') #=>
     #    {:enabled          => true,
@@ -270,7 +270,7 @@ module RightAws
 
     # Set a distribution's configuration 
     # (the :origin and the :caller_reference cannot be changed).
-    # Returns +true+ on success or RightAws::AwsError exception.
+    # Returns +true+ on success or Aws::AwsError exception.
     #
     #  config = acf.get_distribution_config('E2REJM3VUN5RSI') #=>
     #    {:enabled          => true,
@@ -306,7 +306,7 @@ module RightAws
     end
 
     # Delete a distribution. The enabled distribution cannot be deleted.
-    # Returns +true+ on success or RightAws::AwsError exception.
+    # Returns +true+ on success or Aws::AwsError exception.
     #
     #  acf.delete_distribution('E2REJM3VUN5RSI', 'E39OHHU1ON65SI') #=> true
     #
@@ -320,7 +320,7 @@ module RightAws
     #      PARSERS:
     #-----------------------------------------------------------------
 
-    class AcfDistributionListParser < RightAWSParser # :nodoc:
+    class AcfDistributionListParser < AwsParser # :nodoc:
       def reset
         @result = []
       end
@@ -341,7 +341,7 @@ module RightAws
       end
     end
 
-    class AcfDistributionParser < RightAWSParser # :nodoc:
+    class AcfDistributionParser < AwsParser # :nodoc:
       def reset
         @result = { :cnames => [] }
       end
@@ -360,7 +360,7 @@ module RightAws
       end
     end
 
-    class AcfDistributionConfigParser < RightAWSParser # :nodoc:
+    class AcfDistributionConfigParser < AwsParser # :nodoc:
       def reset
         @result = { :cnames => [] }
       end

data/lib/aws.rb

@@ -0,0 +1,27 @@
+
+require 'benchmark'
+require 'net/https'
+require 'uri'
+require 'time'
+require "cgi"
+require "base64"
+require "rexml/document"
+require "openssl"
+require "digest/sha1"
+
+require 'rubygems'
+require 'right_http_connection'
+
+$:.unshift(File.dirname(__FILE__))
+require 'awsbase/benchmark_fix'
+require 'awsbase/support'
+require 'awsbase/right_awsbase'
+require 'ec2/right_ec2'
+require 'ec2/right_mon_interface'
+require 's3/right_s3_interface'
+require 's3/right_s3'
+require 'sqs/right_sqs_interface'
+require 'sqs/right_sqs'
+require 'sdb/right_sdb_interface'
+require 'acf/right_acf_interface'
+require 'elb/right_elb_interface'

data/lib/awsbase/right_awsbase.rb

@@ -22,7 +22,7 @@
 #
 
 # Test
-module RightAws
+module Aws
     require 'digest/md5'
     require 'pp'
     require 'cgi'
@@ -155,7 +155,7 @@ module RightAws
     class AwsNoChange < RuntimeError
     end
 
-    class RightAwsBase
+    class AwsBase
 
         # Amazon HTTP Error handling
 
@@ -187,7 +187,7 @@ module RightAws
 
     end
 
-    module RightAwsBaseInterface
+    module AwsBaseInterface
         DEFAULT_SIGNATURE_VERSION = '2'
 
         @@caching = false
@@ -456,7 +456,7 @@ module RightAws
             false
         end
 
-        # Generic handler for AwsErrors. +aws+ is the RightAws::S3, RightAws::EC2, or RightAws::SQS
+        # Generic handler for AwsErrors. +aws+ is the Aws::S3, Aws::EC2, or Aws::SQS
         # object that caused the exception (it must provide last_request and last_response). Supported
         # boolean options are:
         # * <tt>:log</tt> print a message into the log using aws.logger to access the Logger
@@ -690,7 +690,7 @@ module RightAws
         end
     end
 
-    class RightAWSParser  #:nodoc:
+    class AwsParser  #:nodoc:
         # default parsing library
         DEFAULT_XML_LIBRARY = 'rexml'
         # a list of supported parsers
@@ -787,7 +787,7 @@ module RightAws
 
         # Parser must have a lots of methods
         # (see /usr/lib/ruby/1.8/rexml/parsers/streamparser.rb)
-        # We dont need most of them in RightAWSParser and method_missing helps us
+        # We dont need most of them in AwsParser and method_missing helps us
         # to skip their definition
         def method_missing(method, *params)
             # if the method is one of known - just skip it ...
@@ -828,7 +828,7 @@ module RightAws
 #  <Bucket>bucket-for-k</Bucket>
 #</Error>
 
-    class RightErrorResponseParser < RightAWSParser #:nodoc:
+    class RightErrorResponseParser < AwsParser #:nodoc:
         attr_accessor :errors  # array of hashes: error/message
         attr_accessor :requestID
 #    attr_accessor :endpoint, :host_id, :bucket
@@ -863,7 +863,7 @@ module RightAws
         end
     end
 
-    class RightHttp2xxParser < RightAWSParser # :nodoc:
+    class RightHttp2xxParser < AwsParser # :nodoc:
         def parse(response)
             @result = response.is_a?(Net::HTTPSuccess)
         end

data/lib/ec2/right_ec2.rb

@@ -21,10 +21,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-module RightAws
+module Aws
 
-  # = RightAWS::EC2 -- RightScale Amazon EC2 interface
-  # The RightAws::EC2 class provides a complete interface to Amazon's
+  # = Aws::EC2 -- RightScale Amazon EC2 interface
+  # The Aws::EC2 class provides a complete interface to Amazon's
   # Elastic Compute Cloud service, as well as the associated EBS (Elastic Block
   # Store).
   # For explanations of the semantics
@@ -35,7 +35,7 @@ module RightAws
   #
   # Create an EC2 interface handle:
   #   
-  #   @ec2   = RightAws::Ec2.new(aws_access_key_id,
+  #   @ec2   = Aws::Ec2.new(aws_access_key_id,
   #                               aws_secret_access_key)
   # Create a new SSH key pair:
   #  @key   = 'right_ec2_awesome_test_key'
@@ -61,11 +61,11 @@ module RightAws
   # Describe running instances:
   #  @ec2.describe_instances
   #
-  # Error handling: all operations raise an RightAws::AwsError in case
+  # Error handling: all operations raise an Aws::AwsError in case
   # of problems. Note that transient errors are automatically retried.
     
-  class Ec2 < RightAwsBase
-    include RightAwsBaseInterface
+  class Ec2 < AwsBase
+    include AwsBaseInterface
     
     # Amazon EC2 API version being used
     API_VERSION       = "2008-12-01"
@@ -125,7 +125,7 @@ module RightAws
       # EC2 doesn't really define any transient errors to retry, and in fact,
       # when they return a 503 it is usually for 'request limit exceeded' which
       # we most certainly should not retry.  So let's pare down the list of
-      # retryable errors to InternalError only (see RightAwsBase for the default
+      # retryable errors to InternalError only (see AwsBase for the default
       # list)
       amazon_problems = ['InternalError']
     end
@@ -626,7 +626,7 @@ module RightAws
     # Bundle a Windows image.
     # Internally, it queues the bundling task and shuts down the instance.
     # It then takes a snapshot of the Windows volume bundles it, and uploads it to
-    # S3. After bundling completes, Rightaws::Ec2#register_image may be used to
+    # S3. After bundling completes, Aws::Ec2#register_image may be used to
     # register the new Windows AMI for subsequent launches.
     #
     #   ec2.bundle_instance('i-e3e24e8a', 'my-awesome-bucket', 'my-win-image-1') #=>
@@ -1183,8 +1183,8 @@ module RightAws
       orig_reiteration_time = nil
       orig_http_params = nil
       
-      orig_reiteration_time = RightAws::AWSErrorHandler::reiteration_time
-      RightAws::AWSErrorHandler::reiteration_time = 0
+      orig_reiteration_time = Aws::AWSErrorHandler::reiteration_time
+      Aws::AWSErrorHandler::reiteration_time = 0
       
       orig_http_params = Rightscale::HttpConnection::params()
       new_http_params = orig_http_params.dup
@@ -1200,7 +1200,7 @@ module RightAws
     rescue Exception
       on_exception
     ensure
-      RightAws::AWSErrorHandler::reiteration_time = orig_reiteration_time if orig_reiteration_time
+      Aws::AWSErrorHandler::reiteration_time = orig_reiteration_time if orig_reiteration_time
       Rightscale::HttpConnection::params = orig_http_params if orig_http_params
     end
 
@@ -1220,7 +1220,7 @@ module RightAws
   #      PARSERS: Boolean Response Parser
   #-----------------------------------------------------------------
     
-    class RightBoolResponseParser < RightAWSParser #:nodoc:
+    class RightBoolResponseParser < AwsParser #:nodoc:
       def tagend(name)
         @result = @text=='true' ? true : false if name == 'return'
       end
@@ -1230,7 +1230,7 @@ module RightAws
   #      PARSERS: Key Pair
   #-----------------------------------------------------------------
 
-    class QEc2DescribeKeyPairParser < RightAWSParser #:nodoc:
+    class QEc2DescribeKeyPairParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @item = {} if name == 'item'
       end
@@ -1246,7 +1246,7 @@ module RightAws
       end
     end
 
-    class QEc2CreateKeyPairParser < RightAWSParser #:nodoc:
+    class QEc2CreateKeyPairParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @result = {} if name == 'CreateKeyPairResponse'
       end
@@ -1284,7 +1284,7 @@ module RightAws
     end
 
 
-    class QEc2DescribeSecurityGroupsParser < RightAWSParser #:nodoc:
+    class QEc2DescribeSecurityGroupsParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         case name
           when 'item' 
@@ -1334,7 +1334,7 @@ module RightAws
   #      PARSERS: Images
   #-----------------------------------------------------------------
     
-    class QEc2DescribeImagesParser < RightAWSParser #:nodoc:
+    class QEc2DescribeImagesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         if name == 'item' && @xmlpath[%r{.*/imagesSet$}]
           @image = {}
@@ -1360,7 +1360,7 @@ module RightAws
       end
     end
 
-    class QEc2RegisterImageParser < RightAWSParser #:nodoc:
+    class QEc2RegisterImageParser < AwsParser #:nodoc:
       def tagend(name)
         @result = @text if name == 'imageId'
       end
@@ -1370,7 +1370,7 @@ module RightAws
   #      PARSERS: Image Attribute
   #-----------------------------------------------------------------
 
-    class QEc2DescribeImageAttributeParser < RightAWSParser #:nodoc:
+    class QEc2DescribeImageAttributeParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         case name
           when 'launchPermission'
@@ -1403,7 +1403,7 @@ module RightAws
   #      PARSERS: Instances
   #-----------------------------------------------------------------
 
-    class QEc2DescribeInstancesParser < RightAWSParser #:nodoc:
+    class QEc2DescribeInstancesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
            # DescribeInstances property
         if (name == 'item' && @xmlpath == 'DescribeInstancesResponse/reservationSet') || 
@@ -1465,13 +1465,13 @@ module RightAws
       end
     end
 
-    class QEc2ConfirmProductInstanceParser < RightAWSParser #:nodoc:
+    class QEc2ConfirmProductInstanceParser < AwsParser #:nodoc:
       def tagend(name)
         @result = @text if name == 'ownerId'
       end
     end
 
-    class QEc2TerminateInstancesParser < RightAWSParser #:nodoc:
+    class QEc2TerminateInstancesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @instance = {} if name == 'item'
       end
@@ -1498,7 +1498,7 @@ module RightAws
   #      PARSERS: Console
   #-----------------------------------------------------------------
 
-    class QEc2GetConsoleOutputParser < RightAWSParser #:nodoc:
+    class QEc2GetConsoleOutputParser < AwsParser #:nodoc:
       def tagend(name)
         case name
         when 'instanceId' then @result[:aws_instance_id] = @text
@@ -1515,7 +1515,7 @@ module RightAws
   #-----------------------------------------------------------------
   #      Instances: Wondows related part
   #-----------------------------------------------------------------
-    class QEc2DescribeBundleTasksParser < RightAWSParser #:nodoc:
+    class QEc2DescribeBundleTasksParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @bundle = {} if name == 'item'
       end
@@ -1540,7 +1540,7 @@ module RightAws
       end
     end
 
-    class QEc2BundleInstanceParser < RightAWSParser #:nodoc:
+    class QEc2BundleInstanceParser < AwsParser #:nodoc:
       def tagend(name)
         case name
 #        when 'requestId'  then @result[:request_id]    = @text
@@ -1565,13 +1565,13 @@ module RightAws
   #      PARSERS: Elastic IPs
   #-----------------------------------------------------------------
   
-    class QEc2AllocateAddressParser < RightAWSParser #:nodoc:
+    class QEc2AllocateAddressParser < AwsParser #:nodoc:
       def tagend(name)
         @result = @text if name == 'publicIp'
       end
     end
     
-    class QEc2DescribeAddressesParser < RightAWSParser #:nodoc:
+    class QEc2DescribeAddressesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @address = {} if name == 'item'
       end
@@ -1591,7 +1591,7 @@ module RightAws
   #      PARSERS: AvailabilityZones
   #-----------------------------------------------------------------
 
-    class QEc2DescribeAvailabilityZonesParser < RightAWSParser #:nodoc:
+    class QEc2DescribeAvailabilityZonesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @zone = {} if name == 'item'
       end
@@ -1612,7 +1612,7 @@ module RightAws
   #      PARSERS: Regions
   #-----------------------------------------------------------------
 
-    class QEc2DescribeRegionsParser < RightAWSParser #:nodoc:
+    class QEc2DescribeRegionsParser < AwsParser #:nodoc:
       def tagend(name)
         @result << @text if name == 'regionName'
       end
@@ -1625,7 +1625,7 @@ module RightAws
   #      PARSERS: EBS - Volumes
   #-----------------------------------------------------------------
  
-    class QEc2CreateVolumeParser < RightAWSParser #:nodoc:
+    class QEc2CreateVolumeParser < AwsParser #:nodoc:
       def tagend(name)
         case name 
           when 'volumeId'         then @result[:aws_id]         = @text
@@ -1641,7 +1641,7 @@ module RightAws
       end
     end
     
-    class QEc2AttachAndDetachVolumeParser < RightAWSParser #:nodoc:
+    class QEc2AttachAndDetachVolumeParser < AwsParser #:nodoc:
       def tagend(name)
         case name 
           when 'volumeId'   then @result[:aws_id]                = @text
@@ -1656,7 +1656,7 @@ module RightAws
       end
     end
       
-    class QEc2DescribeVolumesParser < RightAWSParser #:nodoc:
+    class QEc2DescribeVolumesParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         case name
         when 'item'
@@ -1698,7 +1698,7 @@ module RightAws
   #      PARSERS: EBS - Snapshots
   #-----------------------------------------------------------------
   
-    class QEc2DescribeSnapshotsParser < RightAWSParser #:nodoc:
+    class QEc2DescribeSnapshotsParser < AwsParser #:nodoc:
       def tagstart(name, attributes)
         @snapshot = {} if name == 'item'
       end
@@ -1717,7 +1717,7 @@ module RightAws
       end
     end
 
-    class QEc2CreateSnapshotParser < RightAWSParser #:nodoc:
+    class QEc2CreateSnapshotParser < AwsParser #:nodoc:
       def tagend(name)
         case name 
           when 'volumeId'   then @result[:aws_volume_id]  = @text
@@ -1733,5 +1733,7 @@ module RightAws
     end
     
   end
-      
+
 end
+
+