virtual-ip scenario has been replaces by config-payload scenario

diff --git a/testing/tests/ikev2/virtual-ip/description.txt b/testing/tests/ikev2/virtual-ip/description.txt
deleted file mode 100644 (file)
index d6356bc..0000000
--- a/testing/tests/ikev2/virtual-ip/description.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-A tunnel connecting roadwarrior <b>carol</b> with <b>moon</b> and the network behind it is established. <b>carol</b> requests and gets a virtual IP from <b>moon</b>. The connection is tested by client <b>carol</b> pinging client <b>alice</b> located behind gateway <b>moon</b> as well as the inner interface of the gateway.
-<p/>
-Appropriate routes are automatically configured on the IPsec hosts.

diff --git a/testing/tests/ikev2/virtual-ip/evaltest.dat b/testing/tests/ikev2/virtual-ip/evaltest.dat
deleted file mode 100644 (file)
index e353946..0000000
--- a/testing/tests/ikev2/virtual-ip/evaltest.dat
+++ /dev/null
@@ -1,10 +0,0 @@
-moon::ipsec statusall::rw-carol.*ESTABLISHED::YES
-carol::ipsec statusall::home.*ESTABLISHED::YES
-carol::ip route::10.1.0.0/16.*eth0.*PH_IP_CAROL1::YES
-moon::ip route::PH_IP_CAROL1.*eth0.*::YES
-carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
-carol::ping -c 1 PH_IP_MOON1::64 bytes from PH_IP_MOON1: icmp_seq=1::YES
-moon::tcpdumpcount::IP carol.strongswan.org > moon.strongswan.org: ESP::2
-moon::tcpdumpcount::IP moon.strongswan.org > carol.strongswan.org: ESP::2
-moon::tcpdump::IP carol1.strongswan.org > alice.strongswan.org: ICMP::YES
-moon::tcpdump::IP carol1.strongswan.org > moon1.strongswan.org: ICMP::YES

diff --git a/testing/tests/ikev2/virtual-ip/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2/virtual-ip/hosts/carol/etc/ipsec.conf
deleted file mode 100755 (executable)
index face85f..0000000
--- a/testing/tests/ikev2/virtual-ip/hosts/carol/etc/ipsec.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# /etc/ipsec.conf - strongSwan IPsec configuration file
-
-config setup
-       strictcrlpolicy=no
-       plutostart=no
-
-conn %default
-       ikelifetime=60m
-       keylife=20m
-       rekeymargin=3m
-        keyingtries=1
-       keyexchange=ikev2
-
-conn home
-        left=PH_IP_CAROL
-        leftcert=carolCert.pem
-        leftid=carol@strongswan.org
-        leftsourceip=%config
-        right=PH_IP_MOON
-        rightid=@moon.strongswan.org
-        rightsubnet=10.1.0.0/16
-        auto=add
-

diff --git a/testing/tests/ikev2/virtual-ip/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/virtual-ip/hosts/moon/etc/ipsec.conf
deleted file mode 100755 (executable)
index 9e43140..0000000
--- a/testing/tests/ikev2/virtual-ip/hosts/moon/etc/ipsec.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# /etc/ipsec.conf - strongSwan IPsec configuration file
-
-config setup
-       strictcrlpolicy=no
-       plutostart=no
-
-conn %default
-       ikelifetime=60m
-       keylife=20m
-       rekeymargin=3m
-       keyingtries=1
-       keyexchange=ikev2
-
-conn rw-carol
-       left=PH_IP_MOON
-        leftid=@moon.strongswan.org
-        leftcert=moonCert.pem
-       leftsubnet=10.1.0.0/16
-        right=%any
-        rightid=carol@strongswan.org
-        rightsourceip=PH_IP_CAROL1
-        auto=add
-

diff --git a/testing/tests/ikev2/virtual-ip/posttest.dat b/testing/tests/ikev2/virtual-ip/posttest.dat
deleted file mode 100644 (file)
index c6d6235..0000000
--- a/testing/tests/ikev2/virtual-ip/posttest.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-moon::ipsec stop
-carol::ipsec stop

diff --git a/testing/tests/ikev2/virtual-ip/pretest.dat b/testing/tests/ikev2/virtual-ip/pretest.dat
deleted file mode 100644 (file)
index a084fa4..0000000
--- a/testing/tests/ikev2/virtual-ip/pretest.dat
+++ /dev/null
@@ -1,6 +0,0 @@
-moon::echo 1 > /proc/sys/net/ipv4/ip_forward
-moon::ipsec start
-carol::ipsec start
-carol::sleep 2
-carol::ipsec up home
-carol::sleep 2

diff --git a/testing/tests/ikev2/virtual-ip/test.conf b/testing/tests/ikev2/virtual-ip/test.conf
deleted file mode 100644 (file)
index e28cb76..0000000
--- a/testing/tests/ikev2/virtual-ip/test.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# This configuration file provides information on the
-# UML instances used for this test
-
-# All UML instances that are required for this test
-#
-UMLHOSTS="alice moon carol winnetou"
-
-# Corresponding block diagram
-#
-DIAGRAM="a-m-c-w.png"
- 
-# UML instances on which tcpdump is to be started
-#
-TCPDUMPHOSTS="moon"
-
-# UML instances on which IPsec is started
-# Used for IPsec logging purposes
-#
-IPSECHOSTS="moon carol"