git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Progress with LinuxTAP and UDP connections
[nepi.git]
/
test
/
resources
/
planetlab
/
udptunnel.py
diff --git
a/test/resources/planetlab/udptunnel.py
b/test/resources/planetlab/udptunnel.py
index
9dd7d5b
..
a74acee
100755
(executable)
--- a/
test/resources/planetlab/udptunnel.py
+++ b/
test/resources/planetlab/udptunnel.py
@@
-26,7
+26,7
@@
import os
import time
import unittest
import time
import unittest
-class UdpTunnelTestCase(unittest.TestCase):
+class
Planetlab
UdpTunnelTestCase(unittest.TestCase):
def setUp(self):
#self.host1 = "nepi2.pl.sophia.inria.fr"
#self.host2 = "nepi5.pl.sophia.inria.fr"
def setUp(self):
#self.host1 = "nepi2.pl.sophia.inria.fr"
#self.host2 = "nepi5.pl.sophia.inria.fr"
@@
-52,7
+52,6
@@
class UdpTunnelTestCase(unittest.TestCase):
tap1 = ec.register_resource("PlanetlabTap")
ec.set(tap1, "ip4", "%s.1" % self.netblock)
tap1 = ec.register_resource("PlanetlabTap")
ec.set(tap1, "ip4", "%s.1" % self.netblock)
- ec.set(tap1, "pointopoint", "%s.2" % self.netblock)
ec.set(tap1, "prefix4", 24)
ec.register_connection(tap1, node1)
ec.set(tap1, "prefix4", 24)
ec.register_connection(tap1, node1)
@@
-65,11
+64,10
@@
class UdpTunnelTestCase(unittest.TestCase):
tap2 = ec.register_resource("PlanetlabTap")
ec.set(tap2, "ip4", "%s.2" % self.netblock)
tap2 = ec.register_resource("PlanetlabTap")
ec.set(tap2, "ip4", "%s.2" % self.netblock)
- ec.set(tap2, "pointopoint", "%s.1" % self.netblock)
ec.set(tap2, "prefix4", 24)
ec.register_connection(tap2, node2)
ec.set(tap2, "prefix4", 24)
ec.register_connection(tap2, node2)
- udptun = ec.register_resource("UdpTunnel")
+ udptun = ec.register_resource("
Linux
UdpTunnel")
ec.register_connection(tap1, udptun)
ec.register_connection(tap2, udptun)
ec.register_connection(tap1, udptun)
ec.register_connection(tap2, udptun)
@@
-86,18
+84,18
@@
class UdpTunnelTestCase(unittest.TestCase):
expected = """3 packets transmitted, 3 received, 0% packet loss"""
self.assertTrue(ping.find(expected) > -1)
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"))
+
v
if_name = ec.get(tap1, "deviceName")
+ self.assertTrue(
v
if_name.startswith("tap"))
- if_name = ec.get(tap2, "deviceName")
- self.assertTrue(if_name.startswith("tap"))
+
v
if_name = ec.get(tap2, "deviceName")
+ self.assertTrue(
v
if_name.startswith("tap"))
ec.shutdown()
@skipIfAnyNotAliveWithIdentity
def t_tun_udp_tunnel(self, user1, host1, identity1, user2, host2, identity2):
ec.shutdown()
@skipIfAnyNotAliveWithIdentity
def t_tun_udp_tunnel(self, user1, host1, identity1, user2, host2, identity2):
- ec = ExperimentController(exp_id = "test-t
ap
-udp-tunnel")
+ ec = ExperimentController(exp_id = "test-t
un
-udp-tunnel")
node1 = ec.register_resource("PlanetlabNode")
ec.set(node1, "hostname", host1)
node1 = ec.register_resource("PlanetlabNode")
ec.set(node1, "hostname", host1)
@@
-108,7
+106,6
@@
class UdpTunnelTestCase(unittest.TestCase):
tun1 = ec.register_resource("PlanetlabTun")
ec.set(tun1, "ip4", "%s.1" % self.netblock)
tun1 = ec.register_resource("PlanetlabTun")
ec.set(tun1, "ip4", "%s.1" % self.netblock)
- ec.set(tun1, "pointopoint", "%s.2" % self.netblock)
ec.set(tun1, "prefix4", 24)
ec.register_connection(tun1, node1)
ec.set(tun1, "prefix4", 24)
ec.register_connection(tun1, node1)
@@
-121,11
+118,10
@@
class UdpTunnelTestCase(unittest.TestCase):
tun2 = ec.register_resource("PlanetlabTun")
ec.set(tun2, "ip4", "%s.2" % self.netblock)
tun2 = ec.register_resource("PlanetlabTun")
ec.set(tun2, "ip4", "%s.2" % self.netblock)
- ec.set(tun2, "pointopoint", "%s.1" % self.netblock )
ec.set(tun2, "prefix4", 24)
ec.register_connection(tun2, node2)
ec.set(tun2, "prefix4", 24)
ec.register_connection(tun2, node2)
- udptun = ec.register_resource("UdpTunnel")
+ udptun = ec.register_resource("
Linux
UdpTunnel")
ec.register_connection(tun1, udptun)
ec.register_connection(tun2, udptun)
ec.register_connection(tun1, udptun)
ec.register_connection(tun2, udptun)
@@
-142,11
+138,11
@@
class UdpTunnelTestCase(unittest.TestCase):
expected = """3 packets transmitted, 3 received, 0% packet loss"""
self.assertTrue(ping.find(expected) > -1)
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"))
+
v
if_name = ec.get(tun1, "deviceName")
+ self.assertTrue(
v
if_name.startswith("tun"))
- if_name = ec.get(tun2, "deviceName")
- self.assertTrue(if_name.startswith("tun"))
+
v
if_name = ec.get(tun2, "deviceName")
+ self.assertTrue(
v
if_name.startswith("tun"))
ec.shutdown()
ec.shutdown()