6.1.2

[nepi.git] / test / resources / linux / udptest.py

diff --git a/test/resources/linux/udptest.py b/test/resources/linux/udptest.py
index aeafe6a..4b55d09 100755 (executable)
--- 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)