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:52:08 UTC
[7/7] git commit: updated refs/heads/4.7 to 5fdc77e
Merge pull request #1276 from michaelandersen/fix/site2sitevpn
[4.7] FIX Site2SiteVPN on redundant VPCThis PR:
- fixes the inability to setup more than one Site2Site VPN connection from a VPC
- fixes starting of Site2Site VPN on redundant VPC
- fixes Site2Site VPN state checking on redundant VPC
- improves the vpc_vpn test to allow multple hypervisors
- adds an integration test for Site2Site VPN on redundant VPC
Tested it on 4.7 single Xen server zone:
command:
```
nosetests --with-marvin --marvin-config=/data/shared/marvin/mct-zone1-xen1.cfg -a tags=advanced,required_hardware=true /tmp/test_vpc_vpn.py
```
results:
```
Test Site 2 Site VPN Across redundant VPCs ... === TestName: test_01_redundant_vpc_site2site_vpn | Status : SUCCESS ===
ok
Test Remote Access VPN in VPC ... === TestName: test_01_vpc_remote_access_vpn | Status : SUCCESS ===
ok
Test Site 2 Site VPN Across VPCs ... === TestName: test_01_vpc_site2site_vpn | Status : SUCCESS ===
ok
----------------------------------------------------------------------
Ran 3 tests in 1490.076s
OK
```
also performed numerous manual inspections of state of VPN connections and connectivity between VPC's
* pr/1276:
Fix unable to setup more than one Site2Site VPN Connection
FIX S2S VPN rVPC: Check only redundant routers in state MASTER
PEP8 of integration/smoke/test_vpc_vpn
Add S2S VPN test for Redundant VPC
Make integration/smoke/test_vpc_vpn Hypervisor independant
FIX VPN: non-working ipsec commands
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/5fdc77e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fdc77e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fdc77e1
Branch: refs/heads/4.7
Commit: 5fdc77e16c227f31705d119ed47df64aa165ae42
Parents: 450db8c 435a98c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Jan 16 19:51:45 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Jan 16 19:51:46 2016 +0100
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 3 +
.../debian/config/opt/cloud/bin/configure.py | 16 +-
.../config/opt/cloud/bin/cs_site2sitevpn.py | 2 +-
test/integration/smoke/test_vpc_vpn.py | 539 +++++++++++++++++--
4 files changed, 505 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fdc77e1/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------