use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / examples / linux / hello_world.py

diff --git a/examples/linux/hello_world.py b/examples/linux/hello_world.py
index 172547f..2e026b5 100644 (file)
--- a/examples/linux/hello_world.py
+++ b/examples/linux/hello_world.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
@@ -23,6 +22,8 @@
 # $ cd <path-to-nepi>
 # python examples/linux/hello_world.py -a <hostname> -u <username> -i <ssh-key>
 
+from __future__ import print_function
+
 from nepi.execution.ec import ExperimentController 
 
 from optparse import OptionParser, SUPPRESS_HELP
@@ -46,18 +47,18 @@ ssh_key = options.ssh_key
 
 ec = ExperimentController(exp_id = "src-up-exp")
         
-node = ec.register_resource("LinuxNode")
+node = ec.register_resource("linux::Node")
 ec.set(node, "hostname", hostname)
 ec.set(node, "username", username)
 ec.set(node, "identity", ssh_key)
-ec.set(node, "cleanHome", True)
+ec.set(node, "cleanExperiment", True)
 ec.set(node, "cleanProcesses", True)
 
 path_to_sources = os.path.join(
         os.path.dirname(os.path.realpath(__file__)),
         "hello.c")
 
-app = ec.register_resource("LinuxApplication")
+app = ec.register_resource("linux::Application")
 ec.set(app, "sources", path_to_sources)
 ec.set(app, "build", "gcc ${SRC}/hello.c -o ${BIN}/hello")
 ec.set(app, "command", "${BIN}/hello")
@@ -67,7 +68,7 @@ ec.deploy()
 
 ec.wait_finished(app)
 
-print ec.trace(app, "stdout")
+print(ec.trace(app, "stdout"))
 
 ec.shutdown()