X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fns3%2Flocal_csma_p2p_star_ping.py;h=5d7593f6e1475f83fa012af71c879d8c3e3731dd;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=9626a44f456497790d24664dfa9083dca34891be;hpb=a55b5cf0818ced6ab8dc3e88fad7f6616675e826;p=nepi.git diff --git a/examples/ns3/local_csma_p2p_star_ping.py b/examples/ns3/local_csma_p2p_star_ping.py index 9626a44f..5d7593f6 100644 --- a/examples/ns3/local_csma_p2p_star_ping.py +++ b/examples/ns3/local_csma_p2p_star_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 +from __future__ import print_function + """ network topology: @@ -93,11 +94,11 @@ def add_p2p_chan(ec, dev1, dev2): ec = ExperimentController(exp_id = "ns3-csma-p2p-ping") # Simulation will run in a remote machine -node = ec.register_resource("LinuxNode") +node = ec.register_resource("linux::Node") ec.set(node, "hostname", "localhost") # Add a simulation resource -simu = ec.register_resource("LinuxNS3Simulation") +simu = ec.register_resource("linux::ns3::Simulation") ec.set(simu, "verbose", True) ec.set(simu, "enableDump", True) ec.register_connection(simu, node) @@ -182,4 +183,4 @@ stdout = ec.trace(simu, "stdout") ec.shutdown() -print "PING OUTPUT", stdout +print("PING OUTPUT", stdout)