From bfe11b90461f6c2e4c4a6cd4e31b39ef471ef32f Mon Sep 17 00:00:00 2001 From: geemus Date: Thu, 27 May 2010 17:14:07 -0700 Subject: [PATCH] [elb] consolidate to use AWS.indexed_params --- lib/fog/aws/elb.rb | 9 --------- lib/fog/aws/requests/elb/create_load_balancer.rb | 6 +++--- .../elb/deregister_instances_from_load_balancer.rb | 2 +- lib/fog/aws/requests/elb/describe_instance_health.rb | 2 +- lib/fog/aws/requests/elb/describe_load_balancers.rb | 2 +- .../elb/disable_availability_zones_for_load_balancer.rb | 2 +- .../elb/enable_availability_zones_for_load_balancer.rb | 2 +- .../elb/register_instances_with_load_balancer.rb | 2 +- 8 files changed, 9 insertions(+), 18 deletions(-) diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb index b4b64b2a3..b5c7f85d1 100644 --- a/lib/fog/aws/elb.rb +++ b/lib/fog/aws/elb.rb @@ -33,15 +33,6 @@ module Fog Fog::AWS::ELB::Real.new(options) end - def self.indexed_param(key, values, idx_offset = 0) - params = {} - key.concat(".%") unless key.include?("%") - [*values].each_with_index do |value, index| - params["#{key.gsub("%", (index + idx_offset).to_s)}"] = value - end - return params - end - class Real # Initialize connection to ELB diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb index a77868a68..1cd243266 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer.rb @@ -31,9 +31,9 @@ module Fog listener_instance_port.push(listener['InstancePort']) end - params.merge!(ELB.indexed_param('Listeners.member.%.Protocol', listener_protocol, 1)) - params.merge!(ELB.indexed_param('Listeners.member.%.LoadBalancerPort', listener_lb_port, 1)) - params.merge!(ELB.indexed_param('Listeners.member.%.InstancePort', listener_instance_port, 1)) + params.merge!(AWS.indexed_param('Listeners.member.%.Protocol', listener_protocol, 1)) + params.merge!(AWS.indexed_param('Listeners.member.%.LoadBalancerPort', listener_lb_port, 1)) + params.merge!(AWS.indexed_param('Listeners.member.%.InstancePort', listener_instance_port, 1)) request({ 'Action' => 'CreateLoadBalancer', diff --git a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb index 2badb0f48..9ee5e06a8 100644 --- a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +++ b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb @@ -18,7 +18,7 @@ module Fog # * 'Instances'<~Array> - array of hashes describing instances currently enabled # * 'InstanceId'<~String> def deregister_instances_from_load_balancer(instance_ids, lb_name) - params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) request({ 'Action' => 'DeregisterInstancesFromLoadBalancer', 'LoadBalancerName' => lb_name, diff --git a/lib/fog/aws/requests/elb/describe_instance_health.rb b/lib/fog/aws/requests/elb/describe_instance_health.rb index 192cf8c5f..958d3c030 100644 --- a/lib/fog/aws/requests/elb/describe_instance_health.rb +++ b/lib/fog/aws/requests/elb/describe_instance_health.rb @@ -21,7 +21,7 @@ module Fog # * 'InstanceId'<~String> # * 'ReasonCode'<~String> def describe_instance_health(lb_name, instance_ids = []) - params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) request({ 'Action' => 'DescribeInstanceHealth', 'LoadBalancerName' => lb_name, diff --git a/lib/fog/aws/requests/elb/describe_load_balancers.rb b/lib/fog/aws/requests/elb/describe_load_balancers.rb index 59ca1e777..7ea4e0783 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancers.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancers.rb @@ -36,7 +36,7 @@ module Fog # * 'AvailabilityZones'<~Array> - list of availability zones covered by this load balancer # * 'Instances'<~Array> - list of instances that the load balancer balances between def describe_load_balancers(lb_name = []) - params = ELB.indexed_param('LoadBalancerNames.member', [*lb_name], 1) + params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name], 1) request({ 'Action' => 'DescribeLoadBalancers', :parser => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new diff --git a/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb b/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb index 9e8115c0a..16ae623fa 100644 --- a/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb @@ -17,7 +17,7 @@ module Fog # * 'DisableAvailabilityZonesForLoadBalancerResult'<~Hash>: # * 'AvailabilityZones'<~Array> - array of strings describing instances currently enabled def disable_availability_zones_for_load_balancer(availability_zones, lb_name) - params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones], 1) + params = AWS.indexed_param('AvailabilityZones.member', [*availability_zones], 1) request({ 'Action' => 'DisableAvailabilityZonesForLoadBalancer', 'LoadBalancerName' => lb_name, diff --git a/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb b/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb index 7c19722a8..3af9f5b0c 100644 --- a/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb @@ -17,7 +17,7 @@ module Fog # * 'EnableAvailabilityZonesForLoadBalancerResult'<~Hash>: # * 'AvailabilityZones'<~Array> - array of strings describing instances currently enabled def enable_availability_zones_for_load_balancer(availability_zones, lb_name) - params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones], 1) + params = AWS.indexed_param('AvailabilityZones.member', [*availability_zones], 1) request({ 'Action' => 'EnableAvailabilityZonesForLoadBalancer', 'LoadBalancerName' => lb_name, diff --git a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb index 32bd6d499..17cc1135a 100644 --- a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +++ b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb @@ -18,7 +18,7 @@ module Fog # * 'Instances'<~Array> - array of hashes describing instances currently enabled # * 'InstanceId'<~String> def register_instances_with_load_balancer(instance_ids, lb_name) - params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) + params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1) request({ 'Action' => 'RegisterInstancesWithLoadBalancer', 'LoadBalancerName' => lb_name,