Changed the endpoint_ip and endpoint_prefix attributes of TAP/TUN endpoints for ip...

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

diff --git a/test/resources/planetlab/tap.py b/test/resources/planetlab/tap.py
index 3c46513..d52de03 100755 (executable)
--- a/test/resources/planetlab/tap.py
+++ b/test/resources/planetlab/tap.py
@@ -40,21 +40,21 @@ class PlanetlabTapTestCase(unittest.TestCase):
     @skipIfNotAlive
     def t_tap_create(self, host, user, identity):
 
-        ec = ExperimentController(exp_id = "test-tap-create")
+        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, "identity", identity)
-        ec.set(node, "cleanHome", True)
+        ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        tap = ec.register_resource("PlanetlabTap")
-        ec.set(tap, "endpoint_ip", "%s.1" % self.netblock)
-        ec.set(tap, "endpoint_prefix", 24)
+        tap = ec.register_resource("planetlab::Tap")
+        ec.set(tap, "ip", "%s.1" % self.netblock)
+        ec.set(tap, "prefix", "24")
         ec.register_connection(tap, node)
 
-        app = ec.register_resource("LinuxApplication")
+        app = ec.register_resource("linux::Application")
         cmd = "ping -c3 %s.1" % self.netblock
         ec.set(app, "command", cmd)
         ec.register_connection(app, node)
@@ -63,7 +63,7 @@ class PlanetlabTapTestCase(unittest.TestCase):
 
         ec.wait_finished(app)
 
-        ping = ec.trace(app, 'stdout')
+        ping = ec.trace(app, "stdout")
         expected = """3 packets transmitted, 3 received, 0% packet loss"""
         self.assertTrue(ping.find(expected) > -1)