6.1.2

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

diff --git a/test/resources/linux/ccn/ccncat.py b/test/resources/linux/ccn/ccncat.py
index 163e94d..aec8c41 100755 (executable)
--- a/test/resources/linux/ccn/ccncat.py
+++ b/test/resources/linux/ccn/ccncat.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
@@ -40,14 +39,14 @@ class LinuxCCNPeekTestCase(unittest.TestCase):
     def test_ccnpeek(self):
         ec = ExperimentController(exp_id = "test-linux-ccncat")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", self.fedora_host)
         ec.set(node, "username", self.fedora_user)
         ec.set(node, "identity", self.fedora_identity)
         #ec.set(node, "cleanProcesses", True)
-        #ec.set(node, "cleanHome", True)
+        #ec.set(node, "cleanExperiment", True)
 
-        ccnd = ec.register_resource("LinuxCCND")
+        ccnd = ec.register_resource("linux::CCND")
         ec.register_connection(ccnd, node)
 
         # REPO file is in test/resources/linux/ns3/ccn/repoFile1
@@ -56,11 +55,11 @@ class LinuxCCNPeekTestCase(unittest.TestCase):
             "..", "ns3", "ccn", "repoFile1")
 
         ## Register a repository in node 1
-        ccnr = ec.register_resource("LinuxCCNR")
+        ccnr = ec.register_resource("linux::CCNR")
         ec.set(ccnr, "repoFile1", repofile)
         ec.register_connection(ccnr, ccnd)
 
-        ccncat = ec.register_resource("LinuxCCNCat")
+        ccncat = ec.register_resource("linux::CCNCat")
         ec.set(ccncat, "contentName", "ccnx:/test/bunny.ts")
         ec.register_connection(ccncat, ccnd)