GitHub user michaelandersen opened a pull request:
https://github.com/apache/cloudstack/pull/1275
FIX Site2SiteVPN on redundant VPC
This PR:
- 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 a 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
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/michaelandersen/cloudstack fix/site2sitevpn
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1275.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1275
----
commit a6753346fe3d0bcdedb437d01e7b0bb6a13b14bf
Author: Michael Andersen <mander...@schubergphilis.com>
Date: 2015-12-21T15:25:41Z
FIX VPN: non-working ipsec commands
commit 17bedf79f6a830180ec87a549571c4cf434cd618
Author: Michael Andersen <mander...@schubergphilis.com>
Date: 2015-12-21T18:07:26Z
FIX S2S VPN rVPC: Check only redundant routers in state MASTER
commit 87e5f357353107695b8b4677d24ae557184d8ef7
Author: Michael Andersen <mander...@schubergphilis.com>
Date: 2015-12-22T10:16:23Z
Make integration/smoke/test_vpc_vpn Hypervisor independant
commit 39b71a4d735525416ed5b5cf72b8c6a32c036989
Author: Michael Andersen <mander...@schubergphilis.com>
Date: 2015-12-22T11:00:55Z
Add S2S VPN test for Redundant VPC
commit f6364fce6834ea259cd36fdf55458e78eeb300c2
Author: Michael Andersen <mander...@schubergphilis.com>
Date: 2015-12-22T11:29:44Z
PEP8 of integration/smoke/test_vpc_vpn
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
