0.6.7

[nepi.git] / examples / linux / testing / multihop_ssh.py

diff --git a/examples/linux/testing/multihop_ssh.py b/examples/linux/testing/multihop_ssh.py
index 8bcd47f..7a20498 100644 (file)
--- a/examples/linux/testing/multihop_ssh.py
+++ b/examples/linux/testing/multihop_ssh.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
@@ -26,31 +25,31 @@ exp_id = "multihop_ssh"
 ec = ExperimentController(exp_id)
 
 # server
-node1 = ec.register_resource("LinuxNode")
+node1 = ec.register_resource("linux::Node")
 ec.set(node1, "hostname", "wlab29.")
 ec.set(node1, "username", "root")
 ec.set(node1, "gatewayUser", "etourdi")
 ec.set(node1, "gateway", "etourdi.pl.sophia.inria.fr")
-ec.set(node1, "cleanHome", True)
+ec.set(node1, "cleanExperiment", True)
 ec.set(node1, "cleanProcesses", True)
 
 # client
-node2 = ec.register_resource("LinuxNode")
+node2 = ec.register_resource("linux::Node")
 ec.set(node2, "hostname", "wlab5.")
 ec.set(node2, "username", "root")
 ec.set(node2, "gatewayUser", "etourdi")
 ec.set(node2, "gateway", "etourdi.pl.sophia.inria.fr")
-ec.set(node2, "cleanHome", True)
+ec.set(node2, "cleanExperiment", True)
 ec.set(node2, "cleanProcesses", True)
 
-app1 = ec.register_resource("LinuxApplication")
+app1 = ec.register_resource("linux::Application")
 video= "../big_buck_bunny_240p_mpeg4_lq.ts"
 ec.set(app1, "sources", video)
 command = "cat ${SRC}/big_buck_bunny_240p_mpeg4_lq.ts| nc wlab5. 1234" 
 ec.set(app1, "command", command)
 ec.register_connection(app1, node1)
 
-app2 = ec.register_resource("LinuxApplication")
+app2 = ec.register_resource("linux::Application")
 command = "nc -dl 1234 > big_buck_copied_movie.ts"
 ec.set(app2, "command", command)
 ec.register_connection(app2, node2)