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
Serious refactoring of TUN/TAP and tunnel code. Linux udp/gre tunnels not yet functional
[nepi.git]
/
test
/
resources
/
linux
/
udptunnel.py
diff --git
a/test/resources/linux/udptunnel.py
b/test/resources/linux/udptunnel.py
index
59c53de
..
be6b275
100755
(executable)
--- a/
test/resources/linux/udptunnel.py
+++ b/
test/resources/linux/udptunnel.py
@@
-28,41
+28,35
@@
import unittest
class LinuxUdpTunnelTestCase(unittest.TestCase):
def setUp(self):
class LinuxUdpTunnelTestCase(unittest.TestCase):
def setUp(self):
- self.host1 = "roseval.pl.sophia.inria.fr"
- self.host2 = "138.96.118.11"
- self.user1 = "inria_nepi"
- self.user2 = "omflab"
- self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
- self.netblock = "192.168.1"
+ self.host = "roseval.pl.sophia.inria.fr"
+ self.user = "inria_nepi"
+ self.identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
@skipIfAnyNotAliveWithIdentity
@skipIfAnyNotAliveWithIdentity
- def t_tap_udp_tunnel(self, user1, host1, identity1, user2, host2,
- identity2):
+ def t_tap_udp_tunnel(self, user, host, identity):
ec = ExperimentController(exp_id="test-tap-udp-tunnel")
node1 = ec.register_resource("linux::Node")
ec = ExperimentController(exp_id="test-tap-udp-tunnel")
node1 = ec.register_resource("linux::Node")
- ec.set(node1, "hostname", host1)
- ec.set(node1, "username", user1)
- ec.set(node1, "identity", identity1)
+ ec.set(node1, "hostname", "localhost")
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("linux::Tap")
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tap1 = ec.register_resource("linux::Tap")
- ec.set(tap1, "ip", "
%s.1" % self.netblock
)
- ec.set(tap1, "prefix", "3
2
")
+ ec.set(tap1, "ip", "
192.168.3.1"
)
+ ec.set(tap1, "prefix", "3
0
")
ec.register_connection(tap1, node1)
node2 = ec.register_resource("linux::Node")
ec.register_connection(tap1, node1)
node2 = ec.register_resource("linux::Node")
- ec.set(node2, "hostname", host
2
)
- ec.set(node2, "username", user
2
)
- ec.set(node2, "identity", identity
2
)
+ ec.set(node2, "hostname", host)
+ ec.set(node2, "username", user)
+ ec.set(node2, "identity", identity)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("linux::Tap")
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tap2 = ec.register_resource("linux::Tap")
- ec.set(tap2, "ip", "
%s.2" % self.netblock
)
- ec.set(tap2, "prefix", "3
2
")
+ ec.set(tap2, "ip", "
192.168.3.2"
)
+ ec.set(tap2, "prefix", "3
0
")
ec.register_connection(tap2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
ec.register_connection(tap2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
@@
-70,7
+64,7
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.register_connection(tap2, udptun)
app = ec.register_resource("linux::Application")
ec.register_connection(tap2, udptun)
app = ec.register_resource("linux::Application")
- cmd = "ping -c3
%s.2" % self.netblock
+ cmd = "ping -c3
192.168.3.2"
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
@@
-79,6
+73,7
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.wait_finished(app)
ping = ec.trace(app, "stdout")
ec.wait_finished(app)
ping = ec.trace(app, "stdout")
+ print ping
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)
@@
-91,32
+86,30
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.shutdown()
@skipIfAnyNotAliveWithIdentity
ec.shutdown()
@skipIfAnyNotAliveWithIdentity
- def t_tun_udp_tunnel(self, user
1, host1, identity1, user2, host2, identity2
):
+ def t_tun_udp_tunnel(self, user
, host, identity
):
ec = ExperimentController(exp_id="test-tun-udp-tunnel")
node1 = ec.register_resource("linux::Node")
ec = ExperimentController(exp_id="test-tun-udp-tunnel")
node1 = ec.register_resource("linux::Node")
- ec.set(node1, "hostname", host1)
- ec.set(node1, "username", user1)
- ec.set(node1, "identity", identity1)
+ ec.set(node1, "hostname", "localhost")
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("linux::Tun")
ec.set(node1, "cleanExperiment", True)
ec.set(node1, "cleanProcesses", True)
tun1 = ec.register_resource("linux::Tun")
- ec.set(tun1, "ip", "
%s.1" % self.netblock
)
- ec.set(tun1, "prefix", "3
2
")
+ ec.set(tun1, "ip", "
192.168.3.1"
)
+ ec.set(tun1, "prefix", "3
0
")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("linux::Node")
ec.register_connection(tun1, node1)
node2 = ec.register_resource("linux::Node")
- ec.set(node2, "hostname", host
2
)
- ec.set(node2, "username", user
2
)
- ec.set(node2, "identity", identity
2
)
+ ec.set(node2, "hostname", host)
+ ec.set(node2, "username", user)
+ ec.set(node2, "identity", identity)
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("linux::Tun")
ec.set(node2, "cleanExperiment", True)
ec.set(node2, "cleanProcesses", True)
tun2 = ec.register_resource("linux::Tun")
- ec.set(tun2, "ip", "
%s.2" % self.netblock
)
- ec.set(tun2, "prefix", "3
2
")
+ ec.set(tun2, "ip", "
192.168.3.2"
)
+ ec.set(tun2, "prefix", "3
0
")
ec.register_connection(tun2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
ec.register_connection(tun2, node2)
udptun = ec.register_resource("linux::UdpTunnel")
@@
-124,7
+117,7
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.register_connection(tun2, udptun)
app = ec.register_resource("linux::Application")
ec.register_connection(tun2, udptun)
app = ec.register_resource("linux::Application")
- cmd = "ping -c3
%s.2" % self.netblock
+ cmd = "ping -c3
192.168.3.2"
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
ec.set(app, "command", cmd)
ec.register_connection(app, node1)
@@
-133,6
+126,8
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.wait_finished(app)
ping = ec.trace(app, "stdout")
ec.wait_finished(app)
ping = ec.trace(app, "stdout")
+
+ print ping
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)
@@
-145,12
+140,10
@@
class LinuxUdpTunnelTestCase(unittest.TestCase):
ec.shutdown()
def test_tap_udp_tunnel(self):
ec.shutdown()
def test_tap_udp_tunnel(self):
- self.t_tap_udp_tunnel(self.user1, self.host1, self.identity,
- self.user2, self.host2, self.identity)
+ self.t_tap_udp_tunnel(self.user, self.host, self.identity)
def ztest_tun_udp_tunnel(self):
def ztest_tun_udp_tunnel(self):
- self.t_tun_udp_tunnel(self.user1, self.host1, self.identity,
- self.user2, self.host2, self.identity)
+ self.t_tun_udp_tunnel(self.user, self.host, self.identity)
if __name__ == '__main__':
unittest.main()
if __name__ == '__main__':
unittest.main()