Remi Bergsma 5fdc77e16c 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 <github@remi.nl>

2016-01-16 19:51:46 +01:00

..

cs

CLOUDSTACK-9151 - Removes the replacement of the VRID in the CsRedundant file

2015-12-12 16:26:00 +01:00

baremetal_snat.sh

restore barematel work after merge

2014-10-17 10:24:01 +02:00

baremetal-vr.py

Removing "global" declaration from if block

2015-03-16 11:38:13 +01:00

bumpup_priority.sh

CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy

2014-01-16 16:03:09 -08:00

checkbatchs2svpn.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

checkrouter.sh

make both check lines consistent

2015-12-28 17:06:58 +01:00

checks2svpn.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

cloud-nic.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

configure.py

Merge pull request #1276 from michaelandersen/fix/site2sitevpn

2016-01-16 19:51:46 +01:00

cs_cmdline.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_dhcp.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_firewallrules.py

Pep8 changes that got lost with the strange double push request problem last time

2015-05-26 07:07:43 -04:00

cs_forwardingrules.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_guestnetwork.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_ip.py

CLOUDSTACK-8991 - Process the IPs that have been removed

2015-10-28 19:51:57 +01:00

cs_loadbalancer.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_monitorservice.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_network_acl.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_remoteaccessvpn.py

CLOUDSTACK-8690:Added remote access vpn and vpn users configuration

2015-09-09 10:50:50 +05:30

cs_site2sitevpn.py

Fix unable to setup more than one Site2Site VPN Connection

2016-01-12 11:24:35 +01:00

cs_staticroutes.py

CLOUDSTACK-9204 Do not error when staticroute is already gone

2015-12-31 14:11:06 +01:00

cs_vmdata.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_vmp.py

ACL issues

2015-03-16 11:40:10 +01:00

cs_vpnusers.py

CLOUDSTACK-8690:Added remote access vpn and vpn users configuration

2015-09-09 10:50:50 +05:30

dnsmasq.sh

CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy

2014-01-16 16:03:09 -08:00

edithosts.sh

CLOUDSTACK-7974: remove old hostname entry for a VM when adding a VM

2014-12-10 18:25:22 +05:30

get_template_version.sh

ACL issues

2015-03-16 11:40:10 +01:00

ilb.sh

CLOUDSTACK-6047: Make VR LB script accept a file name

2014-02-21 18:26:42 -08:00

ipassoc.sh

CLOUDSTACK-7544: Fixed ip addr del issues in ipassoc

2014-09-15 14:54:13 +05:30

ipsectunnel.sh

made iptables for the VPN connection more secure

2014-12-08 19:06:55 +01:00

line_edit.py

Fancy line editor for Ian

2015-03-16 11:35:11 +01:00

loadbalancer.sh

CLOUDSTACK-6047: Make VR LB script accept a file name

2014-02-21 18:26:42 -08:00

master.py

CLOUDSTACK-9015 - Make sure the Backup router can talk to the Master router after a stop/start/reboot

2015-11-12 18:13:51 +01:00

merge.py

CLOUDSTACK-9075 - Adds VPC static routes test

2015-12-02 10:36:52 +01:00

monitor_service.sh

CLOUDSTACK-6714: monitor script echo service command is added with quotes

2014-05-20 14:11:19 +05:30

netusage.sh

Added code to configure netusage for vpc and domR devices

2015-03-16 11:35:27 +01:00

passwd_server

CLOUDSTACK-7376 passwd_server attempts to start but terminates with the exit code 137

2014-09-17 09:28:44 -07:00

passwd_server_ip

Fixed password server, fixed more firewall issues

2015-03-16 11:40:03 +01:00

passwd_server_ip.py

CLOUDSTACK-9058

2015-11-12 08:05:57 +00:00

patchsystemvm.sh

Remove vpc_router_svcs because they will be the same as any other router (soon)

2015-03-16 11:39:52 +01:00

prepare_pxe.sh

restore barematel work after merge

2014-10-17 10:24:01 +02:00

savepassword.sh

CLOUDSTACK-8331: have savepassword try all interfaces

2015-03-18 14:40:23 +05:30

set_redundant.py

Java: Fixing the redundant flag for the router control nic and the guest network command;

2015-03-16 11:39:15 +01:00

test.sh

Add missing license headers from recent branch merge 3c429ee

2015-03-18 11:03:54 +05:30

update_config.py

CLOUDSTACK-8690:Added remote access vpn and vpn users configuration

2015-09-09 10:50:50 +05:30

vmdata.py

Fix PEP8 compliance

2015-03-16 11:38:07 +01:00

vpc_func.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_netusage.sh

Added code to configure netusage for vpc and domR devices

2015-03-16 11:35:27 +01:00

vpc_passwd_server

systemvm: fix socat usage

2015-03-30 13:50:39 +05:30

vpc_snat.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vpc_staticroute.sh

Move the system vm to a separate maven project.

2013-09-20 18:31:02 +08:00

vr_cfg.sh

small cleanups

2015-09-26 20:33:21 +02:00