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

[nepi.git] / examples / dce / wrapped_local_p2p_ccnpeek.py

diff --git a/examples/dce/wrapped_local_p2p_ccnpeek.py b/examples/dce/wrapped_local_p2p_ccnpeek.py
index f1ca9e6..0ba078c 100644 (file)
--- a/examples/dce/wrapped_local_p2p_ccnpeek.py
+++ b/examples/dce/wrapped_local_p2p_ccnpeek.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
@@ -18,6 +17,8 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from __future__ import print_function
+
 from nepi.execution.ec import ExperimentController 
 
 def add_ns3_node(ec, simu):
@@ -43,29 +44,29 @@ def add_ns3_node(ec, simu):
 
 ec = ExperimentController(exp_id = "dce-local-ccnpeek")
 
-node = ec.register_resource("LinuxNode")
+node = ec.register_resource("linux::Node")
 ec.set(node, "hostname", "localhost")
 ec.set(node, "cleanProcesses", True)
 
-simu = ec.register_resource("LinuxNS3Simulation")
+simu = ec.register_resource("linux::ns3::Simulation")
 ec.register_connection(simu, node)
 
 nsnode = add_ns3_node(ec, simu)
 
 ### create applications
-ccnd = ec.register_resource("ns3::LinuxDceCCND")
+ccnd = ec.register_resource("linux::ns3::dce::CCND")
 ec.set (ccnd, "stackSize", 1<<20)
 ec.set (ccnd, "StartTime", "1s")
 ec.register_connection(ccnd, nsnode)
 
-ccnpoke = ec.register_resource("ns3::LinuxDceCCNPoke")
+ccnpoke = ec.register_resource("linux::ns3::dce::CCNPoke")
 ec.set (ccnpoke, "contentName", "ccnx:/chunk0")
 ec.set (ccnpoke, "content", "DATA")
 ec.set (ccnpoke, "stackSize", 1<<20)
 ec.set (ccnpoke, "StartTime", "2s")
 ec.register_connection(ccnpoke, nsnode)
 
-ccnpeek = ec.register_resource("ns3::LinuxDceCCNPeek")
+ccnpeek = ec.register_resource("linux::ns3::dce::CCNPeek")
 ec.set (ccnpeek, "contentName", "ccnx:/chunk0")
 ec.set (ccnpeek, "stackSize", 1<<20)
 ec.set (ccnpeek, "StartTime", "4s")
@@ -80,5 +81,5 @@ stdout = ec.trace(ccnpeek, "stdout")
 
 ec.shutdown()
 
-print "PEEK received", stdout
+print("PEEK received", stdout)