From 5e88bb06064b0c4c90ff2648c4a99fc9637d7ea4 Mon Sep 17 00:00:00 2001 From: Michael Hale Date: Thu, 1 Aug 2013 15:20:52 -0400 Subject: [PATCH] [AWS|ELB] emulate AWS behavior: no BackendServerDescriptions by default --- lib/fog/aws/requests/elb/create_load_balancer.rb | 5 +---- tests/aws/models/elb/model_tests.rb | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb index dad4585fc..4566fc672 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer.rb @@ -65,9 +65,6 @@ module Fog certificate_ids = Fog::AWS::IAM::Mock.data[@aws_access_key_id][:server_certificates].map {|n, c| c['Arn'] } - instance_ports = listeners.map{|l| l["InstancePort"] } - backend_server_descriptions = instance_ports.map {|port| {'InstancePort' => port } } - listeners = [*listeners].map do |listener| if listener['SSLCertificateId'] and !certificate_ids.include? listener['SSLCertificateId'] raise Fog::AWS::IAM::NotFound.new('CertificateNotFound') @@ -89,7 +86,7 @@ module Fog self.data[:load_balancers][lb_name] = { 'AvailabilityZones' => availability_zones, - 'BackendServerDescriptions' => backend_server_descriptions, + 'BackendServerDescriptions' => [], 'Subnets' => options[:subnet_ids] || [], 'Scheme' => options[:scheme].nil? ? 'internet-facing' : options[:scheme], 'SecurityGroups' => options[:security_groups].nil? ? [] : options[:security_groups], diff --git a/tests/aws/models/elb/model_tests.rb b/tests/aws/models/elb/model_tests.rb index 89e17bb79..2c4206fd4 100644 --- a/tests/aws/models/elb/model_tests.rb +++ b/tests/aws/models/elb/model_tests.rb @@ -284,8 +284,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do tests('backend server descriptions') do tests('default') do - returns(1) { elb.backend_server_descriptions.size } - returns(80) { elb.backend_server_descriptions.first.instance_port } + returns(0) { elb.backend_server_descriptions.size } end tests('with a backend policy') do