commit 3bed48379293e8f5ec5a85d7a8a6a2bbddd92e58
author Ashlesh Gawande <agawande@memphis.edu> Wed Feb 08 18:17:31 2017 -0600
committer Ashlesh Gawande <agawande@memphis.edu> Thu Feb 09 14:52:59 2017 -0600
tree 39c8c818ebcf87d00eca75e4e38637e32a88f34e
parent f5f304b9cd269a9ea62343460704e9ecf1e6c2d4

add missing cert installs and nlsr conf file update

refs: #3951, #3953

Change-Id: Id1264bed658324083618faa579640e50240fecdb

ndn/nlsr.py

diff --git a/ndn/nlsr.py b/ndn/nlsr.py
index 3a4b522..0e22361 100644
--- a/ndn/nlsr.py
+++ b/ndn/nlsr.py
@@ -84,7 +84,7 @@
             shutil.copyfile("{}/root.cert".format(securityDir), "{}/root.cert".format(nodeSecurityFolder))
 
             # Create site certificate
-            siteName = "ndn/{}-site".format(host.name)
+            siteName = "/ndn/{}-site".format(host.name)
             siteKeyFile = "{}/site.keys".format(nodeSecurityFolder)
             siteCertFile = "{}/site.cert".format(nodeSecurityFolder)
             Nlsr.createKey(host, siteName, siteKeyFile)
@@ -110,19 +110,21 @@
 
             host.cmd("ndnsec-cert-install -f {}".format(siteCertFile))
 
-            # Create operator certificate
+            # Create and install operator certificate
             opName = "{}/%C1.Operator/op".format(siteName)
             opKeyFile = "{}/op.keys".format(nodeSecurityFolder)
             opCertFile = "{}/op.cert".format(nodeSecurityFolder)
             Nlsr.createKey(host, opName, opKeyFile)
             Nlsr.createCertificate(host, opName, opName, opKeyFile, opCertFile, signer=siteName)
+            host.cmd("ndnsec-cert-install -f {}".format(opCertFile))
 
-            # Create router certificate
+            # Create and install router certificate
             routerName = "{}/%C1.Router/cs/{}".format(siteName, host.name)
             routerKeyFile = "{}/router.keys".format(nodeSecurityFolder)
             routerCertFile = "{}/router.cert".format(nodeSecurityFolder)
             Nlsr.createKey(host, routerName, routerKeyFile)
             Nlsr.createCertificate(host, routerName, routerName, routerKeyFile, routerCertFile, signer=opName)
+            host.cmd("ndnsec-cert-install -f {}".format(routerCertFile))
 
 class NlsrConfigGenerator:
 
@@ -318,7 +320,7 @@
                             k-regex ^([^<KEY><NLSR>]*)<NLSR><KEY><ksk-.*><ID-CERT>$
                             k-expand \\\\1
                             h-relation equal
-                            p-regex ^([^<NLSR><LSA>]*)<NLSR><LSA>(<>*)<><><><>$
+                            p-regex ^<localhop>([^<NLSR><LSA>]*)<NLSR><LSA>(<>*)<><><><>$
                             p-expand \\\\1\\\\2
                           }
                         }