git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use print() - import print_function - should be fine for both py2 and py3
[nepi.git]
/
examples
/
linux
/
ping.py
diff --git
a/examples/linux/ping.py
b/examples/linux/ping.py
index
3e9f03a
..
0200b54
100644
(file)
--- a/
examples/linux/ping.py
+++ b/
examples/linux/ping.py
@@
-4,9
+4,8
@@
# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
# 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
#
# 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,7
@@
# $ cd <path-to-nepi>
# python examples/linux/ping.py -a <hostname> -u <username> -i <ssh-key>
# $ cd <path-to-nepi>
# python examples/linux/ping.py -a <hostname> -u <username> -i <ssh-key>
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
@@
-47,14
+47,14
@@
ssh_key = options.ssh_key
ec = ExperimentController(exp_id = "ping-exp")
ec = ExperimentController(exp_id = "ping-exp")
-node = ec.register_resource("
Linux
Node")
+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, "hostname", hostname)
ec.set(node, "username", username)
ec.set(node, "identity", ssh_key)
-ec.set(node, "clean
Home
", True)
+ec.set(node, "clean
Experiment
", True)
ec.set(node, "cleanProcesses", True)
ec.set(node, "cleanProcesses", True)
-app = ec.register_resource("
Linux
Application")
+app = ec.register_resource("
linux::
Application")
ec.set(app, "command", "ping -c3 nepi.inria.fr")
ec.register_connection(app, node)
ec.set(app, "command", "ping -c3 nepi.inria.fr")
ec.register_connection(app, node)
@@
-62,7
+62,7
@@
ec.deploy()
ec.wait_finished(app)
ec.wait_finished(app)
-print
ec.trace(app, "stdout"
)
+print
(ec.trace(app, "stdout")
)
ec.shutdown()
ec.shutdown()