Improving DCE examples

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

diff --git a/examples/dce/dce_ccn_application.py b/examples/dce/wrapped_local_p2p_ccncat.py
similarity index 89%
rename from examples/dce/dce_ccn_application.py
rename to examples/dce/wrapped_local_p2p_ccncat.py
index b4c1544..94f69c2 100644 (file)
--- a/examples/dce/dce_ccn_application.py
+++ b/examples/dce/wrapped_local_p2p_ccncat.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)
@@ -54,30 +54,29 @@ def add_point2point_device(ec, node, ip,  prefix):
 
     return dev
 
-ec = ExperimentController(exp_id = "dce-ccn-app")
+ec = ExperimentController(exp_id = "dce-ccncat")
 
 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.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
 # Add ccnd to ns-3 node1
@@ -92,8 +91,8 @@ ec.register_connection(ccnd1, nsnode1)
 # Add CCN repository with content to ns-3 node1
 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::LinuxDceCCNR")
 ec.set (ccnr, "repoFile1", repofile)