X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Ftap.py;h=5b63fab5ad4e47971658ffdd835d2d4ebd367988;hb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;hp=f08a54c91889194c72c996b6852a390780b52c14;hpb=c505d0f175a08073733ac8ff79dfa694de6e07f3;p=nepi.git

diff --git a/test/resources/planetlab/tap.py b/test/resources/planetlab/tap.py
index f08a54c9..5b63fab5 100755
--- a/test/resources/planetlab/tap.py
+++ b/test/resources/planetlab/tap.py
@@ -20,7 +20,7 @@
 
 from nepi.execution.ec import ExperimentController 
 
-from test_utils import skipIfNotAlive, skipInteractive
+from test_utils import skipIfNotAlive
 
 import os
 import time
@@ -28,27 +28,34 @@ import unittest
 
 class PlanetlabTapTestCase(unittest.TestCase):
     def setUp(self):
-        self.host = "nepi2.pl.sophia.inria.fr"
+        self.host = "planetlab1.informatik.uni-erlangen.de"
         self.user = "inria_nepi"
+        self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
+        self.netblock = "192.168.3"
+        #self.host = "nepi2.pl.sophia.inria.fr"
+        #self.user = "inria_nepi"
+        #self.identity = None
+        #self.netblock = "192.168.1"
 
     @skipIfNotAlive
-    def t_tap_create(self, host, user):
+    def t_tap_create(self, host, user, identity):
 
         ec = ExperimentController(exp_id = "test-tap-create")
         
-        node = ec.register_resource("PlanetlabNode")
+        node = ec.register_resource("planetlab::Node")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "identity", identity)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        tap = ec.register_resource("PlanetlabTap")
-        ec.set(tap, "ip4", "192.168.1.1")
-        ec.set(tap, "prefix4", 24)
+        tap = ec.register_resource("planetlab::Tap")
+        ec.set(tap, "endpoint_ip", "%s.1" % self.netblock)
+        ec.set(tap, "endpoint_prefix", 24)
         ec.register_connection(tap, node)
 
-        app = ec.register_resource("LinuxApplication")
-        cmd = "ping -c3 192.168.1.1"
+        app = ec.register_resource("linux::Application")
+        cmd = "ping -c3 %s.1" % self.netblock
         ec.set(app, "command", cmd)
         ec.register_connection(app, node)
 
@@ -66,7 +73,7 @@ class PlanetlabTapTestCase(unittest.TestCase):
         ec.shutdown()
 
     def test_tap_create(self):
-        self.t_tap_create(self.host, self.user)
+        self.t_tap_create(self.host, self.user, self.identity)
 
 if __name__ == '__main__':
     unittest.main()