From: Neale Ranns <nranns@cisco.com>
Date: Wed, 10 Jan 2018 11:49:29 +0000 (-0800)
Subject: Tolerate missing nodes during feature arc initialisation
X-Git-Tag: v18.04-rc1~484
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F10051%2F2;p=vpp.git

Tolerate missing nodes during feature arc initialisation

Change-Id: Ib0d0b663bf71ce52ead2f81140c710f31f040f89
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/vnet/feature/registration.c b/src/vnet/feature/registration.c
index 1deeeef904c..b05d1dc8b0d 100644
--- a/src/vnet/feature/registration.c
+++ b/src/vnet/feature/registration.c
@@ -201,12 +201,18 @@ vnet_feature_arc_init (vlib_main_t * vm,
        * Nonexistent graph nodes are tolerated.
        */
       if (p == 0)
-	return clib_error_return (0, "feature node '%s' not found", a_name);
+	{
+	  clib_warning ("feature node '%s' not found", a_name);
+	  continue;
+	}
       a_index = p[0];
 
       p = hash_get_mem (index_by_name, b_name);
       if (p == 0)
-	return clib_error_return (0, "feature node '%s' not found", b_name);
+	{
+	  clib_warning ("feature node '%s' not found", b_name);
+	  continue;
+	}
       b_index = p[0];
 
       /* add a before b to the original set of constraints */