aws 2.1.5 → 2.1.6

data/lib/elb/right_elb_interface.rb

@@ -5,12 +5,12 @@ module Aws
         include AwsBaseInterface
 
 
-        #Amazon EC2 API version being used
-        API_VERSION = "2008-12-01"
+        #Amazon ELB API version being used
+        API_VERSION = "2009-05-15"
         DEFAULT_HOST = "elasticloadbalancing.amazonaws.com"
         DEFAULT_PATH = '/'
-        DEFAULT_PROTOCOL = 'http'
-        DEFAULT_PORT = 80
+        DEFAULT_PROTOCOL = 'https'
+        DEFAULT_PORT = 443
 
 
         @@bench = AwsBenchmarkingBlock.new
@@ -94,11 +94,11 @@ module Aws
         #       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 = 0
+            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}.Protocol=#{l[:instance_port]}"]
+                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
@@ -113,13 +113,19 @@ module Aws
         end
 
 
-        def register_instance_with_elb(instance_id, lparams={})
+        # 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
 
-            params['LoadBalancerName'] = lparams[:load_balancer_name]
-            params['Instances.member.1.InstanceId'] = instance_id
+            i = 1
+            instance_ids.each do |l|
+                params["Instances.member.#{i}.InstanceId"] = "#{l}"
+                i += 1
+            end
 
-            @logger.info("Registering Instance #{instance_id} with Load Balancer '#{params['LoadBalancerName']}'")
+            @logger.info("Registering Instances #{instance_ids.join(',')} with Load Balancer '#{name}'")
 
             link = generate_request("RegisterInstancesWithLoadBalancer", params)
             resp = request_info(link, QElbRegisterInstanceParser.new(:logger => @logger))
@@ -143,6 +149,20 @@ module Aws
             on_exception
         end
 
+        def delete_load_balancer(name)
+            @logger.info("Deleting Load Balancer - " + name.to_s)
+
+            params = {}
+            params['LoadBalancerName'] = name
+
+            link = generate_request("DeleteLoadBalancer", params)
+
+            resp = request_info(link, QElbDeleteParser.new(:logger => @logger))
+
+        rescue Exception
+            on_exception
+        end
+
 
         #-----------------------------------------------------------------
         #      PARSERS: Instances
@@ -171,15 +191,19 @@ module Aws
             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')
+#                puts 'tagstart ' + name + ' -- ' + @xmlpath
+                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners')
                     @listener = { }
                 end
-                if (name == 'member' && @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions/member/AvailabilityZones')
+                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
 
@@ -191,8 +215,12 @@ module Aws
                         @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
@@ -213,12 +241,14 @@ module Aws
                         @member[:health_check][:unhealthy_threshold] = @text.to_i
                     # AvailabilityZones
                     when 'member' then
-                        if @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions/member/Listeners'
+                        if @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Listeners'
                             @member[:listeners] << @listener
-                        elsif @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions/member/AvailabilityZones'
+                        elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/AvailabilityZones'
                             @availability_zone = @text
                             @member[:availability_zones] << @availability_zone
-                        elsif @xmlpath == 'DescribeLoadBalancersResult/LoadBalancersDescriptions'
+                        elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions/member/Instances'
+                            @member[:instances] << @instance
+                        elsif @xmlpath == 'DescribeLoadBalancersResponse/DescribeLoadBalancersResult/LoadBalancerDescriptions'
                             @result << @member
                         end
 
@@ -241,6 +271,15 @@ module Aws
             end
         end
 
+        class QElbDeleteParser < AwsParser
+
+            def reset
+                @result = true
+            end
+
+
+        end
+
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -08:00
+date: 2009-11-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency