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

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

diff --git a/test/resources/planetlab/udptunnel.py b/test/resources/planetlab/udptunnel.py
index bd87a75..167052b 100755 (executable)
--- a/test/resources/planetlab/udptunnel.py
+++ b/test/resources/planetlab/udptunnel.py
@@ -43,7 +43,7 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
     def t_tap_udp_tunnel(self, user1, host1, identity1, user2, host2, 
             identity2):
 
-        ec = ExperimentController(exp_id = "test-tap-udp-tunnel")
+        ec = ExperimentController(exp_id="test-tap-udp-tunnel")
         
         node1 = ec.register_resource("planetlab::Node")
         ec.set(node1, "hostname", host1)
@@ -53,8 +53,8 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
         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")
@@ -65,8 +65,8 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
         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)
 
         udptun = ec.register_resource("linux::UdpTunnel")
@@ -97,7 +97,7 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
     @skipIfAnyNotAliveWithIdentity
     def t_tun_udp_tunnel(self, user1, host1, identity1, user2, host2, identity2):
 
-        ec = ExperimentController(exp_id = "test-tun-udp-tunnel")
+        ec = ExperimentController(exp_id="test-tun-udp-tunnel")
         
         node1 = ec.register_resource("planetlab::Node")
         ec.set(node1, "hostname", host1)
@@ -107,8 +107,8 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
         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")
@@ -119,8 +119,8 @@ class PlanetlabUdpTunnelTestCase(unittest.TestCase):
         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::UdpTunnel")