X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fplanetlab%2Fudptunnel.py;h=e54c3efe107f793049dca0c6d7eab268a9a14caf;hb=4f61ec12520928b3403ee2a75c9e4ce1b30907a3;hp=413514859cc5f3506f59033ed45638342ef19a38;hpb=7f6a711e6d4a245a1f4b104ab9e999af484a8d69;p=nepi.git diff --git a/test/resources/planetlab/udptunnel.py b/test/resources/planetlab/udptunnel.py index 41351485..e54c3efe 100755 --- a/test/resources/planetlab/udptunnel.py +++ b/test/resources/planetlab/udptunnel.py @@ -20,53 +20,63 @@ from nepi.execution.ec import ExperimentController -from test_utils import skipIfAnyNotAlive +from test_utils import skipIfAnyNotAliveWithIdentity import os import time import unittest -class UdpTunnelTestCase(unittest.TestCase): +class PlanetlabUdpTunnelTestCase(unittest.TestCase): def setUp(self): - self.host1 = "nepi2.pl.sophia.inria.fr" - self.host2 = "nepi5.pl.sophia.inria.fr" + #self.host1 = "nepi2.pl.sophia.inria.fr" + #self.host2 = "nepi5.pl.sophia.inria.fr" + #self.host2 = "planetlab1.informatik.uni-goettingen.de" + self.host1 = "planetlab1.informatik.uni-erlangen.de" + self.host2 = "planck227ple.test.ibbt.be" self.user = "inria_nepi" + #self.identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME']) + self.identity = "%s/.ssh/id_rsa" % (os.environ['HOME']) + #self.netblock = "192.168.1" + self.netblock = "192.168.3" - @skipIfAnyNotAlive - def t_tap_udp_tunnel(self, user, host1, host2): + @skipIfAnyNotAliveWithIdentity + def t_tap_udp_tunnel(self, user1, host1, identity1, user2, host2, + identity2): ec = ExperimentController(exp_id = "test-tap-udp-tunnel") node1 = ec.register_resource("PlanetlabNode") ec.set(node1, "hostname", host1) - ec.set(node1, "username", user) - ec.set(node1, "cleanHome", True) + ec.set(node1, "username", user1) + ec.set(node1, "identity", identity1) + #ec.set(node1, "cleanHome", True) + ec.set(node1, "cleanExperiment", True) ec.set(node1, "cleanProcesses", True) tap1 = ec.register_resource("PlanetlabTap") - ec.set(tap1, "ip4", "192.168.1.1") - ec.set(tap1, "pointopoint", "192.168.1.2") - ec.set(tap1, "prefix4", 24) + ec.set(tap1, "endpoint_ip", "%s.1" % self.netblock) + ec.set(tap1, "endpoint_prefix", 24) ec.register_connection(tap1, node1) node2 = ec.register_resource("PlanetlabNode") ec.set(node2, "hostname", host2) - ec.set(node2, "username", user) - ec.set(node2, "cleanHome", True) + ec.set(node2, "username", user2) + ec.set(node2, "identity", identity2) + #ec.set(node2, "cleanHome", True) + ec.set(node2, "cleanExperiment", True) ec.set(node2, "cleanProcesses", True) tap2 = ec.register_resource("PlanetlabTap") - ec.set(tap2, "ip4", "192.168.1.2") - ec.set(tap2, "pointopoint", "192.168.1.1") - ec.set(tap2, "prefix4", 24) + ec.set(tap2, "endpoint_ip", "%s.2" % self.netblock) + ec.set(tap2, "endpoint_prefix", 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) app = ec.register_resource("LinuxApplication") - cmd = "ping -c3 192.168.1.2" + cmd = "ping -c3 %s.2" % self.netblock ec.set(app, "command", cmd) ec.register_connection(app, node1) @@ -78,17 +88,77 @@ 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-tun-udp-tunnel") + + node1 = ec.register_resource("PlanetlabNode") + ec.set(node1, "hostname", host1) + ec.set(node1, "username", user1) + ec.set(node1, "identity", identity1) + #ec.set(node1, "cleanHome", True) + ec.set(node1, "cleanExperiment", True) + ec.set(node1, "cleanProcesses", True) + + tun1 = ec.register_resource("PlanetlabTun") + ec.set(tun1, "endpoint_ip", "%s.1" % self.netblock) + ec.set(tun1, "endpoint_prefix", 24) + ec.register_connection(tun1, node1) + + node2 = ec.register_resource("PlanetlabNode") + ec.set(node2, "hostname", host2) + ec.set(node2, "username", user2) + ec.set(node2, "identity", identity2) + #ec.set(node2, "cleanHome", True) + ec.set(node2, "cleanExperiment", True) + ec.set(node2, "cleanProcesses", True) + + tun2 = ec.register_resource("PlanetlabTun") + ec.set(tun2, "endpoint_ip", "%s.2" % self.netblock) + ec.set(tun2, "endpoint_prefix", 24) + ec.register_connection(tun2, node2) + + udptun = ec.register_resource("LinuxUdpTunnel") + ec.register_connection(tun1, udptun) + ec.register_connection(tun2, udptun) + + app = ec.register_resource("LinuxApplication") + cmd = "ping -c3 %s.2" % self.netblock + ec.set(app, "command", cmd) + ec.register_connection(app, node1) + + ec.deploy() + + ec.wait_finished(app) + + ping = ec.trace(app, 'stdout') + expected = """3 packets transmitted, 3 received, 0% packet loss""" + self.assertTrue(ping.find(expected) > -1) + + vif_name = ec.get(tun1, "deviceName") + self.assertTrue(vif_name.startswith("tun")) + + vif_name = ec.get(tun2, "deviceName") + self.assertTrue(vif_name.startswith("tun")) ec.shutdown() def test_tap_udp_tunnel(self): - self.t_tap_udp_tunnel(self.user, self.host1, self.host2) + self.t_tap_udp_tunnel(self.user, self.host1, self.identity, + self.user, self.host2, self.identity) + + def test_tun_udp_tunnel(self): + self.t_tun_udp_tunnel(self.user, self.host1, self.identity, + self.user, self.host2, self.identity) if __name__ == '__main__': unittest.main()