Improving DCE examples

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

diff --git a/examples/dce/custom_dce_ping.py b/examples/dce/custom_local_p2p_ping.py
similarity index 86%
rename from examples/dce/custom_dce_ping.py
rename to examples/dce/custom_local_p2p_ping.py
index 5210d63..153b381 100644 (file)
--- a/examples/dce/custom_dce_ping.py
+++ b/examples/dce/custom_local_p2p_ping.py
@@ -41,7 +41,7 @@ def add_ns3_node(ec, simu):
 
     return node
 
-def add_point2point_device(ec, node, ip,  prefix):
+def add_device(ec, node, ip,  prefix):
     dev = ec.register_resource("ns3::PointToPointNetDevice")
     ec.set(dev, "ip", ip)
     ec.set(dev, "prefix", prefix)
@@ -52,33 +52,30 @@ def add_point2point_device(ec, node, ip,  prefix):
 
     return dev
 
-ec = ExperimentController(exp_id = "dce-custom-ping")
+ec = ExperimentController(exp_id = "dce-custom-p2p-ping")
 
 node = ec.register_resource("LinuxNode")
 ec.set(node, "hostname", "localhost")
 ec.set(node, "cleanProcesses", True)
-#ec.set(node, "cleanHome", True)
 
 simu = ec.register_resource("LinuxNS3Simulation")
 ec.set(simu, "verbose", True)
-ec.set(simu, "nsLog", "DceApplication")
-ec.set(simu, "enableDump", True)
 ec.register_connection(simu, node)
 
 nsnode1 = add_ns3_node(ec, simu)
-p2p1 = add_point2point_device(ec, nsnode1, "10.0.0.1", "30")
-ec.set(p2p1, "DataRate", "5Mbps")
+dev1 = add_device(ec, nsnode1, "10.0.0.1", "30")
+ec.set(dev1, "DataRate", "5Mbps")
 
 nsnode2 = add_ns3_node(ec, simu)
-p2p2 = add_point2point_device(ec, nsnode2, "10.0.0.2", "30")
-ec.set(p2p2, "DataRate", "5Mbps")
+dev2 = add_device(ec, nsnode2, "10.0.0.2", "30")
+ec.set(dev2, "DataRate", "5Mbps")
 
 # Create channel
 chan = ec.register_resource("ns3::PointToPointChannel")
 ec.set(chan, "Delay", "2ms")
 
-ec.register_connection(chan, p2p1)
-ec.register_connection(chan, p2p2)
+ec.register_connection(chan, dev1)
+ec.register_connection(chan, dev2)
 
 ### create applications
 ping = ec.register_resource("ns3::LinuxDceApplication")
@@ -104,3 +101,4 @@ stdout = ec.trace(ping, "stdout")
 ec.shutdown()
 
 print "PING OUTPUT", stdout
+