adapted ikev2/ip-pool-wish scenario to the new stroke ip pool function

diff --git a/testing/tests/ikev2/ip-pool-wish/description.txt b/testing/tests/ikev2/ip-pool-wish/description.txt
index a5487169a95862543ef12bdf88d9749d775afebc..4b08aa33e8d09e265cc8e242fdfbe73c37192ea0 100644 (file)
--- a/testing/tests/ikev2/ip-pool-wish/description.txt
+++ b/testing/tests/ikev2/ip-pool-wish/description.txt
@@ -1,8 +1,8 @@
 The roadwarriors <b>carol</b> and <b>dave</b> set up a connection each to gateway <b>moon</b>.
 Both <b>carol</b> and <b>dave</b> request the same <b>virtual IP</b> via the IKEv2
-configuration payload by using the <b>leftsourceip=PH_IP_DAVE1</b> parameter. On a first-come,
-first-served basis, <b>dave</b> gets <b>PH_IP_DAVE1</b> from the simple address pool managed
-by gateway <b>moon</b> and <b>carol</b> gets the first free address <b>PH_IP_CAROL1</b>
+configuration payload by using the <b>leftsourceip=PH_IP_CAROL1</b> parameter. On a first-come,
+first-served basis, <b>carol</b> gets <b>PH_IP_CAROL1</b> from the simple address pool managed
+by gateway <b>moon</b> and <b>dave</b> gets the next free address <b>PH_IP_DAVE1</b>
 from the pool. 
 <p>
 <b>leftfirewall=yes</b> automatically inserts iptables-based firewall rules that let pass

diff --git a/testing/tests/ikev2/ip-pool-wish/evaltest.dat b/testing/tests/ikev2/ip-pool-wish/evaltest.dat
index 19e6783afc89d252db5200d96790a0bcc2c6c1a1..d02d422abd8fd24b7ab266d16ba93c3305a8d047 100644 (file)
--- a/testing/tests/ikev2/ip-pool-wish/evaltest.dat
+++ b/testing/tests/ikev2/ip-pool-wish/evaltest.dat
@@ -9,7 +9,7 @@ dave::ip route list table 220::10.1.0.0/16.*src PH_IP_DAVE1::YES
 dave::ipsec status::home.*INSTALLED::YES
 dave::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
 moon::cat /var/log/daemon.log::adding virtual IP address pool::YES
-moon::cat /var/log/daemon.log::peer requested virtual IP PH_IP_DAVE1::YES
+moon::cat /var/log/daemon.log::peer requested virtual IP PH_IP_CAROL1::YES
 moon::cat /var/log/daemon.log::assigning virtual IP::YES
 moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
 moon::ipsec status::rw.*ESTABLISHED.*dave@strongswan.org::YES

diff --git a/testing/tests/ikev2/ip-pool-wish/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/ip-pool-wish/hosts/carol/etc/ipsec.conf
index 5f93b39871679eae3a5b852cd9e164bc07766351..c9867c7d4fdcf9cec60f5982576c557bf4946985 100755 (executable)
--- a/testing/tests/ikev2/ip-pool-wish/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev2/ip-pool-wish/hosts/carol/etc/ipsec.conf
@@ -14,7 +14,7 @@ conn %default
 
 conn home
        left=PH_IP_CAROL
-       leftsourceip=PH_IP_DAVE1
+       leftsourceip=PH_IP_CAROL1
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
        leftfirewall=yes

diff --git a/testing/tests/ikev2/ip-pool-wish/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2/ip-pool-wish/hosts/dave/etc/ipsec.conf
index b58ba546030be55c04a253129e461fea3515c756..98dd99271443d232852038bf4969471d6cb21953 100755 (executable)
--- a/testing/tests/ikev2/ip-pool-wish/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev2/ip-pool-wish/hosts/dave/etc/ipsec.conf
@@ -14,7 +14,7 @@ conn %default
 
 conn home
        left=PH_IP_DAVE
-       leftsourceip=PH_IP_DAVE1
+       leftsourceip=PH_IP_CAROL1
        leftcert=daveCert.pem
        leftid=dave@strongswan.org
        leftfirewall=yes

diff --git a/testing/tests/ikev2/ip-pool-wish/pretest.dat b/testing/tests/ikev2/ip-pool-wish/pretest.dat
index 519c81a31dcf74326e911b9080e57e5d062bad8c..1f4ff286a27ef41a1d6059b31cbeed1dd0d56e77 100644 (file)
--- a/testing/tests/ikev2/ip-pool-wish/pretest.dat
+++ b/testing/tests/ikev2/ip-pool-wish/pretest.dat
@@ -1,10 +1,10 @@
 moon::/etc/init.d/iptables start 2> /dev/null
 carol::/etc/init.d/iptables start 2> /dev/null
 dave::/etc/init.d/iptables start 2> /dev/null
-dave::ipsec start
 carol::ipsec start
+dave::ipsec start
 moon::ipsec start
-dave::sleep 2 
-dave::ipsec up home
+carol::sleep 2 
 carol::ipsec up home
+dave::ipsec up home
 dave::sleep 1