X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fudptunnel.py;h=2963f9046d5a1639759428cfec9fb1298c6328a1;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=24ddf1494ae1df81d359bb23c13a1d9e693eeba0;hpb=4f61ec12520928b3403ee2a75c9e4ce1b30907a3;p=nepi.git diff --git a/test/resources/linux/udptunnel.py b/test/resources/linux/udptunnel.py index 24ddf149..2963f904 100755 --- a/test/resources/linux/udptunnel.py +++ b/test/resources/linux/udptunnel.py @@ -4,9 +4,8 @@ # Copyright (C) 2013 INRIA # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,6 +17,8 @@ # # Author: Alina Quereilhac +from __future__ import print_function + from nepi.execution.ec import ExperimentController from test_utils import skipIfAnyNotAliveWithIdentity @@ -28,49 +29,43 @@ import unittest 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 - 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") + ec = ExperimentController(exp_id="test-tap-udp-tunnel") - node1 = ec.register_resource("LinuxNode") - ec.set(node1, "hostname", host1) - ec.set(node1, "username", user1) - ec.set(node1, "identity", identity1) - ec.set(node1, "cleanHome", True) + node1 = ec.register_resource("linux::Node") + ec.set(node1, "hostname", "localhost") + ec.set(node1, "cleanExperiment", True) ec.set(node1, "cleanProcesses", True) - tap1 = ec.register_resource("LinuxTap") - ec.set(tap1, "endpoint_ip", "%s.1" % self.netblock) - ec.set(tap1, "endpoint_prefix", 32) + tap1 = ec.register_resource("linux::Tap") + ec.set(tap1, "ip", "192.168.3.1") + ec.set(tap1, "prefix", "30") ec.register_connection(tap1, node1) - node2 = ec.register_resource("LinuxNode") - ec.set(node2, "hostname", host2) - ec.set(node2, "username", user2) - ec.set(node2, "identity", identity2) - ec.set(node2, "cleanHome", True) + node2 = ec.register_resource("linux::Node") + 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("LinuxTap") - ec.set(tap2, "endpoint_ip", "%s.2" % self.netblock) - ec.set(tap2, "endpoint_prefix", 32) + tap2 = ec.register_resource("linux::Tap") + ec.set(tap2, "ip", "192.168.3.2") + ec.set(tap2, "prefix", "30") ec.register_connection(tap2, node2) - udptun = ec.register_resource("LinuxUdpTunnel") + udptun = ec.register_resource("linux::UdpTunnel") ec.register_connection(tap1, udptun) ec.register_connection(tap2, udptun) - app = ec.register_resource("LinuxApplication") - cmd = "ping -c3 %s.2" % self.netblock + app = ec.register_resource("linux::Application") + cmd = "ping -c3 192.168.3.2" ec.set(app, "command", cmd) ec.register_connection(app, node1) @@ -78,7 +73,8 @@ class LinuxUdpTunnelTestCase(unittest.TestCase): ec.wait_finished(app) - ping = ec.trace(app, 'stdout') + ping = ec.trace(app, "stdout") + print(ping) expected = """3 packets transmitted, 3 received, 0% packet loss""" self.assertTrue(ping.find(expected) > -1) @@ -91,40 +87,38 @@ class LinuxUdpTunnelTestCase(unittest.TestCase): ec.shutdown() @skipIfAnyNotAliveWithIdentity - def t_tun_udp_tunnel(self, user1, host1, identity1, user2, host2, identity2): + def t_tun_udp_tunnel(self, user, host, identity): - ec = ExperimentController(exp_id = "test-tun-udp-tunnel") + ec = ExperimentController(exp_id="test-tun-udp-tunnel") - node1 = ec.register_resource("LinuxNode") - ec.set(node1, "hostname", host1) - ec.set(node1, "username", user1) - ec.set(node1, "identity", identity1) - ec.set(node1, "cleanHome", True) + node1 = ec.register_resource("linux::Node") + ec.set(node1, "hostname", "localhost") + ec.set(node1, "cleanExperiment", True) ec.set(node1, "cleanProcesses", True) - tun1 = ec.register_resource("LinuxTun") - ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock) - ec.set(tun1, "endpoint_prefix", 32) + tun1 = ec.register_resource("linux::Tun") + ec.set(tun1, "ip", "192.168.3.1") + ec.set(tun1, "prefix", "30") ec.register_connection(tun1, node1) - node2 = ec.register_resource("LinuxNode") - ec.set(node2, "hostname", host2) - ec.set(node2, "username", user2) - ec.set(node2, "identity", identity2) - ec.set(node2, "cleanHome", True) + node2 = ec.register_resource("linux::Node") + 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("LinuxTun") - ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock) - ec.set(tun2, "endpoint_prefix", 32) + tun2 = ec.register_resource("linux::Tun") + ec.set(tun2, "ip", "192.168.3.2") + ec.set(tun2, "prefix", "30") ec.register_connection(tun2, node2) - udptun = ec.register_resource("LinuxUdpTunnel") + udptun = ec.register_resource("linux::UdpTunnel") ec.register_connection(tun1, udptun) ec.register_connection(tun2, udptun) - app = ec.register_resource("LinuxApplication") - cmd = "ping -c3 %s.2" % self.netblock + app = ec.register_resource("linux::Application") + cmd = "ping -c3 192.168.3.2" ec.set(app, "command", cmd) ec.register_connection(app, node1) @@ -132,7 +126,9 @@ class LinuxUdpTunnelTestCase(unittest.TestCase): ec.wait_finished(app) - ping = ec.trace(app, 'stdout') + ping = ec.trace(app, "stdout") + + print(ping) expected = """3 packets transmitted, 3 received, 0% packet loss""" self.assertTrue(ping.find(expected) > -1) @@ -145,12 +141,10 @@ class LinuxUdpTunnelTestCase(unittest.TestCase): 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): - 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()