X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Fgretunnel.py;fp=test%2Fresources%2Fplanetlab%2Fgretunnel.py;h=74197f1b8a9d2e86612c68050f8d0043f9851e69;hb=b6c4948fd994223cff257cbdae7146da1339b58d;hp=460261f0125ab4c0fe87565582ba8194e6c394bf;hpb=fb002d754908edf9b3dbc11c2cd9111220cf402c;p=nepi.git

diff --git a/test/resources/planetlab/gretunnel.py b/test/resources/planetlab/gretunnel.py
index 460261f0..74197f1b 100755
--- a/test/resources/planetlab/gretunnel.py
+++ b/test/resources/planetlab/gretunnel.py
@@ -43,32 +43,30 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
     def t_tap_gre_tunnel(self, user1, host1, identity1, user2, host2, 
             identity2):
 
-        ec = ExperimentController(exp_id = "test-tap-gre-tunnel")
+        ec = ExperimentController(exp_id="test-tap-gre-tunnel")
         
         node1 = ec.register_resource("planetlab::Node")
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        #ec.set(node1, "cleanHome", True)
         ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
         tap1 = ec.register_resource("planetlab::Tap")
-        ec.set(tap1, "endpoint_ip", "%s.1" % self.netblock)
-        ec.set(tap1, "endpoint_prefix", 24)
+        ec.set(tap1, "ip", "%s.1" % self.netblock)
+        ec.set(tap1, "prefix", "24")
         ec.register_connection(tap1, node1)
 
         node2 = ec.register_resource("planetlab::Node")
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        #ec.set(node2, "cleanHome", True)
         ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
         tap2 = ec.register_resource("planetlab::Tap")
-        ec.set(tap2, "endpoint_ip", "%s.2" % self.netblock)
-        ec.set(tap2, "endpoint_prefix", 24)
+        ec.set(tap2, "ip", "%s.2" % self.netblock)
+        ec.set(tap2, "prefix", "24")
         ec.register_connection(tap2, node2)
 
         gretun = ec.register_resource("linux::GRETunnel")
@@ -84,7 +82,7 @@ class PlanetLabGRETunnelTestCase(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)
         
@@ -100,32 +98,30 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
     def t_tun_gre_tunnel(self, user1, host1, identity1, user2, host2, 
             identity2):
 
-        ec = ExperimentController(exp_id = "test-tun-gre-tunnel")
+        ec = ExperimentController(exp_id="test-tun-gre-tunnel")
         
         node1 = ec.register_resource("planetlab::Node")
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        #ec.set(node1, "cleanHome", True)
         ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
         tun1 = ec.register_resource("planetlab::Tun")
-        ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock)
-        ec.set(tun1, "endpoint_prefix", 24)
+        ec.set(tun1, "ip", "%s.1" % self.netblock)
+        ec.set(tun1, "prefix", "24")
         ec.register_connection(tun1, node1)
 
         node2 = ec.register_resource("planetlab::Node")
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        #ec.set(node2, "cleanHome", True)
         ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
         tun2 = ec.register_resource("planetlab::Tun")
-        ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock)
-        ec.set(tun2, "endpoint_prefix", 24)
+        ec.set(tun2, "ip", "%s.2" % self.netblock)
+        ec.set(tun2, "prefix", "24")
         ec.register_connection(tun2, node2)
 
         udptun = ec.register_resource("linux::GRETunnel")
@@ -141,7 +137,7 @@ class PlanetLabGRETunnelTestCase(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)
         
@@ -157,32 +153,30 @@ class PlanetLabGRETunnelTestCase(unittest.TestCase):
     def t_tun_hybrid_gre_tunnel(self, user1, host1, identity1, 
             user2, host2, identity2):
 
-        ec = ExperimentController(exp_id = "test-tap-hybrid-gre-tunnel")
+        ec = ExperimentController(exp_id="test-tap-hybrid-gre-tunnel")
         
         node1 = ec.register_resource("planetlab::Node")
         ec.set(node1, "hostname", host1)
         ec.set(node1, "username", user1)
         ec.set(node1, "identity", identity1)
-        #ec.set(node1, "cleanHome", True)
         ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
         tun1 = ec.register_resource("planetlab::Tun")
-        ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock)
-        ec.set(tun1, "endpoint_prefix", 24)
+        ec.set(tun1, "ip", "%s.1" % self.netblock)
+        ec.set(tun1, "prefix", "24")
         ec.register_connection(tun1, node1)
 
         node2 = ec.register_resource("linux::Node")
         ec.set(node2, "hostname", host2)
         ec.set(node2, "username", user2)
         ec.set(node2, "identity", identity2)
-        #ec.set(node2, "cleanHome", True)
         ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
         tun2 = ec.register_resource("linux::Tun")
-        ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock)
-        ec.set(tun2, "endpoint_prefix", 24)
+        ec.set(tun2, "ip", "%s.2" % self.netblock)
+        ec.set(tun2, "prefix", "24")
         ec.register_connection(tun2, node2)
 
         gretun = ec.register_resource("linux::GRETunnel")
@@ -200,7 +194,7 @@ class PlanetLabGRETunnelTestCase(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)