oops

[nepi.git] / test / resources / planetlab / tap.py

diff --git a/test/resources/planetlab/tap.py b/test/resources/planetlab/tap.py
index 091babe..d2c86cb 100755 (executable)
--- a/test/resources/planetlab/tap.py
+++ b/test/resources/planetlab/tap.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.tap import PlanetlabTap
-from nepi.resources.linux.application import LinuxApplication
 
-from test_utils import skipIfNotAlive, skipInteractive
+from test_utils import skipIfNotAlive
 
 import os
 import time
@@ -31,16 +28,11 @@ import unittest
 
 class PlanetlabTapTestCase(unittest.TestCase):
     def setUp(self):
-        self.host = "nepi2.pl.sophia.inria.fr"
+        self.host = "nepi5.pl.sophia.inria.fr"
         self.user = "inria_nepi"
 
     @skipIfNotAlive
     def t_tap_create(self, host, user):
-        from nepi.execution.resource import ResourceFactory
-        
-        ResourceFactory.register_type(PlanetlabNode)
-        ResourceFactory.register_type(PlanetlabTap)
-        ResourceFactory.register_type(LinuxApplication)
 
         ec = ExperimentController(exp_id = "test-tap-create")
         
@@ -52,11 +44,11 @@ class PlanetlabTapTestCase(unittest.TestCase):
 
         tap = ec.register_resource("PlanetlabTap")
         ec.set(tap, "ip4", "192.168.1.1")
-        ec.set(tap, "prefix4", "24")
+        ec.set(tap, "prefix4", 24)
         ec.register_connection(tap, node)
 
         app = ec.register_resource("LinuxApplication")
-        cmd = "ping -c3 192.168.1.1" 
+        cmd = "ping -c3 192.168.1.1"
         ec.set(app, "command", cmd)
         ec.register_connection(app, node)