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
/
ns3
/
remote_p2p_ping.py
diff --git
a/examples/ns3/remote_p2p_ping.py
b/examples/ns3/remote_p2p_ping.py
index
6f04d78
..
57bda49
100644
(file)
--- a/
examples/ns3/remote_p2p_ping.py
+++ b/
examples/ns3/remote_p2p_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
@@
-18,6
+17,8
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+from __future__ import print_function
+
from nepi.execution.ec import ExperimentController
from optparse import OptionParser
from nepi.execution.ec import ExperimentController
from optparse import OptionParser
@@
-41,7
+42,7
@@
identity = options.ssh_key
ec = ExperimentController(exp_id = "ns3-remote-p2p-ping")
# Simulation will run in a remote machine
ec = ExperimentController(exp_id = "ns3-remote-p2p-ping")
# Simulation will run in a remote machine
-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", identity)
ec.set(node, "hostname", hostname)
ec.set(node, "username", username)
ec.set(node, "identity", identity)
@@
-49,7
+50,7
@@
ec.set(node, "cleanProcesses", True)
ec.set(node, "cleanExperiment", True)
# Add a simulation resource
ec.set(node, "cleanExperiment", True)
# Add a simulation resource
-simu = ec.register_resource("
LinuxNS3
Simulation")
+simu = ec.register_resource("
linux::ns3::
Simulation")
ec.set(simu, "verbose", True)
ec.register_connection(simu, node)
ec.set(simu, "verbose", True)
ec.register_connection(simu, node)
@@
-114,4
+115,4
@@
stdout = ec.trace(simu, "stdout")
ec.shutdown()
ec.shutdown()
-print
"PING OUTPUT", stdout
+print
("PING OUTPUT", stdout)