FIB Interpose Source

The interpose source allows the source/provider to insert/interpose
a DPO in the forwarding chain of the FIB entry ahead of the forwarding
provided by the next best source. For example if the API source (i.e
the 'control plane') has provided an adjacency for forwarding, then
an interpose source (e.g. a monitoring service) couold interpose a
replicatte DPO to copy the traffic to another location AND forward
using the API's adjacency.
To use the interose feature an existing source (i.e FIB_SOURCE_PLUGIN_HI)
cn specifiy as a flag FIB_ENTRY_FLAG_INTERPOSE and provide a DPO to
interpose. One might also consider using interpose in conjunction with
FIB_ENTRY_FLAG_COVER_INHERIT to ensure the interpose object affects
all prefixes in the sub-tree.

Change-Id: I8b2737b985f8f7c08123406d0491881def347b52
Signed-off-by: Neale Ranns <nranns@cisco.com>
diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c
index 61ba934..56e885c 100644
--- a/src/vnet/fib/fib_test.c
+++ b/src/vnet/fib/fib_test.c
@@ -30,6 +30,7 @@
 #include <vnet/dpo/replicate_dpo.h>
 #include <vnet/dpo/dvr_dpo.h>
 #include <vnet/dpo/mpls_disposition.h>
+#include <vnet/dpo/punt_dpo.h>
 
 #include <vnet/mpls/mpls.h>
 
@@ -51,20 +52,21 @@
 ({								\
     int _evald = (_cond);					\
     if (!(_evald)) {						\
-	fformat(stderr, "FAIL:%d: " _comment "\n",		\
-		__LINE__, ##_args);				\
+        fformat(stderr, "FAIL:%d: " _comment "\n",		\
+                __LINE__, ##_args);				\
+        res = 1;                                                \
     } else {							\
-	if (fib_test_do_debug)                                  \
+        if (fib_test_do_debug)                                  \
             fformat(stderr, "PASS:%d: " _comment "\n",          \
                     __LINE__, ##_args);				\
     }								\
-    _evald;							\
+    res;							\
 })
 #define FIB_TEST(_cond, _comment, _args...)			\
 {								\
-    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
-	return 1;                                               \
-	ASSERT(!("FAIL: " _comment));				\
+    if (FIB_TEST_I(_cond, _comment, ##_args)) {                 \
+        return 1;                                               \
+        ASSERT(!("FAIL: " _comment));				\
     }								\
 }
 
@@ -92,11 +94,11 @@
 }
 
 static uword dummy_interface_tx (vlib_main_t * vm,
-				 vlib_node_runtime_t * node,
-				 vlib_frame_t * frame)
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * frame)
 {
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
+    clib_warning ("you shouldn't be here, leaking buffers...");
+    return frame->n_vectors;
 }
 
 static clib_error_t *
@@ -104,17 +106,17 @@
                               u32 hw_if_index,
                               u32 flags)
 {
-  u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
-    VNET_HW_INTERFACE_FLAG_LINK_UP : 0;
-  vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
-  return 0;
+    u32 hw_flags = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
+        VNET_HW_INTERFACE_FLAG_LINK_UP : 0;
+    vnet_hw_interface_set_flags (vnm, hw_if_index, hw_flags);
+    return 0;
 }
 
 VNET_DEVICE_CLASS (test_interface_device_class,static) = {
-  .name = "Test interface",
-  .format_device_name = format_test_interface_name,
-  .tx_function = dummy_interface_tx,
-  .admin_up_down_function = test_interface_admin_up_down,
+    .name = "Test interface",
+    .format_device_name = format_test_interface_name,
+    .tx_function = dummy_interface_tx,
+    .admin_up_down_function = test_interface_admin_up_down,
 };
 
 static u8 *hw_address;
@@ -124,139 +126,141 @@
 {
     clib_error_t * error = NULL;
     test_main_t *tm = &test_main;
+    u32 i, res;
     u8 byte;
-    u32 i;
 
+    res = 0;
     ASSERT(ninterfaces <= ARRAY_LEN(tm->hw_if_indicies));
 
     for (i=0; i<6; i++)
     {
-	byte = 0xd0+i;
-	vec_add1(hw_address, byte);
+        byte = 0xd0+i;
+        vec_add1(hw_address, byte);
     }
 
     for (i = 0; i < ninterfaces; i++)
     {
-	hw_address[5] = i;
+        hw_address[5] = i;
 
-	error = ethernet_register_interface(vnet_get_main(),
+        error = ethernet_register_interface(vnet_get_main(),
                                             test_interface_device_class.index,
-					    i /* instance */,
-					    hw_address,
-					    &tm->hw_if_indicies[i], 
-					    /* flag change */ 0);
+                                            i /* instance */,
+                                            hw_address,
+                                            &tm->hw_if_indicies[i],
+                                            /* flag change */ 0);
 
-	FIB_TEST((NULL == error), "ADD interface %d", i);
-      
+        FIB_TEST((NULL == error), "ADD interface %d", i);
+
         error = vnet_hw_interface_set_flags(vnet_get_main(),
                                             tm->hw_if_indicies[i],
                                             VNET_HW_INTERFACE_FLAG_LINK_UP);
         tm->hw[i] = vnet_get_hw_interface(vnet_get_main(),
-					  tm->hw_if_indicies[i]);
-	vec_validate (ip4_main.fib_index_by_sw_if_index,
+                                          tm->hw_if_indicies[i]);
+        vec_validate (ip4_main.fib_index_by_sw_if_index,
                       tm->hw[i]->sw_if_index);
-	vec_validate (ip6_main.fib_index_by_sw_if_index,
+        vec_validate (ip6_main.fib_index_by_sw_if_index,
                       tm->hw[i]->sw_if_index);
-	ip4_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
-	ip6_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
+        ip4_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
+        ip6_main.fib_index_by_sw_if_index[tm->hw[i]->sw_if_index] = 0;
 
-	error = vnet_sw_interface_set_flags(vnet_get_main(),
-					    tm->hw[i]->sw_if_index,
-					    VNET_SW_INTERFACE_FLAG_ADMIN_UP);
-	FIB_TEST((NULL == error), "UP interface %d", i);
+        error = vnet_sw_interface_set_flags(vnet_get_main(),
+                                            tm->hw[i]->sw_if_index,
+                                            VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+        FIB_TEST((NULL == error), "UP interface %d", i);
     }
     /*
      * re-eval after the inevitable realloc
      */
     for (i = 0; i < ninterfaces; i++)
     {
-	tm->hw[i] = vnet_get_hw_interface(vnet_get_main(),
-					  tm->hw_if_indicies[i]);
+        tm->hw[i] = vnet_get_hw_interface(vnet_get_main(),
+                                          tm->hw_if_indicies[i]);
     }
 
-    return (0);
+    return (res);
 }
 
 #define FIB_TEST_REC_FORW(_rec_prefix, _via_prefix, _bucket)		\
-{                                                                       \
-    const dpo_id_t *_rec_dpo = fib_entry_contribute_ip_forwarding(      \
-        fib_table_lookup_exact_match(fib_index, (_rec_prefix)));        \
-    const dpo_id_t *_via_dpo = fib_entry_contribute_ip_forwarding(      \
-        fib_table_lookup(fib_index, (_via_prefix)));                    \
-    FIB_TEST(!dpo_cmp(_via_dpo,                                         \
-                      load_balance_get_bucket(_rec_dpo->dpoi_index,	\
-					      _bucket)),		\
-             "%U is recursive via %U",                                  \
-             format_fib_prefix, (_rec_prefix),                          \
-             format_fib_prefix, _via_prefix);                           \
-}
+    {                                                                   \
+        const dpo_id_t *_rec_dpo = fib_entry_contribute_ip_forwarding(  \
+            fib_table_lookup_exact_match(fib_index, (_rec_prefix)));    \
+        const dpo_id_t *_via_dpo = fib_entry_contribute_ip_forwarding(  \
+            fib_table_lookup(fib_index, (_via_prefix)));                \
+        FIB_TEST(!dpo_cmp(_via_dpo,                                     \
+                          load_balance_get_bucket(_rec_dpo->dpoi_index,	\
+                                                  _bucket)),		\
+                 "%U is recursive via %U",                              \
+                 format_fib_prefix, (_rec_prefix),                      \
+                 format_fib_prefix, _via_prefix);                       \
+    }
 
 #define FIB_TEST_LB_BUCKET_VIA_ADJ(_prefix, _bucket, _ai)               \
-{                                                                       \
-    const dpo_id_t *_dpo = fib_entry_contribute_ip_forwarding(          \
-        fib_table_lookup_exact_match(fib_index, (_prefix)));            \
-    const dpo_id_t *_dpo1 =                                             \
-        load_balance_get_bucket(_dpo->dpoi_index, _bucket);             \
-    FIB_TEST(DPO_ADJACENCY == _dpo1->dpoi_type, "type is %U",           \
-             format_dpo_type, _dpo1->dpoi_type);                        \
-    FIB_TEST((_ai == _dpo1->dpoi_index),                                \
-	     "%U bucket %d resolves via %U",                            \
-             format_fib_prefix, (_prefix),                              \
-             _bucket,                                                   \
-             format_dpo_id, _dpo1, 0);                                  \
-}
+    {                                                                   \
+     const dpo_id_t *_dpo = fib_entry_contribute_ip_forwarding(         \
+                                                               fib_table_lookup_exact_match(fib_index, (_prefix))); \
+     const dpo_id_t *_dpo1 =                                            \
+         load_balance_get_bucket(_dpo->dpoi_index, _bucket);            \
+     FIB_TEST(DPO_ADJACENCY == _dpo1->dpoi_type, "type is %U",          \
+                  format_dpo_type, _dpo1->dpoi_type);                   \
+     FIB_TEST((_ai == _dpo1->dpoi_index),                               \
+                  "%U bucket %d resolves via %U",                       \
+                  format_fib_prefix, (_prefix),                         \
+                  _bucket,                                              \
+                  format_dpo_id, _dpo1, 0);                             \
+     }
 
-#define FIB_TEST_RPF(_cond, _comment, _args...)			\
-{								\
-    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
-	return (0);						\
-    }								\
-}
+#define FIB_TEST_RPF(_cond, _comment, _args...)         \
+    {                                                   \
+        if (FIB_TEST_I(_cond, _comment, ##_args)) {     \
+            return (1);                                 \
+        }                                               \
+    }
 
 static int
 fib_test_urpf_is_equal (fib_node_index_t fei,
-		       fib_forward_chain_type_t fct,
-		       u32 num, ...)
+                        fib_forward_chain_type_t fct,
+                        u32 num, ...)
 {
     dpo_id_t dpo = DPO_INVALID;
     fib_urpf_list_t *urpf;
+    int ii, res;
     index_t ui;
     va_list ap;
-    int ii;
 
     va_start(ap, num);
 
+    res = 0;
     fib_entry_contribute_forwarding(fei, fct, &dpo);
     ui = load_balance_get_urpf(dpo.dpoi_index);
 
     urpf = fib_urpf_list_get(ui);
 
     FIB_TEST_RPF(num == vec_len(urpf->furpf_itfs),
-		 "RPF:%U len %d == %d",
-		 format_fib_urpf_list, ui,
-		 num, vec_len(urpf->furpf_itfs));
+                 "RPF:%U len %d == %d",
+                 format_fib_urpf_list, ui,
+                 num, vec_len(urpf->furpf_itfs));
     FIB_TEST_RPF(num == fib_urpf_check_size(ui),
-		 "RPF:%U check-size %d == %d",
-		 format_fib_urpf_list, ui,
-		 num, vec_len(urpf->furpf_itfs));
+                 "RPF:%U check-size %d == %d",
+                 format_fib_urpf_list, ui,
+                 num, vec_len(urpf->furpf_itfs));
 
     for (ii = 0; ii < num; ii++)
     {
-	adj_index_t ai = va_arg(ap, adj_index_t);
+        adj_index_t ai = va_arg(ap, adj_index_t);
 
-	FIB_TEST_RPF(ai == urpf->furpf_itfs[ii],
-		     "RPF:%d item:%d - %d == %d",
-		     ui, ii, ai, urpf->furpf_itfs[ii]);
-	FIB_TEST_RPF(fib_urpf_check(ui, ai),
-		     "RPF:%d %d found",
-		     ui, ai);
+        FIB_TEST_RPF(ai == urpf->furpf_itfs[ii],
+                     "RPF:%d item:%d - %d == %d",
+                     ui, ii, ai, urpf->furpf_itfs[ii]);
+        FIB_TEST_RPF(fib_urpf_check(ui, ai),
+                     "RPF:%d %d found",
+                     ui, ai);
     }
 
     dpo_reset(&dpo);
 
     va_end(ap);
 
-    return (1);
+    return (res);
 }
 
 static u8*
@@ -272,12 +276,12 @@
     return (rewrite);
 }
 
-#define FIB_TEST_LB(_cond, _comment, _args...)			\
-{								\
-    if (!FIB_TEST_I(_cond, _comment, ##_args)) {		\
-	return (0);						\
-    }								\
-}
+#define FIB_TEST_LB(_cond, _comment, _args...)          \
+    {                                                   \
+        if (FIB_TEST_I(_cond, _comment, ##_args)) {     \
+            return (1);                                 \
+        }                                               \
+    }
 
 int
 fib_test_validate_rep_v (const replicate_t *rep,
@@ -286,57 +290,59 @@
 {
     const fib_test_rep_bucket_t *exp;
     const dpo_id_t *dpo;
-    int bucket;
+    int bucket, res;
 
+    res = 0;
     FIB_TEST_LB((n_buckets == rep->rep_n_buckets),
                 "n_buckets = %d", rep->rep_n_buckets);
 
     for (bucket = 0; bucket < n_buckets; bucket++)
     {
-	exp = va_arg(*ap, fib_test_rep_bucket_t*);
+        exp = va_arg(*ap, fib_test_rep_bucket_t*);
 
         dpo = replicate_get_bucket_i(rep, bucket);
 
-	switch (exp->type)
-	{
-	case FT_REP_LABEL_O_ADJ:
-	    {
-		const mpls_label_dpo_t *mld;
+        switch (exp->type)
+        {
+        case FT_REP_LABEL_O_ADJ:
+            {
+                const mpls_label_dpo_t *mld;
                 mpls_label_t hdr;
+
 		FIB_TEST_LB((mpls_label_dpo_get_type(MPLS_LABEL_DPO_FLAG_NONE)
                              == dpo->dpoi_type),
                             "bucket %d stacks on %U",
                             bucket,
                             format_dpo_type, dpo->dpoi_type);
-	    
-		mld = mpls_label_dpo_get(dpo->dpoi_index);
+
+                mld = mpls_label_dpo_get(dpo->dpoi_index);
                 hdr = clib_net_to_host_u32(mld->mld_hdr[0].label_exp_s_ttl);
 
-		FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
-			     exp->label_o_adj.label),
-			    "bucket %d stacks on label %d",
-			    bucket,
-			    exp->label_o_adj.label);
+                FIB_TEST_LB((vnet_mpls_uc_get_label(hdr) ==
+                             exp->label_o_adj.label),
+                            "bucket %d stacks on label %d",
+                            bucket,
+                            exp->label_o_adj.label);
 
-		FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
-			     exp->label_o_adj.eos),
-			    "bucket %d stacks on label %d %U",
-			    bucket,
-			    exp->label_o_adj.label,
-			    format_mpls_eos_bit, exp->label_o_adj.eos);
+                FIB_TEST_LB((vnet_mpls_uc_get_s(hdr) ==
+                             exp->label_o_adj.eos),
+                            "bucket %d stacks on label %d %U",
+                            bucket,
+                            exp->label_o_adj.label,
+                            format_mpls_eos_bit, exp->label_o_adj.eos);
 
-		FIB_TEST_LB((DPO_ADJACENCY_INCOMPLETE == mld->mld_dpo.dpoi_type),
-			    "bucket %d label stacks on %U",
-			    bucket,
-			    format_dpo_type, mld->mld_dpo.dpoi_type);
+                FIB_TEST_LB((DPO_ADJACENCY_INCOMPLETE == mld->mld_dpo.dpoi_type),
+                            "bucket %d label stacks on %U",
+                            bucket,
+                            format_dpo_type, mld->mld_dpo.dpoi_type);
 
-		FIB_TEST_LB((exp->label_o_adj.adj == mld->mld_dpo.dpoi_index),
-			    "bucket %d label stacks on adj %d",
-			    bucket,
-			    exp->label_o_adj.adj);
-	    }
-	    break;
-	case FT_REP_INTF:
+                FIB_TEST_LB((exp->label_o_adj.adj == mld->mld_dpo.dpoi_index),
+                            "bucket %d label stacks on adj %d",
+                            bucket,
+                            exp->label_o_adj.adj);
+            }
+            break;
+        case FT_REP_INTF:
             FIB_TEST_LB((DPO_INTERFACE_RX == dpo->dpoi_type),
                         "bucket %d stacks on %U",
                         bucket,
@@ -346,32 +352,33 @@
                         "bucket %d stacks on adj %d",
                         bucket,
                         exp->adj.adj);
-	    break;
+            break;
         case FT_REP_DISP_MFIB_LOOKUP:
 //            ASSERT(0);
             break;
         }
     }
 
-    return (!0);
+    return (res);
 }
 
 int
 fib_test_validate_lb_v (const load_balance_t *lb,
-			int n_buckets,
-			va_list *ap)
+                        int n_buckets,
+                        va_list *ap)
 {
     const dpo_id_t *dpo;
-    int bucket;
+    int bucket, res;
 
+    res = 0;
     FIB_TEST_LB((n_buckets == lb->lb_n_buckets), "n_buckets = %d", lb->lb_n_buckets);
 
     for (bucket = 0; bucket < n_buckets; bucket++)
     {
-	const fib_test_lb_bucket_t *exp;
+        const fib_test_lb_bucket_t *exp;
 
-	exp = va_arg(*ap, fib_test_lb_bucket_t*);
-	dpo = load_balance_get_bucket_i(lb, bucket);
+        exp = va_arg(*ap, fib_test_lb_bucket_t*);
+        dpo = load_balance_get_bucket_i(lb, bucket);
 
 	switch (exp->type)
 	{
@@ -578,52 +585,59 @@
                        "bucket %d stacks on %U",
                        bucket,
                        format_dpo_type, dpo->dpoi_type);
-	    FIB_TEST_LB((exp->lb.lb == dpo->dpoi_index),
-			"bucket %d stacks on lb %d not %d",
-			bucket,
-			dpo->dpoi_index,
+            FIB_TEST_LB((exp->lb.lb == dpo->dpoi_index),
+                        "bucket %d stacks on lb %d not %d",
+                        bucket,
+                        dpo->dpoi_index,
                         exp->lb.lb);
-	    break;
-	case FT_LB_BIER_TABLE:
-	    FIB_TEST_LB((DPO_BIER_TABLE == dpo->dpoi_type),
-                        "bucket %d stacks on %U",
-                        bucket,
-                        format_dpo_type, dpo->dpoi_type);
-	    FIB_TEST_LB((exp->bier.table == dpo->dpoi_index),
-			"bucket %d stacks on lb %d",
-			bucket,
-			exp->bier.table);
             break;
-	case FT_LB_BIER_FMASK:
-	    FIB_TEST_LB((DPO_BIER_FMASK == dpo->dpoi_type),
+        case FT_LB_BIER_TABLE:
+            FIB_TEST_LB((DPO_BIER_TABLE == dpo->dpoi_type),
                         "bucket %d stacks on %U",
                         bucket,
                         format_dpo_type, dpo->dpoi_type);
-	    FIB_TEST_LB((exp->bier.fmask == dpo->dpoi_index),
-			"bucket %d stacks on lb %d",
-			bucket,
-			exp->bier.fmask);
+            FIB_TEST_LB((exp->bier.table == dpo->dpoi_index),
+                        "bucket %d stacks on lb %d",
+                        bucket,
+                        exp->bier.table);
             break;
-	case FT_LB_DROP:
-	    FIB_TEST_LB((DPO_DROP == dpo->dpoi_type),
+        case FT_LB_BIER_FMASK:
+            FIB_TEST_LB((DPO_BIER_FMASK == dpo->dpoi_type),
                         "bucket %d stacks on %U",
                         bucket,
                         format_dpo_type, dpo->dpoi_type);
-	    break;
-	}
+            FIB_TEST_LB((exp->bier.fmask == dpo->dpoi_index),
+                        "bucket %d stacks on lb %d",
+                        bucket,
+                        exp->bier.fmask);
+            break;
+        case FT_LB_DROP:
+            FIB_TEST_LB((DPO_DROP == dpo->dpoi_type),
+                        "bucket %d stacks on %U",
+                        bucket,
+                        format_dpo_type, dpo->dpoi_type);
+            break;
+        case FT_LB_PUNT:
+            FIB_TEST_LB((DPO_PUNT == dpo->dpoi_type),
+                        "bucket %d stacks on %U",
+                        bucket,
+                        format_dpo_type, dpo->dpoi_type);
+            break;
+        }
     }
-    return (!0);
+    return (res);
 }
 
 int
 fib_test_validate_lb (const dpo_id_t *dpo,
-                     int n_buckets,
-                     ...)
+                      int n_buckets,
+                      ...)
 {
     const load_balance_t *lb;
     va_list ap;
     int res;
 
+    res = 0;
     va_start(ap, n_buckets);
 
     if (FIB_TEST_I((DPO_LOAD_BALANCE == dpo->dpoi_type),
@@ -636,7 +650,7 @@
     }
     else
     {
-        res = !0;
+        res = 0;
     }
 
     va_end(ap);
@@ -646,9 +660,9 @@
 
 int
 fib_test_validate_entry (fib_node_index_t fei,
-			 fib_forward_chain_type_t fct,
-			 int n_buckets,
-			 ...)
+                         fib_forward_chain_type_t fct,
+                         int n_buckets,
+                         ...)
 {
     dpo_id_t dpo = DPO_INVALID;
     fib_prefix_t pfx;
@@ -659,6 +673,7 @@
 
     va_start(ap, n_buckets);
 
+    res = 0;
     fib_entry_get_prefix(fei, &pfx);
     fib_index = fib_entry_get_fib_index(fei);
     fib_entry_contribute_forwarding(fei, fct, &dpo);
@@ -740,19 +755,20 @@
     test_main_t *tm;
     u32 fib_index;
     int lb_count;
-    int ii;
+    int ii, res;
 
+    res = 0;
     /* via 10.10.10.1 */
     ip46_address_t nh_10_10_10_1 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
     };
     /* via 10.10.10.2 */
     ip46_address_t nh_10_10_10_2 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
     };
 
     FIB_TEST((0 == pool_elts(load_balance_map_pool)), "LB-map pool size is %d",
-    	     pool_elts(load_balance_map_pool));
+             pool_elts(load_balance_map_pool));
 
     tm = &test_main;
 
@@ -765,27 +781,27 @@
 
     for (ii = 0; ii < 4; ii++)
     {
-	ip4_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
+        ip4_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
     }
 
     fib_prefix_t pfx_0_0_0_0_s_0 = {
-	.fp_len = 0,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		{0}
-	    },
-	},
+        .fp_len = 0,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4 = {
+                {0}
+            },
+        },
     };
 
     fib_prefix_t pfx = {
-	.fp_len = 0,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		{0}
-	    },
-	},
+        .fp_len = 0,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4 = {
+                {0}
+            },
+        },
     };
 
     dpo_drop = drop_dpo_get(DPO_PROTO_IP4);
@@ -793,34 +809,34 @@
     dfrt = fib_table_lookup(fib_index, &pfx_0_0_0_0_s_0);
     FIB_TEST((FIB_NODE_INDEX_INVALID != dfrt), "default route present");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
-	     "Default route is DROP");
+             "Default route is DROP");
 
     pfx.fp_len = 32;
     fei = fib_table_lookup(fib_index, &pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all zeros route present");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "all 0s route is DROP");
+             "all 0s route is DROP");
 
     pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xffffffff);
     pfx.fp_len = 32;
     fei = fib_table_lookup(fib_index, &pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all ones route present");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "all 1s route is DROP");
+             "all 1s route is DROP");
 
     pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xe0000000);
     pfx.fp_len = 8;
     fei = fib_table_lookup(fib_index, &pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "all-mcast route present");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "all-mcast route is DROP");
+             "all-mcast route is DROP");
 
     pfx.fp_addr.ip4.as_u32 = clib_host_to_net_u32(0xf0000000);
     pfx.fp_len = 8;
     fei = fib_table_lookup(fib_index, &pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "class-e route present");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "class-e route is DROP");
+             "class-e route is DROP");
 
     /*
      * at this stage there are 5 entries in the test FIB (plus 5 in the default),
@@ -840,9 +856,9 @@
 
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * add interface routes.
@@ -850,72 +866,72 @@
      *  test for the presence of the receive address in the glean and local adj
      */
     fib_prefix_t local_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
-	    },
-	},
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4 = {
+                .as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
+            },
+        },
     };
 
     fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1, // weight
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_ATTACHED),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1, // weight
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &local_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
     FIB_TEST(((FIB_ENTRY_FLAG_ATTACHED | FIB_ENTRY_FLAG_CONNECTED) ==
-	      fib_entry_get_flags(fei)),
-	     "Flags set on attached interface");
+              fib_entry_get_flags(fei)),
+             "Flags set on attached interface");
 
     ai = fib_entry_get_adj(fei);
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai),
              "attached interface route adj present %d", ai);
     adj = adj_get(ai);
     FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
+             "attached interface adj is glean");
     FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &adj->sub_type.glean.receive_addr)),
-	      "attached interface adj is receive ok");
+                                    &adj->sub_type.glean.receive_addr)),
+             "attached interface adj is receive ok");
 
     local_pfx.fp_len = 32;
     fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1, // weight
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_LOCAL),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1, // weight
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &local_pfx);
     FIB_TEST(((FIB_ENTRY_FLAG_LOCAL | FIB_ENTRY_FLAG_CONNECTED) ==
-	      fib_entry_get_flags(fei)),
-	     "Flags set on local interface");
+              fib_entry_get_flags(fei)),
+             "Flags set on local interface");
 
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
 
     dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "RPF list for local length 0");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+             "RPF list for local length 0");
     dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
     FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
-	     "local interface adj is local");
+             "local interface adj is local");
     receive_dpo_t *rd = receive_dpo_get(dpo->dpoi_index);
 
     FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &rd->rd_addr)),
-	      "local interface adj is receive ok");
+                                    &rd->rd_addr)),
+             "local interface adj is receive ok");
 
     FIB_TEST((2 == fib_table_get_num_entries(fib_index,
                                              FIB_PROTOCOL_IP4,
@@ -927,9 +943,9 @@
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Modify the default route to be via an adj not yet known.
@@ -939,27 +955,27 @@
     pfx.fp_addr.ip4.as_u32 = 0;
     pfx.fp_len = 0;
     fib_table_entry_path_add(fib_index, &pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx);
     FIB_TEST((FIB_ENTRY_FLAG_NONE == fib_entry_get_flags(fei)),
-	     "Flags set on API route");
+             "Flags set on API route");
 
     FIB_TEST((fei == dfrt), "default route same index");
     ai = fib_entry_get_adj(fei);
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "default route adj present");
     adj = adj_get(ai);
     FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
+             "adj is incomplete");
     FIB_TEST((0 == ip46_address_cmp(&nh_10_10_10_1, &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+             "adj nbr next-hop ok");
     FIB_TEST((1 == fib_table_get_num_entries(fib_index,
                                              FIB_PROTOCOL_IP4,
                                              FIB_SOURCE_API)),
@@ -969,9 +985,9 @@
      * find the adj in the shared db
      */
     locked_ai = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				    VNET_LINK_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index);
+                                    VNET_LINK_IP4,
+                                    &nh_10_10_10_1,
+                                    tm->hw[0]->sw_if_index);
     FIB_TEST((locked_ai == ai), "ADJ NBR DB find");
     adj_unlock(locked_ai);
 
@@ -979,11 +995,11 @@
      * +1 shared path-list
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+3 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * remove the API source from the default route. We expected
@@ -992,62 +1008,62 @@
     pfx.fp_addr.ip4.as_u32 = 0;
     pfx.fp_len = 0;
     fib_table_entry_path_remove(fib_index, &pfx,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // non-recursive path, so no FIB index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0, // non-recursive path, so no FIB index
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx);
 
     FIB_TEST((fei == dfrt), "default route same index");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "Default route is DROP");
+             "Default route is DROP");
 
     /*
      * -1 shared-path-list
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Add an 2 ARP entry => a complete ADJ plus adj-fib.
      */
     fib_prefix_t pfx_10_10_10_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 10.10.10.1 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 10.10.10.1 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+        },
     };
     fib_prefix_t pfx_10_10_10_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 10.10.10.2 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 10.10.10.2 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+        },
     };
     fib_prefix_t pfx_11_11_11_11_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 11.11.11.11 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0b0b0b0b),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 11.11.11.11 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0b0b0b0b),
+        },
     };
     u8 eth_addr[] = {
-	0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
+        0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
     };
 
     ip46_address_t nh_12_12_12_12 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0c0c0c0c),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0c0c0c0c),
     };
     adj_index_t ai_12_12_12_12;
 
@@ -1059,7 +1075,7 @@
                                           &pfx_11_11_11_11_s_32,
                                           FIB_SOURCE_API,
                                           FIB_ENTRY_FLAG_ATTACHED,
-					  DPO_PROTO_IP4,
+                                          DPO_PROTO_IP4,
                                           &pfx_10_10_10_1_s_32.fp_addr,
                                           tm->hw[0]->sw_if_index,
                                           ~0, // invalid fib index
@@ -1073,24 +1089,24 @@
              "11.11.11.11/32 via incomplete adj");
 
     ai_01 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				VNET_LINK_IP4,
-				&pfx_10_10_10_1_s_32.fp_addr,
-				tm->hw[0]->sw_if_index);
+                                VNET_LINK_IP4,
+                                &pfx_10_10_10_1_s_32.fp_addr,
+                                tm->hw[0]->sw_if_index);
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai_01), "adj created");
     adj = adj_get(ai_01);
     FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
+             "adj is incomplete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_1_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
 
     adj_nbr_update_rewrite(ai_01, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
+                           fib_test_build_rewrite(eth_addr));
     FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
+             "adj is complete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_1_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj");
 
@@ -1098,25 +1114,25 @@
     dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
     FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type,
              "11.11.11.11/32 via complete adj");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for adj-fib contains adj");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+                                    tm->hw[0]->sw_if_index),
+             "RPF list for adj-fib contains adj");
 
     ai_12_12_12_12 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-					 VNET_LINK_IP4,
-					 &nh_12_12_12_12,
-					 tm->hw[1]->sw_if_index);
+                                         VNET_LINK_IP4,
+                                         &nh_12_12_12_12,
+                                         tm->hw[1]->sw_if_index);
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai_12_12_12_12), "adj created");
     adj = adj_get(ai_12_12_12_12);
     FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
+             "adj is incomplete");
     FIB_TEST((0 == ip46_address_cmp(&nh_12_12_12_12,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
     adj_nbr_update_rewrite(ai_12_12_12_12, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
+                           fib_test_build_rewrite(eth_addr));
     FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
+             "adj is complete");
 
     /*
      * add the adj fib
@@ -1133,14 +1149,14 @@
                                    NULL,
                                    FIB_ROUTE_PATH_FLAG_NONE);
     FIB_TEST((FIB_ENTRY_FLAG_ATTACHED  == fib_entry_get_flags(fei)),
-	     "Flags set on adj-fib");
+             "Flags set on adj-fib");
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai_01 == ai), "ADJ-FIB resolves via adj, %d", ai);
 
     fib_table_entry_path_remove(fib_index,
                                 &pfx_11_11_11_11_s_32,
                                 FIB_SOURCE_API,
-				DPO_PROTO_IP4,
+                                DPO_PROTO_IP4,
                                 &pfx_10_10_10_1_s_32.fp_addr,
                                 tm->hw[0]->sw_if_index,
                                 ~0, // invalid fib index
@@ -1150,24 +1166,24 @@
     eth_addr[5] = 0xb2;
 
     ai_02 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				VNET_LINK_IP4,
-				&pfx_10_10_10_2_s_32.fp_addr,
-				tm->hw[0]->sw_if_index);
+                                VNET_LINK_IP4,
+                                &pfx_10_10_10_2_s_32.fp_addr,
+                                tm->hw[0]->sw_if_index);
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai_02), "adj created");
     adj = adj_get(ai_02);
     FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
+             "adj is incomplete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_2_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
 
     adj_nbr_update_rewrite(ai_02, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
+                           fib_test_build_rewrite(eth_addr));
     FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
+             "adj is complete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_10_10_10_2_s_32.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
     FIB_TEST((ai_01 != ai_02), "ADJs are different");
 
     fib_table_entry_path_add(fib_index,
@@ -1191,33 +1207,33 @@
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+4 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Add 2 routes via the first ADJ. ensure path-list sharing
      */
     fib_prefix_t pfx_1_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.1/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 1.1.1.1/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_1_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai_01 == ai), "1.1.1.1 resolves via 10.10.10.1");
@@ -1227,30 +1243,30 @@
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+5 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /* 1.1.2.0/24 */
     fib_prefix_t pfx_1_1_2_0_s_24 = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010200),
-	}
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010200),
+        }
     };
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_2_0_s_24,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_2_0_s_24,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai_01 == ai), "1.1.2.0/24 resolves via 10.10.10.1");
@@ -1260,67 +1276,67 @@
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * modify 1.1.2.0/24 to use multipath.
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_2_0_s_24,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_2_0_s_24,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
     dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				    1, tm->hw[0]->sw_if_index),
-	     "RPF list for 1.1.2.0/24 contains both adjs");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                    1, tm->hw[0]->sw_if_index),
+             "RPF list for 1.1.2.0/24 contains both adjs");
 
     dpo1 = load_balance_get_bucket(dpo->dpoi_index, 0);
     FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type, "type is %d", dpo1->dpoi_type);
     FIB_TEST((ai_01 == dpo1->dpoi_index),
-	     "1.1.2.0/24 bucket 0 resolves via 10.10.10.1 (%d=%d)",
+             "1.1.2.0/24 bucket 0 resolves via 10.10.10.1 (%d=%d)",
              ai_01, dpo1->dpoi_index);
 
     dpo1 = load_balance_get_bucket(dpo->dpoi_index, 1);
     FIB_TEST(DPO_ADJACENCY == dpo1->dpoi_type, "type is %d", dpo1->dpoi_type);
     FIB_TEST((ai_02 == dpo1->dpoi_index),
-	     "1.1.2.0/24 bucket 1 resolves via 10.10.10.2");
+             "1.1.2.0/24 bucket 1 resolves via 10.10.10.2");
 
     /*
      * +1 shared-pathlist
      */
     FIB_TEST((2 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * revert the modify
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_2_0_s_24,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_2,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_2_0_s_24,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_2,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_1_1_2_0_s_24);
     dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				   1, tm->hw[0]->sw_if_index),
-	     "RPF list for 1.1.2.0/24 contains one adj");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                    1, tm->hw[0]->sw_if_index),
+             "RPF list for 1.1.2.0/24 contains one adj");
 
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai_01 == ai), "1.1.2.0/24 resolves via 10.10.10.1");
@@ -1329,11 +1345,11 @@
      * +1 shared-pathlist
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB is %d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Add 2 recursive routes:
@@ -1341,110 +1357,110 @@
      *   100.100.100.101/32 via 1.1.1.1/32  => the via entry is installed.
      */
     fib_prefix_t bgp_100_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 100.100.100.100/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x64646464),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 100.100.100.100/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x64646464),
+        },
     };
     /* via 1.1.1.1 */
     ip46_address_t nh_1_1_1_1 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x01010101),
+        .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
     };
 
     fei = fib_table_entry_path_add(fib_index,
-				   &bgp_100_pfx,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &nh_1_1_1_1,
-				   ~0, // no index provided.
-				   fib_index, // nexthop in same fib as route
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &bgp_100_pfx,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &nh_1_1_1_1,
+                                   ~0, // no index provided.
+                                   fib_index, // nexthop in same fib as route
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
 
     FIB_TEST_REC_FORW(&bgp_100_pfx, &pfx_1_1_1_1_s_32, 0);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for adj-fib contains adj");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+                                    tm->hw[0]->sw_if_index),
+             "RPF list for adj-fib contains adj");
 
     /*
      * +1 entry and +1 shared-path-list
      */
     FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     fib_prefix_t bgp_101_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 100.100.100.101/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x64646465),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 100.100.100.101/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x64646465),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
-			     &bgp_101_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_1_1_1_1,
-			     ~0, // no index provided.
-			     fib_index, // nexthop in same fib as route
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &bgp_101_pfx,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_1_1_1_1,
+                             ~0, // no index provided.
+                             fib_index, // nexthop in same fib as route
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     FIB_TEST_REC_FORW(&bgp_101_pfx, &pfx_1_1_1_1_s_32, 0);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for adj-fib contains adj");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+                                    tm->hw[0]->sw_if_index),
+             "RPF list for adj-fib contains adj");
 
     /*
      * +1 entry, but the recursive path-list is shared.
      */
     FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * An special route; one where the user (me) provides the
      * adjacency through which the route will resovle by setting the flags
      */
     fib_prefix_t ex_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 4.4.4.4/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 4.4.4.4/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
+        },
     };
 
     fib_table_entry_special_add(fib_index,
-				&ex_pfx,
-				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_LOCAL);
+                                &ex_pfx,
+                                FIB_SOURCE_SPECIAL,
+                                FIB_ENTRY_FLAG_LOCAL);
     fei = fib_table_lookup_exact_match(fib_index, &ex_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
     FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
-	     "local interface adj is local");
+             "local interface adj is local");
 
     fib_table_entry_special_remove(fib_index,
-				   &ex_pfx,
-				   FIB_SOURCE_SPECIAL);
+                                   &ex_pfx,
+                                   FIB_SOURCE_SPECIAL);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &ex_pfx),
-	     "Exclusive reoute removed");
+             fib_table_lookup_exact_match(fib_index, &ex_pfx),
+             "Exclusive reoute removed");
 
     /*
      * An EXCLUSIVE route; one where the user (me) provides the exclusive
@@ -1467,29 +1483,29 @@
     fei = fib_table_lookup_exact_match(fib_index, &ex_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(&ex_dpo, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "exclusive remote uses lookup DPO");
+             "exclusive remote uses lookup DPO");
 
     /*
      * update the exclusive to use a different DPO
      */
     ip_null_dpo_add_and_lock(DPO_PROTO_IP4,
-			     IP_NULL_ACTION_SEND_ICMP_UNREACH,
-			     &ex_dpo);
+                             IP_NULL_ACTION_SEND_ICMP_UNREACH,
+                             &ex_dpo);
     fib_table_entry_special_dpo_update(fib_index,
-				       &ex_pfx,
-				       FIB_SOURCE_SPECIAL,
-				       FIB_ENTRY_FLAG_EXCLUSIVE,
-				       &ex_dpo);
+                                       &ex_pfx,
+                                       FIB_SOURCE_SPECIAL,
+                                       FIB_ENTRY_FLAG_EXCLUSIVE,
+                                       &ex_dpo);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(&ex_dpo, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "exclusive remote uses now uses NULL DPO");
+             "exclusive remote uses now uses NULL DPO");
 
     fib_table_entry_special_remove(fib_index,
-				   &ex_pfx,
-				   FIB_SOURCE_SPECIAL);
+                                   &ex_pfx,
+                                   FIB_SOURCE_SPECIAL);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &ex_pfx),
-	     "Exclusive reoute removed");
+             fib_table_lookup_exact_match(fib_index, &ex_pfx),
+             "Exclusive reoute removed");
     dpo_reset(&ex_dpo);
 
     /*
@@ -1497,20 +1513,20 @@
      *   200.200.200.200/32 via 1.1.1.2/32  => the via entry is NOT installed.
      */
     fib_prefix_t bgp_200_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 200.200.200.200/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c8),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 200.200.200.200/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c8),
+        },
     };
     /* via 1.1.1.2 */
     fib_prefix_t pfx_1_1_1_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
+        },
     };
 
     fei = fib_table_entry_path_add(fib_index,
@@ -1530,23 +1546,23 @@
 
     /*
      * the adj should be recursive via drop, since the route resolves via
-     * the default route, which is itself a DROP 
+     * the default route, which is itself a DROP
      */
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(load_balance_is_drop(dpo1), "1.1.1.2/32 is drop");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "RPF list for 1.1.1.2/32 contains 0 adjs");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+             "RPF list for 1.1.1.2/32 contains 0 adjs");
 
     /*
      * +2 entry and +1 shared-path-list
      */
     FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+7 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Unequal Cost load-balance. 3:1 ratio. fits in a 4 bucket LB
@@ -1554,17 +1570,17 @@
      * weight is first in the set. This ordering is to test the RPF sort|uniq logic
      */
     fib_prefix_t pfx_1_2_3_4_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01020304),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x01020304),
+        },
     };
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_2_3_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
+                             &pfx_1_2_3_4_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
                              &nh_10_10_10_1,
                              tm->hw[0]->sw_if_index,
                              ~0,
@@ -1575,7 +1591,7 @@
                                    &pfx_1_2_3_4_s_32,
                                    FIB_SOURCE_API,
                                    FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
+                                   DPO_PROTO_IP4,
                                    &nh_12_12_12_12,
                                    tm->hw[1]->sw_if_index,
                                    ~0,
@@ -1595,10 +1611,10 @@
     FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 2, ai_12_12_12_12);
     FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_4_s_32, 3, ai_01);
 
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
-				    tm->hw[0]->sw_if_index,
-				    tm->hw[1]->sw_if_index),
-	     "RPF list for 1.2.3.4/32 contains both adjs");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
+                                    tm->hw[0]->sw_if_index,
+                                    tm->hw[1]->sw_if_index),
+             "RPF list for 1.2.3.4/32 contains both adjs");
 
 
     /*
@@ -1606,17 +1622,17 @@
      *  fits in a 16 bucket LB with ratio 13:3
      */
     fib_prefix_t pfx_1_2_3_5_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01020305),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x01020305),
+        },
     };
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_2_3_5_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
+                             &pfx_1_2_3_5_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
                              &nh_12_12_12_12,
                              tm->hw[1]->sw_if_index,
                              ~0,
@@ -1627,7 +1643,7 @@
                                    &pfx_1_2_3_5_s_32,
                                    FIB_SOURCE_API,
                                    FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
+                                   DPO_PROTO_IP4,
                                    &nh_10_10_10_1,
                                    tm->hw[0]->sw_if_index,
                                    ~0,
@@ -1659,10 +1675,10 @@
     FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 14, ai_12_12_12_12);
     FIB_TEST_LB_BUCKET_VIA_ADJ(&pfx_1_2_3_5_s_32, 15, ai_12_12_12_12);
 
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
-				    tm->hw[0]->sw_if_index,
-				    tm->hw[1]->sw_if_index),
-	     "RPF list for 1.2.3.4/32 contains both adjs");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
+                                    tm->hw[0]->sw_if_index,
+                                    tm->hw[1]->sw_if_index),
+             "RPF list for 1.2.3.4/32 contains both adjs");
 
     /*
      * Test UCMP with a large weight skew - this produces load-balance objects with large
@@ -1670,18 +1686,18 @@
      * laso testing the LB in placce modify code when number of buckets is large.
      */
     fib_prefix_t pfx_6_6_6_6_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.1/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x06060606),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 1.1.1.1/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x06060606),
+        },
     };
     fib_test_lb_bucket_t ip_o_10_10_10_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_01,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_01,
+        },
     };
     fib_test_lb_bucket_t ip_o_10_10_10_2 = {
         .type = FT_LB_ADJ,
@@ -1696,23 +1712,23 @@
         },
     };
     fib_table_entry_update_one_path(fib_index,
-				    &pfx_6_6_6_6_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    0,  // zero weigth
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &pfx_6_6_6_6_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_1,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    0,  // zero weigth
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_10_10_10_1),
+             "6.6.6.6/32 via 10.10.10.1");
 
     fib_table_entry_path_add(fib_index,
                              &pfx_6_6_6_6_s_32,
@@ -1727,74 +1743,74 @@
                              FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     64,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      64,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_1),
+             "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
 
     fib_table_entry_path_add(fib_index,
                              &pfx_6_6_6_6_s_32,
@@ -1809,138 +1825,138 @@
                              FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     128,
-				     &ip_o_10_10_10_1,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12,
-				     &ip_6_6_6_6_o_12_12_12_12),
-	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      128,
+                                      &ip_o_10_10_10_1,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12,
+                                      &ip_6_6_6_6_o_12_12_12_12),
+             "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
 
     fib_table_entry_path_remove(fib_index,
                                 &pfx_6_6_6_6_s_32,
@@ -1953,74 +1969,74 @@
                                 FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     64,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_2,
-				     &ip_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      64,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_2,
+                                      &ip_o_10_10_10_1),
+             "6.6.6.6/32 via 10.10.10.1 and 10.10.10.2 in 63:1 ratio");
 
     fib_table_entry_path_remove(fib_index,
                                 &pfx_6_6_6_6_s_32,
@@ -2033,11 +2049,11 @@
                                 FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_6_6_6_6_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_o_10_10_10_1),
-	     "6.6.6.6/32 via 10.10.10.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_10_10_10_1),
+             "6.6.6.6/32 via 10.10.10.1");
 
     fib_table_entry_delete(fib_index, &pfx_6_6_6_6_s_32, FIB_SOURCE_API);
 
@@ -2045,19 +2061,19 @@
      * A recursive via the two unequal cost entries
      */
     fib_prefix_t bgp_44_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 200.200.200.201/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x44444444),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 200.200.200.201/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x44444444),
+        },
     };
     fei = fib_table_entry_path_add(fib_index,
                                    &bgp_44_s_32,
                                    FIB_SOURCE_API,
                                    FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &pfx_1_2_3_4_s_32.fp_addr,
+                                   DPO_PROTO_IP4,
+                                   &pfx_1_2_3_4_s_32.fp_addr,
                                    ~0,
                                    fib_index,
                                    1,
@@ -2067,8 +2083,8 @@
                                    &bgp_44_s_32,
                                    FIB_SOURCE_API,
                                    FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &pfx_1_2_3_5_s_32.fp_addr,
+                                   DPO_PROTO_IP4,
+                                   &pfx_1_2_3_5_s_32.fp_addr,
                                    ~0,
                                    fib_index,
                                    1,
@@ -2077,10 +2093,10 @@
 
     FIB_TEST_REC_FORW(&bgp_44_s_32, &pfx_1_2_3_4_s_32, 0);
     FIB_TEST_REC_FORW(&bgp_44_s_32, &pfx_1_2_3_5_s_32, 1);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
-				    tm->hw[0]->sw_if_index,
-				    tm->hw[1]->sw_if_index),
-	     "RPF list for 1.2.3.4/32 contains both adjs");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 2,
+                                    tm->hw[0]->sw_if_index,
+                                    tm->hw[1]->sw_if_index),
+             "RPF list for 1.2.3.4/32 contains both adjs");
 
     /*
      * test the uRPF check functions
@@ -2092,14 +2108,14 @@
     urpfi = load_balance_get_urpf(dpo_44.dpoi_index);
 
     FIB_TEST(fib_urpf_check(urpfi, tm->hw[0]->sw_if_index),
-	     "uRPF check for 68.68.68.68/32 on %d OK",
-	     tm->hw[0]->sw_if_index);
+             "uRPF check for 68.68.68.68/32 on %d OK",
+             tm->hw[0]->sw_if_index);
     FIB_TEST(fib_urpf_check(urpfi, tm->hw[1]->sw_if_index),
-	     "uRPF check for 68.68.68.68/32 on %d OK",
-	     tm->hw[1]->sw_if_index);
+             "uRPF check for 68.68.68.68/32 on %d OK",
+             tm->hw[1]->sw_if_index);
     FIB_TEST(!fib_urpf_check(urpfi, 99),
-	     "uRPF check for 68.68.68.68/32 on 99 not-OK",
-	     99);
+             "uRPF check for 68.68.68.68/32 on 99 not-OK",
+             99);
     dpo_reset(&dpo_44);
 
     fib_table_entry_delete(fib_index,
@@ -2117,20 +2133,20 @@
      *   200.200.200.201/32 via 1.1.1.200/32  => the via entry is NOT installed.
      */
     fib_prefix_t bgp_201_pfx = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 200.200.200.201/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c9),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 200.200.200.201/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0xc8c8c8c9),
+        },
     };
     /* via 1.1.1.200 */
     fib_prefix_t pfx_1_1_1_200_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x010101c8),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x010101c8),
+        },
     };
 
     fei = fib_table_entry_path_add(fib_index,
@@ -2150,44 +2166,44 @@
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32);
     FIB_TEST((FIB_ENTRY_FLAG_NONE == fib_entry_get_flags(fei)),
-	     "Flags set on RR via non-attached");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "RPF list for BGP route empty");
+             "Flags set on RR via non-attached");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+             "RPF list for BGP route empty");
 
     /*
      * +2 entry (BGP & RR) and +1 shared-path-list
      */
     FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+12 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * insert a route that covers the missing 1.1.1.2/32. we epxect
      * 200.200.200.200/32 and 200.200.200.201/32 to resolve through it.
      */
     fib_prefix_t pfx_1_1_1_0_s_24 = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.0/24 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
-	},
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 1.1.1.0/24 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_0_s_24,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_0_s_24,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_0_s_24);
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
     ai = fib_entry_get_adj(fei);
@@ -2205,11 +2221,11 @@
      * +1 entry. 1.1.1.1/32 already uses 10.10.10.1 so no new pah-list
      */
     FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+13 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * the recursive adj for 200.200.200.200 should be updated.
@@ -2217,35 +2233,35 @@
     FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
     FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
     fei = fib_table_lookup(fib_index, &bgp_200_pfx);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
-				    tm->hw[0]->sw_if_index),
-	     "RPF list for BGP route has itf index 0");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1,
+                                    tm->hw[0]->sw_if_index),
+             "RPF list for BGP route has itf index 0");
 
     /*
      * insert a more specific route than 1.1.1.0/24 that also covers the
-     * missing 1.1.1.2/32, but not 1.1.1.200/32. we epxect
+     * missing 1.1.1.2/32, but not 1.1.1.200/32. we expect
      * 200.200.200.200 to resolve through it.
      */
     fib_prefix_t pfx_1_1_1_0_s_28 = {
-	.fp_len = 28,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 1.1.1.0/24 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
-	},
+        .fp_len = 28,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 1.1.1.0/24 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010100),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_0_s_28,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_0_s_28,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_0_s_28);
     dpo2 = fib_entry_contribute_ip_forwarding(fei);
     ai = fib_entry_get_adj(fei);
@@ -2255,11 +2271,11 @@
      * +1 entry. +1 shared path-list
      */
     FIB_TEST((5  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+9 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+14 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * the recursive adj for 200.200.200.200 should be updated.
@@ -2272,20 +2288,20 @@
      * remove this /28. 200.200.200.200/32 should revert back to via 1.1.1.0/24
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_0_s_28,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_2,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.0/28 removed");
-    FIB_TEST((fib_table_lookup(fib_index, &pfx_1_1_1_0_s_28) == 
-	      fib_table_lookup(fib_index, &pfx_1_1_1_0_s_24)),
-	     "1.1.1.0/28 lookup via /24");
+                                &pfx_1_1_1_0_s_28,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_2,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28) ==
+              FIB_NODE_INDEX_INVALID),
+             "1.1.1.0/28 removed");
+    FIB_TEST((fib_table_lookup(fib_index, &pfx_1_1_1_0_s_28) ==
+              fib_table_lookup(fib_index, &pfx_1_1_1_0_s_24)),
+             "1.1.1.0/28 lookup via /24");
     FIB_TEST_REC_FORW(&bgp_201_pfx, &pfx_1_1_1_200_s_32, 0);
     FIB_TEST_REC_FORW(&bgp_200_pfx, &pfx_1_1_1_2_s_32, 0);
 
@@ -2293,34 +2309,34 @@
      * -1 entry. -1 shared path-list
      */
     FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+13 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * remove 1.1.1.0/24. 200.200.200.200/32 should revert back to via 0.0.0.0/0
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_0_s_24,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_24) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.0/24 removed");
+                                &pfx_1_1_1_0_s_24,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_24) ==
+              FIB_NODE_INDEX_INVALID),
+             "1.1.1.0/24 removed");
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_2_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "1.1.1.2/32 route is DROP");
+             "1.1.1.2/32 route is DROP");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "1.1.1.200/32 route is DROP");
+             "1.1.1.200/32 route is DROP");
 
     fei = fib_table_lookup_exact_match(fib_index, &bgp_201_pfx);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
@@ -2333,26 +2349,26 @@
      * -1 entry
      */
     FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+12 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * insert the missing 1.1.1.2/32
      */
     fei = fib_table_entry_path_add(fib_index,
-	                           &pfx_1_1_1_2_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &nh_10_10_10_1,
-				   tm->hw[0]->sw_if_index,
-				   ~0, // invalid fib index
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_1_1_1_2_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &nh_10_10_10_1,
+                                   tm->hw[0]->sw_if_index,
+                                   ~0, // invalid fib index
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai = ai_01), "1.1.1.2/32 resolves via 10.10.10.1");
@@ -2366,11 +2382,11 @@
      * no change. 1.1.1.2/32 was already there RR sourced.
      */
     FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+12 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * give 201 a resolved path.
@@ -2403,61 +2419,61 @@
      * remove 200.200.200.201/32 which does not have a valid via FIB
      */
     fib_table_entry_path_remove(fib_index,
-				&bgp_201_pfx,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_1_1_1_200_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &bgp_201_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_1_1_1_200_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     /*
      * -2 entries (BGP and RR). -1 shared path-list;
      */
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_201_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "200.200.200.201/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.200/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_201_pfx) ==
+              FIB_NODE_INDEX_INVALID),
+             "200.200.200.201/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_200_s_32) ==
+              FIB_NODE_INDEX_INVALID),
+             "1.1.1.200/32 removed");
 
     FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+7 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * remove 200.200.200.200/32 which does have a valid via FIB
      */
     fib_table_entry_path_remove(fib_index,
-				&bgp_200_pfx,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_1_1_1_2_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &bgp_200_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_1_1_1_2_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_200_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "200.200.200.200/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32) != 
-	      FIB_NODE_INDEX_INVALID),
-	     "1.1.1.2/32 still present");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_200_pfx) ==
+              FIB_NODE_INDEX_INVALID),
+             "200.200.200.200/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32) !=
+              FIB_NODE_INDEX_INVALID),
+             "1.1.1.2/32 still present");
 
     /*
      * -1 entry (BGP, the RR source is also API sourced). -1 shared path-list;
      */
     FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+9 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * A recursive prefix that has a 2 path  load-balance.
@@ -2465,35 +2481,35 @@
      * test the ref counting of RR sourced prefixes and 2 level LB.
      */
     const fib_prefix_t bgp_102 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 100.100.100.101/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x64646466),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 100.100.100.101/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x64646466),
+        },
     };
     fib_table_entry_path_add(fib_index,
-			     &bgp_102,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_1_1_1_1_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index, // same as route
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &bgp_102,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_1_1_1_1_s_32.fp_addr,
+                             ~0, // no index provided.
+                             fib_index, // same as route
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_add(fib_index,
-			     &bgp_102,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_1_1_1_2_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index, // same as route's FIB
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &bgp_102,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_1_1_1_2_s_32.fp_addr,
+                             ~0, // no index provided.
+                             fib_index, // same as route's FIB
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &bgp_102);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "100.100.100.102/32 presnet");
     dpo = fib_entry_contribute_ip_forwarding(fei);
@@ -2506,28 +2522,28 @@
     lb = load_balance_get(dpo->dpoi_index);
     FIB_TEST((lb->lb_n_buckets == 2), "Recursive LB has %d bucket", lb->lb_n_buckets);
     FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "First via 10.10.10.1");
+             "First via 10.10.10.1");
     FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo->dpoi_index, 1)),
-	     "Second via 10.10.10.1");
+             "Second via 10.10.10.1");
 
     fib_table_entry_path_remove(fib_index,
-				&bgp_102,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_1_1_1_1_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &bgp_102,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_1_1_1_1_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-				&bgp_102,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_1_1_1_2_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &bgp_102,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_1_1_1_2_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &bgp_102);
     FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "100.100.100.102/32 removed");
 
@@ -2535,64 +2551,64 @@
      * remove the remaining recursives
      */
     fib_table_entry_path_remove(fib_index,
-				&bgp_100_pfx,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_1_1_1_1_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &bgp_100_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_1_1_1_1_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-				&bgp_101_pfx,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_1_1_1_1_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_100_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "100.100.100.100/32 removed");
-    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_101_pfx) == 
-	      FIB_NODE_INDEX_INVALID),
-	     "100.100.100.101/32 removed");
+                                &bgp_101_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_1_1_1_1_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_100_pfx) ==
+              FIB_NODE_INDEX_INVALID),
+             "100.100.100.100/32 removed");
+    FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_101_pfx) ==
+              FIB_NODE_INDEX_INVALID),
+             "100.100.100.101/32 removed");
 
     /*
      * -2 entry (2*BGP, the RR source is also API sourced). -1 shared path-list;
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Add a recursive route via a connected cover, using an adj-fib that does exist
      */
     fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     ~0, // no index provided.
-			     fib_index, // Same as route's FIB
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &bgp_200_pfx,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             ~0, // no index provided.
+                             fib_index, // Same as route's FIB
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     /*
      * +1 entry. +1 shared path-list (recursive via 10.10.10.1)
      */
     FIB_TEST((2  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+6 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
@@ -2601,51 +2617,51 @@
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
 
     FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "200.200.200.200/32 is recursive via adj for 10.10.10.1");
+             "200.200.200.200/32 is recursive via adj for 10.10.10.1");
 
     FIB_TEST((FIB_ENTRY_FLAG_ATTACHED  == fib_entry_get_flags(fei)),
-	     "Flags set on RR via existing attached");
+             "Flags set on RR via existing attached");
 
     /*
      * Add a recursive route via a connected cover, using and adj-fib that does
      * not exist
      */
     ip46_address_t nh_10_10_10_3 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
     };
     fib_prefix_t pfx_10_10_10_3 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = nh_10_10_10_3,
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = nh_10_10_10_3,
     };
 
     fib_table_entry_path_add(fib_index,
-			     &bgp_201_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_3,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &bgp_201_pfx,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_3,
+                             ~0, // no index provided.
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     /*
      * +2 entries (BGP and RR). +1 shared path-list (recursive via 10.10.10.3) and
      * one unshared non-recursive via 10.10.10.3
      */
     FIB_TEST((3  == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     ai_03 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-				VNET_LINK_IP4,
-				&nh_10_10_10_3,
-				tm->hw[0]->sw_if_index);
+                                VNET_LINK_IP4,
+                                &nh_10_10_10_3,
+                                tm->hw[0]->sw_if_index);
 
     fei  = fib_table_lookup_exact_match(fib_index, &bgp_201_pfx);
     dpo  = fib_entry_contribute_ip_forwarding(fei);
@@ -2655,11 +2671,11 @@
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai == ai_03), "adj for 10.10.10.3/32 is via adj for 10.10.10.3");
     FIB_TEST(((FIB_ENTRY_FLAG_ATTACHED | FIB_ENTRY_FLAG_CONNECTED) ==
-	      fib_entry_get_flags(fei)),
-	     "Flags set on RR via non-existing attached");
+              fib_entry_get_flags(fei)),
+             "Flags set on RR via non-existing attached");
 
     FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 10.10.10.3");
+             "adj for 200.200.200.200/32 is recursive via adj for 10.10.10.3");
 
     adj_unlock(ai_03);
 
@@ -2667,44 +2683,44 @@
      * remove the recursives
      */
     fib_table_entry_path_remove(fib_index,
-    				&bgp_200_pfx,
-    				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-    				&nh_10_10_10_1,
-    				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &bgp_200_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-    				&bgp_201_pfx,
-    				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-    				&nh_10_10_10_3,
-    				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &bgp_201_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_3,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_201_pfx) ==
-    	      FIB_NODE_INDEX_INVALID),
-    	     "200.200.200.201/32 removed");
+              FIB_NODE_INDEX_INVALID),
+             "200.200.200.201/32 removed");
     FIB_TEST((fib_table_lookup_exact_match(fib_index, &bgp_200_pfx) ==
-    	      FIB_NODE_INDEX_INVALID),
-    	     "200.200.200.200/32 removed");
+              FIB_NODE_INDEX_INVALID),
+             "200.200.200.200/32 removed");
     FIB_TEST((fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3) ==
-    	      FIB_NODE_INDEX_INVALID),
-    	     "10.10.10.3/32 removed");
+              FIB_NODE_INDEX_INVALID),
+             "10.10.10.3/32 removed");
 
     /*
      * -3 entries (2*BGP and RR). -2 shared path-list (recursive via 10.10.10.3 &
      *  10.10.10.1) and one unshared non-recursive via 10.10.10.3
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
 
     /*
@@ -2712,82 +2728,82 @@
      *  Add 5.5.5.5/32 -> 5.5.5.6/32 -> 5.5.5.7/32 -> 5.5.5.5/32
      */
     fib_prefix_t pfx_5_5_5_5_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x05050505),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x05050505),
+        },
     };
     fib_prefix_t pfx_5_5_5_6_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x05050506),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x05050506),
+        },
     };
     fib_prefix_t pfx_5_5_5_7_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x05050507),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x05050507),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_5_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_5_5_5_6_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_5_5_5_5_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_5_5_5_6_s_32.fp_addr,
+                             ~0, // no index provided.
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_6_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_5_5_5_7_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_5_5_5_6_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_5_5_5_7_s_32.fp_addr,
+                             ~0, // no index provided.
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_7_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_5_5_5_5_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_5_5_5_7_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_5_5_5_5_s_32.fp_addr,
+                             ~0, // no index provided.
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     /*
      * +3 entries, +3 shared path-list
      */
     FIB_TEST((4  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+8 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+10 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * All the entries have only looped paths, so they are all drop
      */
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
+             "LB for 5.5.5.7/32 is via adj for DROP");
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
+             "LB for 5.5.5.5/32 is via adj for DROP");
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.6/32 is via adj for DROP");
+             "LB for 5.5.5.6/32 is via adj for DROP");
 
     /*
      * provide 5.5.5.6/32 with alternate path.
@@ -2795,16 +2811,16 @@
      * are still drop since the loop is still present.
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_6_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_5_5_5_6_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
@@ -2815,54 +2831,54 @@
     dpo2 = load_balance_get_bucket(dpo1->dpoi_index, 0);
     FIB_TEST(DPO_ADJACENCY == dpo2->dpoi_type, "type is %d", dpo2->dpoi_type);
     FIB_TEST((ai_01 == dpo2->dpoi_index),
-	     "5.5.5.6 bucket 0 resolves via 10.10.10.2");
+             "5.5.5.6 bucket 0 resolves via 10.10.10.2");
 
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
+             "LB for 5.5.5.7/32 is via adj for DROP");
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
+             "LB for 5.5.5.5/32 is via adj for DROP");
 
     /*
      * remove the alternate path for 5.5.5.6/32
      * back to all drop
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_5_5_5_6_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
+             "LB for 5.5.5.7/32 is via adj for DROP");
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
+             "LB for 5.5.5.5/32 is via adj for DROP");
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.6/32 is via adj for DROP");
+             "LB for 5.5.5.6/32 is via adj for DROP");
 
     /*
      * break the loop by giving 5.5.5.5/32 a new set of paths
      * expect all to forward via this new path.
      */
     fib_table_entry_update_one_path(fib_index,
-				    &pfx_5_5_5_5_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &pfx_5_5_5_5_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_1,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
@@ -2872,7 +2888,7 @@
     dpo2 = load_balance_get_bucket(dpo1->dpoi_index, 0);
     FIB_TEST(DPO_ADJACENCY == dpo2->dpoi_type, "type is %d", dpo2->dpoi_type);
     FIB_TEST((ai_01 == dpo2->dpoi_index),
-	     "5.5.5.5 bucket 0 resolves via 10.10.10.2");
+             "5.5.5.5 bucket 0 resolves via 10.10.10.2");
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_7_s_32);
     dpo2 = fib_entry_contribute_ip_forwarding(fei);
@@ -2880,7 +2896,7 @@
     lb = load_balance_get(dpo2->dpoi_index);
     FIB_TEST((lb->lb_n_buckets == 1), "Recursive LB has %d bucket", lb->lb_n_buckets);
     FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo2->dpoi_index, 0)),
-	     "5.5.5.5.7 via 5.5.5.5");
+             "5.5.5.5.7 via 5.5.5.5");
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_6_s_32);
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
@@ -2888,114 +2904,114 @@
     lb = load_balance_get(dpo1->dpoi_index);
     FIB_TEST((lb->lb_n_buckets == 1), "Recursive LB has %d bucket", lb->lb_n_buckets);
     FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "5.5.5.5.6 via 5.5.5.7");
+             "5.5.5.5.6 via 5.5.5.7");
 
     /*
      * revert back to the loop. so we can remove the prefixes with
      * the loop intact
      */
     fib_table_entry_update_one_path(fib_index,
-				    &pfx_5_5_5_5_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    &pfx_5_5_5_6_s_32.fp_addr,
-				    ~0, // no index provided.
-				    fib_index,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &pfx_5_5_5_5_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &pfx_5_5_5_6_s_32.fp_addr,
+                                    ~0, // no index provided.
+                                    fib_index,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_7_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.7/32 is via adj for DROP");
+             "LB for 5.5.5.7/32 is via adj for DROP");
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_5_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.5/32 is via adj for DROP");
+             "LB for 5.5.5.5/32 is via adj for DROP");
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "LB for 5.5.5.6/32 is via adj for DROP");
+             "LB for 5.5.5.6/32 is via adj for DROP");
 
     /*
      * remove all the 5.5.5.x/32 prefixes
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_5_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_5_5_5_6_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_5_5_5_5_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_5_5_5_6_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_5_5_5_7_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_5_5_5_6_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_5_5_5_7_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_7_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_5_5_5_5_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_5_5_5_7_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_5_5_5_5_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_2,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_5_5_5_6_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_2,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     /*
      * -3 entries, -3 shared path-list
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Single level loop 5.5.5.5/32 via 5.5.5.5/32
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_5_5_5_6_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_5_5_5_6_s_32.fp_addr,
-			     ~0, // no index provided.
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_5_5_5_6_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_5_5_5_6_s_32.fp_addr,
+                             ~0, // no index provided.
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_5_5_5_6_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
-	     "1-level 5.5.5.6/32 loop is via adj for DROP");
- 
+             "1-level 5.5.5.6/32 loop is via adj for DROP");
+
     fib_table_entry_path_remove(fib_index,
-				&pfx_5_5_5_6_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_5_5_5_6_s_32.fp_addr,
-				~0, // no index provided.
-				fib_index, // same as route's FIB
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_5_5_5_6_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_5_5_5_6_s_32.fp_addr,
+                                ~0, // no index provided.
+                                fib_index, // same as route's FIB
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_6_s_32),
-	     "1-level 5.5.5.6/32 loop is removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_5_5_5_6_s_32),
+             "1-level 5.5.5.6/32 loop is removed");
 
     /*
      * A recursive route whose next-hop is covered by the prefix.
@@ -3004,70 +3020,70 @@
      * via-fib, and we have a loop.
      */
     fib_prefix_t pfx_23_23_23_0_s_24 = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x17171700),
-	},
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x17171700),
+        },
     };
     fib_prefix_t pfx_23_23_23_23_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
             .ip4.as_u32 = clib_host_to_net_u32(0x17171717),
         },
     };
     fei = fib_table_entry_path_add(fib_index,
-				   &pfx_23_23_23_0_s_24,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &pfx_23_23_23_23_s_32.fp_addr,
-				   ~0, // recursive
-				   fib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_23_23_23_0_s_24,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &pfx_23_23_23_23_s_32.fp_addr,
+                                   ~0, // recursive
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(load_balance_is_drop(dpo),
-	     "23.23.23.0/24 via covered is DROP");
+             "23.23.23.0/24 via covered is DROP");
     fib_table_entry_delete_index(fei, FIB_SOURCE_API);
 
     /*
      * add-remove test. no change.
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Make the default route recursive via a unknown next-hop. Thus the
      * next hop's cover would be the default route
      */
     fei = fib_table_entry_path_add(fib_index,
-				   &pfx_0_0_0_0_s_0,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &pfx_23_23_23_23_s_32.fp_addr,
-				   ~0, // recursive
-				   fib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_0_0_0_0_s_0,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &pfx_23_23_23_23_s_32.fp_addr,
+                                   ~0, // recursive
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(load_balance_is_drop(dpo),
-	     "0.0.0.0.0/0 via is DROP");
+             "0.0.0.0.0/0 via is DROP");
     FIB_TEST((fib_entry_get_resolving_interface(fei) == ~0),
              "no resolving interface for looped 0.0.0.0/0");
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_23_23_23_23_s_32);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(load_balance_is_drop(dpo),
-	     "23.23.23.23/32 via is DROP");
+             "23.23.23.23/32 via is DROP");
     FIB_TEST((fib_entry_get_resolving_interface(fei) == ~0),
              "no resolving interface for looped 23.23.23.23/32");
 
@@ -3078,16 +3094,16 @@
      *  200.200.200.200/32 via 1.1.1.1 is recurse via host constrained
      */
     fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_1_1_1_1,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+                             &bgp_200_pfx,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_1_1_1_1,
+                             ~0,
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
     dpo2 = fib_entry_contribute_ip_forwarding(fei);
@@ -3096,7 +3112,7 @@
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
 
     FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
+             "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
 
     /*
      * save the load-balance. we expect it to be inplace modified
@@ -3108,87 +3124,87 @@
      * as the resolving route when the host is removed
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_0_s_28,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_0_s_28,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28);
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai == ai_01),
-	     "adj for 1.1.1.0/28 is via adj for 1.1.1.1");
+             "adj for 1.1.1.0/28 is via adj for 1.1.1.1");
 
     /*
      * remove the host via FIB - expect the BGP prefix to be drop
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_1_1_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0, // invalid fib index
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for DROP");
+             "adj for 200.200.200.200/32 is recursive via adj for DROP");
 
     /*
      * add the via-entry host reoute back. expect to resolve again
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_1_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo1->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
+             "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
 
     /*
      * add another path for the recursive. it will then have 2.
      */
     fib_prefix_t pfx_1_1_1_3_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010103),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010103),
+        },
     };
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_3_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_3_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_1_1_1_3_s_32.fp_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+                             &bgp_200_pfx,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_1_1_1_3_s_32.fp_addr,
+                             ~0,
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
 
     /*
      * add a bunch load more entries using this path combo so that we get
@@ -3202,7 +3218,7 @@
         bgp_78s[ii].fp_proto = FIB_PROTOCOL_IP4;
         bgp_78s[ii].fp_addr.ip4.as_u32 = clib_host_to_net_u32(0x4e000000+ii);
 
-        
+
         fib_table_entry_path_add(fib_index,
                                  &bgp_78s[ii],
                                  FIB_SOURCE_API,
@@ -3233,11 +3249,11 @@
     fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32);
     dpo2 = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
+             "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.1");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_3_s_32);
     dpo1 = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket(dpo->dpoi_index, 1)),
-	     "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.3");
+             "adj for 200.200.200.200/32 is recursive via adj for 1.1.1.3");
 
     /*
      * expect the lb-map used by the recursive's load-balance is using both buckets
@@ -3266,25 +3282,25 @@
      * inplace-modify.
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_1_1_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0, // invalid fib index
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     /* suspend so the update walk kicks int */
     vlib_process_suspend(vlib_get_main(), 1e-5);
 
     fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
     FIB_TEST(!dpo_cmp(dpo, fib_entry_contribute_ip_forwarding(fei)),
-	     "post PIC 200.200.200.200/32 was inplace modified");
+             "post PIC 200.200.200.200/32 was inplace modified");
 
     FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket_i(lb, 0)),
-	     "post PIC adj for 200.200.200.200/32 is recursive"
-	     " via adj for 1.1.1.3");
+             "post PIC adj for 200.200.200.200/32 is recursive"
+             " via adj for 1.1.1.3");
 
     /*
      * the LB maps that was locked above should have been modified to remove
@@ -3301,70 +3317,70 @@
     load_balance_map_unlock(lbmi);
 
     /*
-     * add it back. again 
+     * add it back. again
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_1_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     /* suspend so the update walk kicks in */
     vlib_process_suspend(vlib_get_main(), 1e-5);
 
     FIB_TEST(!dpo_cmp(dpo2, load_balance_get_bucket_i(lb, 0)),
-	     "post PIC recovery adj for 200.200.200.200/32 is recursive "
-	     "via adj for 1.1.1.1");
+             "post PIC recovery adj for 200.200.200.200/32 is recursive "
+             "via adj for 1.1.1.1");
     FIB_TEST(!dpo_cmp(dpo1, load_balance_get_bucket_i(lb, 1)),
-	     "post PIC recovery adj for 200.200.200.200/32 is recursive "
-	     "via adj for 1.1.1.3");
+             "post PIC recovery adj for 200.200.200.200/32 is recursive "
+             "via adj for 1.1.1.3");
 
     fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
-	     "post PIC 200.200.200.200/32 was inplace modified");
+             "post PIC 200.200.200.200/32 was inplace modified");
 
     /*
-     * add a 3rd path. this makes the LB 16 buckets. 
+     * add a 3rd path. this makes the LB 16 buckets.
      */
     fib_table_entry_path_add(fib_index,
-			     &bgp_200_pfx,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_1_1_1_2_s_32.fp_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+                             &bgp_200_pfx,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &pfx_1_1_1_2_s_32.fp_addr,
+                             ~0,
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
     for (ii = 0; ii < N_P; ii++)
     {
         fib_table_entry_path_add(fib_index,
                                  &bgp_78s[ii],
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &pfx_1_1_1_2_s_32.fp_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+                                 FIB_SOURCE_API,
+                                 FIB_ENTRY_FLAG_NONE,
+                                 DPO_PROTO_IP4,
+                                 &pfx_1_1_1_2_s_32.fp_addr,
+                                 ~0,
+                                 fib_index,
+                                 1,
+                                 NULL,
+                                 FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
     }
 
     fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
-	     "200.200.200.200/32 was inplace modified for 3rd path");
+             "200.200.200.200/32 was inplace modified for 3rd path");
     FIB_TEST(16 == lb->lb_n_buckets,
-	     "200.200.200.200/32 was inplace modified for 3rd path to 16 buckets");
+             "200.200.200.200/32 was inplace modified for 3rd path to 16 buckets");
 
     lbmi = lb->lb_map;
     load_balance_map_lock(lbmi);
@@ -3382,23 +3398,23 @@
      * the first 6 buckets of the map should map to the next 6
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_1_1_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     /* suspend so the update walk kicks int */
     vlib_process_suspend(vlib_get_main(), 1e-5);
 
     fei = fib_table_lookup_exact_match(fib_index, &bgp_200_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(lb == load_balance_get(dpo->dpoi_index),
-	     "200.200.200.200/32 was inplace modified for 3rd path");
+             "200.200.200.200/32 was inplace modified for 3rd path");
     FIB_TEST(2 == lb->lb_n_buckets,
-	     "200.200.200.200/32 was inplace modified for 3rd path remove to 2 buckets");
+             "200.200.200.200/32 was inplace modified for 3rd path remove to 2 buckets");
 
     for (ii = 0; ii < 6; ii++)
     {
@@ -3421,7 +3437,7 @@
                              &pfx_1_1_1_1_s_32,
                              FIB_SOURCE_API,
                              FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
+                             DPO_PROTO_IP4,
                              &nh_10_10_10_1,
                              tm->hw[0]->sw_if_index,
                              ~0,
@@ -3442,124 +3458,124 @@
     fib_table_entry_path_remove(fib_index,
                                 &bgp_200_pfx,
                                 FIB_SOURCE_API,
-				DPO_PROTO_IP4,
+                                DPO_PROTO_IP4,
                                 &pfx_1_1_1_2_s_32.fp_addr,
                                 ~0,
                                 fib_index,
                                 1,
                                 MPLS_LABEL_INVALID);
     fib_table_entry_path_remove(fib_index,
-				&bgp_200_pfx,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_1_1_1_1,
-				~0,
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+                                &bgp_200_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_1_1_1_1,
+                                ~0,
+                                fib_index,
+                                1,
+                                FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
     fib_table_entry_path_remove(fib_index,
-				&bgp_200_pfx,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&pfx_1_1_1_3_s_32.fp_addr,
-				~0,
-				fib_index,
-				1,
-				FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
+                                &bgp_200_pfx,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &pfx_1_1_1_3_s_32.fp_addr,
+                                ~0,
+                                fib_index,
+                                1,
+                                FIB_ROUTE_PATH_RESOLVE_VIA_HOST);
     fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_3_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_1_1_1_3_s_32,
+                           FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_0_s_28,
-			   FIB_SOURCE_API);
+                           &pfx_1_1_1_0_s_28,
+                           FIB_SOURCE_API);
     /* suspend so the update walk kicks int */
     vlib_process_suspend(vlib_get_main(), 1e-5);
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28)),
-	     "1.1.1.1/28 removed");
+              fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_0_s_28)),
+             "1.1.1.1/28 removed");
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_3_s_32)),
-	     "1.1.1.3/32 removed");
+              fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_3_s_32)),
+             "1.1.1.3/32 removed");
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &bgp_200_pfx)),
-	     "200.200.200.200/32 removed");
+              fib_table_lookup_exact_match(fib_index, &bgp_200_pfx)),
+             "200.200.200.200/32 removed");
 
     /*
      * add-remove test. no change.
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * A route whose paths are built up iteratively and then removed
      * all at once
      */
     fib_prefix_t pfx_4_4_4_4_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 4.4.4.4/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 4.4.4.4/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x04040404),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_4_4_4_4_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_4_4_4_4_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_3,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_4_4_4_4_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_3,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     FIB_TEST(FIB_NODE_INDEX_INVALID !=
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 present");
+             fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+             "4.4.4.4/32 present");
 
     fib_table_entry_delete(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_4_4_4_4_s_32,
+                           FIB_SOURCE_API);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+             "4.4.4.4/32 removed");
 
     /*
      * add-remove test. no change.
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * A route with multiple paths at once
@@ -3568,23 +3584,23 @@
 
     for (ii = 0; ii < 4; ii++)
     {
-	fib_route_path_t r_path = {
-	    .frp_proto = DPO_PROTO_IP4,
-	    .frp_addr = {
-		.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02 + ii),
-	    },
-	    .frp_sw_if_index = tm->hw[0]->sw_if_index,
-	    .frp_weight = 1,
-	    .frp_fib_index = ~0,
-	};
-	vec_add1(r_paths, r_path);
+        fib_route_path_t r_path = {
+            .frp_proto = DPO_PROTO_IP4,
+            .frp_addr = {
+                .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02 + ii),
+            },
+            .frp_sw_if_index = tm->hw[0]->sw_if_index,
+            .frp_weight = 1,
+            .frp_fib_index = ~0,
+        };
+        vec_add1(r_paths, r_path);
     }
 
     fib_table_entry_update(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API,
-			   FIB_ENTRY_FLAG_NONE,
-			   r_paths);
+                           &pfx_4_4_4_4_s_32,
+                           FIB_SOURCE_API,
+                           FIB_ENTRY_FLAG_NONE,
+                           r_paths);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.4.4.4/32 present");
@@ -3594,37 +3610,37 @@
     FIB_TEST((lb->lb_n_buckets == 4), "4.4.4.4/32 lb over %d paths", lb->lb_n_buckets);
 
     fib_table_entry_delete(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_4_4_4_4_s_32,
+                           FIB_SOURCE_API);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+             "4.4.4.4/32 removed");
     vec_free(r_paths);
 
     /*
      * add-remove test. no change.
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * A route deag route
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &zero_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_4_4_4_4_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &zero_addr,
+                             ~0,
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.4.4.4/32 present");
@@ -3634,36 +3650,36 @@
     lookup_dpo_t *lkd = lookup_dpo_get(dpo->dpoi_index);
 
     FIB_TEST((fib_index == lkd->lkd_fib_index),
-	     "4.4.4.4/32 is deag in %d %U",
+             "4.4.4.4/32 is deag in %d %U",
              lkd->lkd_fib_index,
              format_dpo_id, dpo, 0);
     FIB_TEST((LOOKUP_INPUT_DST_ADDR == lkd->lkd_input),
-	     "4.4.4.4/32 is source deag in %d %U",
+             "4.4.4.4/32 is source deag in %d %U",
              lkd->lkd_input,
              format_dpo_id, dpo, 0);
 
     fib_table_entry_delete(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_4_4_4_4_s_32,
+                           FIB_SOURCE_API);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+             "4.4.4.4/32 removed");
     vec_free(r_paths);
 
     /*
      * A route deag route in a source lookup table
      */
     fib_table_entry_path_add(fib_index,
-			     &pfx_4_4_4_4_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &zero_addr,
-			     ~0,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_SOURCE_LOOKUP);
+                             &pfx_4_4_4_4_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &zero_addr,
+                             ~0,
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_SOURCE_LOOKUP);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.4.4.4/32 present");
@@ -3673,49 +3689,49 @@
     lkd = lookup_dpo_get(dpo->dpoi_index);
 
     FIB_TEST((fib_index == lkd->lkd_fib_index),
-	     "4.4.4.4/32 is deag in %d %U",
+             "4.4.4.4/32 is deag in %d %U",
              lkd->lkd_fib_index,
              format_dpo_id, dpo, 0);
     FIB_TEST((LOOKUP_INPUT_SRC_ADDR == lkd->lkd_input),
-	     "4.4.4.4/32 is source deag in %d %U",
+             "4.4.4.4/32 is source deag in %d %U",
              lkd->lkd_input,
              format_dpo_id, dpo, 0);
 
     fib_table_entry_delete(fib_index,
-			   &pfx_4_4_4_4_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_4_4_4_4_s_32,
+                           FIB_SOURCE_API);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
-	     "4.4.4.4/32 removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_4_4_4_4_s_32),
+             "4.4.4.4/32 removed");
     vec_free(r_paths);
 
     /*
      * add-remove test. no change.
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+7 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Duplicate paths:
      *  add a recursive with duplicate paths. Expect the duplicate to be ignored.
      */
     fib_prefix_t pfx_34_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x22010101),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x22010101),
+        },
     };
     fib_prefix_t pfx_34_34_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x22220101),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x22220101),
+        },
     };
     fei = fib_table_entry_path_add(fib_index,
                                    &pfx_34_34_1_1_s_32,
@@ -3762,84 +3778,84 @@
      *           all of which are via 10.10.10.1, Itf1
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_2_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_1_2_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_1_1_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_2_0_s_24,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_2_0_s_24,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32),
-	     "1.1.1.1/32 removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_1_s_32),
+             "1.1.1.1/32 removed");
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32),
-	     "1.1.1.2/32 removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_1_1_1_2_s_32),
+             "1.1.1.2/32 removed");
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_1_1_2_0_s_24),
-	     "1.1.2.0/24 removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_1_1_2_0_s_24),
+             "1.1.2.0/24 removed");
 
     /*
      * -3 entries and -1 shared path-list
      */
     FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+4 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * An attached-host route. Expect to link to the incomplete adj
      */
     fib_prefix_t pfx_4_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 4.1.1.1/32 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x04010101),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 4.1.1.1/32 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x04010101),
+        },
     };
     fib_table_entry_path_add(fib_index,
-			     &pfx_4_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &zero_addr,
-			     tm->hw[0]->sw_if_index,
-			     fib_index,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_4_1_1_1_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &zero_addr,
+                             tm->hw[0]->sw_if_index,
+                             fib_index,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_4_1_1_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "4.1.1.1/32 present");
     ai = fib_entry_get_adj(fei);
 
     ai2 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
-			      VNET_LINK_IP4,
-			      &pfx_4_1_1_1_s_32.fp_addr,
-			      tm->hw[0]->sw_if_index);
+                              VNET_LINK_IP4,
+                              &pfx_4_1_1_1_s_32.fp_addr,
+                              tm->hw[0]->sw_if_index);
     FIB_TEST((ai == ai2), "Attached-host link to incomplete ADJ");
     adj_unlock(ai2);
 
@@ -3847,55 +3863,55 @@
      * +1 entry and +1 shared path-list
      */
     FIB_TEST((1  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+5 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     fib_table_entry_delete(fib_index,
-			   &pfx_4_1_1_1_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_4_1_1_1_s_32,
+                           FIB_SOURCE_API);
 
     FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+4 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+4 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * add a v6 prefix via v4 next-hops
      */
     fib_prefix_t pfx_2001_s_64 = {
-	.fp_len = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6.as_u64[0] = clib_host_to_net_u64(0x2001000000000000),
-	},
+        .fp_len = 64,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr = {
+            .ip6.as_u64[0] = clib_host_to_net_u64(0x2001000000000000),
+        },
     };
     fei = fib_table_entry_path_add(0, //default v6 table
-				   &pfx_2001_s_64,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &nh_10_10_10_1,
-				   tm->hw[0]->sw_if_index,
-				   fib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_2001_s_64,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &nh_10_10_10_1,
+                                   tm->hw[0]->sw_if_index,
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup_exact_match(0, &pfx_2001_s_64);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "2001::/64 present");
     ai = fib_entry_get_adj(fei);
     adj = adj_get(ai);
     FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP),
-	     "2001::/64 via ARP-adj");
+             "2001::/64 via ARP-adj");
     FIB_TEST((adj->ia_link == VNET_LINK_IP6),
-	     "2001::/64 is link type v6");
+             "2001::/64 is link type v6");
     FIB_TEST((adj->ia_nh_proto == FIB_PROTOCOL_IP4),
-	     "2001::/64 ADJ-adj is NH proto v4");
+             "2001::/64 ADJ-adj is NH proto v4");
     fib_table_entry_delete(0, &pfx_2001_s_64, FIB_SOURCE_API);
 
     /*
@@ -3906,17 +3922,17 @@
      *   - the uRPF list for the default route (it's cover) is empty
      */
     fei = fib_table_entry_special_add(fib_index,
-				      &pfx_4_1_1_1_s_32,
-				      FIB_SOURCE_URPF_EXEMPT,
-				      FIB_ENTRY_FLAG_DROP);
+                                      &pfx_4_1_1_1_s_32,
+                                      FIB_SOURCE_URPF_EXEMPT,
+                                      FIB_ENTRY_FLAG_DROP);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(load_balance_is_drop(dpo),
-	     "uRPF exempt 4.1.1.1/32 DROP");
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1, 0),
-	     "uRPF list for exempt prefix has itf index 0");
+             "uRPF exempt 4.1.1.1/32 DROP");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 1, 0),
+             "uRPF list for exempt prefix has itf index 0");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_0_0_0_0_s_0);
-    FIB_TEST(fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
-	     "uRPF list for 0.0.0.0/0 empty");
+    FIB_TEST(!fib_test_urpf_is_equal(fei, FIB_FORW_CHAIN_TYPE_UNICAST_IP4, 0),
+             "uRPF list for 0.0.0.0/0 empty");
 
     fib_table_entry_delete(fib_index, &pfx_4_1_1_1_s_32, FIB_SOURCE_URPF_EXEMPT);
 
@@ -3924,12 +3940,12 @@
      * An adj-fib that fails the refinement criteria - no connected cover
      */
     fib_prefix_t pfx_12_10_10_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 12.10.10.2 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0c0a0a02),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 12.10.10.2 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0c0a0a02),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
@@ -3946,24 +3962,25 @@
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_12_10_10_2_s_32);
     dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_id_is_valid(dpo),
-	     "no connected cover adj-fib fails refinement");
+    FIB_TEST(dpo_is_drop(dpo),
+             "no connected cover adj-fib fails refinement: %U",
+             format_dpo_id, dpo, 0);
 
     fib_table_entry_delete(fib_index,
-			   &pfx_12_10_10_2_s_32,
-			   FIB_SOURCE_ADJ);
+                           &pfx_12_10_10_2_s_32,
+                           FIB_SOURCE_ADJ);
 
     /*
      * An adj-fib that fails the refinement criteria - cover is connected
      * but on a different interface
      */
     fib_prefix_t pfx_10_10_10_127_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 10.10.10.127 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a7f),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 10.10.10.127 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a7f),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
@@ -3980,17 +3997,17 @@
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_127_s_32);
     dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_id_is_valid(dpo),
-	     "wrong interface adj-fib fails refinement");
+    FIB_TEST(dpo_is_drop(dpo),
+             "wrong interface adj-fib fails refinement");
 
     fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_127_s_32,
-			   FIB_SOURCE_ADJ);
+                           &pfx_10_10_10_127_s_32,
+                           FIB_SOURCE_ADJ);
 
     /*
      * add a second path to an adj-fib
      * this is a sumiluation of another ARP entry created
-     * on an interface on which the connected prefi does not exist.
+     * on an interface on which the connected prefix does not exist.
      * The second path fails refinement. Expect to forward through the
      * first.
      */
@@ -4036,10 +4053,10 @@
                                    1,
                                    NULL,
                                    FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &ip_o_10_10_10_3),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_10_10_10_3),
              "10.10.10.3 via 10.10.10.3/Eth0 only");
 
     /*
@@ -4055,7 +4072,7 @@
                                 1,
                                 FIB_ROUTE_PATH_FLAG_NONE);
     dpo = fib_entry_contribute_ip_forwarding(fei);
-    FIB_TEST(!dpo_id_is_valid(dpo),
+    FIB_TEST(dpo_is_drop(dpo),
              "wrong interface adj-fib fails refinement");
 
     /*
@@ -4072,10 +4089,10 @@
                                    1,
                                    NULL,
                                    FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &ip_o_10_10_10_3),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_10_10_10_3),
              "10.10.10.3 via 10.10.10.3/Eth0 only");
 
     /*
@@ -4090,10 +4107,10 @@
                                 fib_index,
                                 1,
                                 FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &ip_o_10_10_10_3),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_10_10_10_3),
              "10.10.10.3 via 10.10.10.3/Eth0 only");
 
     /*
@@ -4161,10 +4178,10 @@
         },
     };
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &ip_o_l2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_l2),
              "10.10.10.3 via L2 on Eth0");
     fib_table_entry_path_remove(fib_index,
                                 &pfx_10_10_10_3_s_32,
@@ -4179,30 +4196,30 @@
 
     /*
      * CLEANUP
-     *    remove adj-fibs: 
+     *    remove adj-fibs:
      */
     fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_1_s_32,
-			   FIB_SOURCE_ADJ);
+                           &pfx_10_10_10_1_s_32,
+                           FIB_SOURCE_ADJ);
     fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_2_s_32,
-			   FIB_SOURCE_ADJ);
+                           &pfx_10_10_10_2_s_32,
+                           FIB_SOURCE_ADJ);
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32),
-	     "10.10.10.1/32 adj-fib removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32),
+             "10.10.10.1/32 adj-fib removed");
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32),
-	     "10.10.10.2/32 adj-fib removed");
+             fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32),
+             "10.10.10.2/32 adj-fib removed");
 
     /*
      * -2 entries and -2 non-shared path-list
      */
     FIB_TEST((0  == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR+2 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR+2 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * unlock the adjacencies for which this test provided a rewrite.
@@ -4213,7 +4230,7 @@
     adj_unlock(ai_12_12_12_12);
 
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
     /*
      * CLEANUP
@@ -4221,30 +4238,30 @@
      */
     local_pfx.fp_len = 32;
     fib_table_entry_special_remove(fib_index, &local_pfx,
-				   FIB_SOURCE_INTERFACE);
+                                   FIB_SOURCE_INTERFACE);
     fei = fib_table_lookup(fib_index, &local_pfx);
 
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &local_pfx),
-	     "10.10.10.10/32 adj-fib removed");
+             fib_table_lookup_exact_match(fib_index, &local_pfx),
+             "10.10.10.10/32 adj-fib removed");
 
     local_pfx.fp_len = 24;
     fib_table_entry_delete(fib_index, &local_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           FIB_SOURCE_INTERFACE);
 
     FIB_TEST(FIB_NODE_INDEX_INVALID ==
-	     fib_table_lookup_exact_match(fib_index, &local_pfx),
-	     "10.10.10.10/24 adj-fib removed");
+             fib_table_lookup_exact_match(fib_index, &local_pfx),
+             "10.10.10.10/24 adj-fib removed");
 
     /*
      * -2 entries and -2 non-shared path-list
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Last but not least, remove the VRF
@@ -4265,21 +4282,21 @@
     fib_table_unlock(fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_API);
 
     FIB_TEST((0  == fib_path_list_db_size()), "path list DB population:%d",
-    	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNBR-5 == fib_path_list_pool_size()), "path list pool size is %d",
-    	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENBR-5 == fib_entry_pool_size()), "entry pool size is %d",
-    	     fib_entry_pool_size());
+             fib_entry_pool_size());
     FIB_TEST((ENBR-5 == pool_elts(fib_urpf_list_pool)), "uRPF pool size is %d",
-    	     pool_elts(fib_urpf_list_pool));
+             pool_elts(fib_urpf_list_pool));
     FIB_TEST((0 == pool_elts(load_balance_map_pool)), "LB-map pool size is %d",
-    	     pool_elts(load_balance_map_pool));
+             pool_elts(load_balance_map_pool));
     FIB_TEST((lb_count == pool_elts(load_balance_pool)), "LB pool size is %d",
              pool_elts(load_balance_pool));
     FIB_TEST((0 == pool_elts(dvr_dpo_pool)), "L2 DPO pool size is %d",
              pool_elts(dvr_dpo_pool));
 
-    return 0;
+    return (res);
 }
 
 static int
@@ -4295,19 +4312,20 @@
     const receive_dpo_t *rd;
     test_main_t *tm;
     u32 fib_index;
-    int ii;
+    int ii, res;
 
+    res = 0;
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
     /* via 2001:0:0:1::2 */
     ip46_address_t nh_2001_2 = {
-	.ip6 = {
-	    .as_u64 = {
-		[0] = clib_host_to_net_u64(0x2001000000000001),
-		[1] = clib_host_to_net_u64(0x0000000000000002),
-	    },
-	},
+        .ip6 = {
+            .as_u64 = {
+                [0] = clib_host_to_net_u64(0x2001000000000001),
+                [1] = clib_host_to_net_u64(0x0000000000000002),
+            },
+        },
     };
 
     tm = &test_main;
@@ -4320,30 +4338,30 @@
 
     for (ii = 0; ii < 4; ii++)
     {
-	ip6_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
+        ip6_main.fib_index_by_sw_if_index[tm->hw[ii]->sw_if_index] = fib_index;
     }
 
     fib_prefix_t pfx_0_0 = {
-	.fp_len = 0,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6 = {
-		{0, 0},
-	    },
-	},
+        .fp_len = 0,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr = {
+            .ip6 = {
+                {0, 0},
+            },
+        },
     };
 
     dfrt = fib_table_lookup(fib_index, &pfx_0_0);
     FIB_TEST((FIB_NODE_INDEX_INVALID != dfrt), "default route present");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
-	     "Default route is DROP");
+             "Default route is DROP");
 
     dpo = fib_entry_contribute_ip_forwarding(dfrt);
     FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
-		                     &ip6_main,
-				     1,
-				     &pfx_0_0.fp_addr.ip6)),
-	     "default-route; fwd and non-fwd tables match");
+                  &ip6_main,
+                  1,
+                  &pfx_0_0.fp_addr.ip6)),
+             "default-route; fwd and non-fwd tables match");
 
     // FIXME - check specials.
 
@@ -4362,9 +4380,9 @@
 
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNPS == fib_path_list_pool_size()), "path list pool size is %d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * add interface routes.
@@ -4374,29 +4392,29 @@
      * receive on 2001:0:0:1::1/128
      */
     fib_prefix_t local_pfx = {
-	.fp_len = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000001),
-		    [1] = clib_host_to_net_u64(0x0000000000000001),
-		},
-	    },
-	}
+        .fp_len = 64,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr = {
+            .ip6 = {
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000001),
+                    [1] = clib_host_to_net_u64(0x0000000000000001),
+                },
+            },
+        }
     };
 
     fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    DPO_PROTO_IP6,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_ATTACHED),
+                                    DPO_PROTO_IP6,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
@@ -4405,29 +4423,29 @@
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "attached interface route adj present");
     adj = adj_get(ai);
     FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
+             "attached interface adj is glean");
     FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &adj->sub_type.glean.receive_addr)),
-	      "attached interface adj is receive ok");
+                                    &adj->sub_type.glean.receive_addr)),
+             "attached interface adj is receive ok");
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
-		                     &ip6_main,
-				     1,
-				     &local_pfx.fp_addr.ip6)),
-	     "attached-route; fwd and non-fwd tables match");
+                  &ip6_main,
+                  1,
+                  &local_pfx.fp_addr.ip6)),
+             "attached-route; fwd and non-fwd tables match");
 
     local_pfx.fp_len = 128;
     fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    DPO_PROTO_IP6,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_LOCAL),
+                                    DPO_PROTO_IP6,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &local_pfx);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
@@ -4435,28 +4453,28 @@
     dpo = fib_entry_contribute_ip_forwarding(fei);
     dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
     FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
-	     "local interface adj is local");
+             "local interface adj is local");
     rd = receive_dpo_get(dpo->dpoi_index);
 
     FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
-				    &rd->rd_addr)),
-	      "local interface adj is receive ok");
+                                    &rd->rd_addr)),
+             "local interface adj is receive ok");
 
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
-		                     &ip6_main,
-				     1,
-				     &local_pfx.fp_addr.ip6)),
-	     "local-route; fwd and non-fwd tables match");
+                  &ip6_main,
+                  1,
+                  &local_pfx.fp_addr.ip6)),
+             "local-route; fwd and non-fwd tables match");
 
     /*
      * +2 entries. +2 unshared path-lists
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNPS+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Modify the default route to be via an adj not yet known.
@@ -4464,15 +4482,15 @@
      * a higher preference to the DEFAULT_ROUTE source
      */
     fib_table_entry_path_add(fib_index, &pfx_0_0,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP6,
-			     &nh_2001_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP6,
+                             &nh_2001_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_0_0);
 
     FIB_TEST((fei == dfrt), "default route same index");
@@ -4480,17 +4498,17 @@
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai), "default route adj present");
     adj = adj_get(ai);
     FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
+             "adj is incomplete");
     FIB_TEST((0 == ip46_address_cmp(&nh_2001_2, &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+             "adj nbr next-hop ok");
 
     /*
      * find the adj in the shared db
      */
     locked_ai = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
-				    VNET_LINK_IP6,
-				    &nh_2001_2,
-				    tm->hw[0]->sw_if_index);
+                                    VNET_LINK_IP6,
+                                    &nh_2001_2,
+                                    tm->hw[0]->sw_if_index);
     FIB_TEST((locked_ai == ai), "ADJ NBR DB find");
     adj_unlock(locked_ai);
 
@@ -4498,90 +4516,90 @@
      * no more entires. +1 shared path-list
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS+3 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * remove the API source from the default route. We expected
      * the route to remain, sourced by DEFAULT_ROUTE, and hence a DROP
      */
     fib_table_entry_path_remove(fib_index, &pfx_0_0,
-				FIB_SOURCE_API,	
-				DPO_PROTO_IP6,
-				&nh_2001_2,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP6,
+                                &nh_2001_2,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_0_0);
 
     FIB_TEST((fei == dfrt), "default route same index");
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(dfrt)),
-	     "Default route is DROP");
+             "Default route is DROP");
 
     /*
      * no more entires. -1 shared path-list
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS+2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Add an 2 ARP entry => a complete ADJ plus adj-fib.
      */
     fib_prefix_t pfx_2001_1_2_s_128 = {
-	.fp_len   = 128,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000001),
-		    [1] = clib_host_to_net_u64(0x0000000000000002),
-		},
-	    },
-	}
+        .fp_len   = 128,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr  = {
+            .ip6 = {
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000001),
+                    [1] = clib_host_to_net_u64(0x0000000000000002),
+                },
+            },
+        }
     };
     fib_prefix_t pfx_2001_1_3_s_128 = {
-	.fp_len   = 128,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000001),
-		    [1] = clib_host_to_net_u64(0x0000000000000003),
-		},
-	    },
-	}
+        .fp_len   = 128,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr  = {
+            .ip6 = {
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000001),
+                    [1] = clib_host_to_net_u64(0x0000000000000003),
+                },
+            },
+        }
     };
     u8 eth_addr[] = {
-	0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
+        0xde, 0xde, 0xde, 0xba, 0xba, 0xba,
     };
 
     ai_01 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
-				VNET_LINK_IP6,
-				&pfx_2001_1_2_s_128.fp_addr,
-				tm->hw[0]->sw_if_index);
+                                VNET_LINK_IP6,
+                                &pfx_2001_1_2_s_128.fp_addr,
+                                tm->hw[0]->sw_if_index);
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai_01), "adj created");
     adj = adj_get(ai_01);
     FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
+             "adj is incomplete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_2_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
 
     adj_nbr_update_rewrite(ai_01, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
+                           fib_test_build_rewrite(eth_addr));
     FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
+             "adj is complete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_2_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
 
     fib_table_entry_path_add(fib_index,
                              &pfx_2001_1_2_s_128,
@@ -4602,24 +4620,24 @@
     eth_addr[5] = 0xb2;
 
     ai_02 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP6,
-				VNET_LINK_IP6,
-				&pfx_2001_1_3_s_128.fp_addr,
-				tm->hw[0]->sw_if_index);
+                                VNET_LINK_IP6,
+                                &pfx_2001_1_3_s_128.fp_addr,
+                                tm->hw[0]->sw_if_index);
     FIB_TEST((FIB_NODE_INDEX_INVALID != ai_02), "adj created");
     adj = adj_get(ai_02);
     FIB_TEST((IP_LOOKUP_NEXT_ARP == adj->lookup_next_index),
-	     "adj is incomplete");
+             "adj is incomplete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_3_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
 
     adj_nbr_update_rewrite(ai_02, ADJ_NBR_REWRITE_FLAG_COMPLETE,
-			   fib_test_build_rewrite(eth_addr));
+                           fib_test_build_rewrite(eth_addr));
     FIB_TEST((IP_LOOKUP_NEXT_REWRITE == adj->lookup_next_index),
-	     "adj is complete");
+             "adj is complete");
     FIB_TEST((0 == ip46_address_cmp(&pfx_2001_1_3_s_128.fp_addr,
-				    &adj->sub_type.nbr.next_hop)),
-	      "adj nbr next-hop ok");
+                                    &adj->sub_type.nbr.next_hop)),
+             "adj nbr next-hop ok");
     FIB_TEST((ai_01 != ai_02), "ADJs are different");
 
     fib_table_entry_path_add(fib_index,
@@ -4642,65 +4660,65 @@
      * +2 entries, +2 unshread path-lists.
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS+4 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+4 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Add a 2 routes via the first ADJ. ensure path-list sharing
      */
     fib_prefix_t pfx_2001_a_s_64 = {
-	.fp_len   = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x200100000000000a),
-		    [1] = clib_host_to_net_u64(0x0000000000000000),
-		},
-	    },
-	}
+        .fp_len   = 64,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr  = {
+            .ip6 = {
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x200100000000000a),
+                    [1] = clib_host_to_net_u64(0x0000000000000000),
+                },
+            },
+        }
     };
     fib_prefix_t pfx_2001_b_s_64 = {
-	.fp_len   = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x200100000000000b),
-		    [1] = clib_host_to_net_u64(0x0000000000000000),
-		},
-	    },
-	}
+        .fp_len   = 64,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr  = {
+            .ip6 = {
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x200100000000000b),
+                    [1] = clib_host_to_net_u64(0x0000000000000000),
+                },
+            },
+        }
     };
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_2001_a_s_64,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP6,
-			     &nh_2001_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_2001_a_s_64,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP6,
+                             &nh_2001_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_2001_a_s_64);
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai_01 == ai), "2001::a/64 resolves via 2001:0:0:1::1");
     fib_table_entry_path_add(fib_index,
-			     &pfx_2001_b_s_64,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP6,
-			     &nh_2001_2,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_2001_b_s_64,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP6,
+                             &nh_2001_2,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &pfx_2001_b_s_64);
     ai = fib_entry_get_adj(fei);
     FIB_TEST((ai_01 == ai), "2001::b/64 resolves via 2001:0:0:1::1");
@@ -4709,87 +4727,87 @@
      * +2 entries, +1 shared path-list.
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS+5 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * add a v4 prefix via a v6 next-hop
      */
     fib_prefix_t pfx_1_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = 0x01010101,
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = 0x01010101,
+        },
     };
     fei = fib_table_entry_path_add(0, // default table
-				   &pfx_1_1_1_1_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP6,
-				   &nh_2001_2,
-				   tm->hw[0]->sw_if_index,
-				   ~0,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_1_1_1_1_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP6,
+                                   &nh_2001_2,
+                                   tm->hw[0]->sw_if_index,
+                                   ~0,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
     FIB_TEST(fei == fib_table_lookup_exact_match(0, &pfx_1_1_1_1_s_32),
-	     "1.1.1.1/32 o v6 route present");
+             "1.1.1.1/32 o v6 route present");
     ai = fib_entry_get_adj(fei);
     adj = adj_get(ai);
     FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP),
-	     "1.1.1.1/32 via ARP-adj");
+             "1.1.1.1/32 via ARP-adj");
     FIB_TEST((adj->ia_link == VNET_LINK_IP4),
-	     "1.1.1.1/32 ADJ-adj is link type v4");
+             "1.1.1.1/32 ADJ-adj is link type v4");
     FIB_TEST((adj->ia_nh_proto == FIB_PROTOCOL_IP6),
-	     "1.1.1.1/32 ADJ-adj is NH proto v6");
+             "1.1.1.1/32 ADJ-adj is NH proto v6");
     fib_table_entry_delete(0, &pfx_1_1_1_1_s_32, FIB_SOURCE_API);
 
     /*
      * An attached route
      */
     fib_prefix_t pfx_2001_c_s_64 = {
-	.fp_len   = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr  = {
-	    .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x200100000000000c),
-		    [1] = clib_host_to_net_u64(0x0000000000000000),
-		},
-	    },
-	}
+        .fp_len   = 64,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr  = {
+            .ip6 = {
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x200100000000000c),
+                    [1] = clib_host_to_net_u64(0x0000000000000000),
+                },
+            },
+        }
     };
     fib_table_entry_path_add(fib_index,
-			     &pfx_2001_c_s_64,
-			     FIB_SOURCE_CLI,
-			     FIB_ENTRY_FLAG_ATTACHED,
-			     DPO_PROTO_IP6,
-			     NULL,
-			     tm->hw[0]->sw_if_index,
-			     ~0,
-			     1,
-			     NULL,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_2001_c_s_64,
+                             FIB_SOURCE_CLI,
+                             FIB_ENTRY_FLAG_ATTACHED,
+                             DPO_PROTO_IP6,
+                             NULL,
+                             tm->hw[0]->sw_if_index,
+                             ~0,
+                             1,
+                             NULL,
+                             FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_c_s_64);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached route present");
     ai = fib_entry_get_adj(fei);
     adj = adj_get(ai);
     FIB_TEST((adj->lookup_next_index == IP_LOOKUP_NEXT_GLEAN),
-	     "2001:0:0:c/64 attached resolves via glean");
+             "2001:0:0:c/64 attached resolves via glean");
 
     fib_table_entry_path_remove(fib_index,
-				&pfx_2001_c_s_64,
-				FIB_SOURCE_CLI,
-				DPO_PROTO_IP6,
-				NULL,
-				tm->hw[0]->sw_if_index,
-				~0,
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_2001_c_s_64,
+                                FIB_SOURCE_CLI,
+                                DPO_PROTO_IP6,
+                                NULL,
+                                tm->hw[0]->sw_if_index,
+                                ~0,
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_c_s_64);
     FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "attached route removed");
 
@@ -4802,80 +4820,80 @@
     clib_error_t * error;
 
     error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[0]->sw_if_index,
-					~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+                                        tm->hw[0]->sw_if_index,
+                                        ~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
     FIB_TEST((NULL == error), "Interface shutdown OK");
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::b/64 resolves via drop");
+             "2001::b/64 resolves via drop");
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::a/64 resolves via drop");
+             "2001::a/64 resolves via drop");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::3/64 resolves via drop");
+             "2001:0:0:1::3/64 resolves via drop");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::2/64 resolves via drop");
+             "2001:0:0:1::2/64 resolves via drop");
     fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::1/128 not drop");
+             "2001:0:0:1::1/128 not drop");
     local_pfx.fp_len = 64;
     fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1/64 resolves via drop");
+             "2001:0:0:1/64 resolves via drop");
 
     /*
      * no change
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS+5 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+6 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * shutdown one of the other interfaces, then add a connected.
      * and swap one of the routes to it.
      */
     error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[1]->sw_if_index,
-					~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+                                        tm->hw[1]->sw_if_index,
+                                        ~VNET_SW_INTERFACE_FLAG_ADMIN_UP);
     FIB_TEST((NULL == error), "Interface 1 shutdown OK");
 
     fib_prefix_t connected_pfx = {
-	.fp_len = 64,
-	.fp_proto = FIB_PROTOCOL_IP6,
-	.fp_addr = {
-	    .ip6 = {
-		/* 2001:0:0:2::1/64 */
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000002),
-		    [1] = clib_host_to_net_u64(0x0000000000000001),
-		},
-	    },
-	}
+        .fp_len = 64,
+        .fp_proto = FIB_PROTOCOL_IP6,
+        .fp_addr = {
+            .ip6 = {
+                /* 2001:0:0:2::1/64 */
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000002),
+                    [1] = clib_host_to_net_u64(0x0000000000000001),
+                },
+            },
+        }
     };
     fib_table_entry_update_one_path(fib_index, &connected_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    DPO_PROTO_IP6,
-				    NULL,
-				    tm->hw[1]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_ATTACHED),
+                                    DPO_PROTO_IP6,
+                                    NULL,
+                                    tm->hw[1]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &connected_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached interface route present");
     dpo = fib_entry_contribute_ip_forwarding(fei);
@@ -4885,37 +4903,37 @@
 
     connected_pfx.fp_len = 128;
     fib_table_entry_update_one_path(fib_index, &connected_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    DPO_PROTO_IP6,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_LOCAL),
+                                    DPO_PROTO_IP6,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup(fib_index, &connected_pfx);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "local interface route present");
     dpo = fib_entry_contribute_ip_forwarding(fei);
     dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
     FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
-	     "local interface adj is local");
+             "local interface adj is local");
     rd = receive_dpo_get(dpo->dpoi_index);
     FIB_TEST((0 == ip46_address_cmp(&connected_pfx.fp_addr,
-				    &rd->rd_addr)),
-	      "local interface adj is receive ok");
+                                    &rd->rd_addr)),
+             "local interface adj is receive ok");
 
     /*
      * +2 entries, +2 unshared path-lists
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS+7 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
 
     /*
@@ -4923,8 +4941,8 @@
      * to normal forwarding.
      */
     error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[0]->sw_if_index,
-					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+                                        tm->hw[0]->sw_if_index,
+                                        VNET_SW_INTERFACE_FLAG_ADMIN_UP);
     FIB_TEST((NULL == error), "Interface bring-up OK");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
     ai = fib_entry_get_adj(fei);
@@ -4943,46 +4961,46 @@
     ai = fib_entry_get_adj(fei);
     adj = adj_get(ai);
     FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
+             "attached interface adj is glean");
 
     /*
      * Same test as above, but this time the HW interface goes down
      */
     error = vnet_hw_interface_set_flags(vnet_get_main(),
-					tm->hw_if_indicies[0],
-					~VNET_HW_INTERFACE_FLAG_LINK_UP);
+                                        tm->hw_if_indicies[0],
+                                        ~VNET_HW_INTERFACE_FLAG_LINK_UP);
     FIB_TEST((NULL == error), "Interface shutdown OK");
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::b/64 resolves via drop");
+             "2001::b/64 resolves via drop");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001::a/64 resolves via drop");
+             "2001::a/64 resolves via drop");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::3/128 resolves via drop");
+             "2001:0:0:1::3/128 resolves via drop");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::2/128 resolves via drop");
+             "2001:0:0:1::2/128 resolves via drop");
     local_pfx.fp_len = 128;
     fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1::1/128 not drop");
+             "2001:0:0:1::1/128 not drop");
     local_pfx.fp_len = 64;
     fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(!dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "2001:0:0:1/64 resolves via drop");
+             "2001:0:0:1/64 resolves via drop");
 
     error = vnet_hw_interface_set_flags(vnet_get_main(),
-					tm->hw_if_indicies[0],
-					VNET_HW_INTERFACE_FLAG_LINK_UP);
+                                        tm->hw_if_indicies[0],
+                                        VNET_HW_INTERFACE_FLAG_LINK_UP);
     FIB_TEST((NULL == error), "Interface bring-up OK");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64);
     ai = fib_entry_get_adj(fei);
@@ -5001,7 +5019,7 @@
     ai = fib_entry_get_adj(fei);
     adj = adj_get(ai);
     FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
-	     "attached interface adj is glean");
+             "attached interface adj is glean");
 
     /*
      * Delete the interface that the routes reolve through.
@@ -5037,21 +5055,21 @@
      * no change
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS+7 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS+8 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * Add the interface back. routes stay unresolved.
      */
     error = ethernet_register_interface(vnet_get_main(),
-					test_interface_device_class.index,
-					0 /* instance */,
-					hw_address,
-					&tm->hw_if_indicies[0],
-					/* flag change */ 0);
+                                        test_interface_device_class.index,
+                                        0 /* instance */,
+                                        hw_address,
+                                        &tm->hw_if_indicies[0],
+                                        /* flag change */ 0);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
@@ -5077,71 +5095,71 @@
      * CLEANUP ALL the routes
      */
     fib_table_entry_delete(fib_index,
-			   &pfx_2001_c_s_64,
-			   FIB_SOURCE_API);
+                           &pfx_2001_c_s_64,
+                           FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &pfx_2001_a_s_64,
-			   FIB_SOURCE_API);
+                           &pfx_2001_a_s_64,
+                           FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &pfx_2001_b_s_64,
-			   FIB_SOURCE_API);
+                           &pfx_2001_b_s_64,
+                           FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &pfx_2001_1_3_s_128,
-			   FIB_SOURCE_ADJ);
+                           &pfx_2001_1_3_s_128,
+                           FIB_SOURCE_ADJ);
     fib_table_entry_delete(fib_index,
-			   &pfx_2001_1_2_s_128,
-			   FIB_SOURCE_ADJ);
+                           &pfx_2001_1_2_s_128,
+                           FIB_SOURCE_ADJ);
     local_pfx.fp_len = 64;
     fib_table_entry_delete(fib_index, &local_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           FIB_SOURCE_INTERFACE);
     local_pfx.fp_len = 128;
     fib_table_entry_special_remove(fib_index, &local_pfx,
-				   FIB_SOURCE_INTERFACE);
+                                   FIB_SOURCE_INTERFACE);
     connected_pfx.fp_len = 64;
     fib_table_entry_delete(fib_index, &connected_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           FIB_SOURCE_INTERFACE);
     connected_pfx.fp_len = 128;
     fib_table_entry_special_remove(fib_index, &connected_pfx,
-				   FIB_SOURCE_INTERFACE);
+                                   FIB_SOURCE_INTERFACE);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64)),
-	     "2001::a/64 removed");
+              fib_table_lookup_exact_match(fib_index, &pfx_2001_a_s_64)),
+             "2001::a/64 removed");
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64)),
-	     "2001::b/64 removed");
+              fib_table_lookup_exact_match(fib_index, &pfx_2001_b_s_64)),
+             "2001::b/64 removed");
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128)),
-	     "2001:0:0:1::3/128 removed");
+              fib_table_lookup_exact_match(fib_index, &pfx_2001_1_3_s_128)),
+             "2001:0:0:1::3/128 removed");
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128)),
-	     "2001:0:0:1::3/128 removed");
+              fib_table_lookup_exact_match(fib_index, &pfx_2001_1_2_s_128)),
+             "2001:0:0:1::3/128 removed");
     local_pfx.fp_len = 64;
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &local_pfx)),
-	     "2001:0:0:1/64 removed");
+              fib_table_lookup_exact_match(fib_index, &local_pfx)),
+             "2001:0:0:1/64 removed");
     local_pfx.fp_len = 128;
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &local_pfx)),
-	     "2001:0:0:1::1/128 removed");
+              fib_table_lookup_exact_match(fib_index, &local_pfx)),
+             "2001:0:0:1::1/128 removed");
     connected_pfx.fp_len = 64;
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &connected_pfx)),
-	     "2001:0:0:2/64 removed");
+              fib_table_lookup_exact_match(fib_index, &connected_pfx)),
+             "2001:0:0:2/64 removed");
     connected_pfx.fp_len = 128;
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup_exact_match(fib_index, &connected_pfx)),
-	     "2001:0:0:2::1/128 removed");
+              fib_table_lookup_exact_match(fib_index, &connected_pfx)),
+             "2001:0:0:2::1/128 removed");
 
     /*
      * -8 entries. -7 path-lists (1 was shared).
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     /*
      * now remove the VRF
@@ -5149,11 +5167,11 @@
     fib_table_unlock(fib_index, FIB_PROTOCOL_IP6, FIB_SOURCE_API);
 
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
-	     fib_path_list_db_size());
+             fib_path_list_db_size());
     FIB_TEST((PNPS-2 == fib_path_list_pool_size()), "path list pool size is%d",
-	     fib_path_list_pool_size());
+             fib_path_list_pool_size());
     FIB_TEST((ENPS-2 == fib_entry_pool_size()), "entry pool size is %d",
-	     fib_entry_pool_size());
+             fib_entry_pool_size());
 
     adj_unlock(ai_02);
     adj_unlock(ai_01);
@@ -5162,16 +5180,16 @@
      * return the interfaces to up state
      */
     error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[0]->sw_if_index,
-					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+                                        tm->hw[0]->sw_if_index,
+                                        VNET_SW_INTERFACE_FLAG_ADMIN_UP);
     error = vnet_sw_interface_set_flags(vnet_get_main(),
-					tm->hw[1]->sw_if_index,
-					VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+                                        tm->hw[1]->sw_if_index,
+                                        VNET_SW_INTERFACE_FLAG_ADMIN_UP);
 
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
-    return (0);
+    return (res);
 }
 
 /*
@@ -5185,26 +5203,28 @@
     fib_node_index_t fei;
     test_main_t *tm;
     ip4_main_t *im;
+    int res;
 
+    res = 0;
     tm = &test_main;
     im = &ip4_main;
 
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
     /*
      * add interface routes. We'll assume this works. It's more rigorously
      * tested elsewhere.
      */
     fib_prefix_t local_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		/* 10.10.10.10 */
-		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
-	    },
-	},
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4 = {
+                /* 10.10.10.10 */
+                .as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
+            },
+        },
     };
 
     vec_validate(im->fib_index_by_sw_if_index, tm->hw[0]->sw_if_index);
@@ -5213,47 +5233,47 @@
     dpo_drop = drop_dpo_get(DPO_PROTO_IP4);
 
     fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_ATTACHED),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "attached interface route present");
+             "attached interface route present");
 
     local_pfx.fp_len = 32;
     fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_LOCAL),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &local_pfx);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "local interface route present");
+             "local interface route present");
 
     /*
      * Add an 2 ARP entry => a complete ADJ plus adj-fib.
      */
     fib_prefix_t pfx_10_10_10_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    /* 10.10.10.1 */
-	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 10.10.10.1 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+        },
     };
     fib_node_index_t ai;
 
@@ -5287,16 +5307,16 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_update_one_path(import_fib_index1,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &local_pfx,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached export created");
 
@@ -5306,7 +5326,7 @@
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
     FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "adj-fib1 Import uses same adj as export");
+             "adj-fib1 Import uses same adj as export");
 
     /*
      * check for the presence of the local in the import table
@@ -5320,12 +5340,12 @@
      * to get magically exported;
      */
     fib_prefix_t pfx_10_10_10_2_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    /* 10.10.10.2 */
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
-    	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 10.10.10.2 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
@@ -5346,7 +5366,7 @@
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
     FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Import uses same adj as export");
+             "Import uses same adj as export");
     FIB_TEST((FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags(fei)),
              "ADJ-fib2 imported flags %d",
              fib_entry_get_flags(fei));
@@ -5364,16 +5384,16 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_update_one_path(import_fib_index2,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &local_pfx,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(import_fib_index1, &local_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached export created");
 
@@ -5392,12 +5412,12 @@
      * add a 3rd adj-fib. expect it to be exported to both tables.
      */
     fib_prefix_t pfx_10_10_10_3_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    /* 10.10.10.3 */
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
-    	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 10.10.10.3 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
+        },
     };
 
     fib_table_entry_path_add(fib_index,
@@ -5418,18 +5438,18 @@
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_3_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 imported to FIB1");
     FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Import uses same adj as export");
+             "Import uses same adj as export");
     fei = fib_table_lookup_exact_match(import_fib_index2, &pfx_10_10_10_3_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib3 imported to FIB2");
     FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Import uses same adj as export");
+             "Import uses same adj as export");
 
     /*
      * remove the 3rd adj fib. we expect it to be removed from both FIBs
      */
     fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_3_s_32,
-			   FIB_SOURCE_ADJ);
+                           &pfx_10_10_10_3_s_32,
+                           FIB_SOURCE_ADJ);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_3_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib3 remved");
@@ -5446,8 +5466,8 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_delete(import_fib_index2,
-			   &local_pfx,
-			   FIB_SOURCE_API);
+                           &local_pfx,
+                           FIB_SOURCE_API);
     fei = fib_table_lookup_exact_match(import_fib_index2, &local_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "attached export removed");
 
@@ -5473,16 +5493,16 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_update_one_path(import_fib_index1,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    &pfx_10_10_10_2_s_32.fp_addr,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &local_pfx,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &pfx_10_10_10_2_s_32.fp_addr,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "ADJ-fib1 removed from FIB1");
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
@@ -5496,16 +5516,16 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_update_one_path(import_fib_index1,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &local_pfx,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported in FIB1");
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
@@ -5519,19 +5539,19 @@
      * a valid adj to find when we check the forwarding tables
      */
     fib_prefix_t pfx_10_0_0_0_s_8 = {
-    	.fp_len = 8,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    /* 10.0.0.0 */
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x0a000000),
-    	},
+        .fp_len = 8,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            /* 10.0.0.0 */
+            .ip4.as_u32 = clib_host_to_net_u32(0x0a000000),
+        },
     };
 
     fei = fib_table_entry_update_one_path(fib_index,
                                           &pfx_10_0_0_0_s_8,
                                           FIB_SOURCE_API,
                                           FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
+                                          DPO_PROTO_IP4,
                                           &pfx_10_10_10_3_s_32.fp_addr,
                                           tm->hw[0]->sw_if_index,
                                           ~0, // invalid fib index
@@ -5545,8 +5565,8 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           &local_pfx,
+                           FIB_SOURCE_INTERFACE);
 
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID == fei), "Delete export: ADJ-fib1 removed from FIB1");
@@ -5587,7 +5607,7 @@
                                           &local_pfx,
                                           FIB_SOURCE_API,
                                           FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
+                                          DPO_PROTO_IP4,
                                           &pfx_10_10_10_1_s_32.fp_addr,
                                           tm->hw[0]->sw_if_index,
                                           ~0, // invalid fib index
@@ -5620,22 +5640,22 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_update_one_path(fib_index,
-				    &local_pfx,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &local_pfx,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 reinstalled in export");
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
+             "Adj-fib1 is not drop in export");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 reinstalled in export");
     local_pfx.fp_len = 32;
@@ -5645,7 +5665,9 @@
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached in export: ADJ-fib1 imported");
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
+             "Adj-fib1 is not drop in export: %U %U",
+             format_dpo_id, dpo, 0,
+             format_dpo_id, load_balance_get_bucket(dpo->dpoi_index, 0), 0);
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 imported");
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
@@ -5659,22 +5681,22 @@
      */
     local_pfx.fp_len = 24;
     fib_table_entry_update_one_path(fib_index, &local_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_ATTACHED),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib1 reinstalled in export");
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
+             "Adj-fib1 is not drop in export");
     fei = fib_table_lookup_exact_match(fib_index, &pfx_10_10_10_2_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 reinstalled in export");
     local_pfx.fp_len = 32;
@@ -5684,7 +5706,7 @@
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "attached in export: ADJ-fib1 imported");
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(dpo_cmp(dpo_drop, load_balance_get_bucket(dpo->dpoi_index, 0)),
-	     "Adj-fib1 is not drop in export");
+             "Adj-fib1 is not drop in export");
     fei = fib_table_lookup_exact_match(import_fib_index1, &pfx_10_10_10_2_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "ADJ-fib2 imported");
     local_pfx.fp_len = 32;
@@ -5698,34 +5720,34 @@
                            &pfx_10_0_0_0_s_8,
                            FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_1_s_32,
-			   FIB_SOURCE_ADJ);
+                           &pfx_10_10_10_1_s_32,
+                           FIB_SOURCE_ADJ);
     fib_table_entry_delete(fib_index,
-			   &pfx_10_10_10_2_s_32,
-			   FIB_SOURCE_ADJ);
+                           &pfx_10_10_10_2_s_32,
+                           FIB_SOURCE_ADJ);
     local_pfx.fp_len = 32;
     fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           &local_pfx,
+                           FIB_SOURCE_INTERFACE);
     local_pfx.fp_len = 24;
     fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_API);
+                           &local_pfx,
+                           FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &local_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           &local_pfx,
+                           FIB_SOURCE_INTERFACE);
     local_pfx.fp_len = 24;
     fib_table_entry_delete(import_fib_index1,
-			   &local_pfx,
-			   FIB_SOURCE_API);
+                           &local_pfx,
+                           FIB_SOURCE_API);
 
     fib_table_unlock(import_fib_index1, FIB_PROTOCOL_IP4, FIB_SOURCE_CLI);
     fib_table_unlock(import_fib_index2, FIB_PROTOCOL_IP4, FIB_SOURCE_CLI);
 
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
-    return (0);
+    return (res);
 }
 
 /*
@@ -5735,7 +5757,9 @@
 fib_test_pref (void)
 {
     test_main_t *tm = &test_main;
+    int res;
 
+    res = 0;
     const fib_prefix_t pfx_1_1_1_1_s_32 = {
         .fp_len = 32,
         .fp_proto = FIB_PROTOCOL_IP4,
@@ -5894,11 +5918,11 @@
                                     FIB_ENTRY_FLAG_NONE,
                                     nr_paths);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &ip_hi_1,
-                                     &ip_hi_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &ip_hi_1,
+                                      &ip_hi_2),
              "1.1.1.1/32 via high preference paths");
 
     /*
@@ -5908,11 +5932,11 @@
                                 tm->hw[0]->sw_if_index,
                                 0);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &ip_med_1,
-                                     &ip_med_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &ip_med_1,
+                                      &ip_med_2),
              "1.1.1.1/32 via medium preference paths");
 
     /*
@@ -5922,11 +5946,11 @@
                                 tm->hw[1]->sw_if_index,
                                 0);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &ip_low_1,
-                                     &ip_low_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &ip_low_1,
+                                      &ip_low_2),
              "1.1.1.1/32 via low preference paths");
 
     /*
@@ -5936,11 +5960,11 @@
                                 tm->hw[0]->sw_if_index,
                                 VNET_SW_INTERFACE_FLAG_ADMIN_UP);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &ip_hi_1,
-                                     &ip_hi_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &ip_hi_1,
+                                      &ip_hi_2),
              "1.1.1.1/32 via high preference paths");
 
     /*
@@ -5950,11 +5974,11 @@
                                 tm->hw[1]->sw_if_index,
                                 VNET_SW_INTERFACE_FLAG_ADMIN_UP);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &ip_hi_1,
-                                     &ip_hi_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &ip_hi_1,
+                                      &ip_hi_2),
              "1.1.1.1/32 via high preference paths");
 
     dpo_id_t ip_1_1_1_1 = DPO_INVALID;
@@ -6056,7 +6080,7 @@
     /*
      * add many recursive so we get the LB MAp created
      */
-    #define N_PFXS 64
+#define N_PFXS 64
     fib_prefix_t pfx_r[N_PFXS];
     unsigned int n_pfxs;
     for (n_pfxs = 0; n_pfxs < N_PFXS; n_pfxs++)
@@ -6072,10 +6096,10 @@
                                         FIB_ENTRY_FLAG_NONE,
                                         r_paths);
 
-        FIB_TEST(fib_test_validate_entry(fei,
-                                         FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                         1,
-                                         &ip_o_1_1_1_1),
+        FIB_TEST(!fib_test_validate_entry(fei,
+                                          FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                          1,
+                                          &ip_o_1_1_1_1),
                  "recursive via high preference paths");
 
         /*
@@ -6088,10 +6112,10 @@
         /* suspend so the update walk kicks int */
         vlib_process_suspend(vlib_get_main(), 1e-5);
 
-        FIB_TEST(fib_test_validate_entry(fei,
-                                         FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                         1,
-                                         &ip_o_1_1_1_2),
+        FIB_TEST(!fib_test_validate_entry(fei,
+                                          FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                          1,
+                                          &ip_o_1_1_1_2),
                  "recursive via medium preference paths");
 
         /*
@@ -6104,10 +6128,10 @@
         /* suspend so the update walk kicks int */
         vlib_process_suspend(vlib_get_main(), 1e-5);
 
-        FIB_TEST(fib_test_validate_entry(fei,
-                                         FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                         1,
-                                         &ip_o_1_1_1_3),
+        FIB_TEST(!fib_test_validate_entry(fei,
+                                          FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                          1,
+                                          &ip_o_1_1_1_3),
                  "recursive via low preference paths");
 
         /*
@@ -6128,10 +6152,10 @@
         vlib_process_suspend(vlib_get_main(), 1e-5);
 
         fei = fib_table_lookup_exact_match(0, &pfx_r[n_pfxs]);
-        FIB_TEST(fib_test_validate_entry(fei,
-                                         FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                         1,
-                                         &ip_o_1_1_1_1),
+        FIB_TEST(!fib_test_validate_entry(fei,
+                                          FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                          1,
+                                          &ip_o_1_1_1_1),
                  "recursive via high preference paths");
     }
 
@@ -6147,10 +6171,10 @@
     {
         fei = fib_table_lookup_exact_match(0, &pfx_r[n_pfxs]);
 
-        FIB_TEST(fib_test_validate_entry(fei,
-                                         FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                         1,
-                                         &ip_o_1_1_1_2),
+        FIB_TEST(!fib_test_validate_entry(fei,
+                                          FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                          1,
+                                          &ip_o_1_1_1_2),
                  "recursive via medium preference paths");
     }
     for (n_pfxs = 0; n_pfxs < N_PFXS; n_pfxs++)
@@ -6179,7 +6203,8 @@
     adj_unlock(ai_med_1);
     adj_unlock(ai_hi_2);
     adj_unlock(ai_hi_1);
-    return (0);
+
+    return (res);
 }
 
 /*
@@ -6190,10 +6215,11 @@
 {
     fib_node_index_t fei, ai_mpls_10_10_10_1, ai_v4_10_10_11_1, ai_v4_10_10_11_2, ai_mpls_10_10_11_2, ai_mpls_10_10_11_1;
     const u32 fib_index = 0;
+    int lb_count, ii, res;
     test_main_t *tm;
     ip4_main_t *im;
-    int lb_count, ii;
 
+    res = 0;
     lb_count = pool_elts(load_balance_pool);
     tm = &test_main;
     im = &ip4_main;
@@ -6203,114 +6229,114 @@
      * tested elsewhere.
      */
     fib_prefix_t local0_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		/* 10.10.10.10 */
-		.as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
-	    },
-	},
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4 = {
+                /* 10.10.10.10 */
+                .as_u32 = clib_host_to_net_u32(0x0a0a0a0a),
+            },
+        },
     };
 
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
     vec_validate(im->fib_index_by_sw_if_index, tm->hw[0]->sw_if_index);
     im->fib_index_by_sw_if_index[tm->hw[0]->sw_if_index] = fib_index;
 
     fib_table_entry_update_one_path(fib_index, &local0_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_ATTACHED),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &local0_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "attached interface route present");
+             "attached interface route present");
 
     local0_pfx.fp_len = 32;
     fib_table_entry_update_one_path(fib_index, &local0_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_LOCAL),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &local0_pfx);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "local interface route present");
+             "local interface route present");
 
     fib_prefix_t local1_pfx = {
-	.fp_len = 24,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4 = {
-		/* 10.10.11.10 */
-		.as_u32 = clib_host_to_net_u32(0x0a0a0b0a),
-	    },
-	},
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4 = {
+                /* 10.10.11.10 */
+                .as_u32 = clib_host_to_net_u32(0x0a0a0b0a),
+            },
+        },
     };
 
     vec_validate(im->fib_index_by_sw_if_index, tm->hw[1]->sw_if_index);
     im->fib_index_by_sw_if_index[tm->hw[1]->sw_if_index] = fib_index;
 
     fib_table_entry_update_one_path(fib_index, &local1_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_ATTACHED),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[1]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_ATTACHED),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[1]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &local1_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "attached interface route present");
+             "attached interface route present");
 
     local1_pfx.fp_len = 32;
     fib_table_entry_update_one_path(fib_index, &local1_pfx,
-				    FIB_SOURCE_INTERFACE,
-				    (FIB_ENTRY_FLAG_CONNECTED |
-				     FIB_ENTRY_FLAG_LOCAL),
-				    DPO_PROTO_IP4,
-				    NULL,
-				    tm->hw[1]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    FIB_SOURCE_INTERFACE,
+                                    (FIB_ENTRY_FLAG_CONNECTED |
+                                     FIB_ENTRY_FLAG_LOCAL),
+                                    DPO_PROTO_IP4,
+                                    NULL,
+                                    tm->hw[1]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(fib_index, &local1_pfx);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei),
-	     "local interface route present");
+             "local interface route present");
 
     ip46_address_t nh_10_10_10_1 = {
-	.ip4 = {
-	    .as_u32 = clib_host_to_net_u32(0x0a0a0a01),
-	},
+        .ip4 = {
+            .as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+        },
     };
     ip46_address_t nh_10_10_11_1 = {
-	.ip4 = {
-	    .as_u32 = clib_host_to_net_u32(0x0a0a0b01),
-	},
+        .ip4 = {
+            .as_u32 = clib_host_to_net_u32(0x0a0a0b01),
+        },
     };
     ip46_address_t nh_10_10_11_2 = {
-	.ip4 = {
-	    .as_u32 = clib_host_to_net_u32(0x0a0a0b02),
-	},
+        .ip4 = {
+            .as_u32 = clib_host_to_net_u32(0x0a0a0b02),
+        },
     };
 
     ai_v4_10_10_11_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
@@ -6338,27 +6364,27 @@
      * Add an etry with one path with a real out-going label
      */
     fib_prefix_t pfx_1_1_1_1_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010101),
+        },
     };
     fib_test_lb_bucket_t l99_eos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_O_ADJ,
-	.label_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label = 99,
-	    .eos = MPLS_EOS,
-	},
+        .type = FT_LB_LABEL_O_ADJ,
+        .label_o_adj = {
+            .adj = ai_mpls_10_10_10_1,
+            .label = 99,
+            .eos = MPLS_EOS,
+        },
     };
     fib_test_lb_bucket_t l99_neos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_O_ADJ,
-	.label_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label = 99,
-	    .eos = MPLS_NON_EOS,
-	},
+        .type = FT_LB_LABEL_O_ADJ,
+        .label_o_adj = {
+            .adj = ai_mpls_10_10_10_1,
+            .label = 99,
+            .eos = MPLS_NON_EOS,
+        },
     };
     fib_mpls_label_t *l99 = NULL, fml99 = {
         .fml_value = 99,
@@ -6366,40 +6392,40 @@
     vec_add1(l99, fml99);
 
     fib_table_entry_update_one_path(fib_index,
-				    &pfx_1_1_1_1_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0, // invalid fib index
-				    1,
-				    l99,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &pfx_1_1_1_1_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_1,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0, // invalid fib index
+                                    1,
+                                    l99,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
     FIB_TEST((FIB_NODE_INDEX_INVALID != fei), "1.1.1.1/32 created");
 
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l99_eos_o_10_10_10_1),
-	     "1.1.1.1/32 LB 1 bucket via label 99 over 10.10.10.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_eos_o_10_10_10_1),
+             "1.1.1.1/32 LB 1 bucket via label 99 over 10.10.10.1");
 
     /*
      * add a path with an implicit NULL label
      */
     fib_test_lb_bucket_t a_o_10_10_11_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_v4_10_10_11_1,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_v4_10_10_11_1,
+        },
     };
     fib_test_lb_bucket_t a_mpls_o_10_10_11_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_mpls_10_10_11_1,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_mpls_10_10_11_1,
+        },
     };
     fib_mpls_label_t *l_imp_null = NULL, fml_imp_null = {
         .fml_value =  MPLS_IETF_IMPLICIT_NULL_LABEL,
@@ -6407,42 +6433,42 @@
     vec_add1(l_imp_null, fml_imp_null);
 
     fei = fib_table_entry_path_add(fib_index,
-				   &pfx_1_1_1_1_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &nh_10_10_11_1,
-				   tm->hw[1]->sw_if_index,
-				   ~0, // invalid fib index
-				   1,
-				   l_imp_null,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_1_1_1_1_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &nh_10_10_11_1,
+                                   tm->hw[1]->sw_if_index,
+                                   ~0, // invalid fib index
+                                   1,
+                                   l_imp_null,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &l99_eos_o_10_10_10_1,
+                                      &a_o_10_10_11_1),
+             "1.1.1.1/32 LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "adj over 10.10.11.1");
 
     /*
      * assign the route a local label
      */
     fib_table_entry_local_label_add(fib_index,
-				    &pfx_1_1_1_1_s_32,
-				    24001);
+                                    &pfx_1_1_1_1_s_32,
+                                    24001);
 
     fib_prefix_t pfx_24001_eos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 24001,
-	.fp_eos = MPLS_EOS,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = 24001,
+        .fp_eos = MPLS_EOS,
     };
     fib_prefix_t pfx_24001_neos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 24001,
-	.fp_eos = MPLS_NON_EOS,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = 24001,
+        .fp_eos = MPLS_NON_EOS,
     };
     fib_test_lb_bucket_t disp_o_10_10_11_1 = {
 	.type = FT_LB_MPLS_DISP_PIPE_O_ADJ,
@@ -6458,36 +6484,36 @@
      *  and use an mpls adj for the imp-null
      */
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &disp_o_10_10_11_1),
-	     "24001/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "mpls disp adj over 10.10.11.1");
+                           &pfx_24001_eos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      2,
+                                      &l99_eos_o_10_10_10_1,
+                                      &disp_o_10_10_11_1),
+             "24001/eos LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "mpls disp adj over 10.10.11.1");
 
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     2,
-				     &l99_neos_o_10_10_10_1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 1 bucket via: "
-	     "label 99 over 10.10.10.1 ",
-	     "mpls-adj via 10.10.11.1");
+                           &pfx_24001_neos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      2,
+                                      &l99_neos_o_10_10_10_1,
+                                      &a_mpls_o_10_10_11_1),
+             "24001/neos LB 1 bucket via: "
+             "label 99 over 10.10.10.1 ",
+             "mpls-adj via 10.10.11.1");
 
     /*
      * add an unlabelled path, this is excluded from the neos chains,
      */
     fib_test_lb_bucket_t adj_o_10_10_11_2 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_v4_10_10_11_2,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_v4_10_10_11_2,
+        },
     };
     fib_test_lb_bucket_t disp_o_10_10_11_2 = {
 	.type = FT_LB_MPLS_DISP_PIPE_O_ADJ,
@@ -6498,73 +6524,73 @@
 
 
     fei = fib_table_entry_path_add(fib_index,
-				   &pfx_1_1_1_1_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &nh_10_10_11_2,
-				   tm->hw[1]->sw_if_index,
-				   ~0, // invalid fib index
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_1_1_1_1_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &nh_10_10_11_2,
+                                   tm->hw[1]->sw_if_index,
+                                   ~0, // invalid fib index
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     16, // 3 choices spread over 16 buckets
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 16 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1",
-	     "adj over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      16, // 3 choices spread over 16 buckets
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2),
+             "1.1.1.1/32 LB 16 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "adj over 10.10.11.1",
+             "adj over 10.10.11.2");
 
     /*
      * get and lock a reference to the non-eos of the via entry 1.1.1.1/32
      */
     dpo_id_t non_eos_1_1_1_1 = DPO_INVALID;
     fib_entry_contribute_forwarding(fei,
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &non_eos_1_1_1_1);
+                                    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                    &non_eos_1_1_1_1);
 
     /*
      * n-eos has only the 2 labelled paths
      */
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
+                           &pfx_24001_neos);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     2,
-				     &l99_neos_o_10_10_10_1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj-mpls over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      2,
+                                      &l99_neos_o_10_10_10_1,
+                                      &a_mpls_o_10_10_11_1),
+             "24001/neos LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "adj-mpls over 10.10.11.2");
 
     /*
      * A labelled recursive
      */
     fib_prefix_t pfx_2_2_2_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020202),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x02020202),
+        },
     };
     fib_test_lb_bucket_t l1600_eos_o_1_1_1_1 = {
 	.type = FT_LB_LABEL_O_LB,
@@ -6593,10 +6619,10 @@
                                           l1600,
                                           FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l1600_eos_o_1_1_1_1),
+    FIB_TEST(!fib_test_validate_entry(fei, 
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l1600_eos_o_1_1_1_1),
 	     "2.2.2.2.2/32 LB 1 buckets via: "
 	     "label 1600 over 1.1.1.1");
 
@@ -6607,18 +6633,18 @@
     urpfi = load_balance_get_urpf(dpo_44.dpoi_index);
 
     FIB_TEST(fib_urpf_check(urpfi, tm->hw[0]->sw_if_index),
-	     "uRPF check for 2.2.2.2/32 on %d OK",
-	     tm->hw[0]->sw_if_index);
+             "uRPF check for 2.2.2.2/32 on %d OK",
+             tm->hw[0]->sw_if_index);
     FIB_TEST(fib_urpf_check(urpfi, tm->hw[1]->sw_if_index),
-	     "uRPF check for 2.2.2.2/32 on %d OK",
-	     tm->hw[1]->sw_if_index);
+             "uRPF check for 2.2.2.2/32 on %d OK",
+             tm->hw[1]->sw_if_index);
     FIB_TEST(!fib_urpf_check(urpfi, 99),
-	     "uRPF check for 2.2.2.2/32 on 99 not-OK",
-	     99);
+             "uRPF check for 2.2.2.2/32 on 99 not-OK",
+             99);
 
     fib_entry_contribute_forwarding(fei, FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS, &dpo_44);
     FIB_TEST(urpfi == load_balance_get_urpf(dpo_44.dpoi_index),
-	     "Shared uRPF on IP and non-EOS chain");
+             "Shared uRPF on IP and non-EOS chain");
 
     dpo_reset(&dpo_44);
 
@@ -6629,38 +6655,38 @@
      * shut down the link with the valid label
      */
     vnet_sw_interface_set_flags(vnet_get_main(),
-				tm->hw[0]->sw_if_index,
-				0);
+                                tm->hw[0]->sw_if_index,
+                                0);
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "adj over 10.10.11.1, ",
-	     "adj-v4 over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &a_o_10_10_11_1,
+                                      &adj_o_10_10_11_2),
+             "1.1.1.1/32 LB 2 buckets via: "
+             "adj over 10.10.11.1, ",
+             "adj-v4 over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &disp_o_10_10_11_1,
-				     &disp_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "mpls-disp adj over 10.10.11.1, ",
-	     "mpls-disp adj-v4 over 10.10.11.2");
+                           &pfx_24001_eos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      2,
+                                      &disp_o_10_10_11_1,
+                                      &disp_o_10_10_11_2),
+             "24001/eos LB 2 buckets via: "
+             "mpls-disp adj over 10.10.11.1, ",
+             "mpls-disp adj-v4 over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 1 buckets via: "
-	     "adj-mpls over 10.10.11.2");
+                           &pfx_24001_neos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      1,
+                                      &a_mpls_o_10_10_11_1),
+             "24001/neos LB 1 buckets via: "
+             "adj-mpls over 10.10.11.2");
 
     /*
      * test that the pre-failover load-balance has been in-place
@@ -6668,12 +6694,12 @@
      */
     dpo_id_t current = DPO_INVALID;
     fib_entry_contribute_forwarding(fei,
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &current);
+                                    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                    &current);
 
     FIB_TEST(!dpo_cmp(&non_eos_1_1_1_1,
                       &current),
-	     "PIC-core LB inplace modified %U %U",
+             "PIC-core LB inplace modified %U %U",
              format_dpo_id, &non_eos_1_1_1_1, 0,
              format_dpo_id, &current, 0);
 
@@ -6684,163 +6710,163 @@
      * no-shut the link with the valid label
      */
     vnet_sw_interface_set_flags(vnet_get_main(),
-				tm->hw[0]->sw_if_index,
-				VNET_SW_INTERFACE_FLAG_ADMIN_UP);
+                                tm->hw[0]->sw_if_index,
+                                VNET_SW_INTERFACE_FLAG_ADMIN_UP);
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     16, // 3 choices spread over 16 buckets
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 16 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.1",
-	     "adj-v4 over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      16, // 3 choices spread over 16 buckets
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &a_o_10_10_11_1,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2,
+                                      &adj_o_10_10_11_2),
+             "1.1.1.1/32 LB 16 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "adj over 10.10.11.1",
+             "adj-v4 over 10.10.11.2");
 
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     16, // 3 choices spread over 16 buckets
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &l99_eos_o_10_10_10_1,
-				     &disp_o_10_10_11_1,
-				     &disp_o_10_10_11_1,
-				     &disp_o_10_10_11_1,
-				     &disp_o_10_10_11_1,
-				     &disp_o_10_10_11_1,
-				     &disp_o_10_10_11_2,
-				     &disp_o_10_10_11_2,
-				     &disp_o_10_10_11_2,
-				     &disp_o_10_10_11_2,
-				     &disp_o_10_10_11_2),
-	     "24001/eos LB 16 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "MPLS disp adj over 10.10.11.1",
-	     "MPLS disp adj-v4 over 10.10.11.2");
+                           &pfx_24001_eos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      16, // 3 choices spread over 16 buckets
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &l99_eos_o_10_10_10_1,
+                                      &disp_o_10_10_11_1,
+                                      &disp_o_10_10_11_1,
+                                      &disp_o_10_10_11_1,
+                                      &disp_o_10_10_11_1,
+                                      &disp_o_10_10_11_1,
+                                      &disp_o_10_10_11_2,
+                                      &disp_o_10_10_11_2,
+                                      &disp_o_10_10_11_2,
+                                      &disp_o_10_10_11_2,
+                                      &disp_o_10_10_11_2),
+             "24001/eos LB 16 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "MPLS disp adj over 10.10.11.1",
+             "MPLS disp adj-v4 over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     2,
-				     &l99_neos_o_10_10_10_1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj-mpls over 10.10.11.2");
+                           &pfx_24001_neos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      2,
+                                      &l99_neos_o_10_10_10_1,
+                                      &a_mpls_o_10_10_11_1),
+             "24001/neos LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "adj-mpls over 10.10.11.2");
 
     /*
      * remove the first path with the valid label
      */
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_10_1,
-				tm->hw[0]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_1_1_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_10_1,
+                                tm->hw[0]->sw_if_index,
+                                ~0, // invalid fib index
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &a_o_10_10_11_1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "adj over 10.10.11.1, "
-	     "adj-v4 over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &a_o_10_10_11_1,
+                                      &adj_o_10_10_11_2),
+             "1.1.1.1/32 LB 2 buckets via: "
+             "adj over 10.10.11.1, "
+             "adj-v4 over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &disp_o_10_10_11_1,
-				     &disp_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "MPLS disp adj over 10.10.11.1, "
-	     "MPLS disp adj-v4 over 10.10.11.2");
+                           &pfx_24001_eos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      2,
+                                      &disp_o_10_10_11_1,
+                                      &disp_o_10_10_11_2),
+             "24001/eos LB 2 buckets via: "
+             "MPLS disp adj over 10.10.11.1, "
+             "MPLS disp adj-v4 over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
+                           &pfx_24001_neos);
 
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &a_mpls_o_10_10_11_1),
-	     "24001/neos LB 1 buckets via: "
-	     "adj-mpls over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      1,
+                                      &a_mpls_o_10_10_11_1),
+             "24001/neos LB 1 buckets via: "
+             "adj-mpls over 10.10.11.2");
 
     /*
      * remove the other path with a valid label
      */
     fib_test_lb_bucket_t bucket_drop = {
-	.type = FT_LB_DROP,
+        .type = FT_LB_DROP,
     };
     fib_test_lb_bucket_t mpls_bucket_drop = {
-	.type = FT_LB_DROP,
-	.special = {
-	    .adj = DPO_PROTO_MPLS,
-	},
+        .type = FT_LB_DROP,
+        .special = {
+            .adj = DPO_PROTO_MPLS,
+        },
     };
 
     fib_table_entry_path_remove(fib_index,
-				&pfx_1_1_1_1_s_32,
-				FIB_SOURCE_API,
-				DPO_PROTO_IP4,
-				&nh_10_10_11_1,
-				tm->hw[1]->sw_if_index,
-				~0, // invalid fib index
-				1,
-				FIB_ROUTE_PATH_FLAG_NONE);
+                                &pfx_1_1_1_1_s_32,
+                                FIB_SOURCE_API,
+                                DPO_PROTO_IP4,
+                                &nh_10_10_11_1,
+                                tm->hw[1]->sw_if_index,
+                                ~0, // invalid fib index
+                                1,
+                                FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 1 buckets via: "
-	     "adj over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_11_2),
+             "1.1.1.1/32 LB 1 buckets via: "
+             "adj over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     1,
-				     &disp_o_10_10_11_2),
-	     "24001/eos LB 1 buckets via: "
-	     "MPLS disp adj over 10.10.11.2");
+                           &pfx_24001_eos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      1,
+                                      &disp_o_10_10_11_2),
+             "24001/eos LB 1 buckets via: "
+             "MPLS disp adj over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-                                     1,
-                                     &mpls_bucket_drop),
-	     "24001/neos LB 1 buckets via: DROP");
+                           &pfx_24001_neos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      1,
+                                      &mpls_bucket_drop),
+             "24001/neos LB 1 buckets via: DROP");
 
     /*
      * add back the path with the valid label
@@ -6849,91 +6875,91 @@
     vec_add1(l99, fml99);
 
     fib_table_entry_path_add(fib_index,
-			     &pfx_1_1_1_1_s_32,
-			     FIB_SOURCE_API,
-			     FIB_ENTRY_FLAG_NONE,
-			     DPO_PROTO_IP4,
-			     &nh_10_10_10_1,
-			     tm->hw[0]->sw_if_index,
-			     ~0, // invalid fib index
-			     1,
-			     l99,
-			     FIB_ROUTE_PATH_FLAG_NONE);
+                             &pfx_1_1_1_1_s_32,
+                             FIB_SOURCE_API,
+                             FIB_ENTRY_FLAG_NONE,
+                             DPO_PROTO_IP4,
+                             &nh_10_10_10_1,
+                             tm->hw[0]->sw_if_index,
+                             ~0, // invalid fib index
+                             1,
+                             l99,
+                             FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &adj_o_10_10_11_2),
-	     "1.1.1.1/32 LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &l99_eos_o_10_10_10_1,
+                                      &adj_o_10_10_11_2),
+             "1.1.1.1/32 LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "adj over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_eos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &disp_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "MPLS disp adj over 10.10.11.2");
+                           &pfx_24001_eos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      2,
+                                      &l99_eos_o_10_10_10_1,
+                                      &disp_o_10_10_11_2),
+             "24001/eos LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "MPLS disp adj over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_24001_neos);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &l99_neos_o_10_10_10_1),
-	     "24001/neos LB 1 buckets via: "
-	     "label 99 over 10.10.10.1");
+                           &pfx_24001_neos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      1,
+                                      &l99_neos_o_10_10_10_1),
+             "24001/neos LB 1 buckets via: "
+             "label 99 over 10.10.10.1");
 
     /*
      * change the local label
      */
     fib_table_entry_local_label_add(fib_index,
-				    &pfx_1_1_1_1_s_32,
-				    25005);
+                                    &pfx_1_1_1_1_s_32,
+                                    25005);
 
     fib_prefix_t pfx_25005_eos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 25005,
-	.fp_eos = MPLS_EOS,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = 25005,
+        .fp_eos = MPLS_EOS,
     };
     fib_prefix_t pfx_25005_neos = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 25005,
-	.fp_eos = MPLS_NON_EOS,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = 25005,
+        .fp_eos = MPLS_NON_EOS,
     };
 
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup(fib_index, &pfx_24001_eos)),
-	     "24001/eos removed after label change");
+              fib_table_lookup(fib_index, &pfx_24001_eos)),
+             "24001/eos removed after label change");
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      fib_table_lookup(fib_index, &pfx_24001_neos)),
-	     "24001/eos removed after label change");
+              fib_table_lookup(fib_index, &pfx_24001_neos)),
+             "24001/eos removed after label change");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_25005_eos);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &disp_o_10_10_11_2),
-	     "25005/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "MPLS disp adj over 10.10.11.2");
+                           &pfx_25005_eos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      2,
+                                      &l99_eos_o_10_10_10_1,
+                                      &disp_o_10_10_11_2),
+             "25005/eos LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "MPLS disp adj over 10.10.11.2");
 
     fei = fib_table_lookup(MPLS_FIB_DEFAULT_TABLE_ID,
-			   &pfx_25005_neos);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &l99_neos_o_10_10_10_1),
-	     "25005/neos LB 1 buckets via: "
-	     "label 99 over 10.10.10.1");
+                           &pfx_25005_neos);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      1,
+                                      &l99_neos_o_10_10_10_1),
+             "25005/neos LB 1 buckets via: "
+             "label 99 over 10.10.10.1");
 
     /*
      * remove the local label.
@@ -6941,40 +6967,40 @@
      * MPLS table is no longer present.
      */
     fib_table_entry_local_label_remove(fib_index,
-				       &pfx_1_1_1_1_s_32,
-				       25005);
+                                       &pfx_1_1_1_1_s_32,
+                                       25005);
 
     fei = fib_table_lookup(fib_index, &pfx_1_1_1_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l99_eos_o_10_10_10_1,
-				     &adj_o_10_10_11_2),
-	     "24001/eos LB 2 buckets via: "
-	     "label 99 over 10.10.10.1, "
-	     "adj over 10.10.11.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &l99_eos_o_10_10_10_1,
+                                      &adj_o_10_10_11_2),
+             "24001/eos LB 2 buckets via: "
+             "label 99 over 10.10.10.1, "
+             "adj over 10.10.11.2");
 
     FIB_TEST((FIB_NODE_INDEX_INVALID ==
-	      mpls_fib_index_from_table_id(MPLS_FIB_DEFAULT_TABLE_ID)),
-	     "No more MPLS FIB entries => table removed");
+              mpls_fib_index_from_table_id(MPLS_FIB_DEFAULT_TABLE_ID)),
+             "No more MPLS FIB entries => table removed");
 
     /*
      * add another via-entry for the recursive
      */
     fib_prefix_t pfx_1_1_1_2_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x01010102),
+        },
     };
     fib_test_lb_bucket_t l101_eos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_O_ADJ,
-	.label_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label = 101,
-	    .eos = MPLS_EOS,
-	},
+        .type = FT_LB_LABEL_O_ADJ,
+        .label_o_adj = {
+            .adj = ai_mpls_10_10_10_1,
+            .label = 101,
+            .eos = MPLS_EOS,
+        },
     };
     fib_mpls_label_t *l101 = NULL, fml101 = {
         .fml_value = 101,
@@ -6982,41 +7008,41 @@
     vec_add1(l101, fml101);
 
     fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1_1_1_2_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
-					  &nh_10_10_10_1,
-					  tm->hw[0]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  l101,
-					  FIB_ROUTE_PATH_FLAG_NONE);
+                                          &pfx_1_1_1_2_s_32,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+                                          DPO_PROTO_IP4,
+                                          &nh_10_10_10_1,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          l101,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l101_eos_o_10_10_10_1),
-	     "1.1.1.2/32 LB 1 buckets via: "
-	     "label 101 over 10.10.10.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l101_eos_o_10_10_10_1),
+             "1.1.1.2/32 LB 1 buckets via: "
+             "label 101 over 10.10.10.1");
 
     dpo_id_t non_eos_1_1_1_2 = DPO_INVALID;
     fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
-						     &pfx_1_1_1_1_s_32),
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &non_eos_1_1_1_1);
+                                                     &pfx_1_1_1_1_s_32),
+                                    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                    &non_eos_1_1_1_1);
     fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
-						     &pfx_1_1_1_2_s_32),
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &non_eos_1_1_1_2);
+                                                     &pfx_1_1_1_2_s_32),
+                                    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                    &non_eos_1_1_1_2);
 
     fib_test_lb_bucket_t l1601_eos_o_1_1_1_2 = {
-    	.type = FT_LB_LABEL_O_LB,
-    	.label_o_lb = {
-    	    .lb = non_eos_1_1_1_2.dpoi_index,
-    	    .label = 1601,
-    	    .eos = MPLS_EOS,
-    	},
+        .type = FT_LB_LABEL_O_LB,
+        .label_o_lb = {
+            .lb = non_eos_1_1_1_2.dpoi_index,
+            .label = 1601,
+            .eos = MPLS_EOS,
+        },
     };
     fib_mpls_label_t *l1601 = NULL, fml1601 = {
         .fml_value = 1601,
@@ -7026,25 +7052,25 @@
     l1600_eos_o_1_1_1_1.label_o_lb.lb = non_eos_1_1_1_1.dpoi_index;
 
     fei = fib_table_entry_path_add(fib_index,
-				   &pfx_2_2_2_2_s_32,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &pfx_1_1_1_2_s_32.fp_addr,
-				   ~0,
-				   fib_index,
-				   1,
-				   l1601,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx_2_2_2_2_s_32,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &pfx_1_1_1_2_s_32.fp_addr,
+                                   ~0,
+                                   fib_index,
+                                   1,
+                                   l1601,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l1600_eos_o_1_1_1_1,
-				     &l1601_eos_o_1_1_1_2),
-	     "2.2.2.2/32 LB 2 buckets via: "
-	     "label 1600 via 1.1,1.1, "
-	     "label 16001 via 1.1.1.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &l1600_eos_o_1_1_1_1,
+                                      &l1601_eos_o_1_1_1_2),
+             "2.2.2.2/32 LB 2 buckets via: "
+             "label 1600 via 1.1,1.1, "
+             "label 16001 via 1.1.1.2");
 
     /*
      * update the via-entry so it no longer has an imp-null path.
@@ -7054,64 +7080,64 @@
     vec_add1(l_imp_null, fml_imp_null);
 
     fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1_1_1_2_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
-					  &nh_10_10_11_1,
-					  tm->hw[1]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  l_imp_null,
-					  FIB_ROUTE_PATH_FLAG_NONE);
+                                          &pfx_1_1_1_2_s_32,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+                                          DPO_PROTO_IP4,
+                                          &nh_10_10_11_1,
+                                          tm->hw[1]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          l_imp_null,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &a_o_10_10_11_1),
-	     "1.1.1.2/32 LB 1 buckets via: "
-	     "adj 10.10.11.1");
- 
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &a_o_10_10_11_1),
+             "1.1.1.2/32 LB 1 buckets via: "
+             "adj 10.10.11.1");
+
     fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     2,
-				     &l1600_eos_o_1_1_1_1,
-				     &l1601_eos_o_1_1_1_2),
-	     "2.2.2.2/32 LB 2 buckets via: "
-	     "label 1600 via 1.1,1.1, "
-	     "label 16001 via 1.1.1.2");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &l1600_eos_o_1_1_1_1,
+                                      &l1601_eos_o_1_1_1_2),
+             "2.2.2.2/32 LB 2 buckets via: "
+             "label 1600 via 1.1,1.1, "
+             "label 16001 via 1.1.1.2");
 
     /*
      * update the via-entry so it no longer has labelled paths.
      * the LB for the recursive should exclue this via form its LB
      */
     fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1_1_1_2_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
-					  &nh_10_10_11_1,
-					  tm->hw[1]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  NULL,
-					  FIB_ROUTE_PATH_FLAG_NONE);
+                                          &pfx_1_1_1_2_s_32,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+                                          DPO_PROTO_IP4,
+                                          &nh_10_10_11_1,
+                                          tm->hw[1]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          NULL,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &a_o_10_10_11_1),
-	     "1.1.1.2/32 LB 1 buckets via: "
-	     "adj 10.10.11.1");
- 
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &a_o_10_10_11_1),
+             "1.1.1.2/32 LB 1 buckets via: "
+             "adj 10.10.11.1");
+
     fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l1600_eos_o_1_1_1_1),
-	     "2.2.2.2/32 LB 1 buckets via: "
-	     "label 1600 via 1.1,1.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l1600_eos_o_1_1_1_1),
+             "2.2.2.2/32 LB 1 buckets via: "
+             "label 1600 via 1.1,1.1");
 
     dpo_reset(&non_eos_1_1_1_1);
     dpo_reset(&non_eos_1_1_1_2);
@@ -7120,77 +7146,77 @@
      * Add a recursive with no out-labels. We expect to use the IP of the via
      */
     fib_prefix_t pfx_2_2_2_3_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
+        },
     };
     dpo_id_t ip_1_1_1_1 = DPO_INVALID;
 
     fib_table_entry_update_one_path(fib_index,
-				    &pfx_2_2_2_3_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    &pfx_1_1_1_1_s_32.fp_addr,
-				    ~0,
-				    fib_index,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &pfx_2_2_2_3_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &pfx_1_1_1_1_s_32.fp_addr,
+                                    ~0,
+                                    fib_index,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fib_entry_contribute_forwarding(fib_table_lookup(fib_index,
-						     &pfx_1_1_1_1_s_32),
-				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				    &ip_1_1_1_1);
+                                                     &pfx_1_1_1_1_s_32),
+                                    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                    &ip_1_1_1_1);
 
     fib_test_lb_bucket_t ip_o_1_1_1_1 = {
-	.type = FT_LB_O_LB,
-	.lb = {
-	    .lb = ip_1_1_1_1.dpoi_index,
-	},
+        .type = FT_LB_O_LB,
+        .lb = {
+            .lb = ip_1_1_1_1.dpoi_index,
+        },
     };
 
     fei = fib_table_lookup(fib_index, &pfx_2_2_2_3_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_o_1_1_1_1),
-	     "2.2.2.2.3/32 LB 1 buckets via: "
-	     "ip 1.1.1.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_1_1_1_1),
+             "2.2.2.2.3/32 LB 1 buckets via: "
+             "ip 1.1.1.1");
 
     /*
-     * Add a recursive with an imp-null out-label. 
+     * Add a recursive with an imp-null out-label.
      * We expect to use the IP of the via
      */
     fib_prefix_t pfx_2_2_2_4_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
+        },
     };
 
     fib_table_entry_update_one_path(fib_index,
-				    &pfx_2_2_2_4_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
-				    &pfx_1_1_1_1_s_32.fp_addr,
-				    ~0,
-				    fib_index,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    &pfx_2_2_2_4_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &pfx_1_1_1_1_s_32.fp_addr,
+                                    ~0,
+                                    fib_index,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup(fib_index, &pfx_2_2_2_4_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ip_o_1_1_1_1),
-	     "2.2.2.2.4/32 LB 1 buckets via: "
-	     "ip 1.1.1.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_1_1_1_1),
+             "2.2.2.2.4/32 LB 1 buckets via: "
+             "ip 1.1.1.1");
 
     dpo_reset(&ip_1_1_1_1);
 
@@ -7198,22 +7224,22 @@
      * Create an entry with a deep label stack
      */
     fib_prefix_t pfx_2_2_5_5_s_32 = {
-	.fp_len = 32,
-	.fp_proto = FIB_PROTOCOL_IP4,
-	.fp_addr = {
-	    .ip4.as_u32 = clib_host_to_net_u32(0x02020505),
-	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x02020505),
+        },
     };
     fib_test_lb_bucket_t ls_eos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_STACK_O_ADJ,
-	.label_stack_o_adj = {
-	    .adj = ai_mpls_10_10_11_1,
-	    .label_stack_size = 8,
-	    .label_stack = {
-		200, 201, 202, 203, 204, 205, 206, 207
-	    },
-	    .eos = MPLS_EOS,
-	},
+        .type = FT_LB_LABEL_STACK_O_ADJ,
+        .label_stack_o_adj = {
+            .adj = ai_mpls_10_10_11_1,
+            .label_stack_size = 8,
+            .label_stack = {
+                200, 201, 202, 203, 204, 205, 206, 207
+            },
+            .eos = MPLS_EOS,
+        },
     };
     fib_mpls_label_t *label_stack = NULL;
     vec_validate(label_stack, 7);
@@ -7223,59 +7249,59 @@
     }
 
     fei = fib_table_entry_update_one_path(fib_index,
-					  &pfx_2_2_5_5_s_32,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
-					  &nh_10_10_11_1,
-					  tm->hw[1]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  label_stack,
-					  FIB_ROUTE_PATH_FLAG_NONE);
+                                          &pfx_2_2_5_5_s_32,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+                                          DPO_PROTO_IP4,
+                                          &nh_10_10_11_1,
+                                          tm->hw[1]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          label_stack,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &ls_eos_o_10_10_10_1),
-	     "2.2.5.5/32 LB 1 buckets via: "
-	     "adj 10.10.11.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ls_eos_o_10_10_10_1),
+             "2.2.5.5/32 LB 1 buckets via: "
+             "adj 10.10.11.1");
     fib_table_entry_delete_index(fei, FIB_SOURCE_API);
 
     /*
      * cleanup
      */
     fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_2_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_1_1_1_2_s_32,
+                           FIB_SOURCE_API);
 
     fei = fib_table_lookup(fib_index, &pfx_2_2_2_2_s_32);
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &l1600_eos_o_1_1_1_1),
-	     "2.2.2.2/32 LB 1 buckets via: "
-	     "label 1600 via 1.1,1.1");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l1600_eos_o_1_1_1_1),
+             "2.2.2.2/32 LB 1 buckets via: "
+             "label 1600 via 1.1,1.1");
 
     fib_table_entry_delete(fib_index,
-			   &pfx_1_1_1_1_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_1_1_1_1_s_32,
+                           FIB_SOURCE_API);
 
-    FIB_TEST(fib_test_validate_entry(fei, 
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &bucket_drop),
-	     "2.2.2.2/32 LB 1 buckets via: DROP");
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &bucket_drop),
+             "2.2.2.2/32 LB 1 buckets via: DROP");
 
     fib_table_entry_delete(fib_index,
-			   &pfx_2_2_2_2_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_2_2_2_2_s_32,
+                           FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &pfx_2_2_2_3_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_2_2_2_3_s_32,
+                           FIB_SOURCE_API);
     fib_table_entry_delete(fib_index,
-			   &pfx_2_2_2_4_s_32,
-			   FIB_SOURCE_API);
+                           &pfx_2_2_2_4_s_32,
+                           FIB_SOURCE_API);
 
     adj_unlock(ai_mpls_10_10_10_1);
     adj_unlock(ai_mpls_10_10_11_2);
@@ -7284,33 +7310,33 @@
     adj_unlock(ai_mpls_10_10_11_1);
 
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
     local0_pfx.fp_len = 32;
     fib_table_entry_delete(fib_index,
-			   &local0_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           &local0_pfx,
+                           FIB_SOURCE_INTERFACE);
     local0_pfx.fp_len = 24;
     fib_table_entry_delete(fib_index,
-			   &local0_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           &local0_pfx,
+                           FIB_SOURCE_INTERFACE);
     local1_pfx.fp_len = 32;
     fib_table_entry_delete(fib_index,
-			   &local1_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           &local1_pfx,
+                           FIB_SOURCE_INTERFACE);
     local1_pfx.fp_len = 24;
     fib_table_entry_delete(fib_index,
-			   &local1_pfx,
-			   FIB_SOURCE_INTERFACE);
+                           &local1_pfx,
+                           FIB_SOURCE_INTERFACE);
 
     /*
      * +1 for the drop LB in the MPLS tables.
      */
     FIB_TEST(lb_count+1 == pool_elts(load_balance_pool),
-	     "Load-balance resources freed %d of %d",
+             "Load-balance resources freed %d of %d",
              lb_count+1, pool_elts(load_balance_pool));
 
-    return (0);
+    return (res);
 }
 
 #define N_TEST_CHILDREN 4
@@ -7329,9 +7355,9 @@
 
 #define PARENT() (&fib_test_nodes[PARENT_INDEX].node)
 
-#define FOR_EACH_TEST_CHILD(_tc)                     \
-    for (ii = 1, (_tc) = &fib_test_nodes[1];         \
-         ii < N_TEST_CHILDREN+1;                     \
+#define FOR_EACH_TEST_CHILD(_tc)                \
+    for (ii = 1, (_tc) = &fib_test_nodes[1];    \
+         ii < N_TEST_CHILDREN+1;                \
          ii++, (_tc) = &fib_test_nodes[ii])
 
 static fib_node_t *
@@ -7390,8 +7416,9 @@
     fib_node_back_walk_ctx_t high_ctx = {}, low_ctx = {};
     fib_node_test_t *tc;
     vlib_main_t *vm;
-    u32 ii;
+    u32 ii, res;
 
+    res = 0;
     vm = vlib_get_main();
     fib_node_register_type(FIB_NODE_TYPE_TEST, &fib_test_child_vft);
 
@@ -7757,7 +7784,7 @@
         FIB_TEST(1 <= vec_len(tc->ctxs),
                  "child %d visitsed %d times during looped async spawns async walk",
                  ii, vec_len(tc->ctxs));
-                vec_free(tc->ctxs);
+        vec_free(tc->ctxs);
     }
 
 
@@ -7784,7 +7811,7 @@
     FIB_TEST((1 == fib_test_nodes[PARENT_INDEX].destroyed),
              "Parent was destroyed");
 
-    return (0);
+    return (res);
 }
 
 /*
@@ -7803,8 +7830,9 @@
 {
     fib_node_index_t fei;
     test_main_t *tm;
-    int n_feis;
+    int n_feis, res;
 
+    res = 0;
     /* via 10.10.10.1 */
     ip46_address_t nh_10_10_10_1 = {
         .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
@@ -7895,10 +7923,10 @@
     };
 
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &adj_o_10_10_10_1),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
              "BFD sourced %U via %U",
              format_fib_prefix, &pfx_10_10_10_1_s_32,
              format_ip_adjacency, ai_10_10_10_1, FORMAT_IP_ADJACENCY_NONE);
@@ -7939,10 +7967,10 @@
     fib_bfd_notify (BFD_LISTEN_EVENT_DELETE, &bfd_10_10_10_1);
 
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_1_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &adj_o_10_10_10_1),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
              "BFD sourced %U remains via %U",
              format_fib_prefix, &pfx_10_10_10_1_s_32,
              format_ip_adjacency, ai_10_10_10_1, FORMAT_IP_ADJACENCY_NONE);
@@ -8079,10 +8107,10 @@
                                    NULL,
                                    FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &lb_o_10_10_10_1),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &lb_o_10_10_10_1),
              "Recursive %U only UP BFD adj-fibs",
              format_fib_prefix, &pfx_200_0_0_0_s_24);
 
@@ -8094,11 +8122,11 @@
     fib_bfd_notify (BFD_LISTEN_EVENT_UPDATE, &bfd_10_10_10_2);
 
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &lb_o_10_10_10_1,
-                                     &lb_o_10_10_10_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &lb_o_10_10_10_1,
+                                      &lb_o_10_10_10_2),
              "Recursive %U via both UP BFD adj-fibs",
              format_fib_prefix, &pfx_200_0_0_0_s_24);
 
@@ -8110,10 +8138,10 @@
     fib_bfd_notify (BFD_LISTEN_EVENT_UPDATE, &bfd_10_10_10_2);
 
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &lb_o_10_10_10_1),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &lb_o_10_10_10_1),
              "Recursive %U via only UP",
              format_fib_prefix, &pfx_200_0_0_0_s_24);
 
@@ -8123,11 +8151,11 @@
      */
     fib_bfd_notify (BFD_LISTEN_EVENT_DELETE, &bfd_10_10_10_2);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &lb_o_10_10_10_1,
-                                     &lb_o_10_10_10_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &lb_o_10_10_10_1,
+                                      &lb_o_10_10_10_2),
              "Recursive %U via both UP BFD adj-fibs post down session delete",
              format_fib_prefix, &pfx_200_0_0_0_s_24);
 
@@ -8136,11 +8164,11 @@
      */
     fib_bfd_notify (BFD_LISTEN_EVENT_DELETE, &bfd_10_10_10_1);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &lb_o_10_10_10_1,
-                                     &lb_o_10_10_10_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &lb_o_10_10_10_1,
+                                      &lb_o_10_10_10_2),
              "Recursive %U via both UP BFD adj-fibs post up session delete",
              format_fib_prefix, &pfx_200_0_0_0_s_24);
 
@@ -8155,7 +8183,7 @@
     fib_table_entry_delete(0, &pfx_10_10_10_10_s_24, FIB_SOURCE_INTERFACE);
 
     adj_unlock(ai_10_10_10_1);
-     /*
+    /*
      * test no-one left behind
      */
     FIB_TEST((n_feis == fib_entry_pool_size()), "Entries gone");
@@ -8249,10 +8277,10 @@
                                    NULL,
                                    FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     1,
-                                     &adj_o_10_10_10_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
              "BFD sourced %U via %U",
              format_fib_prefix, &pfx_5_5_5_5_s_32,
              format_ip_adjacency, ai_10_10_10_2, FORMAT_IP_ADJACENCY_NONE);
@@ -8262,11 +8290,11 @@
      */
     bfd_10_10_10_1.local_state = BFD_STATE_up;
     adj_bfd_notify(BFD_LISTEN_EVENT_UPDATE, &bfd_10_10_10_1);
-    FIB_TEST(fib_test_validate_entry(fei,
-                                     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-                                     2,
-                                     &adj_o_10_10_10_1,
-                                     &adj_o_10_10_10_2),
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      2,
+                                      &adj_o_10_10_10_1,
+                                      &adj_o_10_10_10_2),
              "BFD sourced %U via noth adjs",
              format_fib_prefix, &pfx_5_5_5_5_s_32);
 
@@ -8287,29 +8315,30 @@
      */
     FIB_TEST((n_feis == fib_entry_pool_size()), "Entries gone");
     FIB_TEST(0 == adj_nbr_db_size(), "All adjacencies removed");
-    return (0);
+
+    return (res);
 }
 
 static int
 lfib_test (void)
 {
     const mpls_label_t deag_label = 50;
+    adj_index_t ai_mpls_10_10_10_1;
     dpo_id_t dpo = DPO_INVALID;
-    const mpls_disp_dpo_t *mdd;
     const u32 lfib_index = 0;
     const u32 fib_index = 0;
-    const lookup_dpo_t *lkd;
     const dpo_id_t *dpo1;
     fib_node_index_t lfe;
+    lookup_dpo_t *lkd;
+    int lb_count, res;
     test_main_t *tm;
-    int lb_count;
-    adj_index_t ai_mpls_10_10_10_1;
 
+    res = 0;
     tm = &test_main;
     lb_count = pool_elts(load_balance_pool);
 
     FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
-	     adj_nbr_db_size());
+             adj_nbr_db_size());
 
     /*
      * MPLS enable an interface so we get the MPLS table created
@@ -8320,7 +8349,7 @@
                                      1, 1);
 
     ip46_address_t nh_10_10_10_1 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
     };
     ai_mpls_10_10_10_1 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
                                              VNET_LINK_MPLS,
@@ -8331,24 +8360,24 @@
      * Test the specials stack properly.
      */
     fib_prefix_t exp_null_v6_pfx = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_eos = MPLS_EOS,
-	.fp_label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
-	.fp_payload_proto = DPO_PROTO_IP6,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_eos = MPLS_EOS,
+        .fp_label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
+        .fp_payload_proto = DPO_PROTO_IP6,
     };
     lfe = fib_table_lookup(lfib_index, &exp_null_v6_pfx);
     FIB_TEST((FIB_NODE_INDEX_INVALID != lfe),
-	     "%U/%U present",
-	     format_mpls_unicast_label, MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
-	     format_mpls_eos_bit, MPLS_EOS);
+             "%U/%U present",
+             format_mpls_unicast_label, MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL,
+             format_mpls_eos_bit, MPLS_EOS);
     fib_entry_contribute_forwarding(lfe,
-				    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				    &dpo);
+                                    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                    &dpo);
     dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
     lkd = lookup_dpo_get(dpo1->dpoi_index);
 
     FIB_TEST((fib_index == lkd->lkd_fib_index),
-              "%U/%U is deag in %d %U",
+             "%U/%U is deag in %d %U",
              format_mpls_unicast_label, deag_label,
              format_mpls_eos_bit, MPLS_EOS,
              lkd->lkd_fib_index,
@@ -8371,31 +8400,32 @@
      * A route deag route for EOS
      */
     fib_prefix_t pfx = {
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_eos = MPLS_EOS,
-	.fp_label = deag_label,
-	.fp_payload_proto = DPO_PROTO_IP4,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_eos = MPLS_EOS,
+        .fp_label = deag_label,
+        .fp_payload_proto = DPO_PROTO_IP4,
     };
+    mpls_disp_dpo_t *mdd;
     lfe = fib_table_entry_path_add(lfib_index,
-				   &pfx,
-				   FIB_SOURCE_CLI,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &zero_addr,
-				   ~0,
-				   fib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx,
+                                   FIB_SOURCE_CLI,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &zero_addr,
+                                   ~0,
+                                   fib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
 
     FIB_TEST((lfe == fib_table_lookup(lfib_index, &pfx)),
-              "%U/%U present",
-              format_mpls_unicast_label, deag_label,
-              format_mpls_eos_bit, MPLS_EOS);
+             "%U/%U present",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS);
 
     fib_entry_contribute_forwarding(lfe,
-				    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-				    &dpo);
+                                    FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                    &dpo);
     dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
     mdd = mpls_disp_dpo_get(dpo1->dpoi_index);
 
@@ -8407,7 +8437,7 @@
     lkd = lookup_dpo_get(mdd->mdd_dpo.dpoi_index);
 
     FIB_TEST((fib_index == lkd->lkd_fib_index),
-              "%U/%U is deag in %d %U",
+             "%U/%U is deag in %d %U",
              format_mpls_unicast_label, deag_label,
              format_mpls_eos_bit, MPLS_EOS,
              lkd->lkd_fib_index,
@@ -8499,30 +8529,30 @@
      */
     pfx.fp_eos = MPLS_NON_EOS;
     lfe = fib_table_entry_path_add(lfib_index,
-				   &pfx,
-				   FIB_SOURCE_CLI,
-				   FIB_ENTRY_FLAG_NONE,
-				   DPO_PROTO_IP4,
-				   &zero_addr,
-				   ~0,
-				   lfib_index,
-				   1,
-				   NULL,
-				   FIB_ROUTE_PATH_FLAG_NONE);
+                                   &pfx,
+                                   FIB_SOURCE_CLI,
+                                   FIB_ENTRY_FLAG_NONE,
+                                   DPO_PROTO_IP4,
+                                   &zero_addr,
+                                   ~0,
+                                   lfib_index,
+                                   1,
+                                   NULL,
+                                   FIB_ROUTE_PATH_FLAG_NONE);
 
     FIB_TEST((lfe == fib_table_lookup(lfib_index, &pfx)),
-              "%U/%U present",
-              format_mpls_unicast_label, deag_label,
-              format_mpls_eos_bit, MPLS_NON_EOS);
+             "%U/%U present",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_NON_EOS);
 
     fib_entry_contribute_forwarding(lfe,
-				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				    &dpo);
+                                    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                    &dpo);
     dpo1 = load_balance_get_bucket(dpo.dpoi_index, 0);
     lkd = lookup_dpo_get(dpo1->dpoi_index);
 
     FIB_TEST((fib_index == lkd->lkd_fib_index),
-              "%U/%U is deag in %d %U",
+             "%U/%U is deag in %d %U",
              format_mpls_unicast_label, deag_label,
              format_mpls_eos_bit, MPLS_NON_EOS,
              lkd->lkd_fib_index,
@@ -8541,10 +8571,10 @@
     fib_table_entry_delete_index(lfe, FIB_SOURCE_CLI);
 
     FIB_TEST((FIB_NODE_INDEX_INVALID == fib_table_lookup(lfib_index,
-							 &pfx)),
-              "%U/%U not present",
-              format_mpls_unicast_label, deag_label,
-              format_mpls_eos_bit, MPLS_EOS);
+                                                         &pfx)),
+             "%U/%U not present",
+             format_mpls_unicast_label, deag_label,
+             format_mpls_eos_bit, MPLS_EOS);
 
     dpo_reset(&dpo);
 
@@ -8552,21 +8582,21 @@
      * An MPLS x-connect
      */
     fib_prefix_t pfx_1200 = {
-	.fp_len = 21,
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 1200,
-	.fp_eos = MPLS_NON_EOS,
+        .fp_len = 21,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = 1200,
+        .fp_eos = MPLS_NON_EOS,
     };
     fib_test_lb_bucket_t neos_o_10_10_10_1 = {
-	.type = FT_LB_LABEL_STACK_O_ADJ,
-	.label_stack_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label_stack_size = 4,
-	    .label_stack = {
-		200, 300, 400, 500,
-	    },
-	    .eos = MPLS_NON_EOS,
-	},
+        .type = FT_LB_LABEL_STACK_O_ADJ,
+        .label_stack_o_adj = {
+            .adj = ai_mpls_10_10_10_1,
+            .label_stack_size = 4,
+            .label_stack = {
+                200, 300, 400, 500,
+            },
+            .eos = MPLS_NON_EOS,
+        },
     };
     dpo_id_t neos_1200 = DPO_INVALID;
     dpo_id_t ip_1200 = DPO_INVALID;
@@ -8581,61 +8611,61 @@
     };
 
     lfe = fib_table_entry_update_one_path(fib_index,
-					  &pfx_1200,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
-					  &nh_10_10_10_1,
-					  tm->hw[0]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  l200,
-					  FIB_ROUTE_PATH_FLAG_NONE);
+                                          &pfx_1200,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+                                          DPO_PROTO_IP4,
+                                          &nh_10_10_10_1,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          l200,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
 
-    FIB_TEST(fib_test_validate_entry(lfe,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &neos_o_10_10_10_1),
-	     "1200/0 LB 1 buckets via: "
-	     "adj 10.10.11.1");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      1,
+                                      &neos_o_10_10_10_1),
+             "1200/0 LB 1 buckets via: "
+             "adj 10.10.11.1");
 
     /*
      * A recursive route via the MPLS x-connect
      */
     fib_prefix_t pfx_2_2_2_3_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
-    	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x02020203),
+        },
     };
     fib_route_path_t *rpaths = NULL, rpath = {
         .frp_proto = DPO_PROTO_MPLS,
-    	.frp_local_label = 1200,
+        .frp_local_label = 1200,
         .frp_eos = MPLS_NON_EOS,
-    	.frp_sw_if_index = ~0, // recurive
-    	.frp_fib_index = 0, // Default MPLS fib
-    	.frp_weight = 1,
-    	.frp_flags = FIB_ROUTE_PATH_FLAG_NONE,
-    	.frp_label_stack = NULL,
+        .frp_sw_if_index = ~0, // recurive
+        .frp_fib_index = 0, // Default MPLS fib
+        .frp_weight = 1,
+        .frp_flags = FIB_ROUTE_PATH_FLAG_NONE,
+        .frp_label_stack = NULL,
     };
     vec_add1(rpaths, rpath);
 
     fib_table_entry_path_add2(fib_index,
-    			      &pfx_2_2_2_3_s_32,
-    			      FIB_SOURCE_API,
-    			      FIB_ENTRY_FLAG_NONE,
-    			      rpaths);
+                              &pfx_2_2_2_3_s_32,
+                              FIB_SOURCE_API,
+                              FIB_ENTRY_FLAG_NONE,
+                              rpaths);
 
     /*
      * A labelled recursive route via the MPLS x-connect
      */
     fib_prefix_t pfx_2_2_2_4_s_32 = {
-    	.fp_len = 32,
-    	.fp_proto = FIB_PROTOCOL_IP4,
-    	.fp_addr = {
-    	    .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
-    	},
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+            .ip4.as_u32 = clib_host_to_net_u32(0x02020204),
+        },
     };
     fib_mpls_label_t *l999 = NULL, fml_999 = {
         .fml_value = 999,
@@ -8643,46 +8673,46 @@
     vec_add1(l999, fml_999);
     rpaths[0].frp_label_stack = l999,
 
-    fib_table_entry_path_add2(fib_index,
-    			      &pfx_2_2_2_4_s_32,
-    			      FIB_SOURCE_API,
-    			      FIB_ENTRY_FLAG_NONE,
-    			      rpaths);
+        fib_table_entry_path_add2(fib_index,
+                                  &pfx_2_2_2_4_s_32,
+                                  FIB_SOURCE_API,
+                                  FIB_ENTRY_FLAG_NONE,
+                                  rpaths);
 
     fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
-    				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				    &ip_1200);
+                                    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                    &ip_1200);
     fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
-    				    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-    				    &neos_1200);
+                                    FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                    &neos_1200);
 
     fib_test_lb_bucket_t ip_o_1200 = {
-    	.type = FT_LB_O_LB,
-    	.lb = {
-    	    .lb = ip_1200.dpoi_index,
-    	},
+        .type = FT_LB_O_LB,
+        .lb = {
+            .lb = ip_1200.dpoi_index,
+        },
     };
     fib_test_lb_bucket_t mpls_o_1200 = {
-	.type = FT_LB_LABEL_O_LB,
-	.label_o_lb = {
-    	    .lb = neos_1200.dpoi_index,
-	    .label = 999,
-	    .eos = MPLS_EOS,
-	},
+        .type = FT_LB_LABEL_O_LB,
+        .label_o_lb = {
+            .lb = neos_1200.dpoi_index,
+            .label = 999,
+            .eos = MPLS_EOS,
+        },
     };
 
     lfe = fib_table_lookup(fib_index, &pfx_2_2_2_3_s_32);
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				     1,
-    				     &ip_o_1200),
-    	     "2.2.2.2.3/32 LB 1 buckets via: label 1200 EOS");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &ip_o_1200),
+             "2.2.2.2.3/32 LB 1 buckets via: label 1200 EOS");
     lfe = fib_table_lookup(fib_index, &pfx_2_2_2_4_s_32);
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				     1,
-    				     &mpls_o_1200),
-    	     "2.2.2.2.4/32 LB 1 buckets via: label 1200 non-EOS");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &mpls_o_1200),
+             "2.2.2.2.4/32 LB 1 buckets via: label 1200 non-EOS");
 
     fib_table_entry_delete(fib_index, &pfx_1200, FIB_SOURCE_API);
     fib_table_entry_delete(fib_index, &pfx_2_2_2_3_s_32, FIB_SOURCE_API);
@@ -8695,46 +8725,46 @@
      * A recursive via a label that does not exist
      */
     fib_test_lb_bucket_t bucket_drop = {
-	.type = FT_LB_DROP,
-	.special = {
-	    .adj = DPO_PROTO_IP4,
-	},
+        .type = FT_LB_DROP,
+        .special = {
+            .adj = DPO_PROTO_IP4,
+        },
     };
     fib_test_lb_bucket_t mpls_bucket_drop = {
-	.type = FT_LB_DROP,
-	.special = {
-	    .adj = DPO_PROTO_MPLS,
-	},
+        .type = FT_LB_DROP,
+        .special = {
+            .adj = DPO_PROTO_MPLS,
+        },
     };
 
     rpaths[0].frp_label_stack = NULL;
     lfe = fib_table_entry_path_add2(fib_index,
-				    &pfx_2_2_2_4_s_32,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_NONE,
-				    rpaths);
+                                    &pfx_2_2_2_4_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    rpaths);
 
     fib_entry_contribute_forwarding(fib_table_lookup(fib_index, &pfx_1200),
-    				    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				    &ip_1200);
+                                    FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                    &ip_1200);
     ip_o_1200.lb.lb = ip_1200.dpoi_index;
 
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-    				     1,
-    				     &bucket_drop),
-    	     "2.2.2.2.4/32 LB 1 buckets via: drop");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &bucket_drop),
+             "2.2.2.2.4/32 LB 1 buckets via: drop");
     lfe = fib_table_lookup(fib_index, &pfx_1200);
-    FIB_TEST(fib_test_validate_entry(lfe,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &bucket_drop),
-	     "1200/neos LB 1 buckets via: ip4-DROP");
-    FIB_TEST(fib_test_validate_entry(lfe,
-				     FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
-				     1,
-				     &mpls_bucket_drop),
-	     "1200/neos LB 1 buckets via: mpls-DROP");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &bucket_drop),
+             "1200/neos LB 1 buckets via: ip4-DROP");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS,
+                                      1,
+                                      &mpls_bucket_drop),
+             "1200/neos LB 1 buckets via: mpls-DROP");
 
     fib_table_entry_delete(fib_index, &pfx_2_2_2_4_s_32, FIB_SOURCE_API);
 
@@ -8747,15 +8777,15 @@
     dpo_id_t idpo = DPO_INVALID;
 
     interface_rx_dpo_add_or_lock(DPO_PROTO_IP4,
-                              tm->hw[0]->sw_if_index,
-                              &idpo);
+                                 tm->hw[0]->sw_if_index,
+                                 &idpo);
 
     fib_prefix_t pfx_2500 = {
-	.fp_len = 21,
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 2500,
-	.fp_eos = MPLS_EOS,
-	.fp_payload_proto = DPO_PROTO_IP4,
+        .fp_len = 21,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = 2500,
+        .fp_eos = MPLS_EOS,
+        .fp_payload_proto = DPO_PROTO_IP4,
     };
     fib_test_lb_bucket_t rx_intf_0 = {
         .type = FT_LB_INTF,
@@ -8765,40 +8795,40 @@
     };
 
     lfe = fib_table_entry_update_one_path(fib_index,
-					  &pfx_2500,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_NONE,
-					  DPO_PROTO_IP4,
-					  NULL,
-					  tm->hw[0]->sw_if_index,
-					  ~0, // invalid fib index
-					  0,
-					  NULL,
-					  FIB_ROUTE_PATH_INTF_RX);
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-    				     1,
-    				     &rx_intf_0),
-    	     "2500 rx-interface 0");
+                                          &pfx_2500,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_NONE,
+                                          DPO_PROTO_IP4,
+                                          NULL,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          0,
+                                          NULL,
+                                          FIB_ROUTE_PATH_INTF_RX);
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      1,
+                                      &rx_intf_0),
+             "2500 rx-interface 0");
     fib_table_entry_delete(fib_index, &pfx_2500, FIB_SOURCE_API);
 
     /*
      * An MPLS mulicast entry
      */
     fib_prefix_t pfx_3500 = {
-	.fp_len = 21,
-	.fp_proto = FIB_PROTOCOL_MPLS,
-	.fp_label = 3500,
-	.fp_eos = MPLS_EOS,
-	.fp_payload_proto = DPO_PROTO_IP4,
+        .fp_len = 21,
+        .fp_proto = FIB_PROTOCOL_MPLS,
+        .fp_label = 3500,
+        .fp_eos = MPLS_EOS,
+        .fp_payload_proto = DPO_PROTO_IP4,
     };
     fib_test_rep_bucket_t mc_0 = {
         .type = FT_REP_LABEL_O_ADJ,
-	.label_o_adj = {
-	    .adj = ai_mpls_10_10_10_1,
-	    .label = 3300,
-	    .eos = MPLS_EOS,
-	},
+        .label_o_adj = {
+            .adj = ai_mpls_10_10_10_1,
+            .label = 3300,
+            .eos = MPLS_EOS,
+        },
     };
     fib_test_rep_bucket_t mc_intf_0 = {
         .type = FT_REP_INTF,
@@ -8812,42 +8842,42 @@
     vec_add1(l3300, fml_3300);
 
     lfe = fib_table_entry_update_one_path(lfib_index,
-					  &pfx_3500,
-					  FIB_SOURCE_API,
-					  FIB_ENTRY_FLAG_MULTICAST,
-					  DPO_PROTO_IP4,
-					  &nh_10_10_10_1,
-					  tm->hw[0]->sw_if_index,
-					  ~0, // invalid fib index
-					  1,
-					  l3300,
-					  FIB_ROUTE_PATH_FLAG_NONE);
-    FIB_TEST(fib_test_validate_entry(lfe,
-    				     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-    				     1,
-    				     &mc_0),
-    	     "3500 via replicate over 10.10.10.1");
+                                          &pfx_3500,
+                                          FIB_SOURCE_API,
+                                          FIB_ENTRY_FLAG_MULTICAST,
+                                          DPO_PROTO_IP4,
+                                          &nh_10_10_10_1,
+                                          tm->hw[0]->sw_if_index,
+                                          ~0, // invalid fib index
+                                          1,
+                                          l3300,
+                                          FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      1,
+                                      &mc_0),
+             "3500 via replicate over 10.10.10.1");
 
     /*
      * MPLS Bud-node. Add a replication via an interface-receieve path
      */
     lfe = fib_table_entry_path_add(lfib_index,
-				   &pfx_3500,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_MULTICAST,
-				   DPO_PROTO_IP4,
+                                   &pfx_3500,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_MULTICAST,
+                                   DPO_PROTO_IP4,
                                    NULL,
                                    tm->hw[0]->sw_if_index,
                                    ~0, // invalid fib index
                                    0,
                                    NULL,
                                    FIB_ROUTE_PATH_INTF_RX);
-    FIB_TEST(fib_test_validate_entry(lfe,
-                                     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-                                     2,
-                                     &mc_0,
-                                     &mc_intf_0),
-    	     "3500 via replicate over 10.10.10.1 and interface-rx");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      2,
+                                      &mc_0,
+                                      &mc_intf_0),
+             "3500 via replicate over 10.10.10.1 and interface-rx");
 
     /*
      * Add a replication via an interface-free for-us path
@@ -8859,26 +8889,26 @@
         },
     };
     lfe = fib_table_entry_path_add(lfib_index,
-				   &pfx_3500,
-				   FIB_SOURCE_API,
-				   FIB_ENTRY_FLAG_MULTICAST,
-				   DPO_PROTO_IP4,
+                                   &pfx_3500,
+                                   FIB_SOURCE_API,
+                                   FIB_ENTRY_FLAG_MULTICAST,
+                                   DPO_PROTO_IP4,
                                    NULL,
                                    5, // rpf-id
                                    0, // default table
                                    0,
                                    NULL,
                                    FIB_ROUTE_PATH_RPF_ID);
-    FIB_TEST(fib_test_validate_entry(lfe,
-                                     FIB_FORW_CHAIN_TYPE_MPLS_EOS,
-                                     3,
-                                     &mc_0,
-                                     &mc_disp,
-                                     &mc_intf_0),
-    	     "3500 via replicate over 10.10.10.1 and interface-rx");
+    FIB_TEST(!fib_test_validate_entry(lfe,
+                                      FIB_FORW_CHAIN_TYPE_MPLS_EOS,
+                                      3,
+                                      &mc_0,
+                                      &mc_disp,
+                                      &mc_intf_0),
+             "3500 via replicate over 10.10.10.1 and interface-rx");
 
 
-    
+
     fib_table_entry_delete(fib_index, &pfx_3500, FIB_SOURCE_API);
     dpo_reset(&idpo);
 
@@ -8894,13 +8924,13 @@
 	     "mpls_disp_dpo resources freed %d of %d",
              0, pool_elts(mpls_disp_dpo_pool));
     FIB_TEST(lb_count == pool_elts(load_balance_pool),
-	     "Load-balance resources freed %d of %d",
+             "Load-balance resources freed %d of %d",
              lb_count, pool_elts(load_balance_pool));
     FIB_TEST(0 == pool_elts(interface_rx_dpo_pool),
-	     "interface_rx_dpo resources freed %d of %d",
+             "interface_rx_dpo resources freed %d of %d",
              0, pool_elts(interface_rx_dpo_pool));
 
-    return (0);
+    return (res);
 }
 
 static int
@@ -8908,37 +8938,47 @@
 {
     fib_node_index_t fei;
     test_main_t *tm;
-    int n_feis;
+    int n_feis, res;
 
+    res = 0;
     n_feis = fib_entry_pool_size();
     tm = &test_main;
 
     const ip46_address_t nh_10_10_10_1 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a01),
     };
     const ip46_address_t nh_10_10_10_2 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a02),
+    };
+    const ip46_address_t nh_10_10_10_3 = {
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a03),
     };
     const ip46_address_t nh_10_10_10_16 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a10),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a10),
     };
     const ip46_address_t nh_10_10_10_20 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a14),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a14),
     };
     const ip46_address_t nh_10_10_10_21 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a15),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a15),
     };
     const ip46_address_t nh_10_10_10_22 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a16),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a16),
     };
     const ip46_address_t nh_10_10_10_255 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0aff),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0aff),
     };
     const ip46_address_t nh_10_10_10_0 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a00),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0a00),
     };
     const ip46_address_t nh_10_10_0_0 = {
-	.ip4.as_u32 = clib_host_to_net_u32(0x0a0a0000),
+        .ip4.as_u32 = clib_host_to_net_u32(0x0a0a0000),
+    };
+    const ip46_address_t nh_11_11_11_11 = {
+        .ip4.as_u32 = clib_host_to_net_u32(0x0b0b0b0b),
+    };
+    const ip46_address_t nh_11_11_11_0 = {
+        .ip4.as_u32 = clib_host_to_net_u32(0x0b0b0b00),
     };
 
     /*
@@ -8959,19 +8999,20 @@
         .fp_proto = FIB_PROTOCOL_IP4,
         .fp_addr = nh_10_10_10_255,
     };
+    const u32 N_PLS = fib_path_list_pool_size();
 
     fib_table_entry_special_add(0,
-				&pfx_10_10_10_21_s_32,
-				FIB_SOURCE_CLI,
-				FIB_ENTRY_FLAG_DROP);
+                                &pfx_10_10_10_21_s_32,
+                                FIB_SOURCE_CLI,
+                                FIB_ENTRY_FLAG_DROP);
     fib_table_entry_special_add(0,
-				&pfx_10_10_10_22_s_32,
-				FIB_SOURCE_CLI,
-				FIB_ENTRY_FLAG_DROP);
+                                &pfx_10_10_10_22_s_32,
+                                FIB_SOURCE_CLI,
+                                FIB_ENTRY_FLAG_DROP);
     fib_table_entry_special_add(0,
-				&pfx_10_10_10_255_s_32,
-				FIB_SOURCE_CLI,
-				FIB_ENTRY_FLAG_DROP);
+                                &pfx_10_10_10_255_s_32,
+                                FIB_SOURCE_CLI,
+                                FIB_ENTRY_FLAG_DROP);
 
     /*
      * source an entry that pushes its state down the sub-tree
@@ -8983,15 +9024,15 @@
     };
     fib_table_entry_update_one_path(0,
                                     &pfx_10_10_10_16_s_28,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP4,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP4,
                                     &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     /*
      * this covering entry and all those below it should have
@@ -9002,32 +9043,32 @@
                                                     &nh_10_10_10_1,
                                                     tm->hw[0]->sw_if_index);
     fib_test_lb_bucket_t adj_o_10_10_10_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_10_10_10_1,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_10_10_10_1,
+        },
     };
 
     fei = fib_table_lookup(0, &pfx_10_10_10_16_s_28);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_21_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
@@ -9054,46 +9095,46 @@
     };
     fib_table_entry_update_one_path(0,
                                     &pfx_10_10_10_0_s_24,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP4,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP4,
                                     &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     /*
      * whole sub-tree now covered
      */
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_21_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
 
     /*
@@ -9101,15 +9142,15 @@
      *  this one is directly covered by the root
      */
     fib_table_entry_special_add(0,
-				&pfx_10_10_10_16_s_28,
-				FIB_SOURCE_CLI,
-				FIB_ENTRY_FLAG_DROP);
+                                &pfx_10_10_10_16_s_28,
+                                FIB_SOURCE_CLI,
+                                FIB_ENTRY_FLAG_DROP);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_16_s_28);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
 
     /*
@@ -9122,15 +9163,15 @@
         .fp_addr = nh_10_10_10_20,
     };
     fib_table_entry_special_add(0,
-				&pfx_10_10_10_20_s_30,
-				FIB_SOURCE_CLI,
-				FIB_ENTRY_FLAG_DROP);
+                                &pfx_10_10_10_20_s_30,
+                                FIB_SOURCE_CLI,
+                                FIB_ENTRY_FLAG_DROP);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_20_s_30);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_20_s_30);
 
     /*
@@ -9155,50 +9196,50 @@
                                                     &nh_10_10_10_2,
                                                     tm->hw[0]->sw_if_index);
     fib_test_lb_bucket_t adj_o_10_10_10_2 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_10_10_10_2,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_10_10_10_2,
+        },
     };
 
     fib_table_entry_update_one_path(0,
                                     &pfx_10_10_10_0_s_24,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP4,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP4,
                                     &nh_10_10_10_2,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_21_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
 
     /*
@@ -9207,21 +9248,21 @@
      */
     fib_table_entry_update_one_path(0,
                                     &pfx_10_10_10_0_s_24,
-				    FIB_SOURCE_PLUGIN_HI,
-				    FIB_ENTRY_FLAG_NONE,
-				    DPO_PROTO_IP4,
+                                    FIB_SOURCE_PLUGIN_HI,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
                                     &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
 
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
@@ -9236,7 +9277,7 @@
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
              "%U resolves via drop",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
-        fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_16_s_28);
+    fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_16_s_28);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
              "%U resolves via drop",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
@@ -9248,39 +9289,39 @@
     fib_table_entry_delete(0, &pfx_10_10_10_0_s_24, FIB_SOURCE_PLUGIN_HI);
 
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_21_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_16_s_28);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
 
     /*
@@ -9289,51 +9330,51 @@
      */
     fib_table_entry_update_one_path(0,
                                     &pfx_10_10_10_16_s_28,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP4,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP4,
                                     &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_16_s_28);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_21_s_32);
 
     /* these two unaffected by the sub-tree change */
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
 
     /*
@@ -9342,86 +9383,86 @@
     fib_table_entry_delete(0, &pfx_10_10_10_16_s_28, FIB_SOURCE_API);
 
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_21_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
     /*
      * modify the /24. expect the new forwarding to be pushed down
      */
     fib_table_entry_update_one_path(0,
                                     &pfx_10_10_10_0_s_24,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP4,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP4,
                                     &nh_10_10_10_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_21_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
 
     /*
@@ -9434,72 +9475,462 @@
     };
     fib_table_entry_update_one_path(0,
                                     &pfx_10_10_0_0_s_16,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP4,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP4,
                                     &nh_10_10_10_2,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_16_s_28);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
-             format_fib_prefix, &pfx_10_10_10_21_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_22_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_22_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_255_s_32);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_255_s_32);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_1),
-	     "%U via 10.10.10.1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_1),
+             "%U via 10.10.10.1",
              format_fib_prefix, &pfx_10_10_10_0_s_24);
     fei = fib_table_lookup_exact_match(0, &pfx_10_10_0_0_s_16);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
-				     1,
-				     &adj_o_10_10_10_2),
-	     "%U via 10.10.10.2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_2),
+             "%U via 10.10.10.2",
              format_fib_prefix, &pfx_10_10_0_0_s_16);
 
     /*
+     * Add/remove an interposer source to a new /32
+     */
+    const fib_prefix_t pfx_11_11_11_11_s_32 = {
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = nh_11_11_11_11,
+    };
+
+    fib_table_entry_update_one_path(0,
+                                    &pfx_11_11_11_11_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_3,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
+
+    dpo_id_t interposer = DPO_INVALID;
+    fib_mpls_label_t *l99 = NULL, fml_99 = {
+        .fml_value = 99,
+    };
+    vec_add1(l99, fml_99);
+
+    mpls_label_dpo_create(l99,
+                          MPLS_EOS,
+                          DPO_PROTO_IP4,
+                          MPLS_LABEL_DPO_FLAG_NONE,
+                          punt_dpo_get(DPO_PROTO_MPLS),
+                          &interposer);
+
+    adj_index_t ai_10_10_10_3 = adj_nbr_add_or_lock(FIB_PROTOCOL_IP4,
+                                                    VNET_LINK_IP4,
+                                                    &nh_10_10_10_3,
+                                                    tm->hw[0]->sw_if_index);
+    fib_test_lb_bucket_t adj_o_10_10_10_3 = {
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_10_10_10_3,
+        },
+    };
+    fib_test_lb_bucket_t l99_o_10_10_10_3 = {
+        .type = FT_LB_LABEL_O_ADJ,
+        .label_o_adj = {
+            .adj = ai_10_10_10_3,
+            .label = 99,
+            .eos = MPLS_EOS,
+        },
+    };
+
+    fei = fib_table_entry_special_dpo_add(0,
+                                          &pfx_11_11_11_11_s_32,
+                                          FIB_SOURCE_SPECIAL,
+                                          FIB_ENTRY_FLAG_INTERPOSE,
+                                          &interposer);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer adj",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+
+    fib_table_entry_special_remove(0,
+                                   &pfx_11_11_11_11_s_32,
+                                   FIB_SOURCE_SPECIAL);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_3),
+             "%U via 10.10.10.1",
+             format_fib_prefix, &pfx_11_11_11_11_s_32);
+
+    /*
+     * remove and re-add the second best API source while the interpose
+     * is present
+     */
+    fei = fib_table_entry_special_dpo_add(0,
+                                          &pfx_11_11_11_11_s_32,
+                                          FIB_SOURCE_SPECIAL,
+                                          FIB_ENTRY_FLAG_INTERPOSE,
+                                          &interposer);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer adj",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+
+    FIB_TEST(2 == pool_elts(mpls_label_dpo_pool),
+             "MPLS label pool: %d",
+             pool_elts(mpls_label_dpo_pool));
+
+    fib_table_entry_delete(0, &pfx_11_11_11_11_s_32, FIB_SOURCE_API);
+
+    /*
+     * the interpose does not get stacked when there are not valid paths
+     */
+    fib_test_lb_bucket_t bucket_drop = {
+        .type = FT_LB_DROP,
+        .special = {
+            .adj = DPO_PROTO_IP4,
+        },
+    };
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &bucket_drop),
+             "%U via drop",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+
+    fib_table_entry_update_one_path(0,
+                                    &pfx_11_11_11_11_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_3,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer adj",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+    fib_table_entry_delete(0, &pfx_11_11_11_11_s_32, FIB_SOURCE_API);
+
+    /*
+     * add a cover for the interposed entry, so that we test it selects
+     * the covers forwarding.
+     */
+    const fib_prefix_t pfx_11_11_11_0_s_24 = {
+        .fp_len = 24,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = nh_11_11_11_0,
+    };
+    fib_table_entry_update_one_path(0,
+                                    &pfx_11_11_11_0_s_24,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_3,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer adj",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+
+    /*
+     * multiple interpose sources on the same entry. Only the high
+     * priority source gets to add the interpose.
+     */
+    dpo_id_t interposer2 = DPO_INVALID;
+    fib_mpls_label_t *l100 = NULL, fml_100 = {
+        .fml_value = 100,
+    };
+    vec_add1(l100, fml_100);
+
+    mpls_label_dpo_create(l100,
+                          MPLS_EOS,
+                          DPO_PROTO_IP4,
+                          MPLS_LABEL_DPO_FLAG_NONE,
+                          punt_dpo_get(DPO_PROTO_MPLS),
+                          &interposer2);
+
+    fei = fib_table_entry_special_dpo_add(0,
+                                          &pfx_11_11_11_11_s_32,
+                                          FIB_SOURCE_CLASSIFY,
+                                          FIB_ENTRY_FLAG_INTERPOSE,
+                                          &interposer2);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer label 99",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+
+    fib_test_lb_bucket_t l100_o_10_10_10_3 = {
+        .type = FT_LB_LABEL_O_ADJ,
+        .label_o_adj = {
+            .adj = ai_10_10_10_3,
+            .label = 100,
+            .eos = MPLS_EOS,
+        },
+    };
+
+    fib_table_entry_delete(0, &pfx_11_11_11_11_s_32, FIB_SOURCE_SPECIAL);
+
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l100_o_10_10_10_3),
+             "%U via interposer label 99",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+
+    fib_table_entry_delete(0, &pfx_11_11_11_0_s_24, FIB_SOURCE_API);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &bucket_drop),
+             "%U via drop",
+             format_fib_prefix,&pfx_11_11_11_11_s_32);
+    fib_table_entry_delete(0, &pfx_11_11_11_11_s_32, FIB_SOURCE_CLASSIFY);
+
+    /*
+     * update a source to/from interpose.
+     */
+    /* fib_table_entry_update_one_path(0, */
+    /*                                 &pfx_11_11_11_0_s_24, */
+    /*                              FIB_SOURCE_API, */
+    /*                              FIB_ENTRY_FLAG_NONE, */
+    /*                              DPO_PROTO_IP4, */
+    /*                                 &nh_10_10_10_3, */
+    /*                              tm->hw[0]->sw_if_index, */
+    /*                              ~0, */
+    /*                              1, */
+    /*                              NULL, */
+    /*                              FIB_ROUTE_PATH_FLAG_NONE); */
+    /* fei = fib_table_entry_special_dpo_add(0, */
+    /*                                       &pfx_11_11_11_11_s_32, */
+    /*                                       FIB_SOURCE_API, */
+    /*                                       FIB_ENTRY_FLAG_INTERPOSE, */
+    /*                                       &interposer); */
+    /* FIB_TEST(!fib_test_validate_entry(fei, */
+    /*                                   FIB_FORW_CHAIN_TYPE_UNICAST_IP4, */
+    /*                                   1, */
+    /*                                   &l99_o_10_10_10_3), */
+    /*          "%U via interposer label 99", */
+    /*          format_fib_prefix,&pfx_11_11_11_11_s_32); */
+
+    /* FIB_TEST(3 == pool_elts(mpls_label_dpo_pool), */
+    /*          "MPLS label pool: %d", */
+    /*          pool_elts(mpls_label_dpo_pool)); */
+    /* FIB_TEST((2 == mpls_label_dpo_get(interposer.dpoi_index)->mld_locks), */
+    /*          "Interposer %d locks", */
+    /*          mpls_label_dpo_get(interposer.dpoi_index)->mld_locks); */
+
+    /* fib_table_entry_update_one_path(0, */
+    /*                                 &pfx_11_11_11_11_s_32, */
+    /*                              FIB_SOURCE_API, */
+    /*                              FIB_ENTRY_FLAG_NONE, */
+    /*                              DPO_PROTO_IP4, */
+    /*                                 &nh_10_10_10_2, */
+    /*                              tm->hw[0]->sw_if_index, */
+    /*                              ~0, */
+    /*                              1, */
+    /*                              NULL, */
+    /*                              FIB_ROUTE_PATH_FLAG_NONE); */
+    /* FIB_TEST(!fib_test_validate_entry(fei, */
+    /*                                   FIB_FORW_CHAIN_TYPE_UNICAST_IP4, */
+    /*                                   1, */
+    /*                                   &adj_o_10_10_10_2), */
+    /*          "%U via 10.10.10.2", */
+    /*          format_fib_prefix,&pfx_11_11_11_11_s_32); */
+
+    /* FIB_TEST((1 == mpls_label_dpo_get(interposer.dpoi_index)->mld_locks), */
+    /*          "Interposer %d locks", */
+    /*          mpls_label_dpo_get(interposer.dpoi_index)->mld_locks); */
+    /* FIB_TEST(2 == pool_elts(mpls_label_dpo_pool), */
+    /*          "MPLS label pool: %d", */
+    /*          pool_elts(mpls_label_dpo_pool)); */
+
+    /* fei = fib_table_entry_special_dpo_add(0, */
+    /*                                       &pfx_11_11_11_11_s_32, */
+    /*                                       FIB_SOURCE_API, */
+    /*                                       FIB_ENTRY_FLAG_INTERPOSE, */
+    /*                                       &interposer); */
+    /* FIB_TEST(!fib_test_validate_entry(fei, */
+    /*                                   FIB_FORW_CHAIN_TYPE_UNICAST_IP4, */
+    /*                                   1, */
+    /*                                   &l99_o_10_10_10_3), */
+    /*          "%U via interposer label 99", */
+    /*          format_fib_prefix,&pfx_11_11_11_11_s_32); */
+
+    /* fib_table_entry_delete(0, &pfx_11_11_11_11_s_32, FIB_SOURCE_API); */
+
+    /*
+     * Add/remove an interposer source from the top of the subtrie. The
+     * interposer source is not inherited.
+     */
+    fib_table_entry_update_one_path(0,
+                                    &pfx_10_10_10_0_s_24,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_3,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
+    fei = fib_table_entry_special_dpo_add(0,
+                                          &pfx_10_10_10_0_s_24,
+                                          FIB_SOURCE_SPECIAL,
+                                          FIB_ENTRY_FLAG_INTERPOSE,
+                                          &interposer);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer label",
+             format_fib_prefix,&pfx_10_10_10_0_s_24);
+    fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &bucket_drop),
+             "%U via drop",
+             format_fib_prefix, &pfx_10_10_10_21_s_32);
+
+    fib_table_entry_special_remove(0,
+                                   &pfx_10_10_10_0_s_24,
+                                   FIB_SOURCE_SPECIAL);
+    fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_0_s_24);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_3),
+             "%U via 10.10.10.1",
+             format_fib_prefix, &pfx_10_10_10_0_s_24);
+    fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &adj_o_10_10_10_3),
+             "%U via via 10.10.10.1",
+             format_fib_prefix, &pfx_10_10_10_21_s_32);
+
+    /*
+     * Add/remove an interposer source from the top of the subtrie. The
+     * interposer source is inherited.
+     */
+    fei = fib_table_entry_special_dpo_add(0,
+                                          &pfx_10_10_10_0_s_24,
+                                          FIB_SOURCE_SPECIAL,
+                                          (FIB_ENTRY_FLAG_COVERED_INHERIT |
+                                           FIB_ENTRY_FLAG_INTERPOSE),
+                                          &interposer);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer label",
+             format_fib_prefix,&pfx_10_10_10_0_s_24);
+
+    /* interposer gets forwarding from the drop cli source */
+    fei = fib_table_lookup_exact_match(0, &pfx_10_10_10_21_s_32);
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &bucket_drop),
+             "%U via drop",
+             format_fib_prefix,&pfx_10_10_10_21_s_32);
+
+    fib_table_entry_update_one_path(0,
+                                    &pfx_10_10_10_21_s_32,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_NONE,
+                                    DPO_PROTO_IP4,
+                                    &nh_10_10_10_3,
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
+    fib_table_entry_delete(0, &pfx_10_10_10_21_s_32, FIB_SOURCE_CLI);
+    /* interposer gets forwarding from the API source */
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP4,
+                                      1,
+                                      &l99_o_10_10_10_3),
+             "%U via interposer label",
+             format_fib_prefix,&pfx_10_10_10_21_s_32);
+
+    /*
      * cleanup
      */
-    fib_table_entry_delete(0, &pfx_10_10_10_21_s_32, FIB_SOURCE_CLI);
     fib_table_entry_delete(0, &pfx_10_10_10_22_s_32, FIB_SOURCE_CLI);
+    fib_table_entry_delete(0, &pfx_10_10_10_21_s_32, FIB_SOURCE_API);
     fib_table_entry_delete(0, &pfx_10_10_10_16_s_28, FIB_SOURCE_CLI);
     fib_table_entry_delete(0, &pfx_10_10_10_255_s_32, FIB_SOURCE_CLI);
     fib_table_entry_delete(0, &pfx_10_10_10_0_s_24, FIB_SOURCE_API);
     fib_table_entry_delete(0, &pfx_10_10_0_0_s_16, FIB_SOURCE_API);
+    fib_table_entry_delete(0, &pfx_10_10_10_0_s_24, FIB_SOURCE_SPECIAL);
     adj_unlock(ai_10_10_10_1);
     adj_unlock(ai_10_10_10_2);
+    adj_unlock(ai_10_10_10_3);
+    dpo_reset(&interposer);
+    dpo_reset(&interposer2);
+    FIB_TEST(0 == pool_elts(mpls_label_dpo_pool),
+             "MPLS label pool empty: %d",
+             pool_elts(mpls_label_dpo_pool));
+    FIB_TEST(0 == adj_nbr_db_size(), "All adjacencies removed");
+    FIB_TEST(N_PLS == fib_path_list_pool_size(),
+             "number of path-lists: %d = %d",
+             N_PLS, fib_path_list_pool_size());
 
     /*
      * test the v6 tree walk.
-     * a /64 that covers everytinhg. a /96 that covers one /128
+     * a /64 that covers everything. a /96 that covers one /128
      * a second /128 covered only by the /64.
      */
     const fib_prefix_t pfx_2001_s_64 = {
@@ -9507,10 +9938,10 @@
         .fp_proto = FIB_PROTOCOL_IP6,
         .fp_addr = {
             .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000000),
-		    [1] = clib_host_to_net_u64(0x0000000000000000),
-		},
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000000),
+                    [1] = clib_host_to_net_u64(0x0000000000000000),
+                },
             },
         },
     };
@@ -9519,10 +9950,10 @@
         .fp_proto = FIB_PROTOCOL_IP6,
         .fp_addr = {
             .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000000),
-		    [1] = clib_host_to_net_u64(0x1000000000000000),
-		},
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000000),
+                    [1] = clib_host_to_net_u64(0x1000000000000000),
+                },
             },
         },
     };
@@ -9531,10 +9962,10 @@
         .fp_proto = FIB_PROTOCOL_IP6,
         .fp_addr = {
             .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000000),
-		    [1] = clib_host_to_net_u64(0x1000000000000001),
-		},
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000000),
+                    [1] = clib_host_to_net_u64(0x1000000000000001),
+                },
             },
         },
     };
@@ -9543,10 +9974,10 @@
         .fp_proto = FIB_PROTOCOL_IP6,
         .fp_addr = {
             .ip6 = {
-		.as_u64 = {
-		    [0] = clib_host_to_net_u64(0x2001000000000000),
-		    [1] = clib_host_to_net_u64(0x0000000000000001),
-		},
+                .as_u64 = {
+                    [0] = clib_host_to_net_u64(0x2001000000000000),
+                    [1] = clib_host_to_net_u64(0x0000000000000001),
+                },
             },
         },
     };
@@ -9575,54 +10006,54 @@
                                                 &nh_3000_2,
                                                 tm->hw[0]->sw_if_index);
     fib_test_lb_bucket_t adj_o_3000_1 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_3000_1,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_3000_1,
+        },
     };
     fib_test_lb_bucket_t adj_o_3000_2 = {
-	.type = FT_LB_ADJ,
-	.adj = {
-	    .adj = ai_3000_2,
-	},
+        .type = FT_LB_ADJ,
+        .adj = {
+            .adj = ai_3000_2,
+        },
     };
 
     fib_table_entry_special_add(0,
-				&pfx_2001_0_1_s_128,
-				FIB_SOURCE_CLI,
-				FIB_ENTRY_FLAG_DROP);
+                                &pfx_2001_0_1_s_128,
+                                FIB_SOURCE_CLI,
+                                FIB_ENTRY_FLAG_DROP);
     fib_table_entry_special_add(0,
-				&pfx_2001_1_1_s_128,
-				FIB_SOURCE_CLI,
-				FIB_ENTRY_FLAG_DROP);
+                                &pfx_2001_1_1_s_128,
+                                FIB_SOURCE_CLI,
+                                FIB_ENTRY_FLAG_DROP);
 
     /*
      * /96 has inherited forwarding pushed down to its covered /128
      */
     fib_table_entry_update_one_path(0,
                                     &pfx_2001_1_s_96,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP6,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP6,
                                     &nh_3000_1,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
     fei = fib_table_lookup_exact_match(0, &pfx_2001_1_s_96);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-				     1,
-				     &adj_o_3000_1),
-	     "%U via 3000::1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+                                      1,
+                                      &adj_o_3000_1),
+             "%U via 3000::1",
              format_fib_prefix, &pfx_2001_1_s_96);
     fei = fib_table_lookup_exact_match(0, &pfx_2001_1_1_s_128);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-				     1,
-				     &adj_o_3000_1),
-	     "%U via 3000::1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+                                      1,
+                                      &adj_o_3000_1),
+             "%U via 3000::1",
              format_fib_prefix, &pfx_2001_1_1_s_128);
     fei = fib_table_lookup_exact_match(0, &pfx_2001_0_1_s_128);
     FIB_TEST(load_balance_is_drop(fib_entry_contribute_ip_forwarding(fei)),
@@ -9635,44 +10066,44 @@
      */
     fib_table_entry_update_one_path(0,
                                     &pfx_2001_s_64,
-				    FIB_SOURCE_API,
-				    FIB_ENTRY_FLAG_COVERED_INHERIT,
-				    DPO_PROTO_IP6,
+                                    FIB_SOURCE_API,
+                                    FIB_ENTRY_FLAG_COVERED_INHERIT,
+                                    DPO_PROTO_IP6,
                                     &nh_3000_2,
-				    tm->hw[0]->sw_if_index,
-				    ~0,
-				    1,
-				    NULL,
-				    FIB_ROUTE_PATH_FLAG_NONE);
+                                    tm->hw[0]->sw_if_index,
+                                    ~0,
+                                    1,
+                                    NULL,
+                                    FIB_ROUTE_PATH_FLAG_NONE);
 
     fei = fib_table_lookup_exact_match(0, &pfx_2001_s_64);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-				     1,
-				     &adj_o_3000_2),
-	     "%U via 3000::2",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+                                      1,
+                                      &adj_o_3000_2),
+             "%U via 3000::2",
              format_fib_prefix, &pfx_2001_s_64);
     fei = fib_table_lookup_exact_match(0, &pfx_2001_0_1_s_128);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-				     1,
-				     &adj_o_3000_2),
-	     "%U via 3000::1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+                                      1,
+                                      &adj_o_3000_2),
+             "%U via 3000::1",
              format_fib_prefix, &pfx_2001_0_1_s_128);
 
     fei = fib_table_lookup_exact_match(0, &pfx_2001_1_s_96);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-				     1,
-				     &adj_o_3000_1),
-	     "%U via 3000::1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+                                      1,
+                                      &adj_o_3000_1),
+             "%U via 3000::1",
              format_fib_prefix, &pfx_2001_1_s_96);
     fei = fib_table_lookup_exact_match(0, &pfx_2001_1_1_s_128);
-    FIB_TEST(fib_test_validate_entry(fei,
-				     FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
-				     1,
-				     &adj_o_3000_1),
-	     "%U via 3000::1",
+    FIB_TEST(!fib_test_validate_entry(fei,
+                                      FIB_FORW_CHAIN_TYPE_UNICAST_IP6,
+                                      1,
+                                      &adj_o_3000_1),
+             "%U via 3000::1",
              format_fib_prefix, &pfx_2001_1_1_s_128);
 
     /*
@@ -9690,17 +10121,19 @@
      */
     FIB_TEST((n_feis == fib_entry_pool_size()), "Entries gone");
     FIB_TEST(0 == adj_nbr_db_size(), "All adjacencies removed");
-    return (0);
+
+    return (res);
 }
 
 static clib_error_t *
-fib_test (vlib_main_t * vm, 
-	  unformat_input_t * input,
-	  vlib_cli_command_t * cmd_arg)
+fib_test (vlib_main_t * vm,
+          unformat_input_t * input,
+          vlib_cli_command_t * cmd_arg)
 {
     int res;
 
     res = 0;
+
     fib_test_mk_intf(4);
 
     if (unformat (input, "debug"))
@@ -9708,49 +10141,57 @@
         fib_test_do_debug = 1;
     }
 
-    if (unformat (input, "ip"))
+    if (unformat (input, "ip4"))
     {
-	res += fib_test_v4();
-	res += fib_test_v6();
+        res += fib_test_v4();
+    }
+    else if (unformat (input, "ip6"))
+    {
+        res += fib_test_v6();
+    }
+    else if (unformat (input, "ip"))
+    {
+        res += fib_test_v4();
+        res += fib_test_v6();
     }
     else if (unformat (input, "label"))
     {
-	res += fib_test_label();
+        res += fib_test_label();
     }
     else if (unformat (input, "ae"))
     {
-	res += fib_test_ae();
+        res += fib_test_ae();
     }
     else if (unformat (input, "pref"))
     {
-	res += fib_test_pref();
+        res += fib_test_pref();
     }
     else if (unformat (input, "lfib"))
     {
-	res += lfib_test();
+        res += lfib_test();
     }
     else if (unformat (input, "walk"))
     {
-	res += fib_test_walk();
+        res += fib_test_walk();
     }
     else if (unformat (input, "bfd"))
     {
-	res += fib_test_bfd();
+        res += fib_test_bfd();
     }
     else if (unformat (input, "inherit"))
     {
-	res += fib_test_inherit();
+        res += fib_test_inherit();
     }
     else
     {
-	res += fib_test_v4();
-	res += fib_test_v6();
-	res += fib_test_ae();
-	res += fib_test_bfd();
-	res += fib_test_pref();
-	res += fib_test_label();
+        res += fib_test_v4();
+        res += fib_test_v6();
+        res += fib_test_ae();
+        res += fib_test_bfd();
+        res += fib_test_pref();
+        res += fib_test_label();
         res += fib_test_inherit();
-	res += lfib_test();
+        res += lfib_test();
 
         /*
          * fib-walk process must be disabled in order for the walk tests to work
@@ -9760,6 +10201,7 @@
         fib_walk_process_enable();
     }
 
+    fflush(NULL);
     if (res)
     {
         return clib_error_return(0, "FIB Unit Test Failed");