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
/
dce
/
wrapped_local_p2p_ping.py
diff --git
a/examples/dce/wrapped_local_p2p_ping.py
b/examples/dce/wrapped_local_p2p_ping.py
index
e94c349
..
cdcfd6b
100644
(file)
--- a/
examples/dce/wrapped_local_p2p_ping.py
+++ b/
examples/dce/wrapped_local_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
def add_ns3_node(ec, simu):
from nepi.execution.ec import ExperimentController
def add_ns3_node(ec, simu):
@@
-54,11
+55,11
@@
def add_device(ec, node, ip, prefix):
ec = ExperimentController(exp_id = "dce-ping-app")
ec = ExperimentController(exp_id = "dce-ping-app")
-node = ec.register_resource("
Linux
Node")
+node = ec.register_resource("
linux::
Node")
ec.set(node, "hostname", "localhost")
ec.set(node, "cleanProcesses", True)
ec.set(node, "hostname", "localhost")
ec.set(node, "cleanProcesses", True)
-simu = ec.register_resource("
LinuxNS3
Simulation")
+simu = ec.register_resource("
linux::ns3::
Simulation")
ec.register_connection(simu, node)
nsnode1 = add_ns3_node(ec, simu)
ec.register_connection(simu, node)
nsnode1 = add_ns3_node(ec, simu)
@@
-77,7
+78,7
@@
ec.register_connection(chan, dev1)
ec.register_connection(chan, dev2)
### create applications
ec.register_connection(chan, dev2)
### create applications
-ping = ec.register_resource("
ns3::LinuxDce
Ping")
+ping = ec.register_resource("
linux::ns3::dce::
Ping")
ec.set (ping, "stackSize", 1<<20)
ec.set (ping, "target", "10.0.0.2")
ec.set (ping, "count", "10")
ec.set (ping, "stackSize", 1<<20)
ec.set (ping, "target", "10.0.0.2")
ec.set (ping, "count", "10")
@@
-94,5
+95,5
@@
stdout = ec.trace(ping, "stdout")
ec.shutdown()
ec.shutdown()
-print
"PING OUTPUT", stdout
+print
("PING OUTPUT", stdout)