X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Ftun.py;h=aa0def27766f1857432761c9eae569060cb30c27;hb=38575a0f27f26511965771dde8320060b10252dd;hp=392f2e9f0ea4fff278fb3b03c0a6767bc2f020cf;hpb=5d80869516dfcecb8e7fe6f117e2fb658b57b25b;p=nepi.git

diff --git a/test/resources/planetlab/tun.py b/test/resources/planetlab/tun.py
old mode 100644
new mode 100755
index 392f2e9f..aa0def27
--- a/test/resources/planetlab/tun.py
+++ b/test/resources/planetlab/tun.py
@@ -19,11 +19,8 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.ec import ExperimentController 
-from nepi.resources.planetlab.node import PlanetlabNode
-from nepi.resources.planetlab.tun import PlanetlabTun
-from nepi.resources.linux.application import LinuxApplication
 
-from test_utils import skipIfNotAlive, skipInteractive
+from test_utils import skipIfNotAlive
 
 import os
 import time
@@ -31,32 +28,34 @@ import unittest
 
 class PlanetlabTunTestCase(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_tun_create(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(PlanetlabNode)
-        ResourceFactory.register_type(PlanetlabTun)
-        ResourceFactory.register_type(LinuxApplication)
+    def t_tun_create(self, host, user, identity):
 
         ec = ExperimentController(exp_id = "test-un-create")
         
         node = ec.register_resource("PlanetlabNode")
         ec.set(node, "hostname", host)
         ec.set(node, "username", user)
+        ec.set(node, "identity", identity)
         ec.set(node, "cleanHome", True)
         ec.set(node, "cleanProcesses", True)
 
         tun = ec.register_resource("PlanetlabTun")
-        ec.set(tun, "ip4", "192.168.1.1")
-        ec.set(tun, "prefix4", "24")
+        ec.set(tun, "endpoint_ip", "%s.1" % self.netblock)
+        ec.set(tun, "endpoint_prefix", 24)
         ec.register_connection(tun, node)
 
         app = ec.register_resource("LinuxApplication")
-        cmd = "ping -c3 192.168.1.1" 
+        cmd = "ping -c3 %s.1" % self.netblock
         ec.set(app, "command", cmd)
         ec.register_connection(app, node)
 
@@ -74,7 +73,7 @@ class PlanetlabTunTestCase(unittest.TestCase):
         ec.shutdown()
 
     def test_tun_create(self):
-        self.t_tun_create(self.host, self.user)
+        self.t_tun_create(self.host, self.user, self.identity)
 
 if __name__ == '__main__':
     unittest.main()