cleaned up the rw-eap-tnc-20 and rw-eap-tnc-20-fhh scenarios

testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/carol/etc/strongswan.conf

@@ -9,7 +9,3 @@ charon {
     }
   }
 }
-
-imc-test {
-  command = allow
-}

testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/dave/etc/strongswan.conf

@@ -9,7 +9,3 @@ charon {
     }
   }
 }
-
-imc-test {
-  command = isolate
-}

testing/tests/ikev2/rw-eap-tnc-20-fhh/hosts/moon/etc/strongswan.conf

@@ -14,7 +14,3 @@ charon {
     }
   }
 }
-
-imv-test {
-  rounds = 1
-}

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 

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