kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[aws|elb] fixes for mock tests

Browse source
This commit is contained in:
geemus 2012-08-16 15:17:42 -05:00
parent 58ac82d9a1
commit 41e7132d14
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/aws/requests/elb/create_load_balancer.rb
View file

@ -75,7 +75,7 @@ module Fog
dns_name = Fog::AWS::ELB::Mock.dns_name(lb_name, @region)
self.data[:load_balancers][lb_name] = {
'AvailabilityZones' => availability_zones,
'Subnets' => options[:subnet_ids],
'Subnets' => options[:subnet_ids] || [],
'Scheme' => options[:scheme].nil? ? 'internet-facing' : options[:scheme],
'SecurityGroups' => options[:security_groups].nil? ? [] : options[:security_groups],
'CanonicalHostedZoneName' => '',

2
lib/fog/aws/requests/elb/describe_load_balancers.rb
View file

@ -108,7 +108,7 @@ module Fog
}
if next_marker
response.body['DescribeLoadBalancersResult']['NextMarker'] = next_marker
response.body['DescribeLoadBalancersResult']['NextMarker'] = next_marker.to_s
end
response

2
tests/aws/requests/elb/helper.rb
View file

@ -37,7 +37,7 @@ class AWS
})
DESCRIBE_LOAD_BALANCERS = BASIC.merge({
'DescribeLoadBalancersResult' => {'LoadBalancerDescriptions' => [LOAD_BALANCER]}
'DescribeLoadBalancersResult' => {'LoadBalancerDescriptions' => [LOAD_BALANCER], 'NextMarker' => Fog::Nullable::String}
})
POLICY_ATTRIBUTE_DESCRIPTION = {