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 branch 'master' into rackspace_ssl_termination

Browse source
This commit is contained in:
Brian Hartsock 2012-06-25 23:39:38 -04:00
commit 5fbdd80bec
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/rackspace/requests/load_balancers/helper.rb
View file

@ -1,5 +1,5 @@
SINGLE_NODE_FORMAT = {'address' => String, 'id' => Integer, 'status' => String, 'weight' => Fog::Nullable::Integer, 'port' => Integer, 'condition' => String, 'type' => String}
NODE_FORMAT = {'node' => SINGLE_NODE_FORMAT}
NODE_FORMAT = {'node' => SINGLE_NODE_FORMAT.merge({ 'metadata' => []})}
NODES_FORMAT = {'nodes' => [SINGLE_NODE_FORMAT]}
VIRTUAL_IP_FORMAT = {'type' => String, 'id' => Integer, 'type' => String, 'ipVersion' => String, 'address' => String}
VIRTUAL_IPS_FORMAT = { 'virtualIps' => [VIRTUAL_IP_FORMAT] }
@ -32,6 +32,17 @@ LOAD_BALANCER_USAGE_FORMAT = {
]
}
SSL_TERMINATION_FORMAT = {
'sslTermination' => {
'certificate' => String,
'privateKey' => String,
'enabled' => Fog::Boolean,
'securePort' => Integer,
'secureTrafficOnly' => Integer,
'intermediateCertificate' => Fog::Nullable::String
}
}
USAGE_FORMAT = {
'accountId' => Integer,
'loadBalancerUsages' => [
@ -137,6 +148,7 @@ LOAD_BALANCER_FORMAT = {
'nodes' => [SINGLE_NODE_FORMAT],
'created' => { 'time' => String },
'updated' => { 'time' => String },
'contentCaching' => { 'enabled' => Fog::Boolean }
}.merge(CONNECTION_LOGGING_FORMAT)
}