X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fccn%2Fccnping.py;h=37f2fdb2edb0ccf23deb9e34eb52afceec113eaa;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=2deef2d10a07019acc0498e835ae20b61b748c88;hpb=2e80f0fafa0c2ef6a5f536efd4c868c91468f962;p=nepi.git

diff --git a/test/resources/linux/ccn/ccnping.py b/test/resources/linux/ccn/ccnping.py
old mode 100644
new mode 100755
index 2deef2d1..37f2fdb2
--- a/test/resources/linux/ccn/ccnping.py
+++ b/test/resources/linux/ccn/ccnping.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,37 +40,37 @@ class LinuxCCNPingTestCase(unittest.TestCase):
 
         ec = ExperimentController(exp_id = "test-ccn-ping-count")
         
-        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)
 
-        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", host2)
         ec.register_connection(entry1, ccnd1)
  
-        server = ec.register_resource("LinuxCCNPingServer")
+        server = ec.register_resource("linux::CCNPingServer")
         ec.set(server, "prefix", "ccnx:/test")
         ec.register_connection(server, ccnd1)
  
-        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)
 
-        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", host1)
         ec.register_connection(entry2, ccnd2)
  
-        client = ec.register_resource("LinuxCCNPing")
+        client = ec.register_resource("linux::CCNPing")
         ec.set(client, "c", 15)
         ec.set(client, "prefix", "ccnx:/test")
         ec.register_connection(client, ccnd2)