aws 2.3.34 → 2.4.0

data/lib/ec2/mon_interface.rb

@@ -0,0 +1,243 @@
+module Aws
+
+
+  # This is the interface for Amazon CloudWatch.
+
+  class Mon < Aws::AwsBase
+    include Aws::AwsBaseInterface
+
+
+    #Amazon EC2 API version being used
+    API_VERSION      = "2009-05-15"
+    DEFAULT_HOST     = "monitoring.amazonaws.com"
+    DEFAULT_PATH     = '/'
+    DEFAULT_PROTOCOL = 'https'
+    DEFAULT_PORT     = 443
+
+    # Available measures for EC2 instances:
+    # NetworkIn NetworkOut DiskReadOps DiskWriteOps DiskReadBytes DiskWriteBytes CPUUtilization
+    measures         =%w(NetworkIn NetworkOut DiskReadOps DiskWriteOps DiskReadBytes DiskWriteBytes CPUUtilization)
+
+
+    def self.connection_name
+      :mon_connection
+    end
+
+    @@bench          = Aws::AwsBenchmarkingBlock.new
+ def self.bench
+      @@bench
+    end
+    def self.bench_xml
+      @@bench.xml
+    end
+
+    def self.bench_ec2
+      @@bench.service
+    end
+
+    # Current API version (sometimes we have to check it outside the GEM).
+    @@api = ENV['EC2_API_VERSION'] || API_VERSION
+
+    def self.api
+      @@api
+    end
+
+
+    def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
+      init({:name             => 'MON',
+            :default_host     => ENV['MON_URL'] ? URI.parse(ENV['MON_URL']).host : DEFAULT_HOST,
+            :default_port     => ENV['MON_URL'] ? URI.parse(ENV['MON_URL']).port : DEFAULT_PORT,
+            :default_service  => ENV['MON_URL'] ? URI.parse(ENV['MON_URL']).path : DEFAULT_PATH,
+            :default_protocol => ENV['MON_URL'] ? URI.parse(ENV['MON_URL']).scheme : DEFAULT_PROTOCOL,
+            :api_version      => API_VERSION},
+           aws_access_key_id || ENV['AWS_ACCESS_KEY_ID'],
+           aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
+           params)
+    end
+
+
+    def generate_request(action, params={})
+      service_hash = {"Action"         => action,
+                      "AWSAccessKeyId" => @aws_access_key_id,
+                      "Version"        => @@api}
+      service_hash.update(params)
+      service_params = signed_service_params(@aws_secret_access_key, service_hash, :get, @params[:server], @params[:service])
+
+      # use POST method if the length of the query string is too large
+      if service_params.size > 2000
+        if signature_version == '2'
+          # resign the request because HTTP verb is included into signature
+          service_params = signed_service_params(@aws_secret_access_key, service_hash, :post, @params[:server], @params[:service])
+        end
+        request                 = Net::HTTP::Post.new(service)
+        request.body            = service_params
+        request['Content-Type'] = 'application/x-www-form-urlencoded'
+      else
+        request = Net::HTTP::Get.new("#{@params[:service]}?#{service_params}")
+      end
+
+      #puts "\n\n --------------- QUERY REQUEST TO AWS -------------- \n\n"
+      #puts "#{@params[:service]}?#{service_params}\n\n"
+
+      # prepare output hash
+      {:request  => request,
+       :server   => @params[:server],
+       :port     => @params[:port],
+       :protocol => @params[:protocol]}
+    end
+
+
+    # Sends request to Amazon and parses the response
+    # Raises AwsError if any banana happened
+    # todo: remove this and switch to using request_info2
+    def request_info(request, parser, options={})
+      conn = get_conn(self.class.connection_name, @params, @logger)
+      request_info_impl(conn, @@bench, request, parser, options)
+    end
+
+    #-----------------------------------------------------------------
+    #      REQUESTS
+    #-----------------------------------------------------------------
+
+    def list_metrics(options={})
+
+      next_token = options[:next_token] || nil
+
+      params     = {}
+      params['NextToken'] = next_token unless next_token.nil?
+
+      @logger.info("list Metrics ")
+
+      link = generate_request("ListMetrics", params)
+      resp = request_info(link, QMonListMetrics.new(:logger => @logger))
+
+    rescue Exception
+      on_exception
+    end
+
+
+    # measureName:  CPUUtilization (Units: Percent), NetworkIn (Units: Bytes), NetworkOut (Units: Bytes), DiskWriteOps (Units: Count)
+    #               DiskReadBytes (Units: Bytes), DiskReadOps (Units: Count), DiskWriteBytes (Units: Bytes)
+    # stats: 	array containing one or more of Minimum, Maximum, Sum, Average, Samples
+    # start_time :   Timestamp to start
+    # end_time:      Timestamp to end
+    # unit: 	Either Seconds, Percent, Bytes, Bits, Count, Bytes, Bits/Second, Count/Second, and None
+    #
+    # Optional parameters:
+    #    period: 	Integer 60 or multiple of 60
+    #    dimensions:    Hash containing keys ImageId, AutoScalingGroupName, InstanceId, InstanceType
+    #    customUnit:   nil. not supported currently.
+    #    namespace:    AWS/EC2
+
+    def get_metric_statistics (measure_name, stats, start_time, end_time, unit, options={})
+
+      period                = options[:period] || 60
+      dimensions            = options[:dimensions] || nil
+      custom_unit           = options[:custom_unit] || nil
+      namespace             = options[:namespace] || "AWS/EC2"
+
+      params                = {}
+      params['MeasureName'] = measure_name
+      i                     =1
+      stats.each do |s|
+        params['Statistics.member.'+i.to_s] = s
+        i                                   = i+1
+      end
+      params['Period'] = period
+      if (dimensions != nil)
+        i = 1
+        dimensions.each do |k, v|
+          params['Dimensions.member.'+i.to_s+".Name."+i.to_s]  = k
+          params['Dimensions.member.'+i.to_s+".Value."+i.to_s] = v
+          i                                                    = i+1
+        end
+      end
+      params['StartTime'] = start_time
+      params['EndTime']   = end_time
+      params['Unit']      = unit
+      #params['CustomUnit'] = customUnit always nil
+      params['Namespace'] = namespace
+
+      link                = generate_request("GetMetricStatistics", params)
+      resp                = request_info(link, QMonGetMetricStatistics.new(:logger => @logger))
+
+    rescue Exception
+      on_exception
+    end
+
+
+    #-----------------------------------------------------------------
+    #      PARSERS: Instances
+    #-----------------------------------------------------------------
+
+
+    class QMonGetMetricStatistics < Aws::AwsParser
+
+      def reset
+        @result = []
+      end
+
+      def tagstart(name, attributes)
+        @metric = {} if name == 'member'
+      end
+
+      def tagend(name)
+        case name
+          when 'Timestamp' then
+            @metric[:timestamp] = @text
+          when 'Samples' then
+            @metric[:samples] = @text
+          when 'Unit' then
+            @metric[:unit] = @text
+          when 'Average' then
+            @metric[:average] = @text
+          when 'Minimum' then
+            @metric[:minimum] = @text
+          when 'Maximum' then
+            @metric[:maximum] = @text
+          when 'Sum' then
+            @metric[:sum] = @text
+          when 'Value' then
+            @metric[:value] = @text
+          when 'member' then
+            @result << @metric
+        end
+      end
+    end
+
+    class QMonListMetrics < Aws::AwsParser
+
+      def reset
+        @result       = []
+        @namespace    = ""
+        @measure_name = ""
+      end
+
+      def tagstart(name, attributes)
+        @metric = {} if name == 'member'
+      end
+
+      def tagend(name)
+        case name
+          when 'MeasureName' then
+            @measure_name = @text
+          when 'Namespace' then
+            @namespace = @text
+          when 'Name' then
+            @metric[:name] = @text
+          when 'Value' then
+            @metric[:value] = @text
+          when 'member' then
+            @metric[:namespace]    = @namespace
+            @metric[:measure_name] = @measure_name
+            @result << @metric
+        end
+      end
+    end
+
+
+  end
+
+
+end
+

data/lib/elb/elb_interface.rb

@@ -1,359 +1,361 @@
 module Aws
 
-    require 'xmlsimple'
+  require 'xmlsimple'
 
-    class Elb < AwsBase
+  class Elb < AwsBase
 
-        include AwsBaseInterface
+    include AwsBaseInterface
 
 
-        #Amazon ELB API version being used
-        API_VERSION = "2009-05-15"
-        DEFAULT_HOST = "elasticloadbalancing.amazonaws.com"
-        DEFAULT_PATH = '/'
-        DEFAULT_PROTOCOL = 'https'
-        DEFAULT_PORT = 443
+    #Amazon ELB API version being used
+    API_VERSION      = "2009-05-15"
+    DEFAULT_HOST     = "elasticloadbalancing.amazonaws.com"
+    DEFAULT_PATH     = '/'
+    DEFAULT_PROTOCOL = 'https'
+    DEFAULT_PORT     = 443
 
 
-        @@bench = AwsBenchmarkingBlock.new
-
-        def self.bench_xml
-            @@bench.xml
-        end
-
-        def self.bench_ec2
-            @@bench.service
-        end
-
-        # Current API version (sometimes we have to check it outside the GEM).
-        @@api = ENV['ELB_API_VERSION'] || API_VERSION
-
-        def self.api
-            @@api
-        end
+    @@bench          = AwsBenchmarkingBlock.new
+ def self.bench
+      @@bench
+    end
+    def self.bench_xml
+      @@bench.xml
+    end
 
+    def self.bench_ec2
+      @@bench.service
+    end
 
-        def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
-            init({ :name => 'ELB',
-                   :default_host => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).host : DEFAULT_HOST,
-                   :default_port => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).port : DEFAULT_PORT,
-                   :default_service => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).path : DEFAULT_PATH,
-                   :default_protocol => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).scheme : DEFAULT_PROTOCOL,
-            :api_version => API_VERSION },
-                 aws_access_key_id || ENV['AWS_ACCESS_KEY_ID'],
-                 aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
-                 params)
-        end
+    # Current API version (sometimes we have to check it outside the GEM).
+    @@api = ENV['ELB_API_VERSION'] || API_VERSION
 
+    def self.api
+      @@api
+    end
 
-        # Sends request to Amazon and parses the response
-        # Raises AwsError if any banana happened
-        def request_info(request, parser, options={})
-            request_info2(request, parser, @params, :elb_connection, @logger, @@bench, options)
-        end
 
-        # todo: convert to xml-simple version and get rid of parser below
-        def do_request(action, params, options={})
-            link = generate_request(action, params)
-            resp = request_info_xml_simple(:rds_connection, @params, link, @logger,
-                                           :group_tags=>{"LoadBalancersDescriptions"=>"LoadBalancersDescription",
-                                                            "DBParameterGroups"=>"DBParameterGroup",
-                                                            "DBSecurityGroups"=>"DBSecurityGroup",
-                                                            "EC2SecurityGroups"=>"EC2SecurityGroup",
-                                                            "IPRanges"=>"IPRange"},
-                                           :force_array=>["DBInstances",
-                                                          "DBParameterGroups",
-                                                          "DBSecurityGroups",
-                                                          "EC2SecurityGroups",
-                                                          "IPRanges"],
-                                           :pull_out_array=>options[:pull_out_array],
-                                           :pull_out_single=>options[:pull_out_single],
-                                           :wrapper=>options[:wrapper])
-        end
+    def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
+      init({:name             => 'ELB',
+            :default_host     => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).host : DEFAULT_HOST,
+            :default_port     => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).port : DEFAULT_PORT,
+            :default_service  => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).path : DEFAULT_PATH,
+            :default_protocol => ENV['ELB_URL'] ? URI.parse(ENV['ELB_URL']).scheme : DEFAULT_PROTOCOL,
+            :api_version      => API_VERSION},
+           aws_access_key_id || ENV['AWS_ACCESS_KEY_ID'],
+           aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
+           params)
+    end
 
 
-        #-----------------------------------------------------------------
-        #      REQUESTS
-        #-----------------------------------------------------------------
-
-        #
-        # name: name of load balancer
-        # availability_zones: array of zones
-        # listeners: array of hashes containing :load_balancer_port, :instance_port, :protocol
-        #       eg: {:load_balancer_port=>80, :instance_port=>8080, :protocol=>"HTTP"}
-        def create_load_balancer(name, availability_zones, listeners)
-            params = hash_params('AvailabilityZones.member', availability_zones)
-            i = 1
-            listeners.each do |l|
-                params["Listeners.member.#{i}.Protocol"] = "#{l[:protocol]}"
-                params["Listeners.member.#{i}.LoadBalancerPort"] = "#{l[:load_balancer_port]}"
-                params["Listeners.member.#{i}.InstancePort"] = "#{l[:instance_port]}"
-                i += 1
-            end
-            params['LoadBalancerName'] = name
+    # Sends request to Amazon and parses the response
+    # Raises AwsError if any banana happened
+    def request_info(request, parser, options={})
+      request_info2(request, parser, @params, :elb_connection, @logger, @@bench, options)
+    end
 
-            @logger.info("Creating LoadBalancer called #{params['LoadBalancerName']}")
+    # todo: convert to xml-simple version and get rid of parser below
+    def do_request(action, params, options={})
+      link = generate_request(action, params)
+      resp = request_info_xml_simple(:rds_connection, @params, link, @logger,
+                                     :group_tags     =>{"LoadBalancersDescriptions"=>"LoadBalancersDescription",
+                                                        "DBParameterGroups"        =>"DBParameterGroup",
+                                                        "DBSecurityGroups"         =>"DBSecurityGroup",
+                                                        "EC2SecurityGroups"        =>"EC2SecurityGroup",
+                                                        "IPRanges"                 =>"IPRange"},
+                                     :force_array    =>["DBInstances",
+                                                        "DBParameterGroups",
+                                                        "DBSecurityGroups",
+                                                        "EC2SecurityGroups",
+                                                        "IPRanges"],
+                                     :pull_out_array =>options[:pull_out_array],
+                                     :pull_out_single=>options[:pull_out_single],
+                                     :wrapper        =>options[:wrapper])
+    end
 
-            link = generate_request("CreateLoadBalancer", params)
-            resp = request_info(link, QElbCreateParser.new(:logger => @logger))
 
-        rescue Exception
-            on_exception
-        end
+    #-----------------------------------------------------------------
+    #      REQUESTS
+    #-----------------------------------------------------------------
+
+    #
+    # name: name of load balancer
+    # availability_zones: array of zones
+    # listeners: array of hashes containing :load_balancer_port, :instance_port, :protocol
+    #       eg: {:load_balancer_port=>80, :instance_port=>8080, :protocol=>"HTTP"}
+    def create_load_balancer(name, availability_zones, listeners)
+      params = hash_params('AvailabilityZones.member', availability_zones)
+      i      = 1
+      listeners.each do |l|
+        params["Listeners.member.#{i}.Protocol"]         = "#{l[:protocol]}"
+        params["Listeners.member.#{i}.LoadBalancerPort"] = "#{l[:load_balancer_port]}"
+        params["Listeners.member.#{i}.InstancePort"]     = "#{l[:instance_port]}"
+        i                                                += 1
+      end
+      params['LoadBalancerName'] = name
+
+      @logger.info("Creating LoadBalancer called #{params['LoadBalancerName']}")
+
+      link = generate_request("CreateLoadBalancer", params)
+      resp = request_info(link, QElbCreateParser.new(:logger => @logger))
+
+    rescue Exception
+      on_exception
+    end
 
 
-        # name: name of load balancer
-        # instance_ids: array of instance_id's to add to load balancer
-        def register_instances_with_load_balancer(name, instance_ids)
-            params = {}
-            params['LoadBalancerName'] = name
+    # name: name of load balancer
+    # instance_ids: array of instance_id's to add to load balancer
+    def register_instances_with_load_balancer(name, instance_ids)
+      params                     = {}
+      params['LoadBalancerName'] = name
 
-            i = 1
-            instance_ids.each do |l|
-                params["Instances.member.#{i}.InstanceId"] = "#{l}"
-                i += 1
-            end
+      i                          = 1
+      instance_ids.each do |l|
+        params["Instances.member.#{i}.InstanceId"] = "#{l}"
+        i                                          += 1
+      end
 
-            @logger.info("Registering Instances #{instance_ids.join(',')} with Load Balancer '#{name}'")
+      @logger.info("Registering Instances #{instance_ids.join(',')} with Load Balancer '#{name}'")
 
-            link = generate_request("RegisterInstancesWithLoadBalancer", params)
-            resp = request_info(link, QElbRegisterInstancesParser.new(:logger => @logger))
+      link = generate_request("RegisterInstancesWithLoadBalancer", params)
+      resp = request_info(link, QElbRegisterInstancesParser.new(:logger => @logger))
 
-        rescue Exception
-            on_exception
-        end
+    rescue Exception
+      on_exception
+    end
 
-        def deregister_instances_from_load_balancer(name, instance_ids)
-            params = {}
-            params['LoadBalancerName'] = name
+    def deregister_instances_from_load_balancer(name, instance_ids)
+      params                     = {}
+      params['LoadBalancerName'] = name
 
-            i = 1
-            instance_ids.each do |l|
-                params["Instances.member.#{i}.InstanceId"] = "#{l}"
-                i += 1
-            end
+      i                          = 1
+      instance_ids.each do |l|
+        params["Instances.member.#{i}.InstanceId"] = "#{l}"
+        i                                          += 1
+      end
 
-            @logger.info("Deregistering Instances #{instance_ids.join(',')} from Load Balancer '#{name}'")
+      @logger.info("Deregistering Instances #{instance_ids.join(',')} from Load Balancer '#{name}'")
 
-            link = generate_request("DeregisterInstancesFromLoadBalancer", params) # Same response as register I believe
-            resp = request_info(link, QElbRegisterInstancesParser.new(:logger => @logger))
+      link = generate_request("DeregisterInstancesFromLoadBalancer", params) # Same response as register I believe
+      resp = request_info(link, QElbRegisterInstancesParser.new(:logger => @logger))
 
-        rescue Exception
-            on_exception
-        end
+    rescue Exception
+      on_exception
+    end
 
 
-        def describe_load_balancers(lparams={})
-            @logger.info("Describing Load Balancers")
+    def describe_load_balancers(lparams={})
+      @logger.info("Describing Load Balancers")
 
-            params = {}
-            params.update( hash_params('LoadBalancerNames.member', lparams[:names]) ) if lparams[:names]
+      params = {}
+      params.update(hash_params('LoadBalancerNames.member', lparams[:names])) if lparams[:names]
 
-            link = generate_request("DescribeLoadBalancers", params)
+      link = generate_request("DescribeLoadBalancers", params)
 
-            resp = request_info(link, QElbDescribeLoadBalancersParser.new(:logger => @logger))
+      resp = request_info(link, QElbDescribeLoadBalancersParser.new(:logger => @logger))
 
-        rescue Exception
-            on_exception
-        end
+    rescue Exception
+      on_exception
+    end
 
 
-        def describe_instance_health(name, instance_ids=[])
-            instance_ids = [instance_ids] if instance_ids.is_a?(String)
+    def describe_instance_health(name, instance_ids=[])
+      instance_ids = [instance_ids] if instance_ids.is_a?(String)
 #            @logger.info("Describing Instance Health")
-            params = {}
-            params['LoadBalancerName'] = name
+      params                     = {}
+      params['LoadBalancerName'] = name
 
-            i = 1
-            instance_ids.each do |l|
-                params["Instances.member.#{i}.InstanceId"] = "#{l}"
-                i += 1
-            end
+      i                          = 1
+      instance_ids.each do |l|
+        params["Instances.member.#{i}.InstanceId"] = "#{l}"
+        i                                          += 1
+      end
 
-            @logger.info("Describing Instances Health #{instance_ids.join(',')} with Load Balancer '#{name}'")
+      @logger.info("Describing Instances Health #{instance_ids.join(',')} with Load Balancer '#{name}'")
 
-            link = generate_request("DescribeInstanceHealth", params)
-            resp = request_info(link, QElbDescribeInstancesHealthParser.new(:logger => @logger))
+      link = generate_request("DescribeInstanceHealth", params)
+      resp = request_info(link, QElbDescribeInstancesHealthParser.new(:logger => @logger))
 
 
-        rescue Exception
-            on_exception
-        end
+    rescue Exception
+      on_exception
+    end
 
 
-        def delete_load_balancer(name)
-            @logger.info("Deleting Load Balancer - " + name.to_s)
+    def delete_load_balancer(name)
+      @logger.info("Deleting Load Balancer - " + name.to_s)
 
-            params = {}
-            params['LoadBalancerName'] = name
+      params                     = {}
+      params['LoadBalancerName'] = name
 
-            link = generate_request("DeleteLoadBalancer", params)
+      link                       = generate_request("DeleteLoadBalancer", params)
 
-            resp = request_info(link, QElbDeleteParser.new(:logger => @logger))
+      resp                       = request_info(link, QElbDeleteParser.new(:logger => @logger))
 
-        rescue Exception
-            on_exception
-        end
+    rescue Exception
+      on_exception
+    end
 
 
-        #-----------------------------------------------------------------
-        #      PARSERS: Instances
-        #-----------------------------------------------------------------
+    #-----------------------------------------------------------------
+    #      PARSERS: Instances
+    #-----------------------------------------------------------------
 
 
-        class QElbCreateParser < AwsParser
+    class QElbCreateParser < AwsParser
 
-            def reset
-                @result = {}
-            end
+      def reset
+        @result = {}
+      end
 
 
-            def tagend(name)
-                case name
-                    when 'DNSName' then
-                        @result[:dns_name] = @text
-                end
-            end
+      def tagend(name)
+        case name
+          when 'DNSName' then
+            @result[:dns_name] = @text
         end
+      end
+    end
 
-        class QElbDescribeLoadBalancersParser < AwsParser
+    class QElbDescribeLoadBalancersParser < AwsParser
 
-            def reset
-                @result = []
-            end
+      def reset
+        @result = []
+      end
 
-            def tagstart(name, attributes)
+      def tagstart(name, attributes)
 #                puts 'tagstart ' + name + ' -- ' + @xmlpath
-                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners')
-                    @listener = { }
-                end
-                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/AvailabilityZones')
-                    @availability_zone = { }
-                end
-                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Instances')
-                    @instance = {}
-                end
-                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions')
-                    @member = { :listeners=>[], :availability_zones=>[], :health_check=>{}, :instances=>[] }
-                end
+        if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners')
+          @listener = {}
+        end
+        if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/AvailabilityZones')
+          @availability_zone = {}
+        end
+        if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Instances')
+          @instance = {}
+        end
+        if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions')
+          @member = {:listeners=>[], :availability_zones=>[], :health_check=>{}, :instances=>[]}
+        end
 
+      end
+
+
+      def tagend(name)
+        case name
+          when 'LoadBalancerName' then
+            @member[:load_balancer_name] = @text
+            @member[:name]               = @text
+          when 'CreatedTime' then
+            @member[:created_time] = Time.parse(@text)
+            @member[:created]      = @member[:created_time]
+          when 'DNSName' then
+            @member[:dns_name] = @text
+          # Instances
+          when 'InstanceId' then
+            @instance[:instance_id] = @text
+          # Listeners
+          when 'Protocol' then
+            @listener[:protocol] = @text
+          when 'LoadBalancerPort' then
+            @listener[:load_balancer_port] = @text.to_i
+          when 'InstancePort' then
+            @listener[:instance_port] = @text.to_i
+          # HEALTH CHECK STUFF
+          when 'Interval' then
+            @member[:health_check][:interval] = @text.to_i
+          when 'Target' then
+            @member[:health_check][:target] = @text
+          when 'HealthyThreshold' then
+            @member[:health_check][:healthy_threshold] = @text.to_i
+          when 'Timeout' then
+            @member[:health_check][:timeout] = @text.to_i
+          when 'UnhealthyThreshold' then
+            @member[:health_check][:unhealthy_threshold] = @text.to_i
+          # AvailabilityZones
+          when 'member' then
+            if @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners'
+              @member[:listeners] << @listener
+            elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/AvailabilityZones'
+              @availability_zone = @text
+              @member[:availability_zones] << @availability_zone
+            elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Instances'
+              @member[:instances] << @instance
+            elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions'
+              @result << @member
             end
 
-
-            def tagend(name)
-                case name
-                    when 'LoadBalancerName' then
-                        @member[:load_balancer_name] = @text
-                        @member[:name] = @text
-                    when 'CreatedTime' then
-                        @member[:created_time] = Time.parse(@text)
-                        @member[:created] = @member[:created_time]
-                    when 'DNSName' then
-                        @member[:dns_name] = @text
-                    # Instances
-                    when 'InstanceId' then
-                        @instance[:instance_id] = @text
-                    # Listeners
-                    when 'Protocol' then
-                        @listener[:protocol] = @text
-                    when 'LoadBalancerPort' then
-                        @listener[:load_balancer_port] = @text.to_i
-                    when 'InstancePort' then
-                        @listener[:instance_port] = @text.to_i
-                    # HEALTH CHECK STUFF
-                    when 'Interval' then
-                        @member[:health_check][:interval] = @text.to_i
-                    when 'Target' then
-                        @member[:health_check][:target] = @text
-                    when 'HealthyThreshold' then
-                        @member[:health_check][:healthy_threshold] = @text.to_i
-                    when 'Timeout' then
-                        @member[:health_check][:timeout] = @text.to_i
-                    when 'UnhealthyThreshold' then
-                        @member[:health_check][:unhealthy_threshold] = @text.to_i
-                    # AvailabilityZones
-                    when 'member' then
-                        if @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners'
-                            @member[:listeners] << @listener
-                        elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/AvailabilityZones'
-                            @availability_zone = @text
-                            @member[:availability_zones] << @availability_zone
-                        elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Instances'
-                            @member[:instances] << @instance
-                        elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions'
-                            @result << @member
-                        end
-
-                end
-            end
         end
+      end
+    end
 
-        class QElbRegisterInstancesParser < AwsParser
+    class QElbRegisterInstancesParser < AwsParser
 
-            def reset
-                @result = []
-            end
+      def reset
+        @result = []
+      end
 
-            def tagstart(name, attributes)
+      def tagstart(name, attributes)
 #                puts 'tagstart ' + name + ' -- ' + @xmlpath
-                if (name == 'member' &&
-                        (@xmlpath == 'RegisterInstancesWithLoadBalancerResponse/RegisterInstancesWithLoadBalancerResult/Instances' ||
-                                @xmlpath == 'DeregisterInstancesFromLoadBalancerResponse/DeregisterInstancesFromLoadBalancerResult/Instances')
-                )
-                    @member = { }
-                end
+        if (name == 'member' &&
+            (@xmlpath == 'RegisterInstancesWithLoadBalancerResponse/RegisterInstancesWithLoadBalancerResult/Instances' ||
+                @xmlpath == 'DeregisterInstancesFromLoadBalancerResponse/DeregisterInstancesFromLoadBalancerResult/Instances')
+        )
+          @member = {}
+        end
 
-            end
+      end
 
-            def tagend(name)
-                case name
-                    when 'InstanceId' then
-                        @member[:instance_id] = @text
-                    when 'member' then
-                        @result << @member
-                end
-            end
-#
+      def tagend(name)
+        case name
+          when 'InstanceId' then
+            @member[:instance_id] = @text
+          when 'member' then
+            @result << @member
         end
+      end
+#
+    end
 
-        class QElbDescribeInstancesHealthParser < AwsParser
+    class QElbDescribeInstancesHealthParser < AwsParser
 
-            def reset
-                @result = []
-            end
+      def reset
+        @result = []
+      end
 
-            def tagstart(name, attributes)
+      def tagstart(name, attributes)
 #                puts 'tagstart ' + name + ' -- ' + @xmlpath
-                if (name == 'member' && @xmlpath == 'DescribeInstanceHealthResponse/DescribeInstanceHealthResult/InstanceStates')
-                    @member = { }
-                end
-            end
-
-            def tagend(name)
-                case name
-                    when 'Description' then
-                        @member[:description] = @text
-                    when 'State' then
-                        @member[:state] = @text
-                    when 'InstanceId' then
-                        @member[:instance_id] = @text
-                    when 'ReasonCode' then
-                        @member[:reason_code] = @text
-                    when 'member' then
-                        @result << @member
-                end
-            end
-#
+        if (name == 'member' && @xmlpath == 'DescribeInstanceHealthResponse/DescribeInstanceHealthResult/InstanceStates')
+          @member = {}
         end
-
-        class QElbDeleteParser < AwsParser
-            def reset
-                @result = true
-            end
+      end
+
+      def tagend(name)
+        case name
+          when 'Description' then
+            @member[:description] = @text
+          when 'State' then
+            @member[:state] = @text
+          when 'InstanceId' then
+            @member[:instance_id] = @text
+          when 'ReasonCode' then
+            @member[:reason_code] = @text
+          when 'member' then
+            @result << @member
         end
+      end
+#
+    end
 
-
+    class QElbDeleteParser < AwsParser
+      def reset
+        @result = true
+      end
     end
 
 
+  end
+
+
 end