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
Changed the endpoint_ip and endpoint_prefix attributes of TAP/TUN endpoints for ip...
[nepi.git]
/
test
/
resources
/
linux
/
udptunnel.py
diff --git
a/test/resources/linux/udptunnel.py
b/test/resources/linux/udptunnel.py
index
a3089d8
..
59c53de
100755
(executable)
--- a/
test/resources/linux/udptunnel.py
+++ b/
test/resources/linux/udptunnel.py
@@
-39,7
+39,7
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
def t_tap_udp_tunnel(self, user1, host1, identity1, user2, host2,
identity2):
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("linux::Node")
ec.set(node1, "hostname", host1)
node1 = ec.register_resource("linux::Node")
ec.set(node1, "hostname", host1)
@@
-49,8
+49,8
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("linux::Tap")
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("linux::Tap")
- ec.set(tap1, "
endpoint_
ip", "%s.1" % self.netblock)
- ec.set(tap1, "
endpoint_prefix", 32
)
+ ec.set(tap1, "ip", "%s.1" % self.netblock)
+ ec.set(tap1, "
prefix", "32"
)
ec.register_connection(tap1, node1)
node2 = ec.register_resource("linux::Node")
ec.register_connection(tap1, node1)
node2 = ec.register_resource("linux::Node")
@@
-61,8
+61,8
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("linux::Tap")
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("linux::Tap")
- ec.set(tap2, "
endpoint_
ip", "%s.2" % self.netblock)
- ec.set(tap2, "
endpoint_prefix", 32
)
+ ec.set(tap2, "ip", "%s.2" % self.netblock)
+ ec.set(tap2, "
prefix", "32"
)
ec.register_connection(tap2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
ec.register_connection(tap2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
@@
-78,7
+78,7
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.wait_finished(app)
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)
expected = """3 packets transmitted, 3 received, 0% packet loss"""
self.assertTrue(ping.find(expected) > -1)
@@
-93,7
+93,7
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
@skipIfAnyNotAliveWithIdentity
def t_tun_udp_tunnel(self, user1, host1, identity1, user2, host2, identity2):
@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("linux::Node")
ec.set(node1, "hostname", host1)
node1 = ec.register_resource("linux::Node")
ec.set(node1, "hostname", host1)
@@
-103,8
+103,8
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("linux::Tun")
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("linux::Tun")
- ec.set(tun1, "
endpoint_
ip", "%s.1" % self.netblock)
- ec.set(tun1, "
endpoint_prefix", 32
)
+ ec.set(tun1, "ip", "%s.1" % self.netblock)
+ ec.set(tun1, "
prefix", "32"
)
ec.register_connection(tun1, node1)
node2 = ec.register_resource("linux::Node")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("linux::Node")
@@
-115,8
+115,8
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("linux::Tun")
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", 32
)
+ ec.set(tun2, "ip", "%s.2" % self.netblock)
+ ec.set(tun2, "
prefix", "32"
)
ec.register_connection(tun2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
ec.register_connection(tun2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
@@
-132,7
+132,7
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.wait_finished(app)
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)
expected = """3 packets transmitted, 3 received, 0% packet loss"""
self.assertTrue(ping.find(expected) > -1)