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

Merge pull request #1022 from fcheung/describe_elb_fix

Browse source 
fix not pulling InstanceProtocol from the xml
This commit is contained in:
Wesley Beary 2012-07-06 09:14:34 -07:00
commit 4391f3dee7
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ module Fog
@in_listeners = false @in_listeners = false
when 'PolicyNames' when 'PolicyNames'
@in_policy_names = false @in_policy_names = false
when 'Protocol', 'SSLCertificateId' when 'Protocol', 'SSLCertificateId', 'InstanceProtocol'
@listener_description['Listener'][name] = value @listener_description['Listener'][name] = value
when 'LoadBalancerPort', 'InstancePort' when 'LoadBalancerPort', 'InstancePort'
@listener_description['Listener'][name] = value.to_i @listener_description['Listener'][name] = value.to_i

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

@ -14,13 +14,22 @@ class AWS
"DNSName" => String, "DNSName" => String,
"HealthCheck" => {"HealthyThreshold" => Integer, "Timeout" => Integer, "UnhealthyThreshold" => Integer, "Interval" => Integer, "Target" => String}, "HealthCheck" => {"HealthyThreshold" => Integer, "Timeout" => Integer, "UnhealthyThreshold" => Integer, "Interval" => Integer, "Target" => String},
"Instances" => Array, "Instances" => Array,
"ListenerDescriptions" => Array, "ListenerDescriptions" => [{
'PolicyNames' => Array,
'Listener' => {
'InstancePort' => Integer,
'InstanceProtocol' => String,
'LoadBalancerPort' => Integer,
'Protocol' => String,
'SSLCertificateId' => Fog::Nullable::String
}
}],
"LoadBalancerName" => String, "LoadBalancerName" => String,
"Policies" => {"LBCookieStickinessPolicies" => Array, "AppCookieStickinessPolicies" => Array}, "Policies" => {"LBCookieStickinessPolicies" => Array, "AppCookieStickinessPolicies" => Array},
"Scheme" => String, "Scheme" => String,
"SecurityGroups" => Fog::Nullable::String, "SecurityGroups" => [Fog::Nullable::String],
"SourceSecurityGroup" => {"GroupName" => String, "OwnerAlias" => String}, "SourceSecurityGroup" => {"GroupName" => String, "OwnerAlias" => String},
"Subnets" => Fog::Nullable::String "Subnets" => [Fog::Nullable::String]
} }
CREATE_LOAD_BALANCER = BASIC.merge({ CREATE_LOAD_BALANCER = BASIC.merge({