Fix PL tests after controller interface change

diff --git a/test/testbeds/planetlab/integration_cross.py b/test/testbeds/planetlab/integration_cross.py
index bbb1918..8bba6e7 100755 (executable)
--- a/test/testbeds/planetlab/integration_cross.py
+++ b/test/testbeds/planetlab/integration_cross.py
@@ -193,8 +193,8 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
             while not controller.is_finished(ping.guid):
                 time.sleep(0.5)
               
-            ping_result = controller.trace(pl2.guid, ping.guid, "stdout")
-            tap2_trace = controller.trace(pl2.guid, tap2.guid, "packets")
+            ping_result = controller.trace(ping.guid, "stdout")
+            tap2_trace = controller.trace(tap2.guid, "packets")
         finally:
             controller.stop()
             controller.shutdown()

diff --git a/test/testbeds/planetlab/integration_multi.py b/test/testbeds/planetlab/integration_multi.py
index 9274c46..5c8cad0 100755 (executable)
--- a/test/testbeds/planetlab/integration_multi.py
+++ b/test/testbeds/planetlab/integration_multi.py
@@ -131,9 +131,9 @@ class PlanetLabMultiIntegrationTestCase(unittest.TestCase):
         while not controller.is_finished(ping.guid):
             time.sleep(0.5)
           
-        ping_result = controller.trace(pl.guid, ping.guid, "stdout")
-        tap_trace = controller.trace(pl.guid, tap1.guid, "packets")
-        tap2_trace = controller.trace(pl2.guid, tap2.guid, "packets")
+        ping_result = controller.trace(ping.guid, "stdout")
+        tap_trace = controller.trace(tap1.guid, "packets")
+        tap2_trace = controller.trace(tap2.guid, "packets")
 
         controller.stop()
         controller.shutdown()

diff --git a/test/testbeds/planetlab/integration_ns3.py b/test/testbeds/planetlab/integration_ns3.py
index b2412e2..afc4a5f 100755 (executable)
--- a/test/testbeds/planetlab/integration_ns3.py
+++ b/test/testbeds/planetlab/integration_ns3.py
@@ -213,8 +213,8 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase):
         while not controller.is_finished(ping.guid):
             time.sleep(0.5)
           
-        ping_result = controller.trace(pl.guid, ping.guid, "stdout")
-        tap_trace = controller.trace(pl.guid, tap1.guid, "packets")
+        ping_result = controller.trace(ping.guid, "stdout")
+        tap_trace = controller.trace(tap1.guid, "packets")
 
         controller.stop()
         controller.shutdown()
@@ -290,7 +290,7 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase):
         while not controller.is_finished(ping.guid):
             time.sleep(0.5)
           
-        tap_trace = controller.trace(pl.guid, tap1.guid, "packets")
+        tap_trace = controller.trace(tap1.guid, "packets")
 
         controller.stop()
         controller.shutdown()
@@ -397,9 +397,9 @@ class PlanetLabCrossIntegrationTestCase(unittest.TestCase):
             tap_trace = []
             for i,tap in enumerate([ tap0, tap1, tap2, tap3, tap4 ]):
                 tap_trace.append("\nTrace for tap%d:\n" % i)
-                tap_trace.append(controller.trace(pl.guid, tap.guid, "packets"))
+                tap_trace.append(controller.trace(tap.guid, "packets"))
             tap_trace = "".join(tap_trace)
-            tap0_trace = controller.trace(pl.guid, tap0.guid, "packets")
+            tap0_trace = controller.trace(tap0.guid, "packets")
 
         finally:
             controller.stop()