From ea9f1002cd45f109f553b095649696bdebb115c6 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 30 May 2011 21:46:45 +0200
Subject: [PATCH] cleaned up the rw-eap-tnc-20 and rw-eap-tnc-20-fhh scenarios

---
 .../tests/ikev2/rw-eap-tnc-20-fhh/hosts/carol/etc/strongswan.conf | 4 ----
 .../tests/ikev2/rw-eap-tnc-20-fhh/hosts/dave/etc/strongswan.conf  | 4 ----
 .../tests/ikev2/rw-eap-tnc-20-fhh/hosts/moon/etc/strongswan.conf  | 4 ----
 testing/tests/ikev2/rw-eap-tnc-20-fhh/pretest.dat                 | 1 +
 testing/tests/ikev2/rw-eap-tnc-20/pretest.dat                     | 8 +++-----
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/carol/etc/strongswan.conf
index 7ee4cbc..b2aa280 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/carol/etc/strongswan.conf
@@ -9,7 +9,3 @@ charon {
     }
   }
 }
-
-imc-test {
-  command = allow
-}
diff --git a/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/dave/etc/strongswan.conf
index 79f166d..b2aa280 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/dave/etc/strongswan.conf
@@ -9,7 +9,3 @@ charon {
     }
   }
 }
-
-imc-test {
-  command = isolate
-}
diff --git a/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/moon/etc/strongswan.conf
index 2bc6bec..b76c1cd 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/moon/etc/strongswan.conf
@@ -14,7 +14,3 @@ charon {
     }
   }
 }
-
-imv-test {
-  rounds = 1
-}
diff --git a/testing/tests/ikev2/rw-eap-tnc-20-fhh/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-20-fhh/pretest.dat
index 1c8eeba..76ad91f 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20-fhh/pretest.dat
+++ b/testing/tests/ikev2/rw-eap-tnc-20-fhh/pretest.dat
@@ -6,6 +6,7 @@ carol::cat /etc/tnc_config
 dave::cat /etc/tnc_config
 carol::cat /etc/tnc/dummyimc.file
 dave::cat /etc/tnc/dummyimc.file
+moon::cat /etc/tnc/dummyimv.policy
 moon::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
 carol::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start 
 dave::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start 
diff --git a/testing/tests/ikev2/rw-eap-tnc-20/pretest.dat b/testing/tests/ikev2/rw-eap-tnc-20/pretest.dat
index 1c8eeba..7a5a38e 100644
--- a/testing/tests/ikev2/rw-eap-tnc-20/pretest.dat
+++ b/testing/tests/ikev2/rw-eap-tnc-20/pretest.dat
@@ -4,11 +4,9 @@ dave::/etc/init.d/iptables start 2> /dev/null
 moon::cat /etc/tnc_config
 carol::cat /etc/tnc_config
 dave::cat /etc/tnc_config
-carol::cat /etc/tnc/dummyimc.file
-dave::cat /etc/tnc/dummyimc.file
-moon::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start
-carol::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start 
-dave::LOG4CXX_CONFIGURATION=/etc/tnc/log4cxx.properties ipsec start 
+moon::ipsec start
+carol:ipsec start 
+dave::ipsec start 
 carol::sleep 1
 carol::ipsec up home
 dave::ipsec up home
-- 
2.7.4