os.path.dirname(os.path.realpath(__file__)), "repoFile1.0.8.2")
def get_simulator(ec):
- simulator = ec.filter_resources("LinuxNS3Simulation")
+ simulator = ec.filter_resources("linux::ns3::Simulation")
if not simulator:
- node = ec.register_resource("LinuxNode")
+ node = ec.register_resource("linux::Node")
ec.set(node, "hostname", "localhost")
- simu = ec.register_resource("LinuxNS3Simulation")
+ simu = ec.register_resource("linux::ns3::Simulation")
+ ec.set(simu, "enableDump", True)
+ ec.set(simu, "StopTime", STOP_TIME)
ec.register_connection(simu, node)
return simu
host = ec.netgraph.node_annotation(nid, "host")
# Add dce ccnd to the dce node
- ccnd = ec.register_resource("ns3::LinuxDceCCND")
+ ccnd = ec.register_resource("linux::ns3::dce::CCND")
ec.set (ccnd, "stackSize", 1<<20)
ec.set (ccnd, "debug", 7)
ec.set (ccnd, "capacity", 50000)
ec.set (ccnd, "StartTime", "1s")
- ec.set (ccnd, "StopTime", STOP_TIME)
ec.register_connection(ccnd, host)
# Collector to retrieve ccnd log
host = ec.netgraph.node_annotation(nid, "host")
# Add a CCN content repository to the dce node
- ccnr = ec.register_resource("ns3::LinuxDceCCNR")
+ ccnr = ec.register_resource("linux::ns3::dce::CCNR")
ec.set (ccnr, "repoFile1", repofile)
ec.set (ccnr, "stackSize", 1<<20)
ec.set (ccnr, "StartTime", "2s")
- ec.set (ccnr, "StopTime", STOP_TIME)
ec.register_connection(ccnr, host)
def add_dce_ccncat(ec, nid):
# Retrieve annotation from netgraph
host = ec.netgraph.node_annotation(nid, "host")
- ccnpeek = ec.register_resource("ns3::LinuxDceCCNPeek")
- #ec.set (ccnpeek, "contentName", "ccnx:/chunk0")
- ec.set (ccnpeek, "contentName", content_name)
- ec.set (ccnpeek, "stackSize", 1<<20)
- ec.set (ccnpeek, "StartTime", "5s")
- ec.set (ccnpeek, "StopTime", STOP_TIME)
- ec.register_connection(ccnpeek, host)
-
- collector = add_collector(ec, "stdout", nid, "peek")
- ec.register_connection(collector, ccnpeek)
-
# Add a ccncat application to the dce host
- ccncat = ec.register_resource("ns3::LinuxDceCCNCat")
+ ccncat = ec.register_resource("linux::ns3::dce::CCNCat")
ec.set (ccncat, "contentName", content_name)
ec.set (ccncat, "stackSize", 1<<20)
ec.set (ccncat, "StartTime", "8s")
- ec.set (ccncat, "StopTime", STOP_TIME)
ec.register_connection(ccncat, host)
def add_dce_fib_entry(ec, nid1, nid2):
ip2 = net[nid2]
# Add FIB entry between peer hosts
- ccndc = ec.register_resource("ns3::LinuxDceFIBEntry")
+ ccndc = ec.register_resource("linux::ns3::dce::FIBEntry")
ec.set (ccndc, "protocol", "udp")
ec.set (ccndc, "uri", "ccnx:/")
ec.set (ccndc, "host", ip2)
ec.set (ccndc, "stackSize", 1<<20)
- ec.set (ccndc, "StartTime", "2s")
- ec.set (ccndc, "StopTime", STOP_TIME)
+ ec.set (ccndc, "StartTime", "4s")
ec.register_connection(ccndc, host1)
def add_dce_net_iface(ec, nid1, nid2):
# TODO: DUMP RESULTS TO FILE
# TODO: DUMP GRAPH DELAYS!
- f = open("/tmp/metric", "w+")
+ f = open("/tmp/metric", "a+")
f.write("%.2f\n" % metric)
f.close()
print " METRIC", metric
#### Create NEPI Experiment Description with LINEAR topology
ec = ExperimentController("dce_ccn",
topo_type = TopologyType.LINEAR,
- node_count = 4,
+ node_count = 2,
assign_st = True,
assign_ips = True,
add_node_callback = add_dce_node,
print "Results stored at", ec.exp_dir
#### Retrieve the consumer to wait for ot to finish
- ccncat = ec.filter_resources("ns3::LinuxDceCCNCat")
+ ccncat = ec.filter_resources("linux::ns3::dce::CCNCat")
#### Run experiment until metric convergences
rnr = ExperimentRunner()