X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fudptest.py;h=4b55d09c7155551eafb3df5a08c3db1b8fb973ac;hb=HEAD;hp=aeafe6a96cf4d8174f4da069ac35c6c427210762;hpb=82dfe2319f69a9966e05ecc880cf6a88d18b9f6d;p=nepi.git diff --git a/test/resources/linux/udptest.py b/test/resources/linux/udptest.py index aeafe6a9..4b55d09c 100755 --- a/test/resources/linux/udptest.py +++ b/test/resources/linux/udptest.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 @@ -29,7 +28,7 @@ import unittest class LinuxUdpTestTestCase(unittest.TestCase): def setUp(self): self.fedora_host = "nepi2.pl.sophia.inria.fr" - self.fedora_user = "inria_test" + self.fedora_user = "inria_nepi" self.ubuntu_host = "roseval.pl.sophia.inria.fr" self.ubuntu_user = "alina" @@ -41,23 +40,23 @@ class LinuxUdpTestTestCase(unittest.TestCase): ec = ExperimentController(exp_id = "test-udptest-rtt") - node1 = ec.register_resource("LinuxNode") + node1 = ec.register_resource("linux::Node") ec.set(node1, "hostname", host1) ec.set(node1, "username", user1) - ec.set(node1, "cleanHome", True) + ec.set(node1, "cleanExperiment", True) ec.set(node1, "cleanProcesses", True) - server = ec.register_resource("LinuxUdpTest") + server = ec.register_resource("linux::UdpTest") ec.set(server, "s", True) ec.register_connection(server, node1) - node2 = ec.register_resource("LinuxNode") + node2 = ec.register_resource("linux::Node") ec.set(node2, "hostname", host2) ec.set(node2, "username", user2) - ec.set(node2, "cleanHome", True) + ec.set(node2, "cleanExperiment", True) ec.set(node2, "cleanProcesses", True) - client = ec.register_resource("LinuxUdpTest") + client = ec.register_resource("linux::UdpTest") ec.set(client, "a", True) ec.set(client, "target", host1) ec.register_connection(client, node2)