From: Andreas Steffen Date: Sun, 6 May 2012 13:03:26 +0000 (+0200) Subject: upgraded ha scenario for 5.0.0 X-Git-Tag: 5.0.0~279 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86aab92248294760280c53de3d7c43f01e0316ea;p=thirdparty%2Fstrongswan.git upgraded ha scenario for 5.0.0 --- diff --git a/testing/tests/ha/both-active/evaltest.dat b/testing/tests/ha/both-active/evaltest.dat index a26d8e568b..36d72ff97c 100644 --- a/testing/tests/ha/both-active/evaltest.dat +++ b/testing/tests/ha/both-active/evaltest.dat @@ -1,15 +1,15 @@ -alice::ipsec statusall::rw.*ESTABLISHED.*carol@strongswan.org::YES -alice::ipsec statusall::rw.*ESTABLISHED.*dave@strongswan.org::YES -moon::ipsec statusall::rw.*PASSIVE.*carol@strongswan.org::YES -moon::ipsec statusall::rw.*PASSIVE.*dave@strongswan.org::YES -carol::ipsec statusall::home.*ESTABLISHED::YES -dave::ipsec statusall::home.*ESTABLISHED::YES +alice::ipsec status 2> /dev/null::rw\[1].*ESTABLISHED.*mars.strongswan.org.*carol@strongswan.org::YES +alice::ipsec status 2> /dev/null::rw\[2].*ESTABLISHED.*mars.strongswan.org.*dave@strongswan.org::YES +moon:: ipsec status 2> /dev/null::rw\[1].*PASSIVE.*mars.strongswan.org.*carol@strongswan.org::YES +moon:: ipsec status 2> /dev/null::rw\[2].*PASSIVE.*mars.strongswan.org.*dave@strongswan.org::YES +carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*mars.strongswan.org::YES +dave:: ipsec status 2> /dev/null::home.*ESTABLISHED.*dave@strongswan.org.*mars.strongswan.org::YES alice::cat /var/log/daemon.log::HA segment 1 activated::YES -moon::cat /var/log/daemon.log::HA segment 2 activated::YES +moon:: cat /var/log/daemon.log::HA segment 2 activated::YES alice::cat /var/log/daemon.log::handling HA CHILD_SA::YES -moon::cat /var/log/daemon.log::installed HA CHILD_SA::YES +moon:: cat /var/log/daemon.log::installed HA CHILD_SA::YES carol::ping -c 1 PH_IP_VENUS::64 bytes from PH_IP_VENUS: icmp_seq=1::YES -dave::ping -c 1 PH_IP_VENUS::64 bytes from PH_IP_VENUS: icmp_seq=1::YES +dave:: ping -c 1 PH_IP_VENUS::64 bytes from PH_IP_VENUS: icmp_seq=1::YES carol::tcpdump::IP carol.strongswan.org > mars.strongswan.org: ESP::YES carol::tcpdump::IP mars.strongswan.org > carol.strongswan.org: ESP::YES dave::tcpdump::IP dave.strongswan.org > mars.strongswan.org: ESP::YES diff --git a/testing/tests/ha/both-active/hosts/alice/etc/ipsec.conf b/testing/tests/ha/both-active/hosts/alice/etc/ipsec.conf index 09a5364f43..562b5af60a 100755 --- a/testing/tests/ha/both-active/hosts/alice/etc/ipsec.conf +++ b/testing/tests/ha/both-active/hosts/alice/etc/ipsec.conf @@ -1,8 +1,6 @@ # /etc/ipsec.conf - strongSwan IPsec configuration file config setup - crlcheckinterval=180 - strictcrlpolicy=no plutostart=no conn %default diff --git a/testing/tests/ha/both-active/hosts/carol/etc/ipsec.conf b/testing/tests/ha/both-active/hosts/carol/etc/ipsec.conf index 79e06d4deb..5854169853 100755 --- a/testing/tests/ha/both-active/hosts/carol/etc/ipsec.conf +++ b/testing/tests/ha/both-active/hosts/carol/etc/ipsec.conf @@ -1,8 +1,6 @@ # /etc/ipsec.conf - strongSwan IPsec configuration file config setup - crlcheckinterval=180 - strictcrlpolicy=no plutostart=no conn %default diff --git a/testing/tests/ha/both-active/hosts/dave/etc/ipsec.conf b/testing/tests/ha/both-active/hosts/dave/etc/ipsec.conf index f75e13d2e4..f3af27ab5f 100755 --- a/testing/tests/ha/both-active/hosts/dave/etc/ipsec.conf +++ b/testing/tests/ha/both-active/hosts/dave/etc/ipsec.conf @@ -1,8 +1,6 @@ # /etc/ipsec.conf - strongSwan IPsec configuration file config setup - crlcheckinterval=180 - strictcrlpolicy=no plutostart=no conn %default diff --git a/testing/tests/ha/both-active/hosts/moon/etc/ipsec.conf b/testing/tests/ha/both-active/hosts/moon/etc/ipsec.conf index 09a5364f43..562b5af60a 100755 --- a/testing/tests/ha/both-active/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ha/both-active/hosts/moon/etc/ipsec.conf @@ -1,8 +1,6 @@ # /etc/ipsec.conf - strongSwan IPsec configuration file config setup - crlcheckinterval=180 - strictcrlpolicy=no plutostart=no conn %default