X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fns3%2Flocal_wifi_ping.py;h=8c17d7fa984e382941f385aaf7bbea371fc2245a;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=9d854d777e72b53988e62a36d6107c053c407f2d;hpb=99f7205f29b7dca7baa2fb4d86b1e9869e392ca5;p=nepi.git

diff --git a/examples/ns3/local_wifi_ping.py b/examples/ns3/local_wifi_ping.py
index 9d854d77..8c17d7fa 100644
--- a/examples/ns3/local_wifi_ping.py
+++ b/examples/ns3/local_wifi_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,16 +17,18 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from __future__ import print_function
+
 from nepi.execution.ec import ExperimentController 
 
 ec = ExperimentController(exp_id = "ns3-local-wifi-ping")
 
 # Simulation will executed in the local 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.register_connection(simu, node)
 
@@ -64,6 +65,7 @@ ec.register_connection(phy1, error1)
 manager1 = ec.register_resource("ns3::ArfWifiManager")
 ec.register_connection(dev1, manager1)
 
+# Mark the node as a wireless access point
 mac1 = ec.register_resource("ns3::ApWifiMac")
 ec.set(mac1, "Standard", "WIFI_PHY_STANDARD_80211a")
 ec.register_connection(dev1, mac1)
@@ -82,7 +84,7 @@ ec.register_connection(nsnode2, icmp)
 # Adding constant mobility to the ns-3 node
 mobility2 = ec.register_resource("ns3::ConstantPositionMobilityModel") 
 position2 = "%d:%d:%d" % (50, 50, 0)
-ec.set(mobility2, "Position", position1)
+ec.set(mobility2, "Position", position2)
 ec.register_connection(nsnode2, mobility2)
 
 # Add a wifi station net device to the node
@@ -101,6 +103,7 @@ ec.register_connection(phy2, error2)
 manager2 = ec.register_resource("ns3::ArfWifiManager")
 ec.register_connection(dev2, manager2)
 
+# Mark the node as a wireless station
 mac2 = ec.register_resource("ns3::StaWifiMac")
 ec.set(mac2, "Standard", "WIFI_PHY_STANDARD_80211a")
 ec.register_connection(dev2, mac2)
@@ -131,4 +134,4 @@ stdout = ec.trace(simu, "stdout")
 
 ec.shutdown()
 
-print "PING OUTPUT", stdout
+print("PING OUTPUT", stdout)