Fixing GRE tunnel between localhost and remote host
[nepi.git] / test / resources / planetlab / gretunnel.py
index 33917ab..d0396a5 100755 (executable)
@@ -30,8 +30,9 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
     def setUp(self):
         #self.host1 = "nepi2.pl.sophia.inria.fr"
         #self.host2 = "nepi5.pl.sophia.inria.fr"
+        #self.host2 = "planetlab1.informatik.uni-goettingen.de" 
         self.host1 = "planetlab1.informatik.uni-erlangen.de"
-        self.host2 = "planetlab1.informatik.uni-goettingen.de"
+        self.host2 = "planck227ple.test.ibbt.be"
         self.host3 = "roseval.pl.sophia.inria.fr"
         self.user = "inria_nepi"
         self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
@@ -48,7 +49,8 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        ec.set(node1, "cleanHome", True)
+        #ec.set(node1, "cleanHome", True)
+        ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
         tap1 = ec.register_resource("PlanetlabTap")
@@ -60,7 +62,8 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        ec.set(node2, "cleanHome", True)
+        #ec.set(node2, "cleanHome", True)
+        ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
         tap2 = ec.register_resource("PlanetlabTap")
@@ -103,7 +106,8 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        ec.set(node1, "cleanHome", True)
+        #ec.set(node1, "cleanHome", True)
+        ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
         tun1 = ec.register_resource("PlanetlabTun")
@@ -115,7 +119,8 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        ec.set(node2, "cleanHome", True)
+        #ec.set(node2, "cleanHome", True)
+        ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
         tun2 = ec.register_resource("PlanetlabTun")
@@ -158,7 +163,8 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        ec.set(node1, "cleanHome", True)
+        #ec.set(node1, "cleanHome", True)
+        ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
         tun1 = ec.register_resource("PlanetlabTun")
@@ -170,7 +176,8 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        ec.set(node2, "cleanHome", True)
+        #ec.set(node2, "cleanHome", True)
+        ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
         tun2 = ec.register_resource("LinuxTun")
@@ -183,7 +190,9 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
         ec.register_connection(tun2, gretun)
 
         app = ec.register_resource("LinuxApplication")
-        cmd = "ping -c3 %s.2" % self.netblock
+        # It seems the hybrid tunnel takes some time to setup... we add a sleep 5
+        # XXX: Debug this to see if it can be fixed on the RMs
+        cmd = "sleep 5; ping -c3 %s.2" % self.netblock
         ec.set(app, "command", cmd)
         ec.register_connection(app, node1)