6.1.2

[nepi.git] / test / resources / linux / ccn / fibentry.py

diff --git a/test/resources/linux/ccn/fibentry.py b/test/resources/linux/ccn/fibentry.py
old mode 100644 (file)
new mode 100755 (executable)
index 3ad0348..6f62a62
--- a/test/resources/linux/ccn/fibentry.py
+++ b/test/resources/linux/ccn/fibentry.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,10 +28,10 @@ import unittest
 class LinuxFIBEntryTestCase(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"
+        self.ubuntu_user = "nepi"
         
         self.target = "nepi5.pl.sophia.inria.fr"
 
@@ -41,31 +40,31 @@ class LinuxFIBEntryTestCase(unittest.TestCase):
 
         ec = ExperimentController(exp_id = "test-fib-traces")
         
-        node1 = ec.register_resource("LinuxNode")
+        node1 = ec.register_resource("linux::Node")
         ec.set(node1, "hostname", host)
         ec.set(node1, "username", user)
-        #ec.set(node1, "cleanHome", True)
+        ec.set(node1, "cleanExperiment", True)
         ec.set(node1, "cleanProcesses", True)
 
-        ccnd1 = ec.register_resource("LinuxCCND")
+        ccnd1 = ec.register_resource("linux::CCND")
         ec.register_connection(ccnd1, node1)
 
-        entry1 = ec.register_resource("LinuxFIBEntry")
+        entry1 = ec.register_resource("linux::FIBEntry")
         ec.set(entry1, "host", self.target)
         ec.enable_trace(entry1, "ping")
         ec.enable_trace(entry1, "mtr")
         ec.register_connection(entry1, ccnd1)
  
-        node2 = ec.register_resource("LinuxNode")
+        node2 = ec.register_resource("linux::Node")
         ec.set(node2, "hostname", self.target)
         ec.set(node2, "username", self.fedora_user)
-        ec.set(node2, "cleanHome", True)
+        ec.set(node2, "cleanExperiment", True)
         ec.set(node2, "cleanProcesses", True)
 
-        ccnd2 = ec.register_resource("LinuxCCND")
+        ccnd2 = ec.register_resource("linux::CCND")
         ec.register_connection(ccnd2, node2)
 
-        entry2 = ec.register_resource("LinuxFIBEntry")
+        entry2 = ec.register_resource("linux::FIBEntry")
         ec.set(entry2, "host", host)
         ec.register_connection(entry2, ccnd2)