You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/16 19:55:27 UTC
[20/28] git commit: updated refs/heads/master to 75b68c6
Merge pull request #1317 from michaelandersen/vpn/forceencap
[4.7] ADD Force UDP encapsulation option to Site2Site VPNThis PR adds the option to enable forced UDP encapsulation of ESP packets during a setup of a site2site vpn. This options enforces the 'forceencaps' option in the openswan ipsec config:
https://wiki.strongswan.org/projects/strongswan/wiki/ConnSection
* pr/1317:
[UI] MADNESS
[DB] Add force_encap field to s2s_customer_gateway table
[ROUTER] Add forceencaps field to python router ipsec config method
[TEST] unittest needs rework
[MARVIN] Add forceencap field to VpnCustomerGateway class in marvin base
[CORE] Add Force UDP Encapsulation option to Site2Site VPN
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/55667896
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/55667896
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/55667896
Branch: refs/heads/master
Commit: 55667896d0ff9926c81669471ecae94fca43be47
Parents: 80703ca 9b9272c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Jan 16 19:38:40 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Jan 16 19:38:42 2016 +0100
----------------------------------------------------------------------
.../cloud/network/Site2SiteCustomerGateway.java | 2 ++
.../org/apache/cloudstack/api/ApiConstants.java | 3 ++-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 5 +++++
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 5 +++++
.../Site2SiteCustomerGatewayResponse.java | 6 ++++++
.../Site2SiteVpnConnectionResponse.java | 9 +++++++++
.../classes/resources/messages.properties | 1 +
.../classes/resources/messages_nl_NL.properties | 1 +
.../api/routing/Site2SiteVpnCfgCommand.java | 12 ++++++++++-
.../facade/Site2SiteVpnConfigItem.java | 2 +-
.../virtualnetwork/model/Site2SiteVpn.java | 13 ++++++++++--
.../VirtualRoutingResourceTest.java | 6 +++---
.../network/dao/Site2SiteCustomerGatewayVO.java | 15 +++++++++++++-
server/src/com/cloud/api/ApiResponseHelper.java | 3 ++-
.../network/router/CommandSetupHelper.java | 3 ++-
.../network/vpn/Site2SiteVpnManagerImpl.java | 13 +++++++++++-
setup/db/db/schema-470to471.sql | 1 +
.../debian/config/opt/cloud/bin/configure.py | 5 +++--
tools/marvin/marvin/lib/base.py | 4 ++++
ui/dictionary2.jsp | 3 ++-
ui/scripts/docs.js | 6 +++++-
ui/scripts/network.js | 21 ++++++++++++++++++--
ui/scripts/vpc.js | 6 ++++++
23 files changed, 127 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55667896/ui/scripts/network.js
----------------------------------------------------------------------