aws 2.1.2 → 2.1.3

data/lib/elb/right_elb_interface.rb

@@ -129,10 +129,11 @@ module Aws
         end
 
 
-        def describe_load_balancers
+        def describe_load_balancers(lparams={})
             @logger.info("Describing Load Balancers")
 
             params = {}
+            params.update( hash_params('LoadBalancerNames.member', lparams[:names]) ) if lparams[:names]
 
             link = generate_request("DescribeLoadBalancers", params)
 
@@ -151,7 +152,7 @@ module Aws
         class QElbCreateParser < AwsParser
 
             def reset
-                @result = {}
+                @result = []
             end
 
 
@@ -166,41 +167,61 @@ module Aws
         class QElbDescribeLoadBalancersParser < AwsParser
 
             def reset
-                @result = {}
+                @result = []
+            end
+
+            def tagstart(name, attributes)
+                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions')
+                    @member = { :listeners=>[], :availability_zones=>[], :health_check=>{} }
+                end
+                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions/member/Listeners')
+                    @listener = { }
+                end
+                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions/member/AvailabilityZones')
+                    @availability_zone = { }
+                end
+
             end
 
 
             def tagend(name)
                 case name
                     when 'LoadBalancerName' then
-                        @result[:load_balancer_name] = @text
+                        @member[:load_balancer_name] = @text
                     #    when 'AvailabilityZones' then
                     #        @result[:availability_zones]        = @text
                     when 'CreatedTime' then
-                        @result[:created_time] = Time.parse(@text)
+                        @member[:created_time] = Time.parse(@text)
                     when 'DNSName' then
-                        @result[:dns_name] = @text
+                        @member[:dns_name] = @text
+                    # Listeners
                     when 'Protocol' then
-                        @result[:protocol] = @text
+                        @listener[:protocol] = @text
                     when 'LoadBalancerPort' then
-                        @result[:load_balancer_port] = @text.to_i
+                        @listener[:load_balancer_port] = @text.to_i
                     when 'InstancePort' then
-                        @result[:instance_port] = @text.to_i
+                        @listener[:instance_port] = @text.to_i
                     # HEALTH CHECK STUFF
                     when 'Interval' then
-                        @result[:interval] = @text.to_i
+                         @member[:health_check][:interval] = @text.to_i
                     when 'Target' then
-                        @result[:target] = @text
+                       @member[:health_check][:target] = @text
                     when 'HealthyThreshold' then
-                        @result[:healthy_threshold] = @text.to_i
+                        @member[:health_check][:healthy_threshold] = @text.to_i
                     when 'Timeout' then
-                        @result[:timeout] = @text.to_i
+                        @member[:health_check][:timeout] = @text.to_i
                     when 'UnhealthyThreshold' then
-                        @result[:unhealthy_threshold] = @text.to_i
+                        @member[:health_check][:unhealthy_threshold] = @text.to_i
                     # AvailabilityZones
                     when 'member' then
-                        @result[:availability_zones] = [] unless @result[:availability_zones]
-                        @result[:availability_zones] << @text
+                        if @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions/member/Listeners'
+                            @member[:listeners] << @listener
+                        elsif @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions/member/AvailabilityZones'
+                            @availability_zone = @text
+                            @member[:availability_zones] << @availability_zone
+                        elsif @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions'
+                            @result << @member
+                        end
 
                 end
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors: 
 - Travis Reeder