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

Merge pull request #1003 from estonfer/fix_elb_mock

fixes elb test in mocking mode
This commit is contained in:
Eric Stonfer 2012-06-25 13:37:02 -07:00
commit b851239f5d
2 changed files with 4 additions and 2 deletions

View file

@ -76,7 +76,7 @@ module Fog
self.data[:load_balancers][lb_name] = {
'AvailabilityZones' => availability_zones,
'Subnets' => options[:subnet_ids],
'Scheme' => options[:scheme],
'Scheme' => options[:scheme].nil? ? 'internet-facing' : options[:scheme],
'SecurityGroups' => options[:security_groups],
'CanonicalHostedZoneName' => '',
'CanonicalHostedZoneNameID' => '',

View file

@ -17,8 +17,10 @@ class AWS
"ListenerDescriptions" => Array,
"LoadBalancerName" => String,
"Policies" => {"LBCookieStickinessPolicies" => Array, "AppCookieStickinessPolicies" => Array},
"Scheme" => String,
"SecurityGroups" => Fog::Nullable::String,
"SourceSecurityGroup" => {"GroupName" => String, "OwnerAlias" => String},
"Scheme" => String
"Subnets" => Fog::Nullable::String
}
CREATE_LOAD_BALANCER = BASIC.merge({