aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/starter-includes
diff options
context:
space:
mode:
Diffstat (limited to 'testing/tests/starter-includes')
-rwxr-xr-xtesting/tests/starter-includes/hosts/moon/etc/ipsec.host2
-rw-r--r--testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol2
-rw-r--r--testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave2
-rw-r--r--testing/tests/starter-includes/posttest.dat4
-rw-r--r--testing/tests/starter-includes/pretest.dat1
5 files changed, 6 insertions, 5 deletions
diff --git a/testing/tests/starter-includes/hosts/moon/etc/ipsec.host b/testing/tests/starter-includes/hosts/moon/etc/ipsec.host
index e84e5cdc6..acf753cc0 100755
--- a/testing/tests/starter-includes/hosts/moon/etc/ipsec.host
+++ b/testing/tests/starter-includes/hosts/moon/etc/ipsec.host
@@ -3,7 +3,7 @@
conn %default
left=PH_IP_MOON
leftsubnet=10.1.0.0/16
- leftsourceip=PH_IP1_MOON
+ leftsourceip=PH_IP_MOON1
leftnexthop=%direct
leftcert=moonCert.pem
leftid=@moon.strongswan.org
diff --git a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol
index 9212a9e96..84bedfef6 100644
--- a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol
+++ b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.carol
@@ -3,6 +3,6 @@
conn rw-carol
right=%any
rightid=carol@strongswan.org
- rightsourceip=PH_IP1_CAROL
+ rightsourceip=PH_IP_CAROL1
auto=add
diff --git a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave
index 482d15a21..ee021c9be 100644
--- a/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave
+++ b/testing/tests/starter-includes/hosts/moon/etc/ipsec.peers/ipsec.dave
@@ -3,6 +3,6 @@
conn rw-dave
right=%any
rightid=dave@strongswan.org
- rightsourceip=PH_IP1_DAVE
+ rightsourceip=PH_IP_DAVE1
auto=add
diff --git a/testing/tests/starter-includes/posttest.dat b/testing/tests/starter-includes/posttest.dat
index 121aa8aea..a646f5c5f 100644
--- a/testing/tests/starter-includes/posttest.dat
+++ b/testing/tests/starter-includes/posttest.dat
@@ -7,7 +7,7 @@ dave::ipsec stop
moon::/etc/init.d/iptables stop 2> /dev/null
carol::/etc/init.d/iptables stop 2> /dev/null
dave::/etc/init.d/iptables stop 2> /dev/null
-carol::ip addr del PH_IP1_CAROL/32 dev eth0
-dave::ip addr del PH_IP1_DAVE/32 dev eth0
+carol::ip addr del PH_IP_CAROL1/32 dev eth0
+dave::ip addr del PH_IP_DAVE1/32 dev eth0
moon::rm /etc/ipsec.connections /etc/ipsec.host
moon::rm -r /etc/ipsec.peers
diff --git a/testing/tests/starter-includes/pretest.dat b/testing/tests/starter-includes/pretest.dat
index 0af79a6d2..b034a0c03 100644
--- a/testing/tests/starter-includes/pretest.dat
+++ b/testing/tests/starter-includes/pretest.dat
@@ -8,3 +8,4 @@ moon::ipsec start --debug-all
carol::sleep 2
carol::ipsec up home
dave::ipsec up home
+carol::sleep 1