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

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

diff --git a/examples/dce/custom_local_csma_ping.py b/examples/dce/custom_local_csma_ping.py
index f9f40af..54085ab 100644 (file)
--- a/examples/dce/custom_local_csma_ping.py
+++ b/examples/dce/custom_local_csma_ping.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):
@@ -54,11 +55,11 @@ def add_device(ec, node, ip,  prefix):
 
 ec = ExperimentController(exp_id = "dce-custom-csma-ping")
 
-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.set(simu, "verbose", True)
 ec.register_connection(simu, node)
 
@@ -76,7 +77,7 @@ ec.register_connection(chan, dev1)
 ec.register_connection(chan, dev2)
 
 ### create applications
-ping = ec.register_resource("ns3::LinuxDceApplication")
+ping = ec.register_resource("linux::ns3::dce::Application")
 ec.set (ping, "sources", "http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2")
 ec.set (ping, "build", "tar xvjf ${SRC}/iputils-s20101006.tar.bz2 && "
         "cd iputils-s20101006/ && "
@@ -98,5 +99,5 @@ stdout = ec.trace(ping, "stdout")
 
 ec.shutdown()
 
-print "PING OUTPUT", stdout
+print("PING OUTPUT", stdout)