commit 6f7a64fc75065191035141e3a8c33e149bef27f9
author Alexander Lane <awlane@memphis.edu> Thu May 17 15:01:14 2018 -0500
committer Ashlesh Gawande <agawande@memphis.edu> Mon Aug 20 13:09:12 2018 -0500
tree 6bc9f2702bdab014dbeff56bb5da6ed5c458ea70
parent d6c3cad602e9871d7c30a25437c79fb7cf5af045

Create a helper class to provide a wrapper around nfdc.

Refs #3491

Change-Id: I2cc7cbb480a6ca81ee32bbfee47ef060dd8c51f4

ndn/experiments/experiment.py

diff --git a/ndn/experiments/experiment.py b/ndn/experiments/experiment.py
index fa76370..347655d 100644
--- a/ndn/experiments/experiment.py
+++ b/ndn/experiments/experiment.py
@@ -27,6 +27,7 @@
 from itertools import cycle
 
 from ndn import ExperimentManager
+from ndn.apps.nfdc import Nfdc
 
 class Experiment:
 
@@ -49,10 +50,10 @@
     def setup(self):
         for host in self.net.hosts:
             # Set strategy
-            host.nfd.setStrategy("/ndn/", self.strategy)
+            Nfdc.setStrategy(host, "/ndn/", self.strategy)
 
             # Start ping server
-            host.cmd("ndnpingserver /ndn/" + str(host) + "-site/" + str(host) + " > ping-server &")
+            host.cmd("ndnpingserver /ndn/{}-site/{} > ping-server &".format(host, host))
 
             # Create folder to store ping data
             host.cmd("mkdir ping-data")
@@ -108,8 +109,8 @@
         host.nfd.start()
         host.nlsr.createFaces()
         host.nlsr.start()
-        host.nfd.setStrategy("/ndn/", self.strategy)
-        host.cmd("ndnpingserver /ndn/" + str(host) + "-site/" + str(host) + " > ping-server &")
+        Nfdc.setStrategy(host, "/ndn/", self.strategy)
+        host.cmd("ndnpingserver /ndn/{}-site/{} > ping-server &".format(host, host))
 
     def startPctPings(self):
         nNodesToPing = int(round(len(self.net.hosts)*self.pctTraffic))