kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

Merge pull request #3671 from joshmyers/enable_multiple_peer_subnets 

Cloud Director supports multiple peer subnets.
This commit is contained in:
Wesley Beary 2015-08-24 14:58:32 -05:00
parent 474faeb70a 53706dbe4b
commit 10dd076849
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/fog/vcloud_director/generators/compute/edge_gateway_service_configuration.rb
View File

@ -66,12 +66,13 @@ module Fog
xml.Netmask subnet[:Netmask]
}
end
peer_subnet_config = tunnel_config[:PeerSubnet]
xml.PeerSubnet {
xml.Name peer_subnet_config[:Name]
xml.Gateway peer_subnet_config[:Gateway]
xml.Netmask peer_subnet_config[:Netmask]
}
tunnel_config[:PeerSubnet].each do |subnet|
xml.PeerSubnet {
xml.Name subnet[:Name]
xml.Gateway subnet[:Gateway]
xml.Netmask subnet[:Netmask]
}
end
xml.SharedSecret tunnel_config[:SharedSecret]
xml.SharedSecretEncrypted tunnel_config[:SharedSecretEncrypted] if tunnel_config.key?(:SharedSecretEncrypted)
xml.EncryptionProtocol tunnel_config[:EncryptionProtocol]

4
tests/vcloud_director/requests/compute/edge_gateway_tests.rb
View File

@ -26,11 +26,11 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
:PeerId => "1223-123UDH-12321",
:LocalIpAddress => "192.168.90.90",
:LocalId => "202UB-9602-UB629",
:PeerSubnet => {
:PeerSubnet => [{
:Name => "192.168.0.0/18",
:Gateway => "192.168.0.0",
:Netmask => "255.255.192.0",
},
}],
:SharedSecret => "dont tell anyone",
:SharedSecretEncrypted => "false",
:EncryptionProtocol => "AES",