commit c69041f603d823cfccd5be88422eab72babfa312
author Varun Patil <varunpatil@ucla.edu> Wed May 18 14:17:54 2022 -0700
committer Saurab Dulal <dulal.saurab@gmail.com> Mon Jun 27 20:18:48 2022 -0700
tree 60edb1f2b7ae389080b19bbceefdaba49fc1a4fb
parent 97a347fb3ac36331d04d40d14c7a8a4c0b7d7cb1

Allow existing faces in createFace

Change-Id: I48c09c34a81822c25cbab25bff979194829e067f

minindn/helpers/nfdc.py

diff --git a/minindn/helpers/nfdc.py b/minindn/helpers/nfdc.py
index 1ba926f..9e1e184 100644
--- a/minindn/helpers/nfdc.py
+++ b/minindn/helpers/nfdc.py
@@ -74,7 +74,7 @@
         Minindn.sleep(SLEEP_TIME)
 
     @staticmethod
-    def createFace(node, remoteNodeAddress, protocol='udp', isPermanent=False):
+    def createFace(node, remoteNodeAddress, protocol='udp', isPermanent=False, allowExisting=True):
         '''Create face in node's NFD instance. Returns FaceID of created face or -1 if failed.'''
         cmd = ('nfdc face create {}://{} {}'.format(
             protocol,
@@ -84,10 +84,10 @@
         output = node.cmd(cmd)
         debug(output)
         Minindn.sleep(SLEEP_TIME)
-        if "face-created" not in output:
-            return -1
-        faceID = output.split(" ")[1][3:]
-        return faceID
+        if "face-created" in output or (allowExisting and "face-exists" in output):
+            faceID = output.split(" ")[1][3:]
+            return faceID
+        return -1
 
     @staticmethod
     def destroyFace(node, remoteNode, protocol='udp'):