X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fccn%2Ffibentry.py;h=6f62a62d7a97f77247455f95fde44b0187d02a31;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=c6b219ce318f304f7573a410d2231e0d30ce88a0;hpb=1e2eb157cb569e9c28a5b7888ed97076d27414cb;p=nepi.git

diff --git a/test/resources/linux/ccn/fibentry.py b/test/resources/linux/ccn/fibentry.py
old mode 100644
new mode 100755
index c6b219ce..6f62a62d
--- 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
@@ -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)