Improving DCE examples

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

diff --git a/examples/dce/custom_dce_ccn.py b/examples/dce/custom_local_p2p_ccn.py
similarity index 91%
rename from examples/dce/custom_dce_ccn.py
rename to examples/dce/custom_local_p2p_ccn.py
index b22d668..3ba901a 100644 (file)
--- a/examples/dce/custom_dce_ccn.py
+++ b/examples/dce/custom_local_p2p_ccn.py
@@ -43,7 +43,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)
@@ -59,28 +59,25 @@ ec = ExperimentController(exp_id = "dce-custom-ccn")
 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
 
@@ -110,8 +107,8 @@ ec.register_connection(ccnd1, nsnode1)
 # parameters
 repofile = os.path.join(
     os.path.dirname(os.path.realpath(__file__)), 
-    "..", "..", "..",
-    "test", "resources", "linux", "ns3", "ccn", "repoFile1")
+    "..", "..", "test", "resources", "linux", 
+    "ns3", "ccn", "repoFile1")
 
 ccnr = ec.register_resource("ns3::LinuxCCNDceApplication")
 ec.set (ccnr, "binary", "ccnr")
@@ -172,4 +169,3 @@ print "%0.2f MBytes received" % (len(stdout) / 1024.0 / 1024.0 )
 
 ec.shutdown()
 
-