commit 9665f5c9c1dd6f55f9c456c51e68959f9a33d5af
author suraviregmi <regmisuravi@gmail.com> Thu Nov 09 20:05:26 2023 +0000
committer suraviregmi <regmisuravi@gmail.com> Thu Nov 09 20:05:26 2023 +0000
tree 43796afe4c1e0c116f8ec7c07f89429252e86a73
parent af975e5ed5e60a50d3b2a76098bdc0ad210859b8

update ndnsec commands

Change-Id: Ib802fd40d53e0405b9707e76dec4f2a92f9affc5

minindn/apps/nlsr.py

diff --git a/minindn/apps/nlsr.py b/minindn/apps/nlsr.py
index c6a2c53..12a12d7 100644
--- a/minindn/apps/nlsr.py
+++ b/minindn/apps/nlsr.py
@@ -112,11 +112,11 @@
 
     @staticmethod
     def createKey(host, name, outputFile):
-        host.cmd('ndnsec-keygen {} > {}'.format(name, outputFile))
+        host.cmd('ndnsec-key-gen {} > {}'.format(name, outputFile))
 
     @staticmethod
     def createCertificate(host, signer, keyFile, outputFile):
-        host.cmd('ndnsec-certgen -s {} -r {} > {}'.format(signer, keyFile, outputFile))
+        host.cmd('ndnsec-cert-gen -s {} -r {} > {}'.format(signer, keyFile, outputFile))
 
     def createKeysAndCertificates(self):
         securityDir = '{}/security'.format(Minindn.workDir)
@@ -128,7 +128,7 @@
         rootCertFile = '{}/root.cert'.format(securityDir)
         if not os.path.isfile(rootCertFile):
             # Create root certificate
-            sh('ndnsec-keygen {}'.format(rootName)) # Installs a self-signed cert into the system
+            sh('ndnsec-key-gen {}'.format(rootName)) # Installs a self-signed cert into the system
             sh('ndnsec-cert-dump -i {} > {}'.format(rootName, rootCertFile))
 
         # Create necessary certificates for each site
@@ -151,7 +151,7 @@
         siteCertFile = '{}/site.cert'.format(nodeSecurityFolder)
         Nlsr.createKey(self.node, siteName, siteKeyFile)
 
-        # Copy siteKeyFile from remote for ndnsec-certgen
+        # Copy siteKeyFile from remote for ndnsec-cert-gen
         if isinstance(self.node, RemoteMixin) and self.node.isRemote:
             login = 'mininet@{}'.format(self.node.server)
             src = '{}:{}'.format(login, siteKeyFile)
@@ -159,7 +159,7 @@
             scp(src, dst)
 
         # Root key is in root namespace, must sign site key and then install on host
-        sh('ndnsec-certgen -s {} -r {} > {}'.format(rootName, siteKeyFile, siteCertFile))
+        sh('ndnsec-cert-gen -s {} -r {} > {}'.format(rootName, siteKeyFile, siteCertFile))
 
         # Copy root.cert and site.cert from localhost to remote host
         if isinstance(self.node, RemoteMixin) and self.node.isRemote: