Create a helper class to provide a wrapper around nfdc.
Refs #3491
Change-Id: I2cc7cbb480a6ca81ee32bbfee47ef060dd8c51f4
diff --git a/ndn/nlsr.py b/ndn/nlsr.py
index b6a6009..98efc78 100644
--- a/ndn/nlsr.py
+++ b/ndn/nlsr.py
@@ -26,6 +26,7 @@
from ndn.ndn_application import NdnApplication
from ndn.util import ssh, scp, copyExistentFile
+from apps.nfdc import Nfdc
import shutil
import os
@@ -41,8 +42,8 @@
self.node = node
self.neighbors = neighbors
self.faceType = faceType
- self.routerName = "/%sC1.Router/cs/%s" % ('%', node.name)
- self.confFile = "%s/nlsr.conf" % node.homeFolder
+ self.routerName = "/{}C1.Router/cs/{}".format('%', node.name)
+ self.confFile = "{}/nlsr.conf".format(node.homeFolder)
# Make directory for log file
self.logDir = "{}/log".format(node.homeFolder)
@@ -58,7 +59,7 @@
def createFaces(self):
for ip in self.neighbors:
- self.node.cmd("nfdc face create {}://{} permanent".format(self.faceType, ip))
+ Nfdc.createFace(self.node, ip, self.faceType, isPermanent=True)
@staticmethod
def createKey(host, name, outputFile):