commit e144ceb8c210e5260368cba4773cdab704de3ec8
author Ashlesh Gawande <agawande@memphis.edu> Mon Nov 14 13:56:24 2016 -0600
committer Ashlesh Gawande <agawande@memphis.edu> Mon Nov 28 14:50:44 2016 -0600
tree cab91c436264bf0905cb24a8e73f5bfc44b43b2a
parent 5518f71bfef92f1cc5d863379b6c480e183a9a4f

set different site name for each router

Change-Id: Ic81d8d9908923dfafce777c091fc9b288ade7400
refs: #2719

ndn/nlsr.py

diff --git a/ndn/nlsr.py b/ndn/nlsr.py
index 6033b38..43176b4 100644
--- a/ndn/nlsr.py
+++ b/ndn/nlsr.py
@@ -39,13 +39,9 @@
         self.logDir = "%s/log" % node.homeFolder
         node.cmd("mkdir %s" % self.logDir)
 
-        # Configure basic router information in nlsr.conf based on host name
-        node.cmd("sudo sed -i 's|router .*|router %s|g' %s" % (self.routerName, self.confFile))
-        node.cmd("sudo sed -i 's|log-dir .*|log-dir %s|g' %s" % (self.logDir, self.confFile))
-        node.cmd("sudo sed -i 's|seq-dir .*|seq-dir %s|g' %s" % (self.logDir, self.confFile))
-        node.cmd("sudo sed -i 's|prefix .*netlab|prefix /ndn/edu/%s|g' %s" % (node.name, self.confFile))
-
     def start(self):
+        # Removed & at the end, was giving key not found error
+        # This way NLSR is daemonized fully before continuing
         NdnApplication.start(self, "nlsr -d -f {}".format(self.confFile))
 
     @staticmethod
@@ -81,7 +77,7 @@
             shutil.copyfile("{}/root.cert".format(securityDir), "{}/root.cert".format(nodeSecurityFolder))
 
             # Create site certificate
-            siteName = "/ndn/edu"
+            siteName = "ndn/{}-site".format(host.name)
             siteKeyFile = "{}/site.keys".format(nodeSecurityFolder)
             siteCertFile = "{}/site.cert".format(nodeSecurityFolder)
             Nlsr.createKey(host, siteName, siteKeyFile)
@@ -157,7 +153,7 @@
         general =  "general\n"
         general += "{\n"
         general += "  network /ndn/\n"
-        general += "  site /edu\n"
+        general += "  site /{}-site\n".format(self.node.name)
         general += "  router /%C1.Router/cs/" + self.node.name + "\n"
         general += "  log-level " + self.logLevel + "\n"
         general += "  log-dir " + self.node.homeFolder + "/log\n"
@@ -187,7 +183,7 @@
 
                 neighbors += "neighbor\n"
                 neighbors += "{\n"
-                neighbors += "  name /ndn/edu/%C1.Router/cs/" + other.name + "\n"
+                neighbors += "  name /ndn/" + other.name + "-site/%C1.Router/cs/" + other.name + "\n"
                 neighbors += "  face-uri udp://" + str(ip) + "\n"
                 neighbors += "  link-cost " + linkCost + "\n"
                 neighbors += "}\n"
@@ -220,7 +216,7 @@
 
         advertising =  "advertising\n"
         advertising += "{\n"
-        advertising += "  prefix /ndn/edu/" + self.node.name + "\n"
+        advertising += "  prefix /ndn/" + self.node.name + "-site/" + self.node.name + "\n"
         advertising += "}\n"
 
         return advertising