commit 1b66369d43fc17dfcd40f2695c8ebac4056bea8c
author Ashlesh Gawande <agawande@memphis.edu> Wed Oct 14 16:38:10 2015 -0500
committer Vince Lehman <vslehman@memphis.edu> Thu Oct 22 11:55:30 2015 -0500
tree f6bd06b6e4685cc739626f3245e0dd8ef4fd0e6c
parent 194be2465a853fae8d1a6f45a77f58825434475b

Add working directory option

refs: #3266

Change-Id: Ifd953b242c99f75c68eb3c63ef5e51ef46195b8b

ndn/nlsr.py

diff --git a/ndn/nlsr.py b/ndn/nlsr.py
index 4a90e30..2da0894 100644
--- a/ndn/nlsr.py
+++ b/ndn/nlsr.py
@@ -27,10 +27,10 @@
     def __init__(self, node):
         NdnApplication.__init__(self, node)
         self.routerName = "/%sC1.Router/cs/%s" % ('%', node.name)
-        self.confFile = "/tmp/%s/nlsr.conf" % node.name
+        self.confFile = "%s/nlsr.conf" % node.homeFolder
 
         # Make directory for log file
-        self.logDir = "/tmp/%s/log" % node.name
+        self.logDir = "%s/log" % node.homeFolder
         node.cmd("mkdir %s" % self.logDir)
 
         # Configure basic router information in nlsr.conf based on host name
@@ -61,7 +61,7 @@
 
     def createConfigFile(self):
 
-        filePath = "/tmp/%s/nlsr.conf" % self.node.name
+        filePath = "%s/nlsr.conf" % self.node.homeFolder
 
         configFile = open(filePath, 'r')
         oldContent = configFile.read()
@@ -96,8 +96,8 @@
         general += "  site /edu\n"
         general += "  router /%C1.Router/cs/" + self.node.name + "\n"
         general += "  log-level " + self.logLevel + "\n"
-        general += "  log-dir /tmp/" + self.node.name + "/log\n"
-        general += "  seq-dir /tmp/" + self.node.name + "/log\n"
+        general += "  log-dir " + self.node.homeFolder + "/log\n"
+        general += "  seq-dir " + self.node.homeFolder + "/log\n"
         general += "}\n"
 
         return general