X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Fudptunnel.py;h=6b767fa3f727505a7d1cf65b65d2c790db980616;hb=4ec5c9e5454b68a3dab82a5073aee50231706706;hp=9dd7d5b4743ea37406a473ea0cb83ab5e3e4ed11;hpb=88c5b86c62dbaef9e3b2a73bf08b6c21075e12a3;p=nepi.git

diff --git a/test/resources/planetlab/udptunnel.py b/test/resources/planetlab/udptunnel.py
index 9dd7d5b4..6b767fa3 100755
--- a/test/resources/planetlab/udptunnel.py
+++ b/test/resources/planetlab/udptunnel.py
@@ -69,7 +69,7 @@ class UdpTunnelTestCase(unittest.TestCase):
         ec.set(tap2, "prefix4", 24)
         ec.register_connection(tap2, node2)
 
-        udptun = ec.register_resource("UdpTunnel")
+        udptun = ec.register_resource("LinuxUdpTunnel")
         ec.register_connection(tap1, udptun)
         ec.register_connection(tap2, udptun)
 
@@ -86,18 +86,18 @@ class UdpTunnelTestCase(unittest.TestCase):
         expected = """3 packets transmitted, 3 received, 0% packet loss"""
         self.assertTrue(ping.find(expected) > -1)
         
-        if_name = ec.get(tap1, "deviceName")
-        self.assertTrue(if_name.startswith("tap"))
+        vif_name = ec.get(tap1, "deviceName")
+        self.assertTrue(vif_name.startswith("tap"))
         
-        if_name = ec.get(tap2, "deviceName")
-        self.assertTrue(if_name.startswith("tap"))
+        vif_name = ec.get(tap2, "deviceName")
+        self.assertTrue(vif_name.startswith("tap"))
 
         ec.shutdown()
 
     @skipIfAnyNotAliveWithIdentity
     def t_tun_udp_tunnel(self, user1, host1, identity1, user2, host2, identity2):
 
-        ec = ExperimentController(exp_id = "test-tap-udp-tunnel")
+        ec = ExperimentController(exp_id = "test-tun-udp-tunnel")
         
         node1 = ec.register_resource("PlanetlabNode")
         ec.set(node1, "hostname", host1)
@@ -125,7 +125,7 @@ class UdpTunnelTestCase(unittest.TestCase):
         ec.set(tun2, "prefix4", 24)
         ec.register_connection(tun2, node2)
 
-        udptun = ec.register_resource("UdpTunnel")
+        udptun = ec.register_resource("LinuxUdpTunnel")
         ec.register_connection(tun1, udptun)
         ec.register_connection(tun2, udptun)
 
@@ -142,11 +142,11 @@ class UdpTunnelTestCase(unittest.TestCase):
         expected = """3 packets transmitted, 3 received, 0% packet loss"""
         self.assertTrue(ping.find(expected) > -1)
         
-        if_name = ec.get(tun1, "deviceName")
-        self.assertTrue(if_name.startswith("tun"))
+        vif_name = ec.get(tun1, "deviceName")
+        self.assertTrue(vif_name.startswith("tun"))
         
-        if_name = ec.get(tun2, "deviceName")
-        self.assertTrue(if_name.startswith("tun"))
+        vif_name = ec.get(tun2, "deviceName")
+        self.assertTrue(vif_name.startswith("tun"))
 
         ec.shutdown()