2105 files changed, 114 insertions, 96 deletions

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 837ec75b8d..1ecdfd2fb3 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -19,3 +19,4 @@ c14777c6bfd0a446c85243d3a9835054a259c276
 96244aca23adec551c29b78f26605f8af8eea53e
 8451921b70044a2c1075e7ba391f095fabee2550
 bf8d3d6aca3f20255a621ed1c148fd05b3a8ae5c
+96941f80927ce31a41f7d1905717f099187be723
diff --git a/.travis.yml b/.travis.yml
index 84dd2d7ec2..010292bb6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ jobs:
        - docker ps
        - docker exec frr-ubuntu18 bash -c 'cd ~/frr ; make check'
        - docker exec frr-ubuntu18 bash -c 'ps agxu ; lsmod | grep mpls || true'
-       - docker exec frr-ubuntu18 bash -c 'cd ~/frr/tests/topotests/ospf-topo1 ; sudo pytest test_ospf_topo1.py'
+       - docker exec frr-ubuntu18 bash -c 'cd ~/frr/tests/topotests/ospf_topo1 ; sudo pytest test_ospf_topo1.py'
        - docker exec frr-ubuntu18 bash -c 'cd ~/frr/tests/topotests/bgp_l3vpn_to_bgp_vrf ; sudo pytest test_bgp_l3vpn_to_bgp_vrf.py'
      name: ubuntu18+minimalCI
    - script:
@@ -34,7 +34,7 @@ jobs:
        - docker ps
        - docker exec frr-ubuntu20 bash -c 'cd ~/frr ; make check'
        - docker exec frr-ubuntu20 bash -c 'ps agxu ; lsmod | grep mpls || true'
-       - docker exec frr-ubuntu20 bash -c 'cd ~/frr/tests/topotests/ospf-topo1 ; sudo pytest test_ospf_topo1.py'
+       - docker exec frr-ubuntu20 bash -c 'cd ~/frr/tests/topotests/ospf_topo1 ; sudo pytest test_ospf_topo1.py'
        - docker exec frr-ubuntu20 bash -c 'cd ~/frr/tests/topotests/bgp_l3vpn_to_bgp_vrf ; sudo pytest test_bgp_l3vpn_to_bgp_vrf.py'
      name: ubuntu20+minimalCI
 
diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index dc2b0b679b..e94f63541d 100644
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -620,8 +620,8 @@ void bgp_parse_nexthop_update(int command, vrf_id_t vrf_id)
 	}
 
 	if (!zapi_nexthop_update_decode(zclient->ibuf, &nhr)) {
-		zlog_err("%s[%s]: Failure to decode nexthop update",
-			 __PRETTY_FUNCTION__, bgp->name_pretty);
+		zlog_err("%s[%s]: Failure to decode nexthop update", __func__,
+			 bgp->name_pretty);
 		return;
 	}
 
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 45b60b4903..05d00a4851 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -2394,7 +2394,7 @@ static int bgp_zebra_route_notify_owner(int command, struct zclient *zclient,
 
 	if (!zapi_route_notify_decode(zclient->ibuf, &p, &table_id, &note,
 				      &afi, &safi)) {
-		zlog_err("%s : error in msg decode", __PRETTY_FUNCTION__);
+		zlog_err("%s : error in msg decode", __func__);
 		return -1;
 	}
 
@@ -2402,8 +2402,8 @@ static int bgp_zebra_route_notify_owner(int command, struct zclient *zclient,
 	bgp = bgp_lookup_by_vrf_id(vrf_id);
 	if (!bgp) {
 		flog_err(EC_BGP_INVALID_BGP_INSTANCE,
-			 "%s : bgp instance not found vrf %d",
-			 __PRETTY_FUNCTION__, vrf_id);
+			 "%s : bgp instance not found vrf %d", __func__,
+			 vrf_id);
 		return -1;
 	}
 
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 9d2ff9c00e..5991bff752 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6937,7 +6937,7 @@ static void peer_advertise_map_filter_update(struct peer *peer, afi_t afi,
 
 	/* Removed advertise-map configuration */
 	if (!set) {
-		memset(filter, 0, sizeof(struct bgp_filter));
+		memset(&filter->advmap, 0, sizeof(filter->advmap));
 
 		/* decrement condition_filter_count delete timer if
 		 * this is the last advertise-map to be removed.
diff --git a/doc/developer/topotests.rst b/doc/developer/topotests.rst
index a86566dbb0..dd797a6949 100644
--- a/doc/developer/topotests.rst
+++ b/doc/developer/topotests.rst
@@ -59,7 +59,7 @@ there are some errors in the upstream MIBS which need to be patched up. The
 following steps will get you there on Ubuntu 20.04.
 
 .. code:: shell
-	  
+
    apt install libsnmp-dev
    apt install snmpd snmp
    apt install snmp-mibs-downloader
@@ -68,9 +68,9 @@ following steps will get you there on Ubuntu 20.04.
    wget http://pastebin.com/raw.php?i=p3QyuXzZ -O /usr/share/snmp/mibs/ietf/SNMPv2-PDU
    wget http://pastebin.com/raw.php?i=gG7j8nyk -O /usr/share/snmp/mibs/ietf/IPATM-IPMC-MIB
    edit /etc/snmp/snmp.conf to look like this
-   # As the snmp packages come without MIB files due to license reasons, loading   
-   # of MIBs is disabled by default. If you added the MIBs you can reenable        
-   # loading them by commenting out the following line.                            
+   # As the snmp packages come without MIB files due to license reasons, loading
+   # of MIBs is disabled by default. If you added the MIBs you can reenable
+   # loading them by commenting out the following line.
    mibs +ALL
 
 
@@ -485,7 +485,7 @@ Some things to keep in mind:
   in BGP, the test should look for the peers reconverging instead of just
   sleeping an arbitrary amount of time and continuing on.  It is ok to
   use sleep in a tight loop with appropriate show commands to ensure that
-  the protocol reaches the desired state.  This should be bounded by 
+  the protocol reaches the desired state.  This should be bounded by
   appropriate timeouts for the protocol in question though.  See
   verify_bgp_convergence as a good example of this.  If you are having
   troubles figuring out what to look for, please do not be afraid to ask.
@@ -882,6 +882,8 @@ Example:
 
 Requirements:
 
+- Directory name for a new topotest must not contain hyphen (``-``) characters.
+  To separate words, use underscores (``_``). For example, `tests/topotests/bgp_new_example`.
 - Test code should always be declared inside functions that begin with the
   ``test_`` prefix. Functions beginning with different prefixes will not be run
   by pytest.
diff --git a/lib/if.h b/lib/if.h
index f425ba8bce..0d689fe14b 100644
--- a/lib/if.h
+++ b/lib/if.h
@@ -393,6 +393,7 @@ struct connected {
 #define ZEBRA_IFC_REAL         (1 << 0)
 #define ZEBRA_IFC_CONFIGURED   (1 << 1)
 #define ZEBRA_IFC_QUEUED       (1 << 2)
+#define ZEBRA_IFC_DOWN         (1 << 3)
 	/*
 	   The ZEBRA_IFC_REAL flag should be set if and only if this address
 	   exists in the kernel and is actually usable. (A case where it exists
@@ -406,6 +407,8 @@ struct connected {
 	   in the kernel. It may and should be set although the address might
 	   not be
 	   usable yet. (compare with ZEBRA_IFC_REAL)
+	   The ZEBRA_IFC_DOWN flag is used to record that an address is
+	   present, but down/unavailable.
 	 */
 
 	/* Flags for connected address. */
diff --git a/lib/privs.c b/lib/privs.c
index 49761af871..b3f51267d1 100644
--- a/lib/privs.c
+++ b/lib/privs.c
@@ -159,6 +159,10 @@ static struct {
 			{
 				1, (pvalue_t[]){CAP_FOWNER},
 			},
+		[ZCAP_IPC_LOCK] =
+			{
+				1, (pvalue_t[]){CAP_IPC_LOCK},
+			},
 #endif /* HAVE_LCAPS */
 };
 
diff --git a/lib/privs.h b/lib/privs.h
index 2dcdbe2e6c..9f22d28cf8 100644
--- a/lib/privs.h
+++ b/lib/privs.h
@@ -44,6 +44,7 @@ typedef enum {
 	ZCAP_DAC_OVERRIDE,
 	ZCAP_READ_SEARCH,
 	ZCAP_FOWNER,
+	ZCAP_IPC_LOCK,
 	ZCAP_MAX
 } zebra_capabilities_t;
 
diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 0fa6f8c779..76e81aab7b 100644
--- a/ospf6d/ospf6_flood.c
+++ b/ospf6d/ospf6_flood.c
@@ -1018,18 +1018,20 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from,
 					if (is_debug)
 						zlog_debug(
 							"%s: Current copy of LSA %s is MAXAGE, but new has recent age, flooding/installing.",
-							old->name, __PRETTY_FUNCTION__);
+							__PRETTY_FUNCTION__, old->name);
 					ospf6_lsa_purge(old);
 					ospf6_flood(from, new);
 					ospf6_install_lsa(new);
-				} else {
-					if (is_debug)
-						zlog_debug(
-							"%s: Current copy of self-originated LSA %s is MAXAGE, but new has recent age, ignoring new.",
-							old->name, __PRETTY_FUNCTION__);
-					ospf6_lsa_delete(new);
+					return;
 				}
-				return;
+				/* For self-originated LSA, only trust
+				 * ourselves. Fall through and send
+				 * LS Update with our current copy.
+				 */
+				if (is_debug)
+					zlog_debug(
+						"%s: Current copy of self-originated LSA %s is MAXAGE, but new has recent age, re-sending current one.",
+						__PRETTY_FUNCTION__, old->name);
 			}
 
 			/* XXX, MinLSArrival check !? RFC 2328 13 (8) */
diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c
index b022133dcd..bda00e0c9e 100644
--- a/ospfd/ospf_asbr.c
+++ b/ospfd/ospf_asbr.c
@@ -692,8 +692,7 @@ struct ospf_lsa *ospf_originate_summary_lsa(struct ospf *ospf,
 		if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
 			zlog_debug(
 				"%s: LSA is in MAX-AGE so refreshing LSA(%pI4/%d)",
-				__PRETTY_FUNCTION__, &aggr->p.prefix,
-				aggr->p.prefixlen);
+				__func__, &aggr->p.prefix, aggr->p.prefixlen);
 
 		ospf_external_lsa_refresh(ospf, lsa, &ei_aggr,
 					  LSA_REFRESH_FORCE, 1);
@@ -711,8 +710,7 @@ struct ospf_lsa *ospf_originate_summary_lsa(struct ospf *ospf,
 		if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
 			zlog_debug(
 				"%s: External route prefix is same as aggr so refreshing LSA(%pI4/%d)",
-				__PRETTY_FUNCTION__, &aggr->p.prefix,
-				aggr->p.prefixlen);
+				__func__, &aggr->p.prefix, aggr->p.prefixlen);
 		ospf_external_lsa_refresh(ospf, lsa, &ei_aggr,
 					  LSA_REFRESH_FORCE, 1);
 		SET_FLAG(aggr->flags, OSPF_EXTERNAL_AGGRT_ORIGINATED);
diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index caba03c1b5..7eb587899b 100644
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -388,8 +388,7 @@ int ospf_flood(struct ospf *ospf, struct ospf_neighbor *nbr,
 			if (IS_DEBUG_OSPF_GR_HELPER)
 				zlog_debug(
 					"%s, Received a maxage GRACE-LSA from router %pI4",
-					__PRETTY_FUNCTION__,
-					&new->data->adv_router);
+					__func__, &new->data->adv_router);
 
 			if (current) {
 				ospf_process_maxage_grace_lsa(ospf, new, nbr);
@@ -397,22 +396,21 @@ int ospf_flood(struct ospf *ospf, struct ospf_neighbor *nbr,
 				if (IS_DEBUG_OSPF_GR_HELPER)
 					zlog_debug(
 						"%s, Grace LSA doesn't exist in lsdb, so discarding grace lsa",
-						__PRETTY_FUNCTION__);
+						__func__);
 				return -1;
 			}
 		} else {
 			if (IS_DEBUG_OSPF_GR_HELPER)
 				zlog_debug(
 					"%s, Received a GRACE-LSA from router %pI4",
-					__PRETTY_FUNCTION__,
-					&new->data->adv_router);
+					__func__, &new->data->adv_router);
 
 			if (ospf_process_grace_lsa(ospf, new, nbr)
 			    == OSPF_GR_NOT_HELPER) {
 				if (IS_DEBUG_OSPF_GR_HELPER)
 					zlog_debug(
 						"%s, Not moving to HELPER role, So discarding grace LSA",
-						__PRETTY_FUNCTION__);
+						__func__);
 				return -1;
 			}
 		}
diff --git a/ospfd/ospf_gr_helper.c b/ospfd/ospf_gr_helper.c
index a86e1b8401..d818878cf5 100644
--- a/ospfd/ospf_gr_helper.c
+++ b/ospfd/ospf_gr_helper.c
@@ -164,7 +164,7 @@ void ospf_gr_helper_init(struct ospf *ospf)
 	int rc;
 
 	if (IS_DEBUG_OSPF_GR_HELPER)
-		zlog_debug("%s, GR Helper init.", __PRETTY_FUNCTION__);
+		zlog_debug("%s, GR Helper init.", __func__);
 
 	ospf->is_helper_supported = OSPF_GR_FALSE;
 	ospf->strict_lsa_check = OSPF_GR_TRUE;
@@ -201,7 +201,7 @@ void ospf_gr_helper_stop(struct ospf *ospf)
 {
 
 	if (IS_DEBUG_OSPF_GR_HELPER)
-		zlog_debug("%s, GR helper deinit.", __PRETTY_FUNCTION__);
+		zlog_debug("%s, GR helper deinit.", __func__);
 
 	ospf_enable_rtr_hash_destroy(ospf);
 
@@ -305,7 +305,7 @@ static int ospf_extract_grace_lsa_fields(struct ospf_lsa *lsa,
 			if (IS_DEBUG_OSPF_GR_HELPER)
 				zlog_debug(
 					"%s, Malformed packet.Invalid TLV type:%d",
-					__PRETTY_FUNCTION__, ntohs(tlvh->type));
+					__func__, ntohs(tlvh->type));
 			return OSPF_GR_FAILURE;
 		}
 	}
@@ -370,16 +370,14 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 					    &restart_reason);
 	if (ret != OSPF_GR_SUCCESS) {
 		if (IS_DEBUG_OSPF_GR_HELPER)
-			zlog_debug("%s, Wrong Grace LSA packet.",
-				   __PRETTY_FUNCTION__);
+			zlog_debug("%s, Wrong Grace LSA packet.", __func__);
 		return OSPF_GR_NOT_HELPER;
 	}
 
 	if (IS_DEBUG_OSPF_GR_HELPER)
 		zlog_debug(
 			"%s, Grace LSA received from %pI4, grace interval:%u, restartreason :%s",
-			__PRETTY_FUNCTION__, &restart_addr,
-			grace_interval,
+			__func__, &restart_addr, grace_interval,
 			ospf_restart_reason2str(restart_reason));
 
 	/* Incase of broadcast links, if RESTARTER is DR_OTHER,
@@ -393,8 +391,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 			if (IS_DEBUG_OSPF_GR_HELPER)
 				zlog_debug(
 					"%s, Restarter is not a nbr(%pI4) for this router.",
-					__PRETTY_FUNCTION__,
-					&restart_addr);
+					__func__, &restart_addr);
 			return OSPF_GR_NOT_HELPER;
 		}
 	} else
@@ -411,7 +408,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 			if (IS_DEBUG_OSPF_GR_HELPER)
 				zlog_debug(
 					"%s, HELPER support is disabled, So not a HELPER",
-					__PRETTY_FUNCTION__);
+					__func__);
 			restarter->gr_helper_info.rejected_reason =
 				OSPF_HELPER_SUPPORT_DISABLED;
 			return OSPF_GR_NOT_HELPER;
@@ -426,7 +423,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, This Neighbour %pI4 is not in FULL state.",
-				__PRETTY_FUNCTION__, &restarter->src);
+				__func__, &restarter->src);
 		restarter->gr_helper_info.rejected_reason =
 			OSPF_HELPER_NOT_A_VALID_NEIGHBOUR;
 		return OSPF_GR_NOT_HELPER;
@@ -440,7 +437,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, Router supports only planned restarts but received the GRACE LSA for an unplanned restart.",
-				__PRETTY_FUNCTION__);
+				__func__);
 		restarter->gr_helper_info.rejected_reason =
 			OSPF_HELPER_PLANNED_ONLY_RESTART;
 		return OSPF_GR_NOT_HELPER;
@@ -454,7 +451,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, Changed LSA in Rxmt list. So not Helper.",
-				__PRETTY_FUNCTION__);
+				__func__);
 		restarter->gr_helper_info.rejected_reason =
 			OSPF_HELPER_TOPO_CHANGE_RTXMT_LIST;
 		return OSPF_GR_NOT_HELPER;
@@ -465,8 +462,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, Grace LSA age(%d) is more than the graceinterval(%d)",
-				__PRETTY_FUNCTION__, lsa->data->ls_age,
-				grace_interval);
+				__func__, lsa->data->ls_age, grace_interval);
 		restarter->gr_helper_info.rejected_reason =
 			OSPF_HELPER_LSA_AGE_MORE;
 		return OSPF_GR_NOT_HELPER;
@@ -482,7 +478,7 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, Received grace period %d is larger than supported grace %d",
-				__PRETTY_FUNCTION__, grace_interval,
+				__func__, grace_interval,
 				ospf->supported_grace_time);
 		actual_grace_interval = ospf->supported_grace_time;
 	}
@@ -497,12 +493,12 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, Router is already acting as a HELPER for this nbr,so restart the grace timer",
-				__PRETTY_FUNCTION__);
+				__func__);
 	} else {
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, This Router becomes a HELPER for the neighbour %pI4",
-				__PRETTY_FUNCTION__, &restarter->src);
+				__func__, &restarter->src);
 	}
 
 	/* Became a Helper to the RESTART neighbour.
@@ -518,8 +514,8 @@ int ospf_process_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 	ospf->active_restarter_cnt++;
 
 	if (IS_DEBUG_OSPF_GR_HELPER)
-		zlog_debug("%s, Grace timer started.interval:%d",
-			   __PRETTY_FUNCTION__, actual_grace_interval);
+		zlog_debug("%s, Grace timer started.interval:%d", __func__,
+			   actual_grace_interval);
 
 	/* Start the grace timer */
 	thread_add_timer(master, ospf_handle_grace_timer_expiry, restarter,
@@ -607,8 +603,7 @@ void ospf_helper_handle_topo_chg(struct ospf *ospf, struct ospf_lsa *lsa)
 	if (IS_DEBUG_OSPF_GR_HELPER)
 		zlog_debug(
 			"%s, Topo change detected due to lsa LSID:%pI4 type:%d",
-			__PRETTY_FUNCTION__, &lsa->data->id,
-			lsa->data->type);
+			__func__, &lsa->data->id, lsa->data->type);
 
 	lsa->to_be_acknowledged = OSPF_GR_TRUE;
 
@@ -671,8 +666,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
 
 	if (IS_DEBUG_OSPF_GR_HELPER)
 		zlog_debug("%s, Exiting from HELPER support to %pI4, due to %s",
-			   __PRETTY_FUNCTION__, &nbr->src,
-			   ospf_exit_reason2str(reason));
+			   __func__, &nbr->src, ospf_exit_reason2str(reason));
 
 	/* Reset helper status*/
 	nbr->gr_helper_info.gr_helper_status = OSPF_GR_NOT_HELPER;
@@ -704,7 +698,7 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug(
 				"%s, Failed GR exit, so bringing down the neighbour",
-				__PRETTY_FUNCTION__);
+				__func__);
 		OSPF_NSM_EVENT_EXECUTE(nbr, NSM_KillNbr);
 	}
 
@@ -752,14 +746,13 @@ void ospf_process_maxage_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 					    &restartReason);
 	if (ret != OSPF_GR_SUCCESS) {
 		if (IS_DEBUG_OSPF_GR_HELPER)
-			zlog_debug("%s, Wrong Grace LSA packet.",
-				   __PRETTY_FUNCTION__);
+			zlog_debug("%s, Wrong Grace LSA packet.", __func__);
 		return;
 	}
 
 	if (IS_DEBUG_OSPF_GR_HELPER)
-		zlog_debug("%s, GraceLSA received for neighbour %pI4",
-			   __PRETTY_FUNCTION__, &restartAddr);
+		zlog_debug("%s, GraceLSA received for neighbour %pI4", __func__,
+			   &restartAddr);
 
 	/* In case of broadcast links, if RESTARTER is DR_OTHER,
 	 * grace LSA might be received from DR, so fetching the
@@ -772,7 +765,7 @@ void ospf_process_maxage_grace_lsa(struct ospf *ospf, struct ospf_lsa *lsa,
 			if (IS_DEBUG_OSPF_GR_HELPER)
 				zlog_debug(
 					"%s, Restarter is not a neighbour for this router.",
-					__PRETTY_FUNCTION__);
+					__func__);
 			return;
 		}
 	} else {
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 006c4888ae..b3b9244b22 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -78,7 +78,7 @@ static int ospf_inactivity_timer(struct thread *thread)
 	else if (IS_DEBUG_OSPF_GR_HELPER)
 		zlog_debug(
 			"%s, Acting as HELPER for this neighbour, So inactivitytimer event will not be fired.",
-			__PRETTY_FUNCTION__);
+			__func__);
 
 	return 0;
 }
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index aa98d7dd28..2de6731758 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -4266,7 +4266,7 @@ void ospf_ls_ack_send(struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
 	if (IS_GRACE_LSA(lsa)) {
 		if (IS_DEBUG_OSPF_GR_HELPER)
 			zlog_debug("%s, Sending GRACE ACK to Restarter.",
-				   __PRETTY_FUNCTION__);
+				   __func__);
 	}
 
 	if (listcount(oi->ls_ack_direct.ls_ack) == 0)
diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index 0164bfac67..3849d4b7ea 100644
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -1994,7 +1994,7 @@ void ospf_spf_calculate_schedule(struct ospf *ospf, ospf_spf_reason_t reason)
 void ospf_restart_spf(struct ospf *ospf)
 {
 	if (IS_DEBUG_OSPF_EVENT)
-		zlog_debug("%s: Restart SPF.", __PRETTY_FUNCTION__);
+		zlog_debug("%s: Restart SPF.", __func__);
 
 	/* Handling inter area and intra area routes*/
 	if (ospf->new_table) {
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 579824c88d..1bf3a619bf 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -743,7 +743,7 @@ static int on_ifjoin_prune_pending_timer(struct thread *t)
 				if (!ch->upstream->channel_oil->installed)
 					pim_upstream_mroute_add(
 						ch->upstream->channel_oil,
-						__PRETTY_FUNCTION__);
+						__func__);
 			}
 		}
 		/* from here ch may have been deleted */
diff --git a/tests/topotests/all-protocol-startup/r1/babeld.conf b/tests/topotests/all_protocol_startup/r1/babeld.conf
index 3e119bf24d..3e119bf24d 100644
--- a/tests/topotests/all-protocol-startup/r1/babeld.conf
+++ b/tests/topotests/all_protocol_startup/r1/babeld.conf
diff --git a/tests/topotests/all-protocol-startup/r1/bgpd.conf b/tests/topotests/all_protocol_startup/r1/bgpd.conf
index 32dcb727e5..32dcb727e5 100644
--- a/tests/topotests/all-protocol-startup/r1/bgpd.conf
+++ b/tests/topotests/all_protocol_startup/r1/bgpd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/ip_nht.ref b/tests/topotests/all_protocol_startup/r1/ip_nht.ref
index 1da4da4df5..1da4da4df5 100644
--- a/tests/topotests/all-protocol-startup/r1/ip_nht.ref
+++ b/tests/topotests/all_protocol_startup/r1/ip_nht.ref
diff --git a/tests/topotests/all-protocol-startup/r1/ipv4_routes.ref b/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
index 044cffae7a..044cffae7a 100644
--- a/tests/topotests/all-protocol-startup/r1/ipv4_routes.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv4_routes.ref
diff --git a/tests/topotests/all-protocol-startup/r1/ipv6_nht.ref b/tests/topotests/all_protocol_startup/r1/ipv6_nht.ref
index 0255ecdee8..0255ecdee8 100644
--- a/tests/topotests/all-protocol-startup/r1/ipv6_nht.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv6_nht.ref
diff --git a/tests/topotests/all-protocol-startup/r1/ipv6_routes.ref b/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
index ef12d615dc..ef12d615dc 100644
--- a/tests/topotests/all-protocol-startup/r1/ipv6_routes.ref
+++ b/tests/topotests/all_protocol_startup/r1/ipv6_routes.ref
diff --git a/tests/topotests/all-protocol-startup/r1/isisd.conf b/tests/topotests/all_protocol_startup/r1/isisd.conf
index 413f8d15a9..413f8d15a9 100644
--- a/tests/topotests/all-protocol-startup/r1/isisd.conf
+++ b/tests/topotests/all_protocol_startup/r1/isisd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/ldpd.conf b/tests/topotests/all_protocol_startup/r1/ldpd.conf
index 02332a4e75..02332a4e75 100644
--- a/tests/topotests/all-protocol-startup/r1/ldpd.conf
+++ b/tests/topotests/all_protocol_startup/r1/ldpd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/nhrpd.conf b/tests/topotests/all_protocol_startup/r1/nhrpd.conf
index 74e0f12e32..74e0f12e32 100644
--- a/tests/topotests/all-protocol-startup/r1/nhrpd.conf
+++ b/tests/topotests/all_protocol_startup/r1/nhrpd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/ospf6d.conf b/tests/topotests/all_protocol_startup/r1/ospf6d.conf
index 5c6f071644..5c6f071644 100644
--- a/tests/topotests/all-protocol-startup/r1/ospf6d.conf
+++ b/tests/topotests/all_protocol_startup/r1/ospf6d.conf
diff --git a/tests/topotests/all-protocol-startup/r1/ospf6d.conf-pre-v4 b/tests/topotests/all_protocol_startup/r1/ospf6d.conf-pre-v4
index 6d870f355f..6d870f355f 100644
--- a/tests/topotests/all-protocol-startup/r1/ospf6d.conf-pre-v4
+++ b/tests/topotests/all_protocol_startup/r1/ospf6d.conf-pre-v4
diff --git a/tests/topotests/all-protocol-startup/r1/ospfd.conf b/tests/topotests/all_protocol_startup/r1/ospfd.conf
index bac9f61620..bac9f61620 100644
--- a/tests/topotests/all-protocol-startup/r1/ospfd.conf
+++ b/tests/topotests/all_protocol_startup/r1/ospfd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/pbrd.conf b/tests/topotests/all_protocol_startup/r1/pbrd.conf
index 360fb13a1b..360fb13a1b 100644
--- a/tests/topotests/all-protocol-startup/r1/pbrd.conf
+++ b/tests/topotests/all_protocol_startup/r1/pbrd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/rip_status.ref b/tests/topotests/all_protocol_startup/r1/rip_status.ref
index 4a5255fe13..4a5255fe13 100644
--- a/tests/topotests/all-protocol-startup/r1/rip_status.ref
+++ b/tests/topotests/all_protocol_startup/r1/rip_status.ref
diff --git a/tests/topotests/all-protocol-startup/r1/ripd.conf b/tests/topotests/all_protocol_startup/r1/ripd.conf
index ace7608873..ace7608873 100644
--- a/tests/topotests/all-protocol-startup/r1/ripd.conf
+++ b/tests/topotests/all_protocol_startup/r1/ripd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/ripng_status.ref b/tests/topotests/all_protocol_startup/r1/ripng_status.ref
index 5d67c1467a..5d67c1467a 100644
--- a/tests/topotests/all-protocol-startup/r1/ripng_status.ref
+++ b/tests/topotests/all_protocol_startup/r1/ripng_status.ref
diff --git a/tests/topotests/all-protocol-startup/r1/ripngd.conf b/tests/topotests/all_protocol_startup/r1/ripngd.conf
index 2e0aef3a14..2e0aef3a14 100644
--- a/tests/topotests/all-protocol-startup/r1/ripngd.conf
+++ b/tests/topotests/all_protocol_startup/r1/ripngd.conf
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post4.1.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4-post4.1.ref
index b38701a53d..b38701a53d 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post4.1.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4-post4.1.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post5.0.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4-post5.0.ref
index 82b64c0d98..82b64c0d98 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post5.0.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4-post5.0.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post6.1.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4-post6.1.ref
index fd333b3084..fd333b3084 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post6.1.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4-post6.1.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4.ref
index 3be6cd3d7b..3be6cd3d7b 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv4.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv4.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6-post4.1.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6-post4.1.ref
index 20034b7408..20034b7408 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6-post4.1.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6-post4.1.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6.ref
index fffee63c6b..fffee63c6b 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_post6.1.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6_post6.1.ref
index 5b5f8596cf..5b5f8596cf 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_post6.1.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6_post6.1.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6_summary.ref
index 0246687200..0246687200 100644
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_bgp_ipv6_summary.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref b/tests/topotests/all_protocol_startup/r1/show_ip_bgp_summary.ref
index deeae87fa3..deeae87fa3 100644
--- a/tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_ip_bgp_summary.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_ip_ospf_interface.ref b/tests/topotests/all_protocol_startup/r1/show_ip_ospf_interface.ref
index ff85679256..ff85679256 100644
--- a/tests/topotests/all-protocol-startup/r1/show_ip_ospf_interface.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_ip_ospf_interface.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_ipv6_ospf6_interface b/tests/topotests/all_protocol_startup/r1/show_ipv6_ospf6_interface
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/all-protocol-startup/r1/show_ipv6_ospf6_interface
+++ b/tests/topotests/all_protocol_startup/r1/show_ipv6_ospf6_interface
diff --git a/tests/topotests/all-protocol-startup/r1/show_ipv6_ospf6_interface.ref b/tests/topotests/all_protocol_startup/r1/show_ipv6_ospf6_interface.ref
index 6fbf40bbb8..6fbf40bbb8 100644
--- a/tests/topotests/all-protocol-startup/r1/show_ipv6_ospf6_interface.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_ipv6_ospf6_interface.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref b/tests/topotests/all_protocol_startup/r1/show_isis_interface_detail.ref
index 0534b64d33..0534b64d33 100644
--- a/tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_isis_interface_detail.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_mpls_ldp_interface.ref b/tests/topotests/all_protocol_startup/r1/show_mpls_ldp_interface.ref
index c6bb01c34b..c6bb01c34b 100644
--- a/tests/topotests/all-protocol-startup/r1/show_mpls_ldp_interface.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_mpls_ldp_interface.ref
diff --git a/tests/topotests/all-protocol-startup/r1/show_route_map.ref b/tests/topotests/all_protocol_startup/r1/show_route_map.ref
index 612d0a729d..612d0a729d 100644
--- a/tests/topotests/all-protocol-startup/r1/show_route_map.ref
+++ b/tests/topotests/all_protocol_startup/r1/show_route_map.ref
diff --git a/tests/topotests/all-protocol-startup/r1/zebra.conf b/tests/topotests/all_protocol_startup/r1/zebra.conf
index c5ef79630e..c5ef79630e 100644
--- a/tests/topotests/all-protocol-startup/r1/zebra.conf
+++ b/tests/topotests/all_protocol_startup/r1/zebra.conf
diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.dot b/tests/topotests/all_protocol_startup/test_all_protocol_startup.dot
index f39f8f87b8..f39f8f87b8 100644
--- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.dot
+++ b/tests/topotests/all_protocol_startup/test_all_protocol_startup.dot
diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.pdf b/tests/topotests/all_protocol_startup/test_all_protocol_startup.pdf
index 23f69bcddf..23f69bcddf 100644
--- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.pdf
+++ b/tests/topotests/all_protocol_startup/test_all_protocol_startup.pdf
diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py
index c10e32ad0a..c10e32ad0a 100644
--- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
+++ b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/__init__.py b/tests/topotests/bfd_bgp_cbit_topo3/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/__init__.py
+++ b/tests/topotests/bfd_bgp_cbit_topo3/__init__.py
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/bfdd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r1/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/bfdd.conf
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/bfdd.conf
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgp_ipv6_routes_down.json
index 5cba71ef20..5cba71ef20 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgp_ipv6_routes_down.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf
index 689797a5e6..689797a5e6 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/ipv6_routes.json b/tests/topotests/bfd_bgp_cbit_topo3/r1/ipv6_routes.json
index 8eea183285..8eea183285 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/ipv6_routes.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/ipv6_routes.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json b/tests/topotests/bfd_bgp_cbit_topo3/r1/peers.json
index b436d5562e..b436d5562e 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/peers.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json b/tests/topotests/bfd_bgp_cbit_topo3/r1/peers_down.json
index 4984b52cf2..4984b52cf2 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/peers_down.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/zebra.conf b/tests/topotests/bfd_bgp_cbit_topo3/r1/zebra.conf
index 3a30cd42fb..3a30cd42fb 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/zebra.conf
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/zebra.conf
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r2/zebra.conf b/tests/topotests/bfd_bgp_cbit_topo3/r2/zebra.conf
index 0f70be1bda..0f70be1bda 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r2/zebra.conf
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r2/zebra.conf
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/bfdd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r3/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/bfdd.conf
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/bfdd.conf
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgp_ipv6_routes_down.json
index c0cb3c4ac9..c0cb3c4ac9 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgp_ipv6_routes_down.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf
index 1f5aac42ed..1f5aac42ed 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/ipv6_routes.json b/tests/topotests/bfd_bgp_cbit_topo3/r3/ipv6_routes.json
index 09808cc09a..09808cc09a 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/ipv6_routes.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/ipv6_routes.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json b/tests/topotests/bfd_bgp_cbit_topo3/r3/peers.json
index fc9e145340..fc9e145340 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/peers.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json b/tests/topotests/bfd_bgp_cbit_topo3/r3/peers_down.json
index 620c6ddcd4..620c6ddcd4 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/peers_down.json
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/zebra.conf b/tests/topotests/bfd_bgp_cbit_topo3/r3/zebra.conf
index 7759251dc5..7759251dc5 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/zebra.conf
+++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/zebra.conf
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.dot b/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.dot
index 270de829c3..270de829c3 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.dot
+++ b/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.dot
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.py b/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py
index 560d6eebec..560d6eebec 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.py
+++ b/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py
diff --git a/tests/topotests/bfd-isis-topo1/__init__.py b/tests/topotests/bfd_isis_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-isis-topo1/__init__.py
+++ b/tests/topotests/bfd_isis_topo1/__init__.py
diff --git a/tests/topotests/bfd-isis-topo1/rt1/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt1/bfdd.conf
index 57f9cd9e3d..57f9cd9e3d 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/bfdd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt1/bfdd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt1/isisd.conf b/tests/topotests/bfd_isis_topo1/rt1/isisd.conf
index 8026aad49d..8026aad49d 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt1/isisd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step1/show_ip_route.ref b/tests/topotests/bfd_isis_topo1/rt1/step1/show_ip_route.ref
index af6e45cf33..af6e45cf33 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step1/show_ip_route.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step1/show_ip_route.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/bfd_isis_topo1/rt1/step1/show_ipv6_route.ref
index 68d3fe2c44..68d3fe2c44 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step1/show_ipv6_route.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step2/show_bfd_peers.ref b/tests/topotests/bfd_isis_topo1/rt1/step2/show_bfd_peers.ref
index cb4083d2fd..cb4083d2fd 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step2/show_bfd_peers.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step2/show_bfd_peers.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_healthy.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_bfd_peers_healthy.ref
index cb4083d2fd..cb4083d2fd 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_healthy.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_bfd_peers_healthy.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_rt2_down.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_bfd_peers_rt2_down.ref
index f00b9f3d32..f00b9f3d32 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_rt2_down.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_bfd_peers_rt2_down.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_rt3_down.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_bfd_peers_rt3_down.ref
index f5bd276a4a..f5bd276a4a 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_rt3_down.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_bfd_peers_rt3_down.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_healthy.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ip_route_healthy.ref
index af6e45cf33..af6e45cf33 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_healthy.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ip_route_healthy.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_rt2_down.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ip_route_rt2_down.ref
index b8366bc0b7..b8366bc0b7 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_rt2_down.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ip_route_rt2_down.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_rt3_down.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ip_route_rt3_down.ref
index 42bd6abf82..42bd6abf82 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_rt3_down.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ip_route_rt3_down.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_healthy.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_healthy.ref
index 68d3fe2c44..68d3fe2c44 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_healthy.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_healthy.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_rt2_down.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
index 200053c3e8..200053c3e8 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_rt2_down.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_rt3_down.ref b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
index 4297f163b5..4297f163b5 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_rt3_down.ref
+++ b/tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt1/zebra.conf b/tests/topotests/bfd_isis_topo1/rt1/zebra.conf
index 6003125b6b..6003125b6b 100644
--- a/tests/topotests/bfd-isis-topo1/rt1/zebra.conf
+++ b/tests/topotests/bfd_isis_topo1/rt1/zebra.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt2/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt2/bfdd.conf
index 6b34e337d3..6b34e337d3 100644
--- a/tests/topotests/bfd-isis-topo1/rt2/bfdd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt2/bfdd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt2/isisd.conf b/tests/topotests/bfd_isis_topo1/rt2/isisd.conf
index b0fde64a5e..b0fde64a5e 100644
--- a/tests/topotests/bfd-isis-topo1/rt2/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt2/isisd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt2/step2/show_bfd_peers.ref b/tests/topotests/bfd_isis_topo1/rt2/step2/show_bfd_peers.ref
index 8a90649efa..8a90649efa 100644
--- a/tests/topotests/bfd-isis-topo1/rt2/step2/show_bfd_peers.ref
+++ b/tests/topotests/bfd_isis_topo1/rt2/step2/show_bfd_peers.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt2/zebra.conf b/tests/topotests/bfd_isis_topo1/rt2/zebra.conf
index 5fc7fc5b28..5fc7fc5b28 100644
--- a/tests/topotests/bfd-isis-topo1/rt2/zebra.conf
+++ b/tests/topotests/bfd_isis_topo1/rt2/zebra.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt3/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt3/bfdd.conf
index 22937fe46f..22937fe46f 100644
--- a/tests/topotests/bfd-isis-topo1/rt3/bfdd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt3/bfdd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt3/isisd.conf b/tests/topotests/bfd_isis_topo1/rt3/isisd.conf
index 5c36e96c0f..5c36e96c0f 100644
--- a/tests/topotests/bfd-isis-topo1/rt3/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt3/isisd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt3/step2/show_bfd_peers.ref b/tests/topotests/bfd_isis_topo1/rt3/step2/show_bfd_peers.ref
index 13eb2a2c69..13eb2a2c69 100644
--- a/tests/topotests/bfd-isis-topo1/rt3/step2/show_bfd_peers.ref
+++ b/tests/topotests/bfd_isis_topo1/rt3/step2/show_bfd_peers.ref
diff --git a/tests/topotests/bfd-isis-topo1/rt3/zebra.conf b/tests/topotests/bfd_isis_topo1/rt3/zebra.conf
index d368de9bbe..d368de9bbe 100644
--- a/tests/topotests/bfd-isis-topo1/rt3/zebra.conf
+++ b/tests/topotests/bfd_isis_topo1/rt3/zebra.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt4/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt4/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-isis-topo1/rt4/bfdd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt4/bfdd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt4/isisd.conf b/tests/topotests/bfd_isis_topo1/rt4/isisd.conf
index 3eac407776..3eac407776 100644
--- a/tests/topotests/bfd-isis-topo1/rt4/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt4/isisd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt4/zebra.conf b/tests/topotests/bfd_isis_topo1/rt4/zebra.conf
index 7b053bac35..7b053bac35 100644
--- a/tests/topotests/bfd-isis-topo1/rt4/zebra.conf
+++ b/tests/topotests/bfd_isis_topo1/rt4/zebra.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt5/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt5/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-isis-topo1/rt5/bfdd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt5/bfdd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt5/isisd.conf b/tests/topotests/bfd_isis_topo1/rt5/isisd.conf
index 5d449f6f93..5d449f6f93 100644
--- a/tests/topotests/bfd-isis-topo1/rt5/isisd.conf
+++ b/tests/topotests/bfd_isis_topo1/rt5/isisd.conf
diff --git a/tests/topotests/bfd-isis-topo1/rt5/zebra.conf b/tests/topotests/bfd_isis_topo1/rt5/zebra.conf
index 0b7c9e02f3..0b7c9e02f3 100644
--- a/tests/topotests/bfd-isis-topo1/rt5/zebra.conf
+++ b/tests/topotests/bfd_isis_topo1/rt5/zebra.conf
diff --git a/tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py b/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py
index fcb5672dce..fcb5672dce 100644
--- a/tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py
+++ b/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py
diff --git a/tests/topotests/bfd-ospf-topo1/__init__.py b/tests/topotests/bfd_ospf_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-ospf-topo1/__init__.py
+++ b/tests/topotests/bfd_ospf_topo1/__init__.py
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt1/bfdd.conf
index 610a20f88a..610a20f88a 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/bfdd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt1/bfdd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt1/ospf6d.conf
index 18def599b4..18def599b4 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt1/ospf6d.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf
index 07b42f9885..07b42f9885 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step1/show_ip_route.ref b/tests/topotests/bfd_ospf_topo1/rt1/step1/show_ip_route.ref
index f354eff697..f354eff697 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step1/show_ip_route.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step1/show_ip_route.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/bfd_ospf_topo1/rt1/step1/show_ipv6_route.ref
index 6465efb8b5..6465efb8b5 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step1/show_ipv6_route.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step2/show_bfd_peers.ref b/tests/topotests/bfd_ospf_topo1/rt1/step2/show_bfd_peers.ref
index 63f0d50784..63f0d50784 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step2/show_bfd_peers.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step2/show_bfd_peers.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_healthy.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_bfd_peers_healthy.ref
index 42051f9582..42051f9582 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_healthy.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_bfd_peers_healthy.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_rt2_down.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_bfd_peers_rt2_down.ref
index d844ee6813..d844ee6813 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_rt2_down.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_bfd_peers_rt2_down.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_rt3_down.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_bfd_peers_rt3_down.ref
index 32799084fb..32799084fb 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_rt3_down.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_bfd_peers_rt3_down.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_healthy.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ip_route_healthy.ref
index f354eff697..f354eff697 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_healthy.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ip_route_healthy.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_rt2_down.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ip_route_rt2_down.ref
index 43eecd0b7a..43eecd0b7a 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_rt2_down.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ip_route_rt2_down.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_rt3_down.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ip_route_rt3_down.ref
index 409af6308b..409af6308b 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_rt3_down.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ip_route_rt3_down.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_healthy.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_healthy.ref
index 6465efb8b5..6465efb8b5 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_healthy.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_healthy.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_rt2_down.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
index cfb1ef1bb6..cfb1ef1bb6 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_rt2_down.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_rt3_down.ref b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
index 58b44da5c2..58b44da5c2 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_rt3_down.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt1/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt1/zebra.conf
index 6003125b6b..6003125b6b 100644
--- a/tests/topotests/bfd-ospf-topo1/rt1/zebra.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt1/zebra.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt2/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt2/bfdd.conf
index 437f063d8f..437f063d8f 100644
--- a/tests/topotests/bfd-ospf-topo1/rt2/bfdd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt2/bfdd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt2/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt2/ospf6d.conf
index 2f35099564..2f35099564 100644
--- a/tests/topotests/bfd-ospf-topo1/rt2/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt2/ospf6d.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt2/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf
index a05d8b58c8..a05d8b58c8 100644
--- a/tests/topotests/bfd-ospf-topo1/rt2/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt2/step2/show_bfd_peers.ref b/tests/topotests/bfd_ospf_topo1/rt2/step2/show_bfd_peers.ref
index d6df1ebfb2..d6df1ebfb2 100644
--- a/tests/topotests/bfd-ospf-topo1/rt2/step2/show_bfd_peers.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt2/step2/show_bfd_peers.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt2/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt2/zebra.conf
index 5fc7fc5b28..5fc7fc5b28 100644
--- a/tests/topotests/bfd-ospf-topo1/rt2/zebra.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt2/zebra.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt3/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt3/bfdd.conf
index 437f063d8f..437f063d8f 100644
--- a/tests/topotests/bfd-ospf-topo1/rt3/bfdd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt3/bfdd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt3/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt3/ospf6d.conf
index 3e8777019e..3e8777019e 100644
--- a/tests/topotests/bfd-ospf-topo1/rt3/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt3/ospf6d.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt3/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf
index 1196e6d189..1196e6d189 100644
--- a/tests/topotests/bfd-ospf-topo1/rt3/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt3/step2/show_bfd_peers.ref b/tests/topotests/bfd_ospf_topo1/rt3/step2/show_bfd_peers.ref
index d6df1ebfb2..d6df1ebfb2 100644
--- a/tests/topotests/bfd-ospf-topo1/rt3/step2/show_bfd_peers.ref
+++ b/tests/topotests/bfd_ospf_topo1/rt3/step2/show_bfd_peers.ref
diff --git a/tests/topotests/bfd-ospf-topo1/rt3/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt3/zebra.conf
index d368de9bbe..d368de9bbe 100644
--- a/tests/topotests/bfd-ospf-topo1/rt3/zebra.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt3/zebra.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt4/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt4/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-ospf-topo1/rt4/bfdd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt4/bfdd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt4/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt4/ospf6d.conf
index bccd1e75bd..bccd1e75bd 100644
--- a/tests/topotests/bfd-ospf-topo1/rt4/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt4/ospf6d.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt4/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf
index 3a2568b4ab..3a2568b4ab 100644
--- a/tests/topotests/bfd-ospf-topo1/rt4/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt4/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt4/zebra.conf
index 7b053bac35..7b053bac35 100644
--- a/tests/topotests/bfd-ospf-topo1/rt4/zebra.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt4/zebra.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt5/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt5/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-ospf-topo1/rt5/bfdd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt5/bfdd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt5/ospf6d.conf b/tests/topotests/bfd_ospf_topo1/rt5/ospf6d.conf
index 766862276c..766862276c 100644
--- a/tests/topotests/bfd-ospf-topo1/rt5/ospf6d.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt5/ospf6d.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt5/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf
index a35de5f45f..a35de5f45f 100644
--- a/tests/topotests/bfd-ospf-topo1/rt5/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf
diff --git a/tests/topotests/bfd-ospf-topo1/rt5/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt5/zebra.conf
index 0b7c9e02f3..0b7c9e02f3 100644
--- a/tests/topotests/bfd-ospf-topo1/rt5/zebra.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt5/zebra.conf
diff --git a/tests/topotests/bfd-ospf-topo1/test_bfd_ospf_topo1.py b/tests/topotests/bfd_ospf_topo1/test_bfd_ospf_topo1.py
index ae148f948c..ae148f948c 100755
--- a/tests/topotests/bfd-ospf-topo1/test_bfd_ospf_topo1.py
+++ b/tests/topotests/bfd_ospf_topo1/test_bfd_ospf_topo1.py
diff --git a/tests/topotests/bfd-profiles-topo1/__init__.py b/tests/topotests/bfd_profiles_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-profiles-topo1/__init__.py
+++ b/tests/topotests/bfd_profiles_topo1/__init__.py
diff --git a/tests/topotests/bfd-profiles-topo1/r1/bfd-peers-initial.json b/tests/topotests/bfd_profiles_topo1/r1/bfd-peers-initial.json
index 86a7e5139c..86a7e5139c 100644
--- a/tests/topotests/bfd-profiles-topo1/r1/bfd-peers-initial.json
+++ b/tests/topotests/bfd_profiles_topo1/r1/bfd-peers-initial.json
diff --git a/tests/topotests/bfd-profiles-topo1/r1/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r1/bfdd.conf
index 688f2e839c..688f2e839c 100644
--- a/tests/topotests/bfd-profiles-topo1/r1/bfdd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r1/bfdd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r1/ospfd.conf b/tests/topotests/bfd_profiles_topo1/r1/ospfd.conf
index fcea5d48fc..fcea5d48fc 100644
--- a/tests/topotests/bfd-profiles-topo1/r1/ospfd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r1/ospfd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r1/zebra.conf b/tests/topotests/bfd_profiles_topo1/r1/zebra.conf
index 4b7982b235..4b7982b235 100644
--- a/tests/topotests/bfd-profiles-topo1/r1/zebra.conf
+++ b/tests/topotests/bfd_profiles_topo1/r1/zebra.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json b/tests/topotests/bfd_profiles_topo1/r2/bfd-peers-initial.json
index 503f776aec..503f776aec 100644
--- a/tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json
+++ b/tests/topotests/bfd_profiles_topo1/r2/bfd-peers-initial.json
diff --git a/tests/topotests/bfd-profiles-topo1/r2/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r2/bfdd.conf
index 700c46ba1e..700c46ba1e 100644
--- a/tests/topotests/bfd-profiles-topo1/r2/bfdd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r2/bfdd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r2/bgpd.conf b/tests/topotests/bfd_profiles_topo1/r2/bgpd.conf
index 0c3db97bc1..0c3db97bc1 100644
--- a/tests/topotests/bfd-profiles-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r2/bgpd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r2/zebra.conf b/tests/topotests/bfd_profiles_topo1/r2/zebra.conf
index 6acef139b9..6acef139b9 100644
--- a/tests/topotests/bfd-profiles-topo1/r2/zebra.conf
+++ b/tests/topotests/bfd_profiles_topo1/r2/zebra.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json b/tests/topotests/bfd_profiles_topo1/r3/bfd-peers-initial.json
index d987a0ae7d..d987a0ae7d 100644
--- a/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json
+++ b/tests/topotests/bfd_profiles_topo1/r3/bfd-peers-initial.json
diff --git a/tests/topotests/bfd-profiles-topo1/r3/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r3/bfdd.conf
index 08eb0468d6..08eb0468d6 100644
--- a/tests/topotests/bfd-profiles-topo1/r3/bfdd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r3/bfdd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf b/tests/topotests/bfd_profiles_topo1/r3/bgpd.conf
index 65647b39e5..65647b39e5 100644
--- a/tests/topotests/bfd-profiles-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r3/bgpd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r3/isisd.conf b/tests/topotests/bfd_profiles_topo1/r3/isisd.conf
index ca965e3956..ca965e3956 100644
--- a/tests/topotests/bfd-profiles-topo1/r3/isisd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r3/isisd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r3/zebra.conf b/tests/topotests/bfd_profiles_topo1/r3/zebra.conf
index 2297bfafe9..2297bfafe9 100644
--- a/tests/topotests/bfd-profiles-topo1/r3/zebra.conf
+++ b/tests/topotests/bfd_profiles_topo1/r3/zebra.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json b/tests/topotests/bfd_profiles_topo1/r4/bfd-peers-initial.json
index 9ab7479979..9ab7479979 100644
--- a/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json
+++ b/tests/topotests/bfd_profiles_topo1/r4/bfd-peers-initial.json
diff --git a/tests/topotests/bfd-profiles-topo1/r4/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r4/bfdd.conf
index 4f5e022077..4f5e022077 100644
--- a/tests/topotests/bfd-profiles-topo1/r4/bfdd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r4/bfdd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf b/tests/topotests/bfd_profiles_topo1/r4/bgpd.conf
index 200937a9a5..200937a9a5 100644
--- a/tests/topotests/bfd-profiles-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r4/bgpd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r4/isisd.conf b/tests/topotests/bfd_profiles_topo1/r4/isisd.conf
index d8ffc9bc2c..d8ffc9bc2c 100644
--- a/tests/topotests/bfd-profiles-topo1/r4/isisd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r4/isisd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r4/ospf6d.conf b/tests/topotests/bfd_profiles_topo1/r4/ospf6d.conf
index 4ef28c39ca..4ef28c39ca 100644
--- a/tests/topotests/bfd-profiles-topo1/r4/ospf6d.conf
+++ b/tests/topotests/bfd_profiles_topo1/r4/ospf6d.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r4/zebra.conf b/tests/topotests/bfd_profiles_topo1/r4/zebra.conf
index 753041f952..753041f952 100644
--- a/tests/topotests/bfd-profiles-topo1/r4/zebra.conf
+++ b/tests/topotests/bfd_profiles_topo1/r4/zebra.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r5/bfd-peers-initial.json b/tests/topotests/bfd_profiles_topo1/r5/bfd-peers-initial.json
index 0fe56d576b..0fe56d576b 100644
--- a/tests/topotests/bfd-profiles-topo1/r5/bfd-peers-initial.json
+++ b/tests/topotests/bfd_profiles_topo1/r5/bfd-peers-initial.json
diff --git a/tests/topotests/bfd-profiles-topo1/r5/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r5/bfdd.conf
index 74dae5a60d..74dae5a60d 100644
--- a/tests/topotests/bfd-profiles-topo1/r5/bfdd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r5/bfdd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r5/ospf6d.conf b/tests/topotests/bfd_profiles_topo1/r5/ospf6d.conf
index 20b53cfc55..20b53cfc55 100644
--- a/tests/topotests/bfd-profiles-topo1/r5/ospf6d.conf
+++ b/tests/topotests/bfd_profiles_topo1/r5/ospf6d.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r5/zebra.conf b/tests/topotests/bfd_profiles_topo1/r5/zebra.conf
index de8ae1644b..de8ae1644b 100644
--- a/tests/topotests/bfd-profiles-topo1/r5/zebra.conf
+++ b/tests/topotests/bfd_profiles_topo1/r5/zebra.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r6/bfd-peers-initial.json b/tests/topotests/bfd_profiles_topo1/r6/bfd-peers-initial.json
index ec973eb365..ec973eb365 100644
--- a/tests/topotests/bfd-profiles-topo1/r6/bfd-peers-initial.json
+++ b/tests/topotests/bfd_profiles_topo1/r6/bfd-peers-initial.json
diff --git a/tests/topotests/bfd-profiles-topo1/r6/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r6/bfdd.conf
index 74dae5a60d..74dae5a60d 100644
--- a/tests/topotests/bfd-profiles-topo1/r6/bfdd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r6/bfdd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r6/ospfd.conf b/tests/topotests/bfd_profiles_topo1/r6/ospfd.conf
index d8fce344a8..d8fce344a8 100644
--- a/tests/topotests/bfd-profiles-topo1/r6/ospfd.conf
+++ b/tests/topotests/bfd_profiles_topo1/r6/ospfd.conf
diff --git a/tests/topotests/bfd-profiles-topo1/r6/zebra.conf b/tests/topotests/bfd_profiles_topo1/r6/zebra.conf
index c0804b94a7..c0804b94a7 100644
--- a/tests/topotests/bfd-profiles-topo1/r6/zebra.conf
+++ b/tests/topotests/bfd_profiles_topo1/r6/zebra.conf
diff --git a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.dot b/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.dot
index a3936093aa..a3936093aa 100644
--- a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.dot
+++ b/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.dot
diff --git a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.png b/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.png
index 775fae13f1..775fae13f1 100644
--- a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.png
+++ b/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.png
diff --git a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py b/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.py
index 4a2c8ee002..4a2c8ee002 100644
--- a/tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py
+++ b/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.py
diff --git a/tests/topotests/bfd-topo1/__init__.py b/tests/topotests/bfd_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-topo1/__init__.py
+++ b/tests/topotests/bfd_topo1/__init__.py
diff --git a/tests/topotests/bfd-topo1/r1/bfdd.conf b/tests/topotests/bfd_topo1/r1/bfdd.conf
index 4102000337..4102000337 100644
--- a/tests/topotests/bfd-topo1/r1/bfdd.conf
+++ b/tests/topotests/bfd_topo1/r1/bfdd.conf
diff --git a/tests/topotests/bfd-topo1/r1/bgp_prefixes.json b/tests/topotests/bfd_topo1/r1/bgp_prefixes.json
index 1262f5e984..1262f5e984 100644
--- a/tests/topotests/bfd-topo1/r1/bgp_prefixes.json
+++ b/tests/topotests/bfd_topo1/r1/bgp_prefixes.json
diff --git a/tests/topotests/bfd-topo1/r1/bgp_summary.json b/tests/topotests/bfd_topo1/r1/bgp_summary.json
index fa07d60df9..fa07d60df9 100644
--- a/tests/topotests/bfd-topo1/r1/bgp_summary.json
+++ b/tests/topotests/bfd_topo1/r1/bgp_summary.json
diff --git a/tests/topotests/bfd-topo1/r1/bgpd.conf b/tests/topotests/bfd_topo1/r1/bgpd.conf
index 57bde1f234..57bde1f234 100644
--- a/tests/topotests/bfd-topo1/r1/bgpd.conf
+++ b/tests/topotests/bfd_topo1/r1/bgpd.conf
diff --git a/tests/topotests/bfd-topo1/r1/peers.json b/tests/topotests/bfd_topo1/r1/peers.json
index f49768ff75..f49768ff75 100644
--- a/tests/topotests/bfd-topo1/r1/peers.json
+++ b/tests/topotests/bfd_topo1/r1/peers.json
diff --git a/tests/topotests/bfd-topo1/r1/zebra.conf b/tests/topotests/bfd_topo1/r1/zebra.conf
index a14cd7ac88..a14cd7ac88 100644
--- a/tests/topotests/bfd-topo1/r1/zebra.conf
+++ b/tests/topotests/bfd_topo1/r1/zebra.conf
diff --git a/tests/topotests/bfd-topo1/r2/bfdd.conf b/tests/topotests/bfd_topo1/r2/bfdd.conf
index 412450ca1e..412450ca1e 100644
--- a/tests/topotests/bfd-topo1/r2/bfdd.conf
+++ b/tests/topotests/bfd_topo1/r2/bfdd.conf
diff --git a/tests/topotests/bfd-topo1/r2/bgp_prefixes.json b/tests/topotests/bfd_topo1/r2/bgp_prefixes.json
index 0d47c0fc30..0d47c0fc30 100644
--- a/tests/topotests/bfd-topo1/r2/bgp_prefixes.json
+++ b/tests/topotests/bfd_topo1/r2/bgp_prefixes.json
diff --git a/tests/topotests/bfd-topo1/r2/bgp_summary.json b/tests/topotests/bfd_topo1/r2/bgp_summary.json
index c0ef11ac5f..c0ef11ac5f 100644
--- a/tests/topotests/bfd-topo1/r2/bgp_summary.json
+++ b/tests/topotests/bfd_topo1/r2/bgp_summary.json
diff --git a/tests/topotests/bfd-topo1/r2/bgpd.conf b/tests/topotests/bfd_topo1/r2/bgpd.conf
index 50d75ab67f..50d75ab67f 100644
--- a/tests/topotests/bfd-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd_topo1/r2/bgpd.conf
diff --git a/tests/topotests/bfd-topo1/r2/peers.json b/tests/topotests/bfd_topo1/r2/peers.json
index 267459c7a8..267459c7a8 100644
--- a/tests/topotests/bfd-topo1/r2/peers.json
+++ b/tests/topotests/bfd_topo1/r2/peers.json
diff --git a/tests/topotests/bfd-topo1/r2/zebra.conf b/tests/topotests/bfd_topo1/r2/zebra.conf
index 568abe751e..568abe751e 100644
--- a/tests/topotests/bfd-topo1/r2/zebra.conf
+++ b/tests/topotests/bfd_topo1/r2/zebra.conf
diff --git a/tests/topotests/bfd-topo1/r3/bfdd.conf b/tests/topotests/bfd_topo1/r3/bfdd.conf
index 4cf20bb904..4cf20bb904 100644
--- a/tests/topotests/bfd-topo1/r3/bfdd.conf
+++ b/tests/topotests/bfd_topo1/r3/bfdd.conf
diff --git a/tests/topotests/bfd-topo1/r3/bgp_prefixes.json b/tests/topotests/bfd_topo1/r3/bgp_prefixes.json
index 36fca17bbf..36fca17bbf 100644
--- a/tests/topotests/bfd-topo1/r3/bgp_prefixes.json
+++ b/tests/topotests/bfd_topo1/r3/bgp_prefixes.json
diff --git a/tests/topotests/bfd-topo1/r3/bgp_summary.json b/tests/topotests/bfd_topo1/r3/bgp_summary.json
index d47833377b..d47833377b 100644
--- a/tests/topotests/bfd-topo1/r3/bgp_summary.json
+++ b/tests/topotests/bfd_topo1/r3/bgp_summary.json
diff --git a/tests/topotests/bfd-topo1/r3/bgpd.conf b/tests/topotests/bfd_topo1/r3/bgpd.conf
index ce6055d518..ce6055d518 100644
--- a/tests/topotests/bfd-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd_topo1/r3/bgpd.conf
diff --git a/tests/topotests/bfd-topo1/r3/peers.json b/tests/topotests/bfd_topo1/r3/peers.json
index ef38008643..ef38008643 100644
--- a/tests/topotests/bfd-topo1/r3/peers.json
+++ b/tests/topotests/bfd_topo1/r3/peers.json
diff --git a/tests/topotests/bfd-topo1/r3/zebra.conf b/tests/topotests/bfd_topo1/r3/zebra.conf
index b4fd80fa10..b4fd80fa10 100644
--- a/tests/topotests/bfd-topo1/r3/zebra.conf
+++ b/tests/topotests/bfd_topo1/r3/zebra.conf
diff --git a/tests/topotests/bfd-topo1/r4/bfdd.conf b/tests/topotests/bfd_topo1/r4/bfdd.conf
index 34b88c9a35..34b88c9a35 100644
--- a/tests/topotests/bfd-topo1/r4/bfdd.conf
+++ b/tests/topotests/bfd_topo1/r4/bfdd.conf
diff --git a/tests/topotests/bfd-topo1/r4/bgp_prefixes.json b/tests/topotests/bfd_topo1/r4/bgp_prefixes.json
index efe7d47b1a..efe7d47b1a 100644
--- a/tests/topotests/bfd-topo1/r4/bgp_prefixes.json
+++ b/tests/topotests/bfd_topo1/r4/bgp_prefixes.json
diff --git a/tests/topotests/bfd-topo1/r4/bgp_summary.json b/tests/topotests/bfd_topo1/r4/bgp_summary.json
index 7d81784b56..7d81784b56 100644
--- a/tests/topotests/bfd-topo1/r4/bgp_summary.json
+++ b/tests/topotests/bfd_topo1/r4/bgp_summary.json
diff --git a/tests/topotests/bfd-topo1/r4/bgpd.conf b/tests/topotests/bfd_topo1/r4/bgpd.conf
index 0d032b4cdd..0d032b4cdd 100644
--- a/tests/topotests/bfd-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd_topo1/r4/bgpd.conf
diff --git a/tests/topotests/bfd-topo1/r4/peers.json b/tests/topotests/bfd_topo1/r4/peers.json
index 37140089e1..37140089e1 100644
--- a/tests/topotests/bfd-topo1/r4/peers.json
+++ b/tests/topotests/bfd_topo1/r4/peers.json
diff --git a/tests/topotests/bfd-topo1/r4/zebra.conf b/tests/topotests/bfd_topo1/r4/zebra.conf
index afdd44b1ab..afdd44b1ab 100644
--- a/tests/topotests/bfd-topo1/r4/zebra.conf
+++ b/tests/topotests/bfd_topo1/r4/zebra.conf
diff --git a/tests/topotests/bfd-topo1/test_bfd_topo1.dot b/tests/topotests/bfd_topo1/test_bfd_topo1.dot
index c84ace2780..c84ace2780 100644
--- a/tests/topotests/bfd-topo1/test_bfd_topo1.dot
+++ b/tests/topotests/bfd_topo1/test_bfd_topo1.dot
diff --git a/tests/topotests/bfd-topo1/test_bfd_topo1.jpg b/tests/topotests/bfd_topo1/test_bfd_topo1.jpg
index 4d6d56e072..4d6d56e072 100644
--- a/tests/topotests/bfd-topo1/test_bfd_topo1.jpg
+++ b/tests/topotests/bfd_topo1/test_bfd_topo1.jpg
diff --git a/tests/topotests/bfd-topo1/test_bfd_topo1.py b/tests/topotests/bfd_topo1/test_bfd_topo1.py
index 86bdcfed04..86bdcfed04 100644
--- a/tests/topotests/bfd-topo1/test_bfd_topo1.py
+++ b/tests/topotests/bfd_topo1/test_bfd_topo1.py
diff --git a/tests/topotests/bfd-topo2/__init__.py b/tests/topotests/bfd_topo2/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-topo2/__init__.py
+++ b/tests/topotests/bfd_topo2/__init__.py
diff --git a/tests/topotests/bfd-topo2/r1/bfdd.conf b/tests/topotests/bfd_topo2/r1/bfdd.conf
index f03135021e..f03135021e 100644
--- a/tests/topotests/bfd-topo2/r1/bfdd.conf
+++ b/tests/topotests/bfd_topo2/r1/bfdd.conf
diff --git a/tests/topotests/bfd-topo2/r1/bgpd.conf b/tests/topotests/bfd_topo2/r1/bgpd.conf
index 0918796e95..0918796e95 100644
--- a/tests/topotests/bfd-topo2/r1/bgpd.conf
+++ b/tests/topotests/bfd_topo2/r1/bgpd.conf
diff --git a/tests/topotests/bfd-topo2/r1/ipv4_routes.json b/tests/topotests/bfd_topo2/r1/ipv4_routes.json
index 650c0a81bb..650c0a81bb 100644
--- a/tests/topotests/bfd-topo2/r1/ipv4_routes.json
+++ b/tests/topotests/bfd_topo2/r1/ipv4_routes.json
diff --git a/tests/topotests/bfd-topo2/r1/ipv6_routes.json b/tests/topotests/bfd_topo2/r1/ipv6_routes.json
index 50c1f9ad8f..50c1f9ad8f 100644
--- a/tests/topotests/bfd-topo2/r1/ipv6_routes.json
+++ b/tests/topotests/bfd_topo2/r1/ipv6_routes.json
diff --git a/tests/topotests/bfd-topo2/r1/peers.json b/tests/topotests/bfd_topo2/r1/peers.json
index 9bce991d0d..9bce991d0d 100644
--- a/tests/topotests/bfd-topo2/r1/peers.json
+++ b/tests/topotests/bfd_topo2/r1/peers.json
diff --git a/tests/topotests/bfd-topo2/r1/zebra.conf b/tests/topotests/bfd_topo2/r1/zebra.conf
index 7fe5eb218f..7fe5eb218f 100644
--- a/tests/topotests/bfd-topo2/r1/zebra.conf
+++ b/tests/topotests/bfd_topo2/r1/zebra.conf
diff --git a/tests/topotests/bfd-topo2/r2/bfdd.conf b/tests/topotests/bfd_topo2/r2/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-topo2/r2/bfdd.conf
+++ b/tests/topotests/bfd_topo2/r2/bfdd.conf
diff --git a/tests/topotests/bfd-topo2/r2/bgpd.conf b/tests/topotests/bfd_topo2/r2/bgpd.conf
index 55d48560e7..55d48560e7 100644
--- a/tests/topotests/bfd-topo2/r2/bgpd.conf
+++ b/tests/topotests/bfd_topo2/r2/bgpd.conf
diff --git a/tests/topotests/bfd-topo2/r2/ipv4_routes.json b/tests/topotests/bfd_topo2/r2/ipv4_routes.json
index 3d49b178b5..3d49b178b5 100644
--- a/tests/topotests/bfd-topo2/r2/ipv4_routes.json
+++ b/tests/topotests/bfd_topo2/r2/ipv4_routes.json
diff --git a/tests/topotests/bfd-topo2/r2/ipv6_routes.json b/tests/topotests/bfd_topo2/r2/ipv6_routes.json
index 4f3c74c5e2..4f3c74c5e2 100644
--- a/tests/topotests/bfd-topo2/r2/ipv6_routes.json
+++ b/tests/topotests/bfd_topo2/r2/ipv6_routes.json
diff --git a/tests/topotests/bfd-topo2/r2/ospf6d.conf b/tests/topotests/bfd_topo2/r2/ospf6d.conf
index 48a729ce19..48a729ce19 100644
--- a/tests/topotests/bfd-topo2/r2/ospf6d.conf
+++ b/tests/topotests/bfd_topo2/r2/ospf6d.conf
diff --git a/tests/topotests/bfd-topo2/r2/ospfd.conf b/tests/topotests/bfd_topo2/r2/ospfd.conf
index c786f1fe43..c786f1fe43 100644
--- a/tests/topotests/bfd-topo2/r2/ospfd.conf
+++ b/tests/topotests/bfd_topo2/r2/ospfd.conf
diff --git a/tests/topotests/bfd-topo2/r2/peers.json b/tests/topotests/bfd_topo2/r2/peers.json
index ec2135ce37..ec2135ce37 100644
--- a/tests/topotests/bfd-topo2/r2/peers.json
+++ b/tests/topotests/bfd_topo2/r2/peers.json
diff --git a/tests/topotests/bfd-topo2/r2/zebra.conf b/tests/topotests/bfd_topo2/r2/zebra.conf
index cccbf6574a..cccbf6574a 100644
--- a/tests/topotests/bfd-topo2/r2/zebra.conf
+++ b/tests/topotests/bfd_topo2/r2/zebra.conf
diff --git a/tests/topotests/bfd-topo2/r3/bfdd.conf b/tests/topotests/bfd_topo2/r3/bfdd.conf
index f35e772790..f35e772790 100644
--- a/tests/topotests/bfd-topo2/r3/bfdd.conf
+++ b/tests/topotests/bfd_topo2/r3/bfdd.conf
diff --git a/tests/topotests/bfd-topo2/r3/ipv4_routes.json b/tests/topotests/bfd_topo2/r3/ipv4_routes.json
index e96fdc0b15..e96fdc0b15 100644
--- a/tests/topotests/bfd-topo2/r3/ipv4_routes.json
+++ b/tests/topotests/bfd_topo2/r3/ipv4_routes.json
diff --git a/tests/topotests/bfd-topo2/r3/ipv6_routes.json b/tests/topotests/bfd_topo2/r3/ipv6_routes.json
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/bfd-topo2/r3/ipv6_routes.json
+++ b/tests/topotests/bfd_topo2/r3/ipv6_routes.json
diff --git a/tests/topotests/bfd-topo2/r3/ospfd.conf b/tests/topotests/bfd_topo2/r3/ospfd.conf
index 932ab4da63..932ab4da63 100644
--- a/tests/topotests/bfd-topo2/r3/ospfd.conf
+++ b/tests/topotests/bfd_topo2/r3/ospfd.conf
diff --git a/tests/topotests/bfd-topo2/r3/peers.json b/tests/topotests/bfd_topo2/r3/peers.json
index c19c980338..c19c980338 100644
--- a/tests/topotests/bfd-topo2/r3/peers.json
+++ b/tests/topotests/bfd_topo2/r3/peers.json
diff --git a/tests/topotests/bfd-topo2/r3/zebra.conf b/tests/topotests/bfd_topo2/r3/zebra.conf
index 96fd08c729..96fd08c729 100644
--- a/tests/topotests/bfd-topo2/r3/zebra.conf
+++ b/tests/topotests/bfd_topo2/r3/zebra.conf
diff --git a/tests/topotests/bfd-topo2/r4/bfdd.conf b/tests/topotests/bfd_topo2/r4/bfdd.conf
index 0173dc9be2..0173dc9be2 100644
--- a/tests/topotests/bfd-topo2/r4/bfdd.conf
+++ b/tests/topotests/bfd_topo2/r4/bfdd.conf
diff --git a/tests/topotests/bfd-topo2/r4/ipv4_routes.json b/tests/topotests/bfd_topo2/r4/ipv4_routes.json
index dc394aa891..dc394aa891 100644
--- a/tests/topotests/bfd-topo2/r4/ipv4_routes.json
+++ b/tests/topotests/bfd_topo2/r4/ipv4_routes.json
diff --git a/tests/topotests/bfd-topo2/r4/ipv6_routes.json b/tests/topotests/bfd_topo2/r4/ipv6_routes.json
index c828575c84..c828575c84 100644
--- a/tests/topotests/bfd-topo2/r4/ipv6_routes.json
+++ b/tests/topotests/bfd_topo2/r4/ipv6_routes.json
diff --git a/tests/topotests/bfd-topo2/r4/ospf6d.conf b/tests/topotests/bfd_topo2/r4/ospf6d.conf
index 57f7f6c079..57f7f6c079 100644
--- a/tests/topotests/bfd-topo2/r4/ospf6d.conf
+++ b/tests/topotests/bfd_topo2/r4/ospf6d.conf
diff --git a/tests/topotests/bfd-topo2/r4/peers.json b/tests/topotests/bfd_topo2/r4/peers.json
index dd26b9b580..dd26b9b580 100644
--- a/tests/topotests/bfd-topo2/r4/peers.json
+++ b/tests/topotests/bfd_topo2/r4/peers.json
diff --git a/tests/topotests/bfd-topo2/r4/zebra.conf b/tests/topotests/bfd_topo2/r4/zebra.conf
index e4f8fd8514..e4f8fd8514 100644
--- a/tests/topotests/bfd-topo2/r4/zebra.conf
+++ b/tests/topotests/bfd_topo2/r4/zebra.conf
diff --git a/tests/topotests/bfd-topo2/test_bfd_topo2.dot b/tests/topotests/bfd_topo2/test_bfd_topo2.dot
index 6b68fb398f..6b68fb398f 100644
--- a/tests/topotests/bfd-topo2/test_bfd_topo2.dot
+++ b/tests/topotests/bfd_topo2/test_bfd_topo2.dot
diff --git a/tests/topotests/bfd-topo2/test_bfd_topo2.jpg b/tests/topotests/bfd_topo2/test_bfd_topo2.jpg
index 35fe562a80..35fe562a80 100644
--- a/tests/topotests/bfd-topo2/test_bfd_topo2.jpg
+++ b/tests/topotests/bfd_topo2/test_bfd_topo2.jpg
diff --git a/tests/topotests/bfd-topo2/test_bfd_topo2.py b/tests/topotests/bfd_topo2/test_bfd_topo2.py
index e85b2644dd..e85b2644dd 100644
--- a/tests/topotests/bfd-topo2/test_bfd_topo2.py
+++ b/tests/topotests/bfd_topo2/test_bfd_topo2.py
diff --git a/tests/topotests/bfd-topo3/__init__.py b/tests/topotests/bfd_topo3/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-topo3/__init__.py
+++ b/tests/topotests/bfd_topo3/__init__.py
diff --git a/tests/topotests/bfd-topo3/r1/bfd-peers.json b/tests/topotests/bfd_topo3/r1/bfd-peers.json
index f8a354fc20..f8a354fc20 100644
--- a/tests/topotests/bfd-topo3/r1/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r1/bfd-peers.json
diff --git a/tests/topotests/bfd-topo3/r1/bfdd.conf b/tests/topotests/bfd_topo3/r1/bfdd.conf
index 8e40b76d41..8e40b76d41 100644
--- a/tests/topotests/bfd-topo3/r1/bfdd.conf
+++ b/tests/topotests/bfd_topo3/r1/bfdd.conf
diff --git a/tests/topotests/bfd-topo3/r1/bgpd.conf b/tests/topotests/bfd_topo3/r1/bgpd.conf
index 4c75d669c5..4c75d669c5 100644
--- a/tests/topotests/bfd-topo3/r1/bgpd.conf
+++ b/tests/topotests/bfd_topo3/r1/bgpd.conf
diff --git a/tests/topotests/bfd-topo3/r1/zebra.conf b/tests/topotests/bfd_topo3/r1/zebra.conf
index 64aee48436..64aee48436 100644
--- a/tests/topotests/bfd-topo3/r1/zebra.conf
+++ b/tests/topotests/bfd_topo3/r1/zebra.conf
diff --git a/tests/topotests/bfd-topo3/r2/bfd-peers.json b/tests/topotests/bfd_topo3/r2/bfd-peers.json
index 786d66dbe3..786d66dbe3 100644
--- a/tests/topotests/bfd-topo3/r2/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r2/bfd-peers.json
diff --git a/tests/topotests/bfd-topo3/r2/bfdd.conf b/tests/topotests/bfd_topo3/r2/bfdd.conf
index 2a92e463e0..2a92e463e0 100644
--- a/tests/topotests/bfd-topo3/r2/bfdd.conf
+++ b/tests/topotests/bfd_topo3/r2/bfdd.conf
diff --git a/tests/topotests/bfd-topo3/r2/bgpd.conf b/tests/topotests/bfd_topo3/r2/bgpd.conf
index 75225765e1..75225765e1 100644
--- a/tests/topotests/bfd-topo3/r2/bgpd.conf
+++ b/tests/topotests/bfd_topo3/r2/bgpd.conf
diff --git a/tests/topotests/bfd-topo3/r2/zebra.conf b/tests/topotests/bfd_topo3/r2/zebra.conf
index c7e22d4804..c7e22d4804 100644
--- a/tests/topotests/bfd-topo3/r2/zebra.conf
+++ b/tests/topotests/bfd_topo3/r2/zebra.conf
diff --git a/tests/topotests/bfd-topo3/r3/bfd-peers.json b/tests/topotests/bfd_topo3/r3/bfd-peers.json
index 1f58663a4e..1f58663a4e 100644
--- a/tests/topotests/bfd-topo3/r3/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r3/bfd-peers.json
diff --git a/tests/topotests/bfd-topo3/r3/bfdd.conf b/tests/topotests/bfd_topo3/r3/bfdd.conf
index f7972c6ce5..f7972c6ce5 100644
--- a/tests/topotests/bfd-topo3/r3/bfdd.conf
+++ b/tests/topotests/bfd_topo3/r3/bfdd.conf
diff --git a/tests/topotests/bfd-topo3/r3/bgpd.conf b/tests/topotests/bfd_topo3/r3/bgpd.conf
index 82adf8be9e..82adf8be9e 100644
--- a/tests/topotests/bfd-topo3/r3/bgpd.conf
+++ b/tests/topotests/bfd_topo3/r3/bgpd.conf
diff --git a/tests/topotests/bfd-topo3/r3/zebra.conf b/tests/topotests/bfd_topo3/r3/zebra.conf
index 14248fb6f7..14248fb6f7 100644
--- a/tests/topotests/bfd-topo3/r3/zebra.conf
+++ b/tests/topotests/bfd_topo3/r3/zebra.conf
diff --git a/tests/topotests/bfd-topo3/r4/bfd-peers.json b/tests/topotests/bfd_topo3/r4/bfd-peers.json
index 5477f39120..5477f39120 100644
--- a/tests/topotests/bfd-topo3/r4/bfd-peers.json
+++ b/tests/topotests/bfd_topo3/r4/bfd-peers.json
diff --git a/tests/topotests/bfd-topo3/r4/bfdd.conf b/tests/topotests/bfd_topo3/r4/bfdd.conf
index f44abc0b8a..f44abc0b8a 100644
--- a/tests/topotests/bfd-topo3/r4/bfdd.conf
+++ b/tests/topotests/bfd_topo3/r4/bfdd.conf
diff --git a/tests/topotests/bfd-topo3/r4/bgpd.conf b/tests/topotests/bfd_topo3/r4/bgpd.conf
index 0aab6e3017..0aab6e3017 100644
--- a/tests/topotests/bfd-topo3/r4/bgpd.conf
+++ b/tests/topotests/bfd_topo3/r4/bgpd.conf
diff --git a/tests/topotests/bfd-topo3/r4/zebra.conf b/tests/topotests/bfd_topo3/r4/zebra.conf
index bf0cfcf42c..bf0cfcf42c 100644
--- a/tests/topotests/bfd-topo3/r4/zebra.conf
+++ b/tests/topotests/bfd_topo3/r4/zebra.conf
diff --git a/tests/topotests/bfd-topo3/test_bfd_topo3.dot b/tests/topotests/bfd_topo3/test_bfd_topo3.dot
index 502cea11f2..502cea11f2 100644
--- a/tests/topotests/bfd-topo3/test_bfd_topo3.dot
+++ b/tests/topotests/bfd_topo3/test_bfd_topo3.dot
diff --git a/tests/topotests/bfd-topo3/test_bfd_topo3.jpg b/tests/topotests/bfd_topo3/test_bfd_topo3.jpg
index 6b532560bf..6b532560bf 100644
--- a/tests/topotests/bfd-topo3/test_bfd_topo3.jpg
+++ b/tests/topotests/bfd_topo3/test_bfd_topo3.jpg
diff --git a/tests/topotests/bfd-topo3/test_bfd_topo3.py b/tests/topotests/bfd_topo3/test_bfd_topo3.py
index 6bb223e203..6bb223e203 100644
--- a/tests/topotests/bfd-topo3/test_bfd_topo3.py
+++ b/tests/topotests/bfd_topo3/test_bfd_topo3.py
diff --git a/tests/topotests/bfd-vrf-topo1/__init__.py b/tests/topotests/bfd_vrf_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bfd-vrf-topo1/__init__.py
+++ b/tests/topotests/bfd_vrf_topo1/__init__.py
diff --git a/tests/topotests/bfd-vrf-topo1/r1/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r1/bfdd.conf
index 5e736a7fcc..5e736a7fcc 100644
--- a/tests/topotests/bfd-vrf-topo1/r1/bfdd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r1/bfdd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r1/bgp_prefixes.json b/tests/topotests/bfd_vrf_topo1/r1/bgp_prefixes.json
index 1262f5e984..1262f5e984 100644
--- a/tests/topotests/bfd-vrf-topo1/r1/bgp_prefixes.json
+++ b/tests/topotests/bfd_vrf_topo1/r1/bgp_prefixes.json
diff --git a/tests/topotests/bfd-vrf-topo1/r1/bgp_summary.json b/tests/topotests/bfd_vrf_topo1/r1/bgp_summary.json
index fa07d60df9..fa07d60df9 100644
--- a/tests/topotests/bfd-vrf-topo1/r1/bgp_summary.json
+++ b/tests/topotests/bfd_vrf_topo1/r1/bgp_summary.json
diff --git a/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf b/tests/topotests/bfd_vrf_topo1/r1/bgpd.conf
index 5bb45b9863..5bb45b9863 100644
--- a/tests/topotests/bfd-vrf-topo1/r1/bgpd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r1/bgpd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r1/peers.json b/tests/topotests/bfd_vrf_topo1/r1/peers.json
index f49768ff75..f49768ff75 100644
--- a/tests/topotests/bfd-vrf-topo1/r1/peers.json
+++ b/tests/topotests/bfd_vrf_topo1/r1/peers.json
diff --git a/tests/topotests/bfd-vrf-topo1/r1/zebra.conf b/tests/topotests/bfd_vrf_topo1/r1/zebra.conf
index fcd1e7db17..fcd1e7db17 100644
--- a/tests/topotests/bfd-vrf-topo1/r1/zebra.conf
+++ b/tests/topotests/bfd_vrf_topo1/r1/zebra.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r2/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r2/bfdd.conf
index 94f502c7d9..94f502c7d9 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/bfdd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r2/bfdd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r2/bgp_prefixes.json b/tests/topotests/bfd_vrf_topo1/r2/bgp_prefixes.json
index 0d47c0fc30..0d47c0fc30 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/bgp_prefixes.json
+++ b/tests/topotests/bfd_vrf_topo1/r2/bgp_prefixes.json
diff --git a/tests/topotests/bfd-vrf-topo1/r2/bgp_summary.json b/tests/topotests/bfd_vrf_topo1/r2/bgp_summary.json
index c0ef11ac5f..c0ef11ac5f 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/bgp_summary.json
+++ b/tests/topotests/bfd_vrf_topo1/r2/bgp_summary.json
diff --git a/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf b/tests/topotests/bfd_vrf_topo1/r2/bgpd.conf
index b2aac74685..b2aac74685 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/bgpd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r2/bgpd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r2/peers.json b/tests/topotests/bfd_vrf_topo1/r2/peers.json
index 267459c7a8..267459c7a8 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/peers.json
+++ b/tests/topotests/bfd_vrf_topo1/r2/peers.json
diff --git a/tests/topotests/bfd-vrf-topo1/r2/zebra.conf b/tests/topotests/bfd_vrf_topo1/r2/zebra.conf
index daffd1912e..daffd1912e 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/zebra.conf
+++ b/tests/topotests/bfd_vrf_topo1/r2/zebra.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r3/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r3/bfdd.conf
index 76910ac927..76910ac927 100644
--- a/tests/topotests/bfd-vrf-topo1/r3/bfdd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r3/bfdd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r3/bgp_prefixes.json b/tests/topotests/bfd_vrf_topo1/r3/bgp_prefixes.json
index 36fca17bbf..36fca17bbf 100644
--- a/tests/topotests/bfd-vrf-topo1/r3/bgp_prefixes.json
+++ b/tests/topotests/bfd_vrf_topo1/r3/bgp_prefixes.json
diff --git a/tests/topotests/bfd-vrf-topo1/r3/bgp_summary.json b/tests/topotests/bfd_vrf_topo1/r3/bgp_summary.json
index d47833377b..d47833377b 100644
--- a/tests/topotests/bfd-vrf-topo1/r3/bgp_summary.json
+++ b/tests/topotests/bfd_vrf_topo1/r3/bgp_summary.json
diff --git a/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf b/tests/topotests/bfd_vrf_topo1/r3/bgpd.conf
index 1d7c730395..1d7c730395 100644
--- a/tests/topotests/bfd-vrf-topo1/r3/bgpd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r3/bgpd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r3/peers.json b/tests/topotests/bfd_vrf_topo1/r3/peers.json
index ef38008643..ef38008643 100644
--- a/tests/topotests/bfd-vrf-topo1/r3/peers.json
+++ b/tests/topotests/bfd_vrf_topo1/r3/peers.json
diff --git a/tests/topotests/bfd-vrf-topo1/r3/zebra.conf b/tests/topotests/bfd_vrf_topo1/r3/zebra.conf
index f727c2d633..f727c2d633 100644
--- a/tests/topotests/bfd-vrf-topo1/r3/zebra.conf
+++ b/tests/topotests/bfd_vrf_topo1/r3/zebra.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r4/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r4/bfdd.conf
index 63d0da7805..63d0da7805 100644
--- a/tests/topotests/bfd-vrf-topo1/r4/bfdd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r4/bfdd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r4/bgp_prefixes.json b/tests/topotests/bfd_vrf_topo1/r4/bgp_prefixes.json
index efe7d47b1a..efe7d47b1a 100644
--- a/tests/topotests/bfd-vrf-topo1/r4/bgp_prefixes.json
+++ b/tests/topotests/bfd_vrf_topo1/r4/bgp_prefixes.json
diff --git a/tests/topotests/bfd-vrf-topo1/r4/bgp_summary.json b/tests/topotests/bfd_vrf_topo1/r4/bgp_summary.json
index 7d81784b56..7d81784b56 100644
--- a/tests/topotests/bfd-vrf-topo1/r4/bgp_summary.json
+++ b/tests/topotests/bfd_vrf_topo1/r4/bgp_summary.json
diff --git a/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf b/tests/topotests/bfd_vrf_topo1/r4/bgpd.conf
index f34035d460..f34035d460 100644
--- a/tests/topotests/bfd-vrf-topo1/r4/bgpd.conf
+++ b/tests/topotests/bfd_vrf_topo1/r4/bgpd.conf
diff --git a/tests/topotests/bfd-vrf-topo1/r4/peers.json b/tests/topotests/bfd_vrf_topo1/r4/peers.json
index 37140089e1..37140089e1 100644
--- a/tests/topotests/bfd-vrf-topo1/r4/peers.json
+++ b/tests/topotests/bfd_vrf_topo1/r4/peers.json
diff --git a/tests/topotests/bfd-vrf-topo1/r4/zebra.conf b/tests/topotests/bfd_vrf_topo1/r4/zebra.conf
index 69770dd2bf..69770dd2bf 100644
--- a/tests/topotests/bfd-vrf-topo1/r4/zebra.conf
+++ b/tests/topotests/bfd_vrf_topo1/r4/zebra.conf
diff --git a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.dot b/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.dot
index c84ace2780..c84ace2780 100644
--- a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.dot
+++ b/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.dot
diff --git a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.jpg b/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.jpg
index 4d6d56e072..4d6d56e072 100644
--- a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.jpg
+++ b/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.jpg
diff --git a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py b/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.py
index 8a1ffe085d..8a1ffe085d 100644
--- a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py
+++ b/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.py
diff --git a/tests/topotests/bgp-aggregator-zero/__init__.py b/tests/topotests/bgp_aggregate_address_origin/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-aggregator-zero/__init__.py
+++ b/tests/topotests/bgp_aggregate_address_origin/__init__.py
diff --git a/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf b/tests/topotests/bgp_aggregate_address_origin/r1/bgpd.conf
index 3486c64c55..3486c64c55 100644
--- a/tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregate_address_origin/r1/bgpd.conf
diff --git a/tests/topotests/bgp_aggregate-address_origin/r1/zebra.conf b/tests/topotests/bgp_aggregate_address_origin/r1/zebra.conf
index 0a283c06d5..0a283c06d5 100644
--- a/tests/topotests/bgp_aggregate-address_origin/r1/zebra.conf
+++ b/tests/topotests/bgp_aggregate_address_origin/r1/zebra.conf
diff --git a/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf b/tests/topotests/bgp_aggregate_address_origin/r2/bgpd.conf
index b2d945583c..b2d945583c 100644
--- a/tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf
+++ b/tests/topotests/bgp_aggregate_address_origin/r2/bgpd.conf
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r2/zebra.conf b/tests/topotests/bgp_aggregate_address_origin/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r2/zebra.conf
+++ b/tests/topotests/bgp_aggregate_address_origin/r2/zebra.conf
diff --git a/tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py b/tests/topotests/bgp_aggregate_address_origin/test_bgp_aggregate-address_origin.py
index be07fab87b..be07fab87b 100644
--- a/tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py
+++ b/tests/topotests/bgp_aggregate_address_origin/test_bgp_aggregate-address_origin.py
diff --git a/tests/topotests/bgp-basic-functionality-topo1/__init__.py b/tests/topotests/bgp_aggregate_address_route_map/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-basic-functionality-topo1/__init__.py
+++ b/tests/topotests/bgp_aggregate_address_route_map/__init__.py
diff --git a/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf b/tests/topotests/bgp_aggregate_address_route_map/r1/bgpd.conf
index 7fb55cf001..7fb55cf001 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregate_address_route_map/r1/bgpd.conf
diff --git a/tests/topotests/bgp_aggregate-address_route-map/r1/zebra.conf b/tests/topotests/bgp_aggregate_address_route_map/r1/zebra.conf
index 0a283c06d5..0a283c06d5 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/r1/zebra.conf
+++ b/tests/topotests/bgp_aggregate_address_route_map/r1/zebra.conf
diff --git a/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf b/tests/topotests/bgp_aggregate_address_route_map/r2/bgpd.conf
index b2d945583c..b2d945583c 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf
+++ b/tests/topotests/bgp_aggregate_address_route_map/r2/bgpd.conf
diff --git a/tests/topotests/bgp_aggregate-address_origin/r2/zebra.conf b/tests/topotests/bgp_aggregate_address_route_map/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_aggregate-address_origin/r2/zebra.conf
+++ b/tests/topotests/bgp_aggregate_address_route_map/r2/zebra.conf
diff --git a/tests/topotests/bgp_aggregate-address_route-map/test_bgp_aggregate-address_route-map.py b/tests/topotests/bgp_aggregate_address_route_map/test_bgp_aggregate-address_route-map.py
index 484f40251f..484f40251f 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/test_bgp_aggregate-address_route-map.py
+++ b/tests/topotests/bgp_aggregate_address_route_map/test_bgp_aggregate-address_route-map.py
diff --git a/tests/topotests/bgp-community-alias/__init__.py b/tests/topotests/bgp_aggregator_zero/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-community-alias/__init__.py
+++ b/tests/topotests/bgp_aggregator_zero/__init__.py
diff --git a/tests/topotests/bgp-aggregator-zero/exabgp.env b/tests/topotests/bgp_aggregator_zero/exabgp.env
index 28e642360a..28e642360a 100644
--- a/tests/topotests/bgp-aggregator-zero/exabgp.env
+++ b/tests/topotests/bgp_aggregator_zero/exabgp.env
diff --git a/tests/topotests/bgp-aggregator-zero/peer1/exabgp.cfg b/tests/topotests/bgp_aggregator_zero/peer1/exabgp.cfg
index b3f25272d2..b3f25272d2 100644
--- a/tests/topotests/bgp-aggregator-zero/peer1/exabgp.cfg
+++ b/tests/topotests/bgp_aggregator_zero/peer1/exabgp.cfg
diff --git a/tests/topotests/bgp-aggregator-zero/r1/bgpd.conf b/tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
index 002a5c78c0..002a5c78c0 100644
--- a/tests/topotests/bgp-aggregator-zero/r1/bgpd.conf
+++ b/tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
diff --git a/tests/topotests/bgp-aggregator-zero/r1/zebra.conf b/tests/topotests/bgp_aggregator_zero/r1/zebra.conf
index 22a26ac610..22a26ac610 100644
--- a/tests/topotests/bgp-aggregator-zero/r1/zebra.conf
+++ b/tests/topotests/bgp_aggregator_zero/r1/zebra.conf
diff --git a/tests/topotests/bgp-aggregator-zero/test_bgp_aggregator_zero.py b/tests/topotests/bgp_aggregator_zero/test_bgp_aggregator_zero.py
index c4bbdce2c3..c4bbdce2c3 100644
--- a/tests/topotests/bgp-aggregator-zero/test_bgp_aggregator_zero.py
+++ b/tests/topotests/bgp_aggregator_zero/test_bgp_aggregator_zero.py
diff --git a/tests/topotests/bgp-auth/R1/bgpd.conf b/tests/topotests/bgp_auth/R1/bgpd.conf
index 1cb26c6537..1cb26c6537 100644
--- a/tests/topotests/bgp-auth/R1/bgpd.conf
+++ b/tests/topotests/bgp_auth/R1/bgpd.conf
diff --git a/tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf b/tests/topotests/bgp_auth/R1/bgpd_multi_vrf.conf
index dde3c090b5..dde3c090b5 100644
--- a/tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf
+++ b/tests/topotests/bgp_auth/R1/bgpd_multi_vrf.conf
diff --git a/tests/topotests/bgp-auth/R1/bgpd_multi_vrf_prefix.conf b/tests/topotests/bgp_auth/R1/bgpd_multi_vrf_prefix.conf
index 7e15720c7e..7e15720c7e 100644
--- a/tests/topotests/bgp-auth/R1/bgpd_multi_vrf_prefix.conf
+++ b/tests/topotests/bgp_auth/R1/bgpd_multi_vrf_prefix.conf
diff --git a/tests/topotests/bgp-auth/R1/bgpd_prefix.conf b/tests/topotests/bgp_auth/R1/bgpd_prefix.conf
index 9200b0501d..9200b0501d 100644
--- a/tests/topotests/bgp-auth/R1/bgpd_prefix.conf
+++ b/tests/topotests/bgp_auth/R1/bgpd_prefix.conf
diff --git a/tests/topotests/bgp-auth/R1/bgpd_vrf.conf b/tests/topotests/bgp_auth/R1/bgpd_vrf.conf
index 781f906d3a..781f906d3a 100644
--- a/tests/topotests/bgp-auth/R1/bgpd_vrf.conf
+++ b/tests/topotests/bgp_auth/R1/bgpd_vrf.conf
diff --git a/tests/topotests/bgp-auth/R1/bgpd_vrf_prefix.conf b/tests/topotests/bgp_auth/R1/bgpd_vrf_prefix.conf
index d68951b406..d68951b406 100644
--- a/tests/topotests/bgp-auth/R1/bgpd_vrf_prefix.conf
+++ b/tests/topotests/bgp_auth/R1/bgpd_vrf_prefix.conf
diff --git a/tests/topotests/bgp-auth/R1/ospfd.conf b/tests/topotests/bgp_auth/R1/ospfd.conf
index 79eb0e33da..79eb0e33da 100644
--- a/tests/topotests/bgp-auth/R1/ospfd.conf
+++ b/tests/topotests/bgp_auth/R1/ospfd.conf
diff --git a/tests/topotests/bgp-auth/R1/ospfd_multi_vrf.conf b/tests/topotests/bgp_auth/R1/ospfd_multi_vrf.conf
index e2a28000b8..e2a28000b8 100644
--- a/tests/topotests/bgp-auth/R1/ospfd_multi_vrf.conf
+++ b/tests/topotests/bgp_auth/R1/ospfd_multi_vrf.conf
diff --git a/tests/topotests/bgp-auth/R1/ospfd_vrf.conf b/tests/topotests/bgp_auth/R1/ospfd_vrf.conf
index 0b7fbae8c4..0b7fbae8c4 100644
--- a/tests/topotests/bgp-auth/R1/ospfd_vrf.conf
+++ b/tests/topotests/bgp_auth/R1/ospfd_vrf.conf
diff --git a/tests/topotests/bgp-auth/R1/zebra.conf b/tests/topotests/bgp_auth/R1/zebra.conf
index a0b062c44c..a0b062c44c 100644
--- a/tests/topotests/bgp-auth/R1/zebra.conf
+++ b/tests/topotests/bgp_auth/R1/zebra.conf
diff --git a/tests/topotests/bgp-auth/R2/bgpd.conf b/tests/topotests/bgp_auth/R2/bgpd.conf
index fa2a570ef9..fa2a570ef9 100644
--- a/tests/topotests/bgp-auth/R2/bgpd.conf
+++ b/tests/topotests/bgp_auth/R2/bgpd.conf
diff --git a/tests/topotests/bgp-auth/R2/bgpd_multi_vrf.conf b/tests/topotests/bgp_auth/R2/bgpd_multi_vrf.conf
index d5f70edf68..d5f70edf68 100644
--- a/tests/topotests/bgp-auth/R2/bgpd_multi_vrf.conf
+++ b/tests/topotests/bgp_auth/R2/bgpd_multi_vrf.conf
diff --git a/tests/topotests/bgp-auth/R2/bgpd_multi_vrf_prefix.conf b/tests/topotests/bgp_auth/R2/bgpd_multi_vrf_prefix.conf
index d5f70edf68..d5f70edf68 100644
--- a/tests/topotests/bgp-auth/R2/bgpd_multi_vrf_prefix.conf
+++ b/tests/topotests/bgp_auth/R2/bgpd_multi_vrf_prefix.conf
diff --git a/tests/topotests/bgp-auth/R2/bgpd_prefix.conf b/tests/topotests/bgp_auth/R2/bgpd_prefix.conf
index fa2a570ef9..fa2a570ef9 100644
--- a/tests/topotests/bgp-auth/R2/bgpd_prefix.conf
+++ b/tests/topotests/bgp_auth/R2/bgpd_prefix.conf
diff --git a/tests/topotests/bgp-auth/R2/bgpd_vrf.conf b/tests/topotests/bgp_auth/R2/bgpd_vrf.conf
index d1f3847420..d1f3847420 100644
--- a/tests/topotests/bgp-auth/R2/bgpd_vrf.conf
+++ b/tests/topotests/bgp_auth/R2/bgpd_vrf.conf
diff --git a/tests/topotests/bgp-auth/R2/bgpd_vrf_prefix.conf b/tests/topotests/bgp_auth/R2/bgpd_vrf_prefix.conf
index d1f3847420..d1f3847420 100644
--- a/tests/topotests/bgp-auth/R2/bgpd_vrf_prefix.conf
+++ b/tests/topotests/bgp_auth/R2/bgpd_vrf_prefix.conf
diff --git a/tests/topotests/bgp-auth/R2/ospfd.conf b/tests/topotests/bgp_auth/R2/ospfd.conf
index 028b546a0c..028b546a0c 100644
--- a/tests/topotests/bgp-auth/R2/ospfd.conf
+++ b/tests/topotests/bgp_auth/R2/ospfd.conf
diff --git a/tests/topotests/bgp-auth/R2/ospfd_multi_vrf.conf b/tests/topotests/bgp_auth/R2/ospfd_multi_vrf.conf
index a05dfb8e41..a05dfb8e41 100644
--- a/tests/topotests/bgp-auth/R2/ospfd_multi_vrf.conf
+++ b/tests/topotests/bgp_auth/R2/ospfd_multi_vrf.conf
diff --git a/tests/topotests/bgp-auth/R2/ospfd_vrf.conf b/tests/topotests/bgp_auth/R2/ospfd_vrf.conf
index b198d352e2..b198d352e2 100644
--- a/tests/topotests/bgp-auth/R2/ospfd_vrf.conf
+++ b/tests/topotests/bgp_auth/R2/ospfd_vrf.conf
diff --git a/tests/topotests/bgp-auth/R2/zebra.conf b/tests/topotests/bgp_auth/R2/zebra.conf
index fed4c27c16..fed4c27c16 100644
--- a/tests/topotests/bgp-auth/R2/zebra.conf
+++ b/tests/topotests/bgp_auth/R2/zebra.conf
diff --git a/tests/topotests/bgp-auth/R3/bgpd.conf b/tests/topotests/bgp_auth/R3/bgpd.conf
index deccfd418b..deccfd418b 100644
--- a/tests/topotests/bgp-auth/R3/bgpd.conf
+++ b/tests/topotests/bgp_auth/R3/bgpd.conf
diff --git a/tests/topotests/bgp-auth/R3/bgpd_multi_vrf.conf b/tests/topotests/bgp_auth/R3/bgpd_multi_vrf.conf
index fe3e64d8d5..fe3e64d8d5 100644
--- a/tests/topotests/bgp-auth/R3/bgpd_multi_vrf.conf
+++ b/tests/topotests/bgp_auth/R3/bgpd_multi_vrf.conf
diff --git a/tests/topotests/bgp-auth/R3/bgpd_multi_vrf_prefix.conf b/tests/topotests/bgp_auth/R3/bgpd_multi_vrf_prefix.conf
index fe3e64d8d5..fe3e64d8d5 100644
--- a/tests/topotests/bgp-auth/R3/bgpd_multi_vrf_prefix.conf
+++ b/tests/topotests/bgp_auth/R3/bgpd_multi_vrf_prefix.conf
diff --git a/tests/topotests/bgp-auth/R3/bgpd_prefix.conf b/tests/topotests/bgp_auth/R3/bgpd_prefix.conf
index deccfd418b..deccfd418b 100644
--- a/tests/topotests/bgp-auth/R3/bgpd_prefix.conf
+++ b/tests/topotests/bgp_auth/R3/bgpd_prefix.conf
diff --git a/tests/topotests/bgp-auth/R3/bgpd_vrf.conf b/tests/topotests/bgp_auth/R3/bgpd_vrf.conf
index c109aa801b..c109aa801b 100644
--- a/tests/topotests/bgp-auth/R3/bgpd_vrf.conf
+++ b/tests/topotests/bgp_auth/R3/bgpd_vrf.conf
diff --git a/tests/topotests/bgp-auth/R3/bgpd_vrf_prefix.conf b/tests/topotests/bgp_auth/R3/bgpd_vrf_prefix.conf
index c109aa801b..c109aa801b 100644
--- a/tests/topotests/bgp-auth/R3/bgpd_vrf_prefix.conf
+++ b/tests/topotests/bgp_auth/R3/bgpd_vrf_prefix.conf
diff --git a/tests/topotests/bgp-auth/R3/ospfd.conf b/tests/topotests/bgp_auth/R3/ospfd.conf
index 0f0a2e926a..0f0a2e926a 100644
--- a/tests/topotests/bgp-auth/R3/ospfd.conf
+++ b/tests/topotests/bgp_auth/R3/ospfd.conf
diff --git a/tests/topotests/bgp-auth/R3/ospfd_multi_vrf.conf b/tests/topotests/bgp_auth/R3/ospfd_multi_vrf.conf
index f32d2a8423..f32d2a8423 100644
--- a/tests/topotests/bgp-auth/R3/ospfd_multi_vrf.conf
+++ b/tests/topotests/bgp_auth/R3/ospfd_multi_vrf.conf
diff --git a/tests/topotests/bgp-auth/R3/ospfd_vrf.conf b/tests/topotests/bgp_auth/R3/ospfd_vrf.conf
index 6465b635aa..6465b635aa 100644
--- a/tests/topotests/bgp-auth/R3/ospfd_vrf.conf
+++ b/tests/topotests/bgp_auth/R3/ospfd_vrf.conf
diff --git a/tests/topotests/bgp-auth/R3/zebra.conf b/tests/topotests/bgp_auth/R3/zebra.conf
index d49c98b168..d49c98b168 100644
--- a/tests/topotests/bgp-auth/R3/zebra.conf
+++ b/tests/topotests/bgp_auth/R3/zebra.conf
diff --git a/tests/topotests/bgp-auth/test_bgp_auth.py b/tests/topotests/bgp_auth/test_bgp_auth.py
index b2cdef1c93..b2cdef1c93 100644
--- a/tests/topotests/bgp-auth/test_bgp_auth.py
+++ b/tests/topotests/bgp_auth/test_bgp_auth.py
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/__init__.py b/tests/topotests/bgp_basic_functionality_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/__init__.py
+++ b/tests/topotests/bgp_basic_functionality_topo1/__init__.py
diff --git a/tests/topotests/bgp-basic-functionality-topo1/bgp_basic_functionality.json b/tests/topotests/bgp_basic_functionality_topo1/bgp_basic_functionality.json
index ee1f1b74c0..ee1f1b74c0 100644
--- a/tests/topotests/bgp-basic-functionality-topo1/bgp_basic_functionality.json
+++ b/tests/topotests/bgp_basic_functionality_topo1/bgp_basic_functionality.json
diff --git a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py b/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py
index 374cce21f6..374cce21f6 100644
--- a/tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py
+++ b/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/__init__.py b/tests/topotests/bgp_comm_list_delete/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/__init__.py
+++ b/tests/topotests/bgp_comm_list_delete/__init__.py
diff --git a/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf b/tests/topotests/bgp_comm_list_delete/r1/bgpd.conf
index 12161d2fa2..12161d2fa2 100644
--- a/tests/topotests/bgp_comm-list_delete/r1/bgpd.conf
+++ b/tests/topotests/bgp_comm_list_delete/r1/bgpd.conf
diff --git a/tests/topotests/bgp_comm-list_delete/r1/zebra.conf b/tests/topotests/bgp_comm_list_delete/r1/zebra.conf
index 0a283c06d5..0a283c06d5 100644
--- a/tests/topotests/bgp_comm-list_delete/r1/zebra.conf
+++ b/tests/topotests/bgp_comm_list_delete/r1/zebra.conf
diff --git a/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf b/tests/topotests/bgp_comm_list_delete/r2/bgpd.conf
index 33231b5274..33231b5274 100644
--- a/tests/topotests/bgp_comm-list_delete/r2/bgpd.conf
+++ b/tests/topotests/bgp_comm_list_delete/r2/bgpd.conf
diff --git a/tests/topotests/bgp_aggregate-address_route-map/r2/zebra.conf b/tests/topotests/bgp_comm_list_delete/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/r2/zebra.conf
+++ b/tests/topotests/bgp_comm_list_delete/r2/zebra.conf
diff --git a/tests/topotests/bgp_comm-list_delete/test_bgp_comm-list_delete.py b/tests/topotests/bgp_comm_list_delete/test_bgp_comm-list_delete.py
index 81bf8da31a..81bf8da31a 100644
--- a/tests/topotests/bgp_comm-list_delete/test_bgp_comm-list_delete.py
+++ b/tests/topotests/bgp_comm_list_delete/test_bgp_comm-list_delete.py
diff --git a/tests/topotests/bgp-ecmp-topo1/__init__.py b/tests/topotests/bgp_community_alias/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-ecmp-topo1/__init__.py
+++ b/tests/topotests/bgp_community_alias/__init__.py
diff --git a/tests/topotests/bgp-community-alias/r1/bgpd.conf b/tests/topotests/bgp_community_alias/r1/bgpd.conf
index 2cf84d0b70..2cf84d0b70 100644
--- a/tests/topotests/bgp-community-alias/r1/bgpd.conf
+++ b/tests/topotests/bgp_community_alias/r1/bgpd.conf
diff --git a/tests/topotests/bgp-community-alias/r1/zebra.conf b/tests/topotests/bgp_community_alias/r1/zebra.conf
index b29940f46a..b29940f46a 100644
--- a/tests/topotests/bgp-community-alias/r1/zebra.conf
+++ b/tests/topotests/bgp_community_alias/r1/zebra.conf
diff --git a/tests/topotests/bgp-community-alias/r2/bgpd.conf b/tests/topotests/bgp_community_alias/r2/bgpd.conf
index 517ef70f2a..517ef70f2a 100644
--- a/tests/topotests/bgp-community-alias/r2/bgpd.conf
+++ b/tests/topotests/bgp_community_alias/r2/bgpd.conf
diff --git a/tests/topotests/bgp-community-alias/r2/zebra.conf b/tests/topotests/bgp_community_alias/r2/zebra.conf
index cffe827363..cffe827363 100644
--- a/tests/topotests/bgp-community-alias/r2/zebra.conf
+++ b/tests/topotests/bgp_community_alias/r2/zebra.conf
diff --git a/tests/topotests/bgp-community-alias/test_bgp-community-alias.py b/tests/topotests/bgp_community_alias/test_bgp-community-alias.py
index a43e5f937e..a43e5f937e 100644
--- a/tests/topotests/bgp-community-alias/test_bgp-community-alias.py
+++ b/tests/topotests/bgp_community_alias/test_bgp-community-alias.py
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/__init__.py b/tests/topotests/bgp_default_ipv4_ipv6_unicast/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/__init__.py
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/__init__.py
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r1/bgpd.conf b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/bgpd.conf
index bf39152ea8..bf39152ea8 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r1/bgpd.conf
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/bgpd.conf
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r1/zebra.conf b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/zebra.conf
index 697765168d..697765168d 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r1/zebra.conf
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r1/zebra.conf
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r2/bgpd.conf b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/bgpd.conf
index abbd1b86fa..abbd1b86fa 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r2/bgpd.conf
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/bgpd.conf
diff --git a/tests/topotests/bgp_comm-list_delete/r2/zebra.conf b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_comm-list_delete/r2/zebra.conf
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r2/zebra.conf
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r3/bgpd.conf b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/bgpd.conf
index a405c047ca..a405c047ca 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r3/bgpd.conf
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/bgpd.conf
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r3/zebra.conf b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/zebra.conf
index e9fdfb70c5..e9fdfb70c5 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/r3/zebra.conf
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/r3/zebra.conf
diff --git a/tests/topotests/bgp-default-ipv4-ipv6-unicast/test_bgp-default-ipv4-ipv6-unicast.py b/tests/topotests/bgp_default_ipv4_ipv6_unicast/test_bgp-default-ipv4-ipv6-unicast.py
index f9aa94fd14..f9aa94fd14 100644
--- a/tests/topotests/bgp-default-ipv4-ipv6-unicast/test_bgp-default-ipv4-ipv6-unicast.py
+++ b/tests/topotests/bgp_default_ipv4_ipv6_unicast/test_bgp-default-ipv4-ipv6-unicast.py
diff --git a/tests/topotests/bgp-path-attributes-topo1/__init__.py b/tests/topotests/bgp_default_route/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-path-attributes-topo1/__init__.py
+++ b/tests/topotests/bgp_default_route/__init__.py
diff --git a/tests/topotests/bgp_default-route/r1/bgpd.conf b/tests/topotests/bgp_default_route/r1/bgpd.conf
index 8699d62ff2..8699d62ff2 100644
--- a/tests/topotests/bgp_default-route/r1/bgpd.conf
+++ b/tests/topotests/bgp_default_route/r1/bgpd.conf
diff --git a/tests/topotests/bgp_default-route/r1/zebra.conf b/tests/topotests/bgp_default_route/r1/zebra.conf
index 0a283c06d5..0a283c06d5 100644
--- a/tests/topotests/bgp_default-route/r1/zebra.conf
+++ b/tests/topotests/bgp_default_route/r1/zebra.conf
diff --git a/tests/topotests/bgp_default-route/r2/bgpd.conf b/tests/topotests/bgp_default_route/r2/bgpd.conf
index 00c96cc58b..00c96cc58b 100644
--- a/tests/topotests/bgp_default-route/r2/bgpd.conf
+++ b/tests/topotests/bgp_default_route/r2/bgpd.conf
diff --git a/tests/topotests/bgp_default-route/r2/zebra.conf b/tests/topotests/bgp_default_route/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_default-route/r2/zebra.conf
+++ b/tests/topotests/bgp_default_route/r2/zebra.conf
diff --git a/tests/topotests/bgp_default-route/test_bgp_default-originate.py b/tests/topotests/bgp_default_route/test_bgp_default-originate.py
index d8de0f0ac6..d8de0f0ac6 100644
--- a/tests/topotests/bgp_default-route/test_bgp_default-originate.py
+++ b/tests/topotests/bgp_default_route/test_bgp_default-originate.py
diff --git a/tests/topotests/bgp-prefix-list-topo1/__init__.py b/tests/topotests/bgp_default_route_route_map_match/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-prefix-list-topo1/__init__.py
+++ b/tests/topotests/bgp_default_route_route_map_match/__init__.py
diff --git a/tests/topotests/bgp_default-route_route-map_match/r1/bgpd.conf b/tests/topotests/bgp_default_route_route_map_match/r1/bgpd.conf
index 97b440f5ce..97b440f5ce 100644
--- a/tests/topotests/bgp_default-route_route-map_match/r1/bgpd.conf
+++ b/tests/topotests/bgp_default_route_route_map_match/r1/bgpd.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match/r1/zebra.conf b/tests/topotests/bgp_default_route_route_map_match/r1/zebra.conf
index 9e581a7be7..9e581a7be7 100644
--- a/tests/topotests/bgp_default-route_route-map_match/r1/zebra.conf
+++ b/tests/topotests/bgp_default_route_route_map_match/r1/zebra.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match/r2/bgpd.conf b/tests/topotests/bgp_default_route_route_map_match/r2/bgpd.conf
index 00c96cc58b..00c96cc58b 100644
--- a/tests/topotests/bgp_default-route_route-map_match/r2/bgpd.conf
+++ b/tests/topotests/bgp_default_route_route_map_match/r2/bgpd.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match/r2/zebra.conf b/tests/topotests/bgp_default_route_route_map_match/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_default-route_route-map_match/r2/zebra.conf
+++ b/tests/topotests/bgp_default_route_route_map_match/r2/zebra.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match/test_bgp_default-originate_route-map_match.py b/tests/topotests/bgp_default_route_route_map_match/test_bgp_default-originate_route-map_match.py
index 089c9a964e..089c9a964e 100644
--- a/tests/topotests/bgp_default-route_route-map_match/test_bgp_default-originate_route-map_match.py
+++ b/tests/topotests/bgp_default_route_route_map_match/test_bgp_default-originate_route-map_match.py
diff --git a/tests/topotests/bgp_aggregate-address_origin/__init__.py b/tests/topotests/bgp_default_route_route_map_match_set/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_aggregate-address_origin/__init__.py
+++ b/tests/topotests/bgp_default_route_route_map_match_set/__init__.py
diff --git a/tests/topotests/bgp_default-route_route-map_match_set/r1/bgpd.conf b/tests/topotests/bgp_default_route_route_map_match_set/r1/bgpd.conf
index 6ef8b1c0f4..6ef8b1c0f4 100644
--- a/tests/topotests/bgp_default-route_route-map_match_set/r1/bgpd.conf
+++ b/tests/topotests/bgp_default_route_route_map_match_set/r1/bgpd.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match_set/r1/zebra.conf b/tests/topotests/bgp_default_route_route_map_match_set/r1/zebra.conf
index 9e581a7be7..9e581a7be7 100644
--- a/tests/topotests/bgp_default-route_route-map_match_set/r1/zebra.conf
+++ b/tests/topotests/bgp_default_route_route_map_match_set/r1/zebra.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match_set/r2/bgpd.conf b/tests/topotests/bgp_default_route_route_map_match_set/r2/bgpd.conf
index 00c96cc58b..00c96cc58b 100644
--- a/tests/topotests/bgp_default-route_route-map_match_set/r2/bgpd.conf
+++ b/tests/topotests/bgp_default_route_route_map_match_set/r2/bgpd.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match_set/r2/zebra.conf b/tests/topotests/bgp_default_route_route_map_match_set/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_default-route_route-map_match_set/r2/zebra.conf
+++ b/tests/topotests/bgp_default_route_route_map_match_set/r2/zebra.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match_set/test_bgp_default-originate_route-map_match_set.py b/tests/topotests/bgp_default_route_route_map_match_set/test_bgp_default-originate_route-map_match_set.py
index d9ea5db278..d9ea5db278 100644
--- a/tests/topotests/bgp_default-route_route-map_match_set/test_bgp_default-originate_route-map_match_set.py
+++ b/tests/topotests/bgp_default_route_route_map_match_set/test_bgp_default-originate_route-map_match_set.py
diff --git a/tests/topotests/bgp_aggregate-address_route-map/__init__.py b/tests/topotests/bgp_default_route_route_map_set/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_aggregate-address_route-map/__init__.py
+++ b/tests/topotests/bgp_default_route_route_map_set/__init__.py
diff --git a/tests/topotests/bgp_default-route_route-map_set/r1/bgpd.conf b/tests/topotests/bgp_default_route_route_map_set/r1/bgpd.conf
index cb07ea9fdf..cb07ea9fdf 100644
--- a/tests/topotests/bgp_default-route_route-map_set/r1/bgpd.conf
+++ b/tests/topotests/bgp_default_route_route_map_set/r1/bgpd.conf
diff --git a/tests/topotests/bgp_default-route_route-map_set/r1/zebra.conf b/tests/topotests/bgp_default_route_route_map_set/r1/zebra.conf
index 0a283c06d5..0a283c06d5 100644
--- a/tests/topotests/bgp_default-route_route-map_set/r1/zebra.conf
+++ b/tests/topotests/bgp_default_route_route_map_set/r1/zebra.conf
diff --git a/tests/topotests/bgp_default-route_route-map_set/r2/bgpd.conf b/tests/topotests/bgp_default_route_route_map_set/r2/bgpd.conf
index 00c96cc58b..00c96cc58b 100644
--- a/tests/topotests/bgp_default-route_route-map_set/r2/bgpd.conf
+++ b/tests/topotests/bgp_default_route_route_map_set/r2/bgpd.conf
diff --git a/tests/topotests/bgp_default-route_route-map_set/r2/zebra.conf b/tests/topotests/bgp_default_route_route_map_set/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_default-route_route-map_set/r2/zebra.conf
+++ b/tests/topotests/bgp_default_route_route_map_set/r2/zebra.conf
diff --git a/tests/topotests/bgp_default-route_route-map_set/test_bgp_default-originate_route-map_set.py b/tests/topotests/bgp_default_route_route_map_set/test_bgp_default-originate_route-map_set.py
index 9a22c58b16..9a22c58b16 100644
--- a/tests/topotests/bgp_default-route_route-map_set/test_bgp_default-originate_route-map_set.py
+++ b/tests/topotests/bgp_default_route_route_map_set/test_bgp_default-originate_route-map_set.py
diff --git a/tests/topotests/bgp_comm-list_delete/__init__.py b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_comm-list_delete/__init__.py
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/__init__.py
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r1/bgpd.conf b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r1/bgpd.conf
index c320bb5d11..c320bb5d11 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r1/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r1/bgpd.conf
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r1/zebra.conf b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r1/zebra.conf
index 1782edc2a5..1782edc2a5 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r1/zebra.conf
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r1/zebra.conf
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r2/bgpd.conf b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r2/bgpd.conf
index cb712e9a8d..cb712e9a8d 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r2/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r2/bgpd.conf
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r2/zebra.conf b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r2/zebra.conf
index 968171e7b9..968171e7b9 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r2/zebra.conf
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r2/zebra.conf
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r3/bgpd.conf b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r3/bgpd.conf
index a6e3260d15..a6e3260d15 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r3/bgpd.conf
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r3/bgpd.conf
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r3/zebra.conf b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r3/zebra.conf
index ddcf862132..ddcf862132 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r3/zebra.conf
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/r3/zebra.conf
diff --git a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/test_bgp-ebgp-common-subnet-nexthop-unchanged.py b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/test_bgp-ebgp-common-subnet-nexthop-unchanged.py
index 3b99065fe0..3b99065fe0 100644
--- a/tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/test_bgp-ebgp-common-subnet-nexthop-unchanged.py
+++ b/tests/topotests/bgp_ebgp_common_subnet_nexthop_unchanged/test_bgp-ebgp-common-subnet-nexthop-unchanged.py
diff --git a/tests/topotests/bgp_default-route/__init__.py b/tests/topotests/bgp_ecmp_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_default-route/__init__.py
+++ b/tests/topotests/bgp_ecmp_topo1/__init__.py
diff --git a/tests/topotests/bgp-ecmp-topo1/bgp-ecmp-topo1.dot b/tests/topotests/bgp_ecmp_topo1/bgp-ecmp-topo1.dot
index 90295e199d..90295e199d 100644
--- a/tests/topotests/bgp-ecmp-topo1/bgp-ecmp-topo1.dot
+++ b/tests/topotests/bgp_ecmp_topo1/bgp-ecmp-topo1.dot
diff --git a/tests/topotests/bgp-ecmp-topo1/bgp-ecmp-topo1.pdf b/tests/topotests/bgp_ecmp_topo1/bgp-ecmp-topo1.pdf
index b4d4f6a5e5..b4d4f6a5e5 100644
--- a/tests/topotests/bgp-ecmp-topo1/bgp-ecmp-topo1.pdf
+++ b/tests/topotests/bgp_ecmp_topo1/bgp-ecmp-topo1.pdf
diff --git a/tests/topotests/bgp-ecmp-topo1/exabgp.env b/tests/topotests/bgp_ecmp_topo1/exabgp.env
index a328e04962..a328e04962 100644
--- a/tests/topotests/bgp-ecmp-topo1/exabgp.env
+++ b/tests/topotests/bgp_ecmp_topo1/exabgp.env
diff --git a/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer1/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer1/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer1/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer1/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer1/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer1/exabgp.cfg
index 2d0ca89f0f..2d0ca89f0f 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer1/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer1/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer10/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer10/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer10/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer10/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer10/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer10/exabgp.cfg
index 0c842a0e7f..0c842a0e7f 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer10/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer10/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer11/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer11/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer11/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer11/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer11/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer11/exabgp.cfg
index 936dc572bd..936dc572bd 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer11/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer11/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer12/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer12/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer12/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer12/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer12/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer12/exabgp.cfg
index 56b33eae8e..56b33eae8e 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer12/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer12/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer13/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer13/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer13/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer13/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer13/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer13/exabgp.cfg
index b933ffb5cf..b933ffb5cf 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer13/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer13/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer14/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer14/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer14/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer14/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer14/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer14/exabgp.cfg
index bcfa41eb2e..bcfa41eb2e 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer14/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer14/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer15/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer15/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer15/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer15/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer15/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer15/exabgp.cfg
index 022e835798..022e835798 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer15/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer15/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer16/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer16/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer16/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer16/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer16/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer16/exabgp.cfg
index 0649202f1f..0649202f1f 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer16/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer16/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer17/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer17/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer17/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer17/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer17/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer17/exabgp.cfg
index 0aeeed9d95..0aeeed9d95 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer17/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer17/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer18/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer18/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer18/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer18/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer18/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer18/exabgp.cfg
index 352c030eda..352c030eda 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer18/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer18/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer19/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer19/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer19/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer19/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer19/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer19/exabgp.cfg
index 9913c226f6..9913c226f6 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer19/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer19/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer2/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer2/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer2/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer2/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer2/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer2/exabgp.cfg
index 46b436d2af..46b436d2af 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer2/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer2/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer20/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer20/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer20/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer20/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer20/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer20/exabgp.cfg
index 17fb816a75..17fb816a75 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer20/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer20/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer3/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer3/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer3/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer3/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer3/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer3/exabgp.cfg
index acd57756b9..acd57756b9 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer3/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer3/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer4/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer4/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer4/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer4/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer4/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer4/exabgp.cfg
index 4c9a989b5a..4c9a989b5a 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer4/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer4/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer5/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer5/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer5/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer5/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer5/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer5/exabgp.cfg
index eba2aae378..eba2aae378 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer5/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer5/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer6/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer6/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer6/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer6/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer6/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer6/exabgp.cfg
index 38b6af0e85..38b6af0e85 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer6/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer6/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer7/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer7/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer7/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer7/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer7/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer7/exabgp.cfg
index 7631e43750..7631e43750 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer7/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer7/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer8/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer8/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer8/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer8/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer8/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer8/exabgp.cfg
index 1cd1cd9024..1cd1cd9024 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer8/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer8/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py b/tests/topotests/bgp_ecmp_topo1/peer9/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer9/exa-receive.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py b/tests/topotests/bgp_ecmp_topo1/peer9/exa-send.py
index d9ae3d1906..d9ae3d1906 100755
--- a/tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py
+++ b/tests/topotests/bgp_ecmp_topo1/peer9/exa-send.py
diff --git a/tests/topotests/bgp-ecmp-topo1/peer9/exabgp.cfg b/tests/topotests/bgp_ecmp_topo1/peer9/exabgp.cfg
index 5771553962..5771553962 100644
--- a/tests/topotests/bgp-ecmp-topo1/peer9/exabgp.cfg
+++ b/tests/topotests/bgp_ecmp_topo1/peer9/exabgp.cfg
diff --git a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf b/tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
index 49981ac589..49981ac589 100644
--- a/tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf
+++ b/tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt b/tests/topotests/bgp_ecmp_topo1/r1/summary.txt
index f0929536d3..f0929536d3 100644
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
+++ b/tests/topotests/bgp_ecmp_topo1/r1/summary.txt
diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt b/tests/topotests/bgp_ecmp_topo1/r1/summary20.txt
index 9015f485f8..9015f485f8 100644
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
+++ b/tests/topotests/bgp_ecmp_topo1/r1/summary20.txt
diff --git a/tests/topotests/bgp-ecmp-topo1/r1/zebra.conf b/tests/topotests/bgp_ecmp_topo1/r1/zebra.conf
index 77c76cd490..77c76cd490 100644
--- a/tests/topotests/bgp-ecmp-topo1/r1/zebra.conf
+++ b/tests/topotests/bgp_ecmp_topo1/r1/zebra.conf
diff --git a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py b/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
index 75506d1a51..75506d1a51 100644
--- a/tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py
+++ b/tests/topotests/bgp_ecmp_topo1/test_bgp_ecmp_topo1.py
diff --git a/tests/topotests/bgp-ecmp-topo2/ebgp_ecmp_topo2.json b/tests/topotests/bgp_ecmp_topo2/ebgp_ecmp_topo2.json
index 34f11c0a29..34f11c0a29 100755
--- a/tests/topotests/bgp-ecmp-topo2/ebgp_ecmp_topo2.json
+++ b/tests/topotests/bgp_ecmp_topo2/ebgp_ecmp_topo2.json
diff --git a/tests/topotests/bgp-ecmp-topo2/ibgp_ecmp_topo2.json b/tests/topotests/bgp_ecmp_topo2/ibgp_ecmp_topo2.json
index 9eea9073c7..9eea9073c7 100755
--- a/tests/topotests/bgp-ecmp-topo2/ibgp_ecmp_topo2.json
+++ b/tests/topotests/bgp_ecmp_topo2/ibgp_ecmp_topo2.json
diff --git a/tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py b/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py
index fffcbbd0ef..fffcbbd0ef 100644
--- a/tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py
+++ b/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py
diff --git a/tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py b/tests/topotests/bgp_ecmp_topo2/test_ibgp_ecmp_topo2.py
index 342a0a4b2f..342a0a4b2f 100644
--- a/tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py
+++ b/tests/topotests/bgp_ecmp_topo2/test_ibgp_ecmp_topo2.py
diff --git a/tests/topotests/bgp-evpn-mh/evpn-mh-topo-tests.pdf b/tests/topotests/bgp_evpn_mh/evpn-mh-topo-tests.pdf
index 8858e21496..8858e21496 100644
--- a/tests/topotests/bgp-evpn-mh/evpn-mh-topo-tests.pdf
+++ b/tests/topotests/bgp_evpn_mh/evpn-mh-topo-tests.pdf
diff --git a/tests/topotests/bgp-evpn-mh/hostd11/evpn.conf b/tests/topotests/bgp_evpn_mh/hostd11/evpn.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd11/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd11/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd11/pim.conf b/tests/topotests/bgp_evpn_mh/hostd11/pim.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd11/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd11/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd11/zebra.conf b/tests/topotests/bgp_evpn_mh/hostd11/zebra.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd11/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd11/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd12/evpn.conf b/tests/topotests/bgp_evpn_mh/hostd12/evpn.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd12/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd12/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd12/pim.conf b/tests/topotests/bgp_evpn_mh/hostd12/pim.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd12/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd12/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd12/zebra.conf b/tests/topotests/bgp_evpn_mh/hostd12/zebra.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd12/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd12/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd21/evpn.conf b/tests/topotests/bgp_evpn_mh/hostd21/evpn.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd21/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd21/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd21/pim.conf b/tests/topotests/bgp_evpn_mh/hostd21/pim.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd21/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd21/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd21/zebra.conf b/tests/topotests/bgp_evpn_mh/hostd21/zebra.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd21/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd21/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd22/evpn.conf b/tests/topotests/bgp_evpn_mh/hostd22/evpn.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd22/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd22/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd22/pim.conf b/tests/topotests/bgp_evpn_mh/hostd22/pim.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd22/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd22/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/hostd22/zebra.conf b/tests/topotests/bgp_evpn_mh/hostd22/zebra.conf
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp-evpn-mh/hostd22/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/hostd22/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/spine1/evpn.conf b/tests/topotests/bgp_evpn_mh/spine1/evpn.conf
index 2e26f60f44..2e26f60f44 100644
--- a/tests/topotests/bgp-evpn-mh/spine1/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/spine1/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/spine1/pim.conf b/tests/topotests/bgp_evpn_mh/spine1/pim.conf
index 68e686e8c7..68e686e8c7 100644
--- a/tests/topotests/bgp-evpn-mh/spine1/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/spine1/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/spine1/zebra.conf b/tests/topotests/bgp_evpn_mh/spine1/zebra.conf
index 80e9e5a263..80e9e5a263 100644
--- a/tests/topotests/bgp-evpn-mh/spine1/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/spine1/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/spine2/evpn.conf b/tests/topotests/bgp_evpn_mh/spine2/evpn.conf
index ec2e789276..ec2e789276 100644
--- a/tests/topotests/bgp-evpn-mh/spine2/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/spine2/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/spine2/pim.conf b/tests/topotests/bgp_evpn_mh/spine2/pim.conf
index c1566240e6..c1566240e6 100644
--- a/tests/topotests/bgp-evpn-mh/spine2/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/spine2/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/spine2/zebra.conf b/tests/topotests/bgp_evpn_mh/spine2/zebra.conf
index 1cd1df8c81..1cd1df8c81 100644
--- a/tests/topotests/bgp-evpn-mh/spine2/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/spine2/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/test_evpn_mh.py b/tests/topotests/bgp_evpn_mh/test_evpn_mh.py
index f389632b1e..f389632b1e 100644
--- a/tests/topotests/bgp-evpn-mh/test_evpn_mh.py
+++ b/tests/topotests/bgp_evpn_mh/test_evpn_mh.py
diff --git a/tests/topotests/bgp-evpn-mh/torm11/evpn.conf b/tests/topotests/bgp_evpn_mh/torm11/evpn.conf
index 01f4b65704..01f4b65704 100644
--- a/tests/topotests/bgp-evpn-mh/torm11/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/torm11/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm11/pim.conf b/tests/topotests/bgp_evpn_mh/torm11/pim.conf
index fbba735873..fbba735873 100644
--- a/tests/topotests/bgp-evpn-mh/torm11/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/torm11/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm11/zebra.conf b/tests/topotests/bgp_evpn_mh/torm11/zebra.conf
index 33e89c06ae..33e89c06ae 100644
--- a/tests/topotests/bgp-evpn-mh/torm11/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/torm11/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm12/evpn.conf b/tests/topotests/bgp_evpn_mh/torm12/evpn.conf
index 2c13024bbc..2c13024bbc 100644
--- a/tests/topotests/bgp-evpn-mh/torm12/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/torm12/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm12/pim.conf b/tests/topotests/bgp_evpn_mh/torm12/pim.conf
index 3dd63b44ca..3dd63b44ca 100644
--- a/tests/topotests/bgp-evpn-mh/torm12/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/torm12/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm12/zebra.conf b/tests/topotests/bgp_evpn_mh/torm12/zebra.conf
index 419f62b2ac..419f62b2ac 100644
--- a/tests/topotests/bgp-evpn-mh/torm12/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/torm12/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm21/evpn.conf b/tests/topotests/bgp_evpn_mh/torm21/evpn.conf
index 2a2ba061c6..2a2ba061c6 100644
--- a/tests/topotests/bgp-evpn-mh/torm21/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/torm21/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm21/pim.conf b/tests/topotests/bgp_evpn_mh/torm21/pim.conf
index 71aa91a06d..71aa91a06d 100644
--- a/tests/topotests/bgp-evpn-mh/torm21/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/torm21/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm21/zebra.conf b/tests/topotests/bgp_evpn_mh/torm21/zebra.conf
index 525f5eb099..525f5eb099 100644
--- a/tests/topotests/bgp-evpn-mh/torm21/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/torm21/zebra.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm22/evpn.conf b/tests/topotests/bgp_evpn_mh/torm22/evpn.conf
index 432135c94a..432135c94a 100644
--- a/tests/topotests/bgp-evpn-mh/torm22/evpn.conf
+++ b/tests/topotests/bgp_evpn_mh/torm22/evpn.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm22/pim.conf b/tests/topotests/bgp_evpn_mh/torm22/pim.conf
index 46f330f5cd..46f330f5cd 100644
--- a/tests/topotests/bgp-evpn-mh/torm22/pim.conf
+++ b/tests/topotests/bgp_evpn_mh/torm22/pim.conf
diff --git a/tests/topotests/bgp-evpn-mh/torm22/zebra.conf b/tests/topotests/bgp_evpn_mh/torm22/zebra.conf
index 398064df6c..398064df6c 100644
--- a/tests/topotests/bgp-evpn-mh/torm22/zebra.conf
+++ b/tests/topotests/bgp_evpn_mh/torm22/zebra.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/P1/bgpd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/P1/bgpd.conf
index cdf4cb4feb..cdf4cb4feb 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/P1/bgpd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/P1/bgpd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/P1/ospfd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/P1/ospfd.conf
index 2db7edb806..2db7edb806 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/P1/ospfd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/P1/ospfd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/P1/zebra.conf b/tests/topotests/bgp_evpn_vxlan_topo1/P1/zebra.conf
index 95b5da8402..95b5da8402 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/P1/zebra.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/P1/zebra.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/bgpd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/bgpd.conf
index 991a1e7e56..991a1e7e56 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/bgpd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/bgpd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/evpn.vni.json b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/evpn.vni.json
index e500a1d85c..e500a1d85c 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/evpn.vni.json
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/evpn.vni.json
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/ospfd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/ospfd.conf
index f1c2b42dc1..f1c2b42dc1 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/ospfd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/ospfd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/zebra.conf b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/zebra.conf
index e2699475c9..e2699475c9 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE1/zebra.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE1/zebra.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/bgpd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/bgpd.conf
index 52f8687bc1..52f8687bc1 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/bgpd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/bgpd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/evpn.vni.json b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/evpn.vni.json
index 0a56a235bd..0a56a235bd 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/evpn.vni.json
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/evpn.vni.json
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/ospfd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/ospfd.conf
index 065c993303..065c993303 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/ospfd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/ospfd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/zebra.conf b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/zebra.conf
index 9738916ab0..9738916ab0 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/PE2/zebra.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/PE2/zebra.conf
diff --git a/tests/topotests/bgp_default-route_route-map_match/__init__.py b/tests/topotests/bgp_evpn_vxlan_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_default-route_route-map_match/__init__.py
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/__init__.py
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/host1/bgpd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/host1/bgpd.conf
index cdf4cb4feb..cdf4cb4feb 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/host1/bgpd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/host1/bgpd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/host1/ospfd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/host1/ospfd.conf
index cdf4cb4feb..cdf4cb4feb 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/host1/ospfd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/host1/ospfd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/host1/zebra.conf b/tests/topotests/bgp_evpn_vxlan_topo1/host1/zebra.conf
index 91fae9eeba..91fae9eeba 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/host1/zebra.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/host1/zebra.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/host2/bgpd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/host2/bgpd.conf
index cdf4cb4feb..cdf4cb4feb 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/host2/bgpd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/host2/bgpd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/host2/ospfd.conf b/tests/topotests/bgp_evpn_vxlan_topo1/host2/ospfd.conf
index cdf4cb4feb..cdf4cb4feb 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/host2/ospfd.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/host2/ospfd.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/host2/zebra.conf b/tests/topotests/bgp_evpn_vxlan_topo1/host2/zebra.conf
index df9adeb3b5..df9adeb3b5 100644
--- a/tests/topotests/bgp-evpn-vxlan_topo1/host2/zebra.conf
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/host2/zebra.conf
diff --git a/tests/topotests/bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py b/tests/topotests/bgp_evpn_vxlan_topo1/test_bgp_evpn_vxlan.py
index 086bad6481..086bad6481 100755
--- a/tests/topotests/bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py
+++ b/tests/topotests/bgp_evpn_vxlan_topo1/test_bgp_evpn_vxlan.py
diff --git a/tests/topotests/bgp_default-route_route-map_match_set/__init__.py b/tests/topotests/bgp_path_attributes_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_default-route_route-map_match_set/__init__.py
+++ b/tests/topotests/bgp_path_attributes_topo1/__init__.py
diff --git a/tests/topotests/bgp-path-attributes-topo1/bgp_path_attributes.json b/tests/topotests/bgp_path_attributes_topo1/bgp_path_attributes.json
index de2bffa33d..de2bffa33d 100644
--- a/tests/topotests/bgp-path-attributes-topo1/bgp_path_attributes.json
+++ b/tests/topotests/bgp_path_attributes_topo1/bgp_path_attributes.json
diff --git a/tests/topotests/bgp-path-attributes-topo1/test_bgp_path_attributes.py b/tests/topotests/bgp_path_attributes_topo1/test_bgp_path_attributes.py
index a9541a55c5..a9541a55c5 100644
--- a/tests/topotests/bgp-path-attributes-topo1/test_bgp_path_attributes.py
+++ b/tests/topotests/bgp_path_attributes_topo1/test_bgp_path_attributes.py
diff --git a/tests/topotests/bgp_default-route_route-map_set/__init__.py b/tests/topotests/bgp_peer_group/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_default-route_route-map_set/__init__.py
+++ b/tests/topotests/bgp_peer_group/__init__.py
diff --git a/tests/topotests/bgp_peer-group/r1/bgpd.conf b/tests/topotests/bgp_peer_group/r1/bgpd.conf
index 19b490a359..19b490a359 100644
--- a/tests/topotests/bgp_peer-group/r1/bgpd.conf
+++ b/tests/topotests/bgp_peer_group/r1/bgpd.conf
diff --git a/tests/topotests/bgp_peer-group/r1/zebra.conf b/tests/topotests/bgp_peer_group/r1/zebra.conf
index e2c399e536..e2c399e536 100644
--- a/tests/topotests/bgp_peer-group/r1/zebra.conf
+++ b/tests/topotests/bgp_peer_group/r1/zebra.conf
diff --git a/tests/topotests/bgp_peer-group/r2/bgpd.conf b/tests/topotests/bgp_peer_group/r2/bgpd.conf
index 0880ee9fae..0880ee9fae 100644
--- a/tests/topotests/bgp_peer-group/r2/bgpd.conf
+++ b/tests/topotests/bgp_peer_group/r2/bgpd.conf
diff --git a/tests/topotests/bgp_peer-group/r2/zebra.conf b/tests/topotests/bgp_peer_group/r2/zebra.conf
index 606c17bec9..606c17bec9 100644
--- a/tests/topotests/bgp_peer-group/r2/zebra.conf
+++ b/tests/topotests/bgp_peer_group/r2/zebra.conf
diff --git a/tests/topotests/bgp_peer-group/r3/bgpd.conf b/tests/topotests/bgp_peer_group/r3/bgpd.conf
index eb2fca15fb..eb2fca15fb 100644
--- a/tests/topotests/bgp_peer-group/r3/bgpd.conf
+++ b/tests/topotests/bgp_peer_group/r3/bgpd.conf
diff --git a/tests/topotests/bgp_peer-group/r3/zebra.conf b/tests/topotests/bgp_peer_group/r3/zebra.conf
index e9fdfb70c5..e9fdfb70c5 100644
--- a/tests/topotests/bgp_peer-group/r3/zebra.conf
+++ b/tests/topotests/bgp_peer_group/r3/zebra.conf
diff --git a/tests/topotests/bgp_peer-group/test_bgp_peer-group.py b/tests/topotests/bgp_peer_group/test_bgp_peer-group.py
index 21dc725793..21dc725793 100644
--- a/tests/topotests/bgp_peer-group/test_bgp_peer-group.py
+++ b/tests/topotests/bgp_peer_group/test_bgp_peer-group.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/exabgp.env b/tests/topotests/bgp_peer_type_multipath_relax/exabgp.env
index 6c554f5fa8..6c554f5fa8 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/exabgp.env
+++ b/tests/topotests/bgp_peer_type_multipath_relax/exabgp.env
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer1/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer1/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer1/exa-receive.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer1/exa-receive.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer1/exa_readpipe.py b/tests/topotests/bgp_peer_type_multipath_relax/peer1/exa_readpipe.py
index 9e689a27e3..9e689a27e3 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer1/exa_readpipe.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer1/exa_readpipe.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer1/exabgp.cfg b/tests/topotests/bgp_peer_type_multipath_relax/peer1/exabgp.cfg
index 4a7dc48126..4a7dc48126 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer1/exabgp.cfg
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer1/exabgp.cfg
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer2/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer2/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer2/exa-receive.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer2/exa-receive.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer2/exa_readpipe.py b/tests/topotests/bgp_peer_type_multipath_relax/peer2/exa_readpipe.py
index 9e689a27e3..9e689a27e3 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer2/exa_readpipe.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer2/exa_readpipe.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer2/exabgp.cfg b/tests/topotests/bgp_peer_type_multipath_relax/peer2/exabgp.cfg
index b53b054550..b53b054550 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer2/exabgp.cfg
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer2/exabgp.cfg
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer3/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer3/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer3/exa-receive.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer3/exa-receive.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer3/exa_readpipe.py b/tests/topotests/bgp_peer_type_multipath_relax/peer3/exa_readpipe.py
index 9e689a27e3..9e689a27e3 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer3/exa_readpipe.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer3/exa_readpipe.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer3/exabgp.cfg b/tests/topotests/bgp_peer_type_multipath_relax/peer3/exabgp.cfg
index 6a1cc2fb3f..6a1cc2fb3f 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer3/exabgp.cfg
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer3/exabgp.cfg
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer4/exa-receive.py b/tests/topotests/bgp_peer_type_multipath_relax/peer4/exa-receive.py
index 031ff455ca..031ff455ca 100755
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer4/exa-receive.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer4/exa-receive.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer4/exa_readpipe.py b/tests/topotests/bgp_peer_type_multipath_relax/peer4/exa_readpipe.py
index 9e689a27e3..9e689a27e3 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer4/exa_readpipe.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer4/exa_readpipe.py
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/peer4/exabgp.cfg b/tests/topotests/bgp_peer_type_multipath_relax/peer4/exabgp.cfg
index 2cc26cb80f..2cc26cb80f 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/peer4/exabgp.cfg
+++ b/tests/topotests/bgp_peer_type_multipath_relax/peer4/exabgp.cfg
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/bgpd.conf b/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
index 038f108aa8..038f108aa8 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/bgpd.conf
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/multipath.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/multipath.json
index 11dad786f2..11dad786f2 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/multipath.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/multipath.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/not-multipath.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/not-multipath.json
index c621832157..c621832157 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/not-multipath.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/not-multipath.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-eBGP-confed.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-confed.json
index 22ec2c298b..22ec2c298b 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-eBGP-confed.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-confed.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-eBGP-iBGP.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-iBGP.json
index facddcda46..facddcda46 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-eBGP-iBGP.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-iBGP.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-no-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-no-recursive.json
index 5399ceefcc..5399ceefcc 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-no-recursive.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-no-recursive.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-recursive.json
index 7da95aed1c..7da95aed1c 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-recursive.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-recursive.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1.json
index a90669a474..a90669a474 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-ip-route.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-ip-route.json
index 1bf38efcc5..1bf38efcc5 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-ip-route.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-ip-route.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-no-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-no-recursive.json
index 33d0f2d1ce..33d0f2d1ce 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-no-recursive.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-no-recursive.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-recursive.json
index 6ac2512a60..6ac2512a60 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-recursive.json
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-recursive.json
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r1/zebra.conf b/tests/topotests/bgp_peer_type_multipath_relax/r1/zebra.conf
index 911aa1c39d..911aa1c39d 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r1/zebra.conf
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/zebra.conf
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r2/bgpd.conf b/tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
index 2362a19f26..2362a19f26 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r2/bgpd.conf
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r2/staticd.conf b/tests/topotests/bgp_peer_type_multipath_relax/r2/staticd.conf
index 35ebe0dc66..35ebe0dc66 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r2/staticd.conf
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r2/staticd.conf
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/r2/zebra.conf b/tests/topotests/bgp_peer_type_multipath_relax/r2/zebra.conf
index 900e7d4fbc..900e7d4fbc 100644
--- a/tests/topotests/bgp_peer-type_multipath-relax/r2/zebra.conf
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r2/zebra.conf
diff --git a/tests/topotests/bgp_peer-type_multipath-relax/test_bgp_peer-type_multipath-relax.py b/tests/topotests/bgp_peer_type_multipath_relax/test_bgp_peer-type_multipath-relax.py
index 39a0beeb11..39a0beeb11 100755
--- a/tests/topotests/bgp_peer-type_multipath-relax/test_bgp_peer-type_multipath-relax.py
+++ b/tests/topotests/bgp_peer_type_multipath_relax/test_bgp_peer-type_multipath-relax.py
diff --git a/tests/topotests/bgp_peer-group/__init__.py b/tests/topotests/bgp_prefix_list_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_peer-group/__init__.py
+++ b/tests/topotests/bgp_prefix_list_topo1/__init__.py
diff --git a/tests/topotests/bgp-prefix-list-topo1/prefix_lists.json b/tests/topotests/bgp_prefix_list_topo1/prefix_lists.json
index 3bb07ad994..3bb07ad994 100644
--- a/tests/topotests/bgp-prefix-list-topo1/prefix_lists.json
+++ b/tests/topotests/bgp_prefix_list_topo1/prefix_lists.json
diff --git a/tests/topotests/bgp-prefix-list-topo1/test_prefix_lists.py b/tests/topotests/bgp_prefix_list_topo1/test_prefix_lists.py
index 22952f645c..22952f645c 100644
--- a/tests/topotests/bgp-prefix-list-topo1/test_prefix_lists.py
+++ b/tests/topotests/bgp_prefix_list_topo1/test_prefix_lists.py
diff --git a/tests/topotests/bgp_recursive_route_ebgp_multi_hop/test_bgp_recursive_route_ebgp_multi_hop.py b/tests/topotests/bgp_recursive_route_ebgp_multi_hop/test_bgp_recursive_route_ebgp_multi_hop.py
index c758c31dc1..e7d70f6d8e 100644
--- a/tests/topotests/bgp_recursive_route_ebgp_multi_hop/test_bgp_recursive_route_ebgp_multi_hop.py
+++ b/tests/topotests/bgp_recursive_route_ebgp_multi_hop/test_bgp_recursive_route_ebgp_multi_hop.py
@@ -287,7 +287,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             input_dict_4,
             next_hop=topo["routers"]["r3"]["links"]["r1"][addr_type].split("/")[0],
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -322,7 +322,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             }
         }
         result = create_static_routes(tgen, input_dict_3)
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -335,7 +335,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             next_hop=topo["routers"]["r3"]["links"]["r1"][addr_type].split("/")[0],
             protocol="bgp",
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -354,7 +354,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             }
         }
         result = create_static_routes(tgen, input_dict_3)
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -388,7 +388,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             }
         }
         result = create_static_routes(tgen, input_dict_3)
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -401,7 +401,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             next_hop=topo["routers"]["r3"]["links"]["r1"][addr_type].split("/")[0],
             protocol="bgp",
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -427,7 +427,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             }
         }
         result = create_static_routes(tgen, input_dict_4)
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -474,7 +474,7 @@ def test_recursive_routes_iBGP_peer_p1(request):
             }
         }
         result = create_static_routes(tgen, input_dict_4)
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -639,7 +639,7 @@ def test_next_hop_as_self_ip_p1(request):
             input_dict_4,
             next_hop=topo["routers"]["r2"]["links"]["r4"][addr_type].split("/")[0],
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -671,7 +671,7 @@ def test_next_hop_as_self_ip_p1(request):
             input_dict_4,
             next_hop=topo["routers"]["r2"]["links"]["r4"][addr_type].split("/")[0],
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
         result = verify_rib(
@@ -1277,7 +1277,7 @@ def test_BGP_path_attributes_default_values_p1(request):
                 topo["routers"]["r3"]["links"]["r4"][addr_type].split("/")[0],
             ],
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -1298,7 +1298,7 @@ def test_BGP_path_attributes_default_values_p1(request):
             rmap_name="rmap_pf",
             input_dict=input_dict_4,
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -1402,7 +1402,7 @@ def test_BGP_path_attributes_default_values_p1(request):
             rmap_name="rmap_pf",
             input_dict=input_dict_4,
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -1478,7 +1478,7 @@ def test_BGP_path_attributes_default_values_p1(request):
             input_dict=input_dict_4,
             nexthop=None,
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
@@ -1859,7 +1859,7 @@ def test_BGP_active_standby_preemption_and_ecmp_p1(request):
                 topo["routers"]["r3"]["links"]["r4"][addr_type].split("/")[0],
             ],
         )
-        assert result is True, "Testcase  : Failed \n Error : {}".format(
+        assert result is True, "Testcase {}: Failed \n Error : {}".format(
             tc_name, result
         )
 
diff --git a/tests/topotests/bgp-route-map/bgp_route_map_topo1.json b/tests/topotests/bgp_route_map/bgp_route_map_topo1.json
index e89263961d..e89263961d 100644
--- a/tests/topotests/bgp-route-map/bgp_route_map_topo1.json
+++ b/tests/topotests/bgp_route_map/bgp_route_map_topo1.json
diff --git a/tests/topotests/bgp-route-map/bgp_route_map_topo2.json b/tests/topotests/bgp_route_map/bgp_route_map_topo2.json
index c22a4c3ea7..c22a4c3ea7 100755
--- a/tests/topotests/bgp-route-map/bgp_route_map_topo2.json
+++ b/tests/topotests/bgp_route_map/bgp_route_map_topo2.json
diff --git a/tests/topotests/bgp-route-map/test_route_map_topo1.py b/tests/topotests/bgp_route_map/test_route_map_topo1.py
index 0158e24d31..0158e24d31 100644
--- a/tests/topotests/bgp-route-map/test_route_map_topo1.py
+++ b/tests/topotests/bgp_route_map/test_route_map_topo1.py
diff --git a/tests/topotests/bgp-route-map/test_route_map_topo2.py b/tests/topotests/bgp_route_map/test_route_map_topo2.py
index 958eceba62..958eceba62 100644
--- a/tests/topotests/bgp-route-map/test_route_map_topo2.py
+++ b/tests/topotests/bgp_route_map/test_route_map_topo2.py
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/__init__.py b/tests/topotests/bgp_sender_as_path_loop_detection/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/__init__.py
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/__init__.py
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf b/tests/topotests/bgp_sender_as_path_loop_detection/r1/bgpd.conf
index 719d76392d..719d76392d 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/r1/bgpd.conf
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r1/zebra.conf b/tests/topotests/bgp_sender_as_path_loop_detection/r1/zebra.conf
index 9904bb4e16..9904bb4e16 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r1/zebra.conf
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/r1/zebra.conf
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf b/tests/topotests/bgp_sender_as_path_loop_detection/r2/bgpd.conf
index a4a654d7b5..a4a654d7b5 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/r2/bgpd.conf
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r2/zebra.conf b/tests/topotests/bgp_sender_as_path_loop_detection/r2/zebra.conf
index f0d357c5ff..f0d357c5ff 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r2/zebra.conf
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/r2/zebra.conf
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf b/tests/topotests/bgp_sender_as_path_loop_detection/r3/bgpd.conf
index 2e24de0b2d..2e24de0b2d 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/r3/bgpd.conf
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/r3/zebra.conf b/tests/topotests/bgp_sender_as_path_loop_detection/r3/zebra.conf
index a10fe3a3c7..a10fe3a3c7 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/r3/zebra.conf
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/r3/zebra.conf
diff --git a/tests/topotests/bgp_sender-as-path-loop-detection/test_bgp_sender-as-path-loop-detection.py b/tests/topotests/bgp_sender_as_path_loop_detection/test_bgp_sender-as-path-loop-detection.py
index dffe24f3a0..dffe24f3a0 100644
--- a/tests/topotests/bgp_sender-as-path-loop-detection/test_bgp_sender-as-path-loop-detection.py
+++ b/tests/topotests/bgp_sender_as_path_loop_detection/test_bgp_sender-as-path-loop-detection.py
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/__init__.py b/tests/topotests/bgp_set_local_preference_add_subtract/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/__init__.py
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/__init__.py
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf b/tests/topotests/bgp_set_local_preference_add_subtract/r1/bgpd.conf
index 57e2f5818a..57e2f5818a 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/r1/bgpd.conf
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r1/zebra.conf b/tests/topotests/bgp_set_local_preference_add_subtract/r1/zebra.conf
index 6e9b0b4a7e..6e9b0b4a7e 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r1/zebra.conf
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/r1/zebra.conf
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf b/tests/topotests/bgp_set_local_preference_add_subtract/r2/bgpd.conf
index 82a01d4570..82a01d4570 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/r2/bgpd.conf
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r2/zebra.conf b/tests/topotests/bgp_set_local_preference_add_subtract/r2/zebra.conf
index 93e3590448..93e3590448 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r2/zebra.conf
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/r2/zebra.conf
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf b/tests/topotests/bgp_set_local_preference_add_subtract/r3/bgpd.conf
index 65e092b0f2..65e092b0f2 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/r3/bgpd.conf
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/r3/zebra.conf b/tests/topotests/bgp_set_local_preference_add_subtract/r3/zebra.conf
index b5e060c3d6..b5e060c3d6 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/r3/zebra.conf
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/r3/zebra.conf
diff --git a/tests/topotests/bgp_set_local-preference_add_subtract/test_bgp_set_local-preference_add_subtract.py b/tests/topotests/bgp_set_local_preference_add_subtract/test_bgp_set_local-preference_add_subtract.py
index af64648951..af64648951 100644
--- a/tests/topotests/bgp_set_local-preference_add_subtract/test_bgp_set_local-preference_add_subtract.py
+++ b/tests/topotests/bgp_set_local_preference_add_subtract/test_bgp_set_local-preference_add_subtract.py
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce1/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
index b598666dfb..b598666dfb 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce1/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce1/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf
index 36218d3538..36218d3538 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce1/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce1/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
index 8ad2ddc48c..8ad2ddc48c 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce1/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce2/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
index e388ccba8a..e388ccba8a 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce2/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce2/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/snmpd.conf
index 714585cb9b..714585cb9b 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce2/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
index fa2e968e55..fa2e968e55 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce2/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce3/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
index e388ccba8a..e388ccba8a 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce3/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce3/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/snmpd.conf
index 36218d3538..36218d3538 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce3/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
index ea91e21bad..ea91e21bad 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce3/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce4/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
index e388ccba8a..e388ccba8a 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce4/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce4/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/snmpd.conf
index 36218d3538..36218d3538 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce4/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/ce4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
index 0866fa9759..0866fa9759 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/ce4/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r1/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
index 098e55d0ed..098e55d0ed 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r1/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r1/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf
index b5ca993da3..b5ca993da3 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r1/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r1/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/snmpd.conf
index c903c1ad2e..c903c1ad2e 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r1/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r1/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/zebra.conf
index 7228ae6bd2..7228ae6bd2 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r1/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r2/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf
index 3dfa43831a..3dfa43831a 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r2/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r2/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/snmpd.conf
index 0cfebc7238..0cfebc7238 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r2/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
index 9bc4331bae..9bc4331bae 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r2/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r3/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf
index 578ebafad6..578ebafad6 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r3/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r3/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/snmpd.conf
index b9eb00ea52..b9eb00ea52 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r3/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
index 4d2007e787..4d2007e787 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r3/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r4/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
index 2a834c799e..2a834c799e 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r4/bgpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r4/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf
index 3e9e9af45f..3e9e9af45f 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r4/isisd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r4/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/snmpd.conf
index ec35f9f9c9..ec35f9f9c9 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r4/snmpd.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/snmpd.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/r4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
index c48407c108..c48407c108 100644
--- a/tests/topotests/bgp-snmp-mplsl3vpn/r4/zebra.conf
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py b/tests/topotests/bgp_snmp_mplsl3vpn/test_bgp_snmp_mplsvpn.py
index b830e16b9a..b830e16b9a 100755
--- a/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py
+++ b/tests/topotests/bgp_snmp_mplsl3vpn/test_bgp_snmp_mplsvpn.py
diff --git a/tests/topotests/bgp-vrf-route-leak-basic/r1/bgpd.conf b/tests/topotests/bgp_vrf_route_leak_basic/r1/bgpd.conf
index 03dfbf9322..03dfbf9322 100644
--- a/tests/topotests/bgp-vrf-route-leak-basic/r1/bgpd.conf
+++ b/tests/topotests/bgp_vrf_route_leak_basic/r1/bgpd.conf
diff --git a/tests/topotests/bgp-vrf-route-leak-basic/r1/zebra.conf b/tests/topotests/bgp_vrf_route_leak_basic/r1/zebra.conf
index 35038557df..35038557df 100644
--- a/tests/topotests/bgp-vrf-route-leak-basic/r1/zebra.conf
+++ b/tests/topotests/bgp_vrf_route_leak_basic/r1/zebra.conf
diff --git a/tests/topotests/bgp-vrf-route-leak-basic/setup_vrfs b/tests/topotests/bgp_vrf_route_leak_basic/setup_vrfs
index fb67953fe3..fb67953fe3 100644
--- a/tests/topotests/bgp-vrf-route-leak-basic/setup_vrfs
+++ b/tests/topotests/bgp_vrf_route_leak_basic/setup_vrfs
diff --git a/tests/topotests/bgp-vrf-route-leak-basic/test_bgp-vrf-route-leak-basic.py b/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
index 71f64e9b70..71f64e9b70 100644
--- a/tests/topotests/bgp-vrf-route-leak-basic/test_bgp-vrf-route-leak-basic.py
+++ b/tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py
diff --git a/tests/topotests/eigrp-topo1/r1/eigrpd.conf b/tests/topotests/eigrp_topo1/r1/eigrpd.conf
index 6c800abd9b..6c800abd9b 100644
--- a/tests/topotests/eigrp-topo1/r1/eigrpd.conf
+++ b/tests/topotests/eigrp_topo1/r1/eigrpd.conf
diff --git a/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.json b/tests/topotests/eigrp_topo1/r1/show_ip_eigrp.json
index be0fdcfed9..be0fdcfed9 100644
--- a/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.json
+++ b/tests/topotests/eigrp_topo1/r1/show_ip_eigrp.json
diff --git a/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.ref b/tests/topotests/eigrp_topo1/r1/show_ip_eigrp.ref
index a2d7b3307d..a2d7b3307d 100644
--- a/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.ref
+++ b/tests/topotests/eigrp_topo1/r1/show_ip_eigrp.ref
diff --git a/tests/topotests/eigrp-topo1/r1/show_ip_route.json_ref b/tests/topotests/eigrp_topo1/r1/show_ip_route.json_ref
index 26fa7ca415..26fa7ca415 100644
--- a/tests/topotests/eigrp-topo1/r1/show_ip_route.json_ref
+++ b/tests/topotests/eigrp_topo1/r1/show_ip_route.json_ref
diff --git a/tests/topotests/eigrp-topo1/r1/zebra.conf b/tests/topotests/eigrp_topo1/r1/zebra.conf
index 56ae4a66f4..56ae4a66f4 100644
--- a/tests/topotests/eigrp-topo1/r1/zebra.conf
+++ b/tests/topotests/eigrp_topo1/r1/zebra.conf
diff --git a/tests/topotests/eigrp-topo1/r2/eigrpd.conf b/tests/topotests/eigrp_topo1/r2/eigrpd.conf
index 56c747d97c..56c747d97c 100644
--- a/tests/topotests/eigrp-topo1/r2/eigrpd.conf
+++ b/tests/topotests/eigrp_topo1/r2/eigrpd.conf
diff --git a/tests/topotests/eigrp-topo1/r2/show_ip_eigrp.json b/tests/topotests/eigrp_topo1/r2/show_ip_eigrp.json
index ae9f441a38..ae9f441a38 100644
--- a/tests/topotests/eigrp-topo1/r2/show_ip_eigrp.json
+++ b/tests/topotests/eigrp_topo1/r2/show_ip_eigrp.json
diff --git a/tests/topotests/eigrp-topo1/r2/show_ip_eigrp.ref b/tests/topotests/eigrp_topo1/r2/show_ip_eigrp.ref
index cce49cda07..cce49cda07 100644
--- a/tests/topotests/eigrp-topo1/r2/show_ip_eigrp.ref
+++ b/tests/topotests/eigrp_topo1/r2/show_ip_eigrp.ref
diff --git a/tests/topotests/eigrp-topo1/r2/show_ip_route.json_ref b/tests/topotests/eigrp_topo1/r2/show_ip_route.json_ref
index 71c931b17a..71c931b17a 100644
--- a/tests/topotests/eigrp-topo1/r2/show_ip_route.json_ref
+++ b/tests/topotests/eigrp_topo1/r2/show_ip_route.json_ref
diff --git a/tests/topotests/eigrp-topo1/r2/zebra.conf b/tests/topotests/eigrp_topo1/r2/zebra.conf
index c440f3a350..c440f3a350 100644
--- a/tests/topotests/eigrp-topo1/r2/zebra.conf
+++ b/tests/topotests/eigrp_topo1/r2/zebra.conf
diff --git a/tests/topotests/eigrp-topo1/r3/eigrpd.conf b/tests/topotests/eigrp_topo1/r3/eigrpd.conf
index 53ad1bb6a1..53ad1bb6a1 100644
--- a/tests/topotests/eigrp-topo1/r3/eigrpd.conf
+++ b/tests/topotests/eigrp_topo1/r3/eigrpd.conf
diff --git a/tests/topotests/eigrp-topo1/r3/show_ip_eigrp.json b/tests/topotests/eigrp_topo1/r3/show_ip_eigrp.json
index 83db66c8c8..83db66c8c8 100644
--- a/tests/topotests/eigrp-topo1/r3/show_ip_eigrp.json
+++ b/tests/topotests/eigrp_topo1/r3/show_ip_eigrp.json
diff --git a/tests/topotests/eigrp-topo1/r3/show_ip_eigrp.ref b/tests/topotests/eigrp_topo1/r3/show_ip_eigrp.ref
index 70f3d3f98b..70f3d3f98b 100644
--- a/tests/topotests/eigrp-topo1/r3/show_ip_eigrp.ref
+++ b/tests/topotests/eigrp_topo1/r3/show_ip_eigrp.ref
diff --git a/tests/topotests/eigrp-topo1/r3/show_ip_route.json_ref b/tests/topotests/eigrp_topo1/r3/show_ip_route.json_ref
index 5e0b79d811..5e0b79d811 100644
--- a/tests/topotests/eigrp-topo1/r3/show_ip_route.json_ref
+++ b/tests/topotests/eigrp_topo1/r3/show_ip_route.json_ref
diff --git a/tests/topotests/eigrp-topo1/r3/zebra.conf b/tests/topotests/eigrp_topo1/r3/zebra.conf
index 7f145b4583..7f145b4583 100644
--- a/tests/topotests/eigrp-topo1/r3/zebra.conf
+++ b/tests/topotests/eigrp_topo1/r3/zebra.conf
diff --git a/tests/topotests/eigrp-topo1/test_eigrp_topo1.dot b/tests/topotests/eigrp_topo1/test_eigrp_topo1.dot
index ca3a0fe5b9..ca3a0fe5b9 100644
--- a/tests/topotests/eigrp-topo1/test_eigrp_topo1.dot
+++ b/tests/topotests/eigrp_topo1/test_eigrp_topo1.dot
diff --git a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py b/tests/topotests/eigrp_topo1/test_eigrp_topo1.py
index 6993bc53e7..6993bc53e7 100644
--- a/tests/topotests/eigrp-topo1/test_eigrp_topo1.py
+++ b/tests/topotests/eigrp_topo1/test_eigrp_topo1.py
diff --git a/tests/topotests/evpn-pim-1/host1/bgpd.conf b/tests/topotests/evpn_pim_1/host1/bgpd.conf
index cdf4cb4feb..cdf4cb4feb 100644
--- a/tests/topotests/evpn-pim-1/host1/bgpd.conf
+++ b/tests/topotests/evpn_pim_1/host1/bgpd.conf
diff --git a/tests/topotests/evpn-pim-1/host1/pimd.conf b/tests/topotests/evpn_pim_1/host1/pimd.conf
index 63a44c1333..63a44c1333 100644
--- a/tests/topotests/evpn-pim-1/host1/pimd.conf
+++ b/tests/topotests/evpn_pim_1/host1/pimd.conf
diff --git a/tests/topotests/evpn-pim-1/host1/zebra.conf b/tests/topotests/evpn_pim_1/host1/zebra.conf
index 45ad031017..45ad031017 100644
--- a/tests/topotests/evpn-pim-1/host1/zebra.conf
+++ b/tests/topotests/evpn_pim_1/host1/zebra.conf
diff --git a/tests/topotests/evpn-pim-1/host2/bgpd.conf b/tests/topotests/evpn_pim_1/host2/bgpd.conf
index cdf4cb4feb..cdf4cb4feb 100644
--- a/tests/topotests/evpn-pim-1/host2/bgpd.conf
+++ b/tests/topotests/evpn_pim_1/host2/bgpd.conf
diff --git a/tests/topotests/evpn-pim-1/host2/pimd.conf b/tests/topotests/evpn_pim_1/host2/pimd.conf
index 63a44c1333..63a44c1333 100644
--- a/tests/topotests/evpn-pim-1/host2/pimd.conf
+++ b/tests/topotests/evpn_pim_1/host2/pimd.conf
diff --git a/tests/topotests/evpn-pim-1/host2/zebra.conf b/tests/topotests/evpn_pim_1/host2/zebra.conf
index bfae53017f..bfae53017f 100644
--- a/tests/topotests/evpn-pim-1/host2/zebra.conf
+++ b/tests/topotests/evpn_pim_1/host2/zebra.conf
diff --git a/tests/topotests/evpn-pim-1/leaf1/bgpd.conf b/tests/topotests/evpn_pim_1/leaf1/bgpd.conf
index 97fd8662f4..97fd8662f4 100644
--- a/tests/topotests/evpn-pim-1/leaf1/bgpd.conf
+++ b/tests/topotests/evpn_pim_1/leaf1/bgpd.conf
diff --git a/tests/topotests/evpn-pim-1/leaf1/pimd.conf b/tests/topotests/evpn_pim_1/leaf1/pimd.conf
index 293e252086..293e252086 100644
--- a/tests/topotests/evpn-pim-1/leaf1/pimd.conf
+++ b/tests/topotests/evpn_pim_1/leaf1/pimd.conf
diff --git a/tests/topotests/evpn-pim-1/leaf1/zebra.conf b/tests/topotests/evpn_pim_1/leaf1/zebra.conf
index 581cc6e7be..581cc6e7be 100644
--- a/tests/topotests/evpn-pim-1/leaf1/zebra.conf
+++ b/tests/topotests/evpn_pim_1/leaf1/zebra.conf
diff --git a/tests/topotests/evpn-pim-1/leaf2/bgpd.conf b/tests/topotests/evpn_pim_1/leaf2/bgpd.conf
index 91d9bd8c8b..91d9bd8c8b 100644
--- a/tests/topotests/evpn-pim-1/leaf2/bgpd.conf
+++ b/tests/topotests/evpn_pim_1/leaf2/bgpd.conf
diff --git a/tests/topotests/evpn-pim-1/leaf2/pimd.conf b/tests/topotests/evpn_pim_1/leaf2/pimd.conf
index 08d5a19a2a..08d5a19a2a 100644
--- a/tests/topotests/evpn-pim-1/leaf2/pimd.conf
+++ b/tests/topotests/evpn_pim_1/leaf2/pimd.conf
diff --git a/tests/topotests/evpn-pim-1/leaf2/zebra.conf b/tests/topotests/evpn_pim_1/leaf2/zebra.conf
index 1bcf8e1ded..1bcf8e1ded 100644
--- a/tests/topotests/evpn-pim-1/leaf2/zebra.conf
+++ b/tests/topotests/evpn_pim_1/leaf2/zebra.conf
diff --git a/tests/topotests/evpn-pim-1/spine/bgp.summ.json b/tests/topotests/evpn_pim_1/spine/bgp.summ.json
index 5ff4b096fd..5ff4b096fd 100644
--- a/tests/topotests/evpn-pim-1/spine/bgp.summ.json
+++ b/tests/topotests/evpn_pim_1/spine/bgp.summ.json
diff --git a/tests/topotests/evpn-pim-1/spine/bgpd.conf b/tests/topotests/evpn_pim_1/spine/bgpd.conf
index 81ab802f35..81ab802f35 100644
--- a/tests/topotests/evpn-pim-1/spine/bgpd.conf
+++ b/tests/topotests/evpn_pim_1/spine/bgpd.conf
diff --git a/tests/topotests/evpn-pim-1/spine/join-info.json b/tests/topotests/evpn_pim_1/spine/join-info.json
index 3d135fb964..3d135fb964 100644
--- a/tests/topotests/evpn-pim-1/spine/join-info.json
+++ b/tests/topotests/evpn_pim_1/spine/join-info.json
diff --git a/tests/topotests/evpn-pim-1/spine/pimd.conf b/tests/topotests/evpn_pim_1/spine/pimd.conf
index 56adda5cc4..56adda5cc4 100644
--- a/tests/topotests/evpn-pim-1/spine/pimd.conf
+++ b/tests/topotests/evpn_pim_1/spine/pimd.conf
diff --git a/tests/topotests/evpn-pim-1/spine/zebra.conf b/tests/topotests/evpn_pim_1/spine/zebra.conf
index 2cb719486e..2cb719486e 100644
--- a/tests/topotests/evpn-pim-1/spine/zebra.conf
+++ b/tests/topotests/evpn_pim_1/spine/zebra.conf
diff --git a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py b/tests/topotests/evpn_pim_1/test_evpn_pim_topo1.py
index 260a197aca..260a197aca 100644
--- a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
+++ b/tests/topotests/evpn_pim_1/test_evpn_pim_topo1.py
diff --git a/tests/topotests/example-test/__init__.py b/tests/topotests/example_test/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/example-test/__init__.py
+++ b/tests/topotests/example_test/__init__.py
diff --git a/tests/topotests/example-test/test_example.py b/tests/topotests/example_test/test_example.py
index 72eceee612..72eceee612 100755
--- a/tests/topotests/example-test/test_example.py
+++ b/tests/topotests/example_test/test_example.py
diff --git a/tests/topotests/example-test/test_template.dot b/tests/topotests/example_test/test_template.dot
index b5e12020ce..b5e12020ce 100644
--- a/tests/topotests/example-test/test_template.dot
+++ b/tests/topotests/example_test/test_template.dot
diff --git a/tests/topotests/example-test/test_template.jpg b/tests/topotests/example_test/test_template.jpg
index b01ef73f5a..b01ef73f5a 100644
--- a/tests/topotests/example-test/test_template.jpg
+++ b/tests/topotests/example_test/test_template.jpg
diff --git a/tests/topotests/example-test/test_template.py b/tests/topotests/example_test/test_template.py
index 0265dbe796..0265dbe796 100644
--- a/tests/topotests/example-test/test_template.py
+++ b/tests/topotests/example_test/test_template.py
diff --git a/tests/topotests/example-topojson-test/__init__.py b/tests/topotests/example_topojson_test/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/example-topojson-test/__init__.py
+++ b/tests/topotests/example_topojson_test/__init__.py
diff --git a/tests/topotests/example-topojson-test/test_topo_json_multiple_links/__init__.py b/tests/topotests/example_topojson_test/test_topo_json_multiple_links/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/example-topojson-test/test_topo_json_multiple_links/__init__.py
+++ b/tests/topotests/example_topojson_test/test_topo_json_multiple_links/__init__.py
diff --git a/tests/topotests/example-topojson-test/test_topo_json_multiple_links/example_topojson_multiple_links.json b/tests/topotests/example_topojson_test/test_topo_json_multiple_links/example_topojson_multiple_links.json
index 3968348b1f..3968348b1f 100644
--- a/tests/topotests/example-topojson-test/test_topo_json_multiple_links/example_topojson_multiple_links.json
+++ b/tests/topotests/example_topojson_test/test_topo_json_multiple_links/example_topojson_multiple_links.json
diff --git a/tests/topotests/example-topojson-test/test_topo_json_multiple_links/test_example_topojson_multiple_links.py b/tests/topotests/example_topojson_test/test_topo_json_multiple_links/test_example_topojson_multiple_links.py
index 09ac9f2fa4..09ac9f2fa4 100755
--- a/tests/topotests/example-topojson-test/test_topo_json_multiple_links/test_example_topojson_multiple_links.py
+++ b/tests/topotests/example_topojson_test/test_topo_json_multiple_links/test_example_topojson_multiple_links.py
diff --git a/tests/topotests/example-topojson-test/test_topo_json_single_link/__init__.py b/tests/topotests/example_topojson_test/test_topo_json_single_link/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/example-topojson-test/test_topo_json_single_link/__init__.py
+++ b/tests/topotests/example_topojson_test/test_topo_json_single_link/__init__.py
diff --git a/tests/topotests/example-topojson-test/test_topo_json_single_link/example_topojson.json b/tests/topotests/example_topojson_test/test_topo_json_single_link/example_topojson.json
index 629d2d6d78..629d2d6d78 100644
--- a/tests/topotests/example-topojson-test/test_topo_json_single_link/example_topojson.json
+++ b/tests/topotests/example_topojson_test/test_topo_json_single_link/example_topojson.json
diff --git a/tests/topotests/example-topojson-test/test_topo_json_single_link/test_example_topojson.py b/tests/topotests/example_topojson_test/test_topo_json_single_link/test_example_topojson.py
index 26336d5de1..26336d5de1 100755
--- a/tests/topotests/example-topojson-test/test_topo_json_single_link/test_example_topojson.py
+++ b/tests/topotests/example_topojson_test/test_topo_json_single_link/test_example_topojson.py
diff --git a/tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/__init__.py b/tests/topotests/example_topojson_test/test_topo_json_single_link_loopback/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/__init__.py
+++ b/tests/topotests/example_topojson_test/test_topo_json_single_link_loopback/__init__.py
diff --git a/tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/example_topojson.json b/tests/topotests/example_topojson_test/test_topo_json_single_link_loopback/example_topojson.json
index c76c6264be..c76c6264be 100644
--- a/tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/example_topojson.json
+++ b/tests/topotests/example_topojson_test/test_topo_json_single_link_loopback/example_topojson.json
diff --git a/tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/test_example_topojson.py b/tests/topotests/example_topojson_test/test_topo_json_single_link_loopback/test_example_topojson.py
index 012b05d376..012b05d376 100755
--- a/tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/test_example_topojson.py
+++ b/tests/topotests/example_topojson_test/test_topo_json_single_link_loopback/test_example_topojson.py
diff --git a/tests/topotests/isis-lfa-topo1/__init__.py b/tests/topotests/isis_lfa_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-lfa-topo1/__init__.py
+++ b/tests/topotests/isis_lfa_topo1/__init__.py
diff --git a/tests/topotests/isis-lfa-topo1/rt1/isisd.conf b/tests/topotests/isis_lfa_topo1/rt1/isisd.conf
index 2ad8c12538..2ad8c12538 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt1/isisd.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/isis_lfa_topo1/rt1/step1/show_ipv6_route.ref
index 10c61d53e3..10c61d53e3 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lfa_topo1/rt1/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index d8a7c5a9c4..d8a7c5a9c4 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step10/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step10/show_ipv6_route.ref.diff
index d626cdca02..d626cdca02 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step10/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step10/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step11/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step11/show_ipv6_route.ref.diff
index f7f99c276e..f7f99c276e 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step11/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step11/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step12/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step12/show_ipv6_route.ref.diff
index 3b767f1bf6..3b767f1bf6 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step12/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step12/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step13/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step13/show_ipv6_route.ref.diff
index 504af5ac58..504af5ac58 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step13/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step13/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step2/show_ipv6_route.ref.diff
index efc56d9835..efc56d9835 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step3/show_ipv6_route.ref.diff
index cafbe490b5..cafbe490b5 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step4/show_ipv6_route.ref.diff
index 47d8334a05..47d8334a05 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step5/show_ipv6_route.ref.diff
index b6a342df88..b6a342df88 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step6/show_ipv6_route.ref.diff
index fafa2999d1..fafa2999d1 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step7/show_ipv6_route.ref.diff
index 1803e2cf5c..1803e2cf5c 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step8/show_ipv6_route.ref.diff
index 306f725340..306f725340 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_lfa_topo1/rt1/step9/show_ipv6_route.ref.diff
index 3ffab46eeb..3ffab46eeb 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_lfa_topo1/rt1/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-lfa-topo1/rt1/zebra.conf b/tests/topotests/isis_lfa_topo1/rt1/zebra.conf
index 317f1031df..317f1031df 100644
--- a/tests/topotests/isis-lfa-topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_lfa_topo1/rt1/zebra.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt2/isisd.conf b/tests/topotests/isis_lfa_topo1/rt2/isisd.conf
index 39ff2570d4..39ff2570d4 100644
--- a/tests/topotests/isis-lfa-topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt2/isisd.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt2/step1/show_ipv6_route.ref b/tests/topotests/isis_lfa_topo1/rt2/step1/show_ipv6_route.ref
index 036bfe1f4f..036bfe1f4f 100644
--- a/tests/topotests/isis-lfa-topo1/rt2/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lfa_topo1/rt2/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index 681c5222ad..681c5222ad 100644
--- a/tests/topotests/isis-lfa-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt2/zebra.conf b/tests/topotests/isis_lfa_topo1/rt2/zebra.conf
index 9feaada791..9feaada791 100644
--- a/tests/topotests/isis-lfa-topo1/rt2/zebra.conf
+++ b/tests/topotests/isis_lfa_topo1/rt2/zebra.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt3/isisd.conf b/tests/topotests/isis_lfa_topo1/rt3/isisd.conf
index 8b0c7bd0dc..8b0c7bd0dc 100644
--- a/tests/topotests/isis-lfa-topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt3/isisd.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt3/step1/show_ipv6_route.ref b/tests/topotests/isis_lfa_topo1/rt3/step1/show_ipv6_route.ref
index a1aab400e4..a1aab400e4 100644
--- a/tests/topotests/isis-lfa-topo1/rt3/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lfa_topo1/rt3/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index 1495e32284..1495e32284 100644
--- a/tests/topotests/isis-lfa-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt3/zebra.conf b/tests/topotests/isis_lfa_topo1/rt3/zebra.conf
index 48d732e72a..48d732e72a 100644
--- a/tests/topotests/isis-lfa-topo1/rt3/zebra.conf
+++ b/tests/topotests/isis_lfa_topo1/rt3/zebra.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt4/isisd.conf b/tests/topotests/isis_lfa_topo1/rt4/isisd.conf
index 86edee6ab1..86edee6ab1 100644
--- a/tests/topotests/isis-lfa-topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt4/isisd.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt4/step1/show_ipv6_route.ref b/tests/topotests/isis_lfa_topo1/rt4/step1/show_ipv6_route.ref
index 6878e2fac0..6878e2fac0 100644
--- a/tests/topotests/isis-lfa-topo1/rt4/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lfa_topo1/rt4/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index d8cd565b5b..d8cd565b5b 100644
--- a/tests/topotests/isis-lfa-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt4/zebra.conf b/tests/topotests/isis_lfa_topo1/rt4/zebra.conf
index bff10860cc..bff10860cc 100644
--- a/tests/topotests/isis-lfa-topo1/rt4/zebra.conf
+++ b/tests/topotests/isis_lfa_topo1/rt4/zebra.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt5/isisd.conf b/tests/topotests/isis_lfa_topo1/rt5/isisd.conf
index 7a7cfe557d..7a7cfe557d 100644
--- a/tests/topotests/isis-lfa-topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt5/isisd.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt5/step1/show_ipv6_route.ref b/tests/topotests/isis_lfa_topo1/rt5/step1/show_ipv6_route.ref
index f8181c7769..f8181c7769 100644
--- a/tests/topotests/isis-lfa-topo1/rt5/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lfa_topo1/rt5/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index d8cd565b5b..d8cd565b5b 100644
--- a/tests/topotests/isis-lfa-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt5/zebra.conf b/tests/topotests/isis_lfa_topo1/rt5/zebra.conf
index ee1e46c966..ee1e46c966 100644
--- a/tests/topotests/isis-lfa-topo1/rt5/zebra.conf
+++ b/tests/topotests/isis_lfa_topo1/rt5/zebra.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt6/isisd.conf b/tests/topotests/isis_lfa_topo1/rt6/isisd.conf
index 20cb7769a4..20cb7769a4 100644
--- a/tests/topotests/isis-lfa-topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt6/isisd.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt6/step1/show_ipv6_route.ref b/tests/topotests/isis_lfa_topo1/rt6/step1/show_ipv6_route.ref
index e5f3c77ac5..e5f3c77ac5 100644
--- a/tests/topotests/isis-lfa-topo1/rt6/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lfa_topo1/rt6/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index d8cd565b5b..d8cd565b5b 100644
--- a/tests/topotests/isis-lfa-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt6/zebra.conf b/tests/topotests/isis_lfa_topo1/rt6/zebra.conf
index 4108078896..4108078896 100644
--- a/tests/topotests/isis-lfa-topo1/rt6/zebra.conf
+++ b/tests/topotests/isis_lfa_topo1/rt6/zebra.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt7/isisd.conf b/tests/topotests/isis_lfa_topo1/rt7/isisd.conf
index 713e6d39f4..713e6d39f4 100644
--- a/tests/topotests/isis-lfa-topo1/rt7/isisd.conf
+++ b/tests/topotests/isis_lfa_topo1/rt7/isisd.conf
diff --git a/tests/topotests/isis-lfa-topo1/rt7/step1/show_ipv6_route.ref b/tests/topotests/isis_lfa_topo1/rt7/step1/show_ipv6_route.ref
index 0dff15e3fd..0dff15e3fd 100644
--- a/tests/topotests/isis-lfa-topo1/rt7/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lfa_topo1/rt7/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lfa_topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref
index d8a7c5a9c4..d8a7c5a9c4 100644
--- a/tests/topotests/isis-lfa-topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lfa_topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lfa-topo1/rt7/zebra.conf b/tests/topotests/isis_lfa_topo1/rt7/zebra.conf
index 353c9efa93..353c9efa93 100644
--- a/tests/topotests/isis-lfa-topo1/rt7/zebra.conf
+++ b/tests/topotests/isis_lfa_topo1/rt7/zebra.conf
diff --git a/tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py b/tests/topotests/isis_lfa_topo1/test_isis_lfa_topo1.py
index dcfcd11435..dcfcd11435 100755
--- a/tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py
+++ b/tests/topotests/isis_lfa_topo1/test_isis_lfa_topo1.py
diff --git a/tests/topotests/isis-lsp-bits-topo1/__init__.py b/tests/topotests/isis_lsp_bits_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-lsp-bits-topo1/__init__.py
+++ b/tests/topotests/isis_lsp_bits_topo1/__init__.py
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf
index 90764a0d0f..90764a0d0f 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_ip_route.ref
index 8557f4b010..8557f4b010 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_ipv6_route.ref
index fa76533756..fa76533756 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index 26f0dffa7a..26f0dffa7a 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step2/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step2/show_ip_route.ref
index c826efdcfe..c826efdcfe 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step2/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step2/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step2/show_ipv6_route.ref
index a386b45dad..a386b45dad 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step3/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step3/show_ip_route.ref
index 2b281b74fb..2b281b74fb 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step3/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step3/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step3/show_ipv6_route.ref
index 4b920eda01..4b920eda01 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step4/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step4/show_ip_route.ref
index 8557f4b010..8557f4b010 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step4/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/step4/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt1/step4/show_ipv6_route.ref
index fa76533756..fa76533756 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt1/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt1/zebra.conf
index 9d71d3005f..9d71d3005f 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt1/zebra.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt2/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf
index 2bc4c4ad97..2bc4c4ad97 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_ip_route.ref
index d7e886ce86..d7e886ce86 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_ipv6_route.ref
index a92272f6d0..a92272f6d0 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index c70b44e1c9..c70b44e1c9 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt2/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt2/zebra.conf
index 234e10efa9..234e10efa9 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt2/zebra.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt2/zebra.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt3/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf
index 9ad97109b5..9ad97109b5 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_ip_route.ref
index 55f0aedef5..55f0aedef5 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_ipv6_route.ref
index 5d6dfca76a..5d6dfca76a 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index 6950086b1e..6950086b1e 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt3/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt3/zebra.conf
index 9a0defd62b..9a0defd62b 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt3/zebra.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt3/zebra.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt4/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf
index e85412a71d..e85412a71d 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_ip_route.ref
index 2cf5c40635..2cf5c40635 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_ipv6_route.ref
index cde7287943..cde7287943 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index 233180ceb8..233180ceb8 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt4/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt4/zebra.conf
index adcf433249..adcf433249 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt4/zebra.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt4/zebra.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt5/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf
index 2cab0c88fc..2cab0c88fc 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_ip_route.ref
index 358d0a230c..358d0a230c 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_ipv6_route.ref
index 7586c73852..7586c73852 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index f939a6abff..f939a6abff 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt5/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt5/zebra.conf
index 0f10ce921f..0f10ce921f 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt5/zebra.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt5/zebra.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf
index 249f945e0c..249f945e0c 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_ip_route.ref
index 40375792a4..40375792a4 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_ipv6_route.ref
index 278129f481..278129f481 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index b4e8c23189..b4e8c23189 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step2/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step2/show_ip_route.ref
index 8083be4cfb..8083be4cfb 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step2/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step2/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step2/show_ipv6_route.ref
index 2e982e0c37..2e982e0c37 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step3/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step3/show_ip_route.ref
index 1ba8c8cda8..1ba8c8cda8 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step3/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step3/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step3/show_ipv6_route.ref
index 9b53a1d760..9b53a1d760 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step4/show_ip_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step4/show_ip_route.ref
index 40375792a4..40375792a4 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step4/show_ip_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/step4/show_ipv6_route.ref b/tests/topotests/isis_lsp_bits_topo1/rt6/step4/show_ipv6_route.ref
index 278129f481..278129f481 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-lsp-bits-topo1/rt6/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt6/zebra.conf
index 6084010a93..6084010a93 100644
--- a/tests/topotests/isis-lsp-bits-topo1/rt6/zebra.conf
+++ b/tests/topotests/isis_lsp_bits_topo1/rt6/zebra.conf
diff --git a/tests/topotests/isis-lsp-bits-topo1/test_isis_lsp_bits_topo1.py b/tests/topotests/isis_lsp_bits_topo1/test_isis_lsp_bits_topo1.py
index 27dc1073c6..27dc1073c6 100755
--- a/tests/topotests/isis-lsp-bits-topo1/test_isis_lsp_bits_topo1.py
+++ b/tests/topotests/isis_lsp_bits_topo1/test_isis_lsp_bits_topo1.py
diff --git a/tests/topotests/isis-rlfa-topo1/__init__.py b/tests/topotests/isis_rlfa_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-rlfa-topo1/__init__.py
+++ b/tests/topotests/isis_rlfa_topo1/__init__.py
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf
index a80f30dc7b..a80f30dc7b 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt1/ldpd.conf
index f60fdb9742..f60fdb9742 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt1/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step1/show_ip_route.ref b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_ip_route.ref
index 680b31eb8d..680b31eb8d 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step1/show_ip_route.ref
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_ipv6_route.ref
index c487d2740d..c487d2740d 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index 3fe2b798a0..3fe2b798a0 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step10/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step10/show_ip_route.ref.diff
index ef5707f14a..ef5707f14a 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step10/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step10/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step10/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step10/show_ipv6_route.ref.diff
index acd2ce003a..acd2ce003a 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step10/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step10/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step2/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step2/show_ip_route.ref.diff
index f7f31ac021..f7f31ac021 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step2/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step2/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step2/show_ipv6_route.ref.diff
index e980031ad7..e980031ad7 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step3/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step3/show_ip_route.ref.diff
index f3ed764f0b..f3ed764f0b 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step3/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step3/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step3/show_ipv6_route.ref.diff
index 57b0b1de1a..57b0b1de1a 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step4/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step4/show_ip_route.ref.diff
index 107a0ba2f7..107a0ba2f7 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step4/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step4/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step4/show_ipv6_route.ref.diff
index 9cf24082e1..9cf24082e1 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step5/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step5/show_ip_route.ref.diff
index 09469501f5..09469501f5 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step5/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step5/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step5/show_ipv6_route.ref.diff
index 70fb1a65c7..70fb1a65c7 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step6/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step6/show_ip_route.ref.diff
index 4e4a5692a4..4e4a5692a4 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step6/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step6/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step6/show_ipv6_route.ref.diff
index c9ebb1e3f5..c9ebb1e3f5 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step7/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step7/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step7/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step7/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step7/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step8/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step8/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step8/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step8/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step8/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step9/show_ip_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step9/show_ip_route.ref.diff
index 33eb6577bd..33eb6577bd 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step9/show_ip_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step9/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_rlfa_topo1/rt1/step9/show_ipv6_route.ref.diff
index 7aaca3354e..7aaca3354e 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_rlfa_topo1/rt1/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-rlfa-topo1/rt1/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt1/zebra.conf
index 741fc2d02b..741fc2d02b 100644
--- a/tests/topotests/isis-rlfa-topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt1/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt2/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf
index 7b4c6c50b9..7b4c6c50b9 100644
--- a/tests/topotests/isis-rlfa-topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt2/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt2/ldpd.conf
index 0a815ef004..0a815ef004 100644
--- a/tests/topotests/isis-rlfa-topo1/rt2/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt2/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt2/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt2/zebra.conf
index 657c69bf28..657c69bf28 100644
--- a/tests/topotests/isis-rlfa-topo1/rt2/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt2/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt3/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf
index 17d58a9d15..17d58a9d15 100644
--- a/tests/topotests/isis-rlfa-topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt3/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt3/ldpd.conf
index 40f1f5587a..40f1f5587a 100644
--- a/tests/topotests/isis-rlfa-topo1/rt3/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt3/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt3/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt3/zebra.conf
index 86f5d2871a..86f5d2871a 100644
--- a/tests/topotests/isis-rlfa-topo1/rt3/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt3/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt4/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf
index 1519fd4c16..1519fd4c16 100644
--- a/tests/topotests/isis-rlfa-topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt4/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt4/ldpd.conf
index 569ecf733e..569ecf733e 100644
--- a/tests/topotests/isis-rlfa-topo1/rt4/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt4/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt4/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt4/zebra.conf
index 1dd09bf83b..1dd09bf83b 100644
--- a/tests/topotests/isis-rlfa-topo1/rt4/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt4/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt5/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf
index caf7477073..caf7477073 100644
--- a/tests/topotests/isis-rlfa-topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt5/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt5/ldpd.conf
index 519c3d3628..519c3d3628 100644
--- a/tests/topotests/isis-rlfa-topo1/rt5/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt5/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt5/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt5/zebra.conf
index 7117a2a2e3..7117a2a2e3 100644
--- a/tests/topotests/isis-rlfa-topo1/rt5/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt5/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt6/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf
index cdf6267236..cdf6267236 100644
--- a/tests/topotests/isis-rlfa-topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt6/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt6/ldpd.conf
index a5b7062bec..a5b7062bec 100644
--- a/tests/topotests/isis-rlfa-topo1/rt6/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt6/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt6/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt6/zebra.conf
index c6344870b7..c6344870b7 100644
--- a/tests/topotests/isis-rlfa-topo1/rt6/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt6/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt7/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf
index 8ab8fcb232..8ab8fcb232 100644
--- a/tests/topotests/isis-rlfa-topo1/rt7/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt7/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt7/ldpd.conf
index 26d428c4c6..26d428c4c6 100644
--- a/tests/topotests/isis-rlfa-topo1/rt7/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt7/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt7/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt7/zebra.conf
index 4c5e0f1126..4c5e0f1126 100644
--- a/tests/topotests/isis-rlfa-topo1/rt7/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt7/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt8/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf
index abdc6a53a5..abdc6a53a5 100644
--- a/tests/topotests/isis-rlfa-topo1/rt8/isisd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt8/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt8/ldpd.conf
index 1629f82de1..1629f82de1 100644
--- a/tests/topotests/isis-rlfa-topo1/rt8/ldpd.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt8/ldpd.conf
diff --git a/tests/topotests/isis-rlfa-topo1/rt8/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt8/zebra.conf
index f3f10f649a..f3f10f649a 100644
--- a/tests/topotests/isis-rlfa-topo1/rt8/zebra.conf
+++ b/tests/topotests/isis_rlfa_topo1/rt8/zebra.conf
diff --git a/tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py b/tests/topotests/isis_rlfa_topo1/test_isis_rlfa_topo1.py
index 9ad41c5934..9ad41c5934 100755
--- a/tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py
+++ b/tests/topotests/isis_rlfa_topo1/test_isis_rlfa_topo1.py
diff --git a/tests/topotests/isis-snmp/ce3/zebra.conf b/tests/topotests/isis_snmp/ce3/zebra.conf
index c6a5824d15..c6a5824d15 100644
--- a/tests/topotests/isis-snmp/ce3/zebra.conf
+++ b/tests/topotests/isis_snmp/ce3/zebra.conf
diff --git a/tests/topotests/isis-snmp/r1/isisd.conf b/tests/topotests/isis_snmp/r1/isisd.conf
index dd32d3b8a5..dd32d3b8a5 100644
--- a/tests/topotests/isis-snmp/r1/isisd.conf
+++ b/tests/topotests/isis_snmp/r1/isisd.conf
diff --git a/tests/topotests/isis-snmp/r1/ldpd.conf b/tests/topotests/isis_snmp/r1/ldpd.conf
index 4ec296ca5a..4ec296ca5a 100644
--- a/tests/topotests/isis-snmp/r1/ldpd.conf
+++ b/tests/topotests/isis_snmp/r1/ldpd.conf
diff --git a/tests/topotests/isis-snmp/r1/show_ip_route.ref b/tests/topotests/isis_snmp/r1/show_ip_route.ref
index dc8f19dad0..dc8f19dad0 100644
--- a/tests/topotests/isis-snmp/r1/show_ip_route.ref
+++ b/tests/topotests/isis_snmp/r1/show_ip_route.ref
diff --git a/tests/topotests/isis-snmp/r1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_snmp/r1/show_yang_interface_isis_adjacencies.ref
index 390fda749e..390fda749e 100644
--- a/tests/topotests/isis-snmp/r1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_snmp/r1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-snmp/r1/snmpd.conf b/tests/topotests/isis_snmp/r1/snmpd.conf
index b37911da36..b37911da36 100644
--- a/tests/topotests/isis-snmp/r1/snmpd.conf
+++ b/tests/topotests/isis_snmp/r1/snmpd.conf
diff --git a/tests/topotests/isis-snmp/r1/zebra.conf b/tests/topotests/isis_snmp/r1/zebra.conf
index 6ac341e431..6ac341e431 100644
--- a/tests/topotests/isis-snmp/r1/zebra.conf
+++ b/tests/topotests/isis_snmp/r1/zebra.conf
diff --git a/tests/topotests/isis-snmp/r2/isisd.conf b/tests/topotests/isis_snmp/r2/isisd.conf
index 4403d8913b..4403d8913b 100644
--- a/tests/topotests/isis-snmp/r2/isisd.conf
+++ b/tests/topotests/isis_snmp/r2/isisd.conf
diff --git a/tests/topotests/isis-snmp/r2/ldpd.conf b/tests/topotests/isis_snmp/r2/ldpd.conf
index eb963fe41c..eb963fe41c 100644
--- a/tests/topotests/isis-snmp/r2/ldpd.conf
+++ b/tests/topotests/isis_snmp/r2/ldpd.conf
diff --git a/tests/topotests/isis-snmp/r2/show_ip_route.ref b/tests/topotests/isis_snmp/r2/show_ip_route.ref
index 2bcee96064..2bcee96064 100644
--- a/tests/topotests/isis-snmp/r2/show_ip_route.ref
+++ b/tests/topotests/isis_snmp/r2/show_ip_route.ref
diff --git a/tests/topotests/isis-snmp/r2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_snmp/r2/show_yang_interface_isis_adjacencies.ref
index 52550daf14..52550daf14 100644
--- a/tests/topotests/isis-snmp/r2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_snmp/r2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-snmp/r2/snmpd.conf b/tests/topotests/isis_snmp/r2/snmpd.conf
index 0f779b8b91..0f779b8b91 100644
--- a/tests/topotests/isis-snmp/r2/snmpd.conf
+++ b/tests/topotests/isis_snmp/r2/snmpd.conf
diff --git a/tests/topotests/isis-snmp/r2/zebra.conf b/tests/topotests/isis_snmp/r2/zebra.conf
index 4aa7440c33..4aa7440c33 100644
--- a/tests/topotests/isis-snmp/r2/zebra.conf
+++ b/tests/topotests/isis_snmp/r2/zebra.conf
diff --git a/tests/topotests/isis-snmp/r3/isisd.conf b/tests/topotests/isis_snmp/r3/isisd.conf
index e06fe8c1f9..e06fe8c1f9 100644
--- a/tests/topotests/isis-snmp/r3/isisd.conf
+++ b/tests/topotests/isis_snmp/r3/isisd.conf
diff --git a/tests/topotests/isis-snmp/r3/ldpd.conf b/tests/topotests/isis_snmp/r3/ldpd.conf
index 2935caf13b..2935caf13b 100644
--- a/tests/topotests/isis-snmp/r3/ldpd.conf
+++ b/tests/topotests/isis_snmp/r3/ldpd.conf
diff --git a/tests/topotests/isis-snmp/r3/show_ip_route.ref b/tests/topotests/isis_snmp/r3/show_ip_route.ref
index da46f1dfe2..da46f1dfe2 100644
--- a/tests/topotests/isis-snmp/r3/show_ip_route.ref
+++ b/tests/topotests/isis_snmp/r3/show_ip_route.ref
diff --git a/tests/topotests/isis-snmp/r3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_snmp/r3/show_yang_interface_isis_adjacencies.ref
index 3aafab4e2e..3aafab4e2e 100644
--- a/tests/topotests/isis-snmp/r3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_snmp/r3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-snmp/r3/snmpd.conf b/tests/topotests/isis_snmp/r3/snmpd.conf
index 3f3501a6fd..3f3501a6fd 100644
--- a/tests/topotests/isis-snmp/r3/snmpd.conf
+++ b/tests/topotests/isis_snmp/r3/snmpd.conf
diff --git a/tests/topotests/isis-snmp/r3/zebra.conf b/tests/topotests/isis_snmp/r3/zebra.conf
index 6b76114d4d..6b76114d4d 100644
--- a/tests/topotests/isis-snmp/r3/zebra.conf
+++ b/tests/topotests/isis_snmp/r3/zebra.conf
diff --git a/tests/topotests/isis-snmp/r4/isisd.conf b/tests/topotests/isis_snmp/r4/isisd.conf
index 1256141da9..1256141da9 100644
--- a/tests/topotests/isis-snmp/r4/isisd.conf
+++ b/tests/topotests/isis_snmp/r4/isisd.conf
diff --git a/tests/topotests/isis-snmp/r4/ldpd.conf b/tests/topotests/isis_snmp/r4/ldpd.conf
index b27952514b..b27952514b 100644
--- a/tests/topotests/isis-snmp/r4/ldpd.conf
+++ b/tests/topotests/isis_snmp/r4/ldpd.conf
diff --git a/tests/topotests/isis-snmp/r4/show_ip_route.ref b/tests/topotests/isis_snmp/r4/show_ip_route.ref
index da46f1dfe2..da46f1dfe2 100644
--- a/tests/topotests/isis-snmp/r4/show_ip_route.ref
+++ b/tests/topotests/isis_snmp/r4/show_ip_route.ref
diff --git a/tests/topotests/isis-snmp/r4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_snmp/r4/show_yang_interface_isis_adjacencies.ref
index 86fcfea1a6..86fcfea1a6 100644
--- a/tests/topotests/isis-snmp/r4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_snmp/r4/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-snmp/r4/snmpd.conf b/tests/topotests/isis_snmp/r4/snmpd.conf
index e5e336d888..e5e336d888 100644
--- a/tests/topotests/isis-snmp/r4/snmpd.conf
+++ b/tests/topotests/isis_snmp/r4/snmpd.conf
diff --git a/tests/topotests/isis-snmp/r4/zebra.conf b/tests/topotests/isis_snmp/r4/zebra.conf
index fa13601164..fa13601164 100644
--- a/tests/topotests/isis-snmp/r4/zebra.conf
+++ b/tests/topotests/isis_snmp/r4/zebra.conf
diff --git a/tests/topotests/isis-snmp/r5/isisd.conf b/tests/topotests/isis_snmp/r5/isisd.conf
index 58859041a9..58859041a9 100644
--- a/tests/topotests/isis-snmp/r5/isisd.conf
+++ b/tests/topotests/isis_snmp/r5/isisd.conf
diff --git a/tests/topotests/isis-snmp/r5/ldpd.conf b/tests/topotests/isis_snmp/r5/ldpd.conf
index f3ba867a9f..f3ba867a9f 100644
--- a/tests/topotests/isis-snmp/r5/ldpd.conf
+++ b/tests/topotests/isis_snmp/r5/ldpd.conf
diff --git a/tests/topotests/isis-snmp/r5/ldpdconf b/tests/topotests/isis_snmp/r5/ldpdconf
index fc700608b5..fc700608b5 100644
--- a/tests/topotests/isis-snmp/r5/ldpdconf
+++ b/tests/topotests/isis_snmp/r5/ldpdconf
diff --git a/tests/topotests/isis-snmp/r5/show_ip_route.ref b/tests/topotests/isis_snmp/r5/show_ip_route.ref
index da46f1dfe2..da46f1dfe2 100644
--- a/tests/topotests/isis-snmp/r5/show_ip_route.ref
+++ b/tests/topotests/isis_snmp/r5/show_ip_route.ref
diff --git a/tests/topotests/isis-snmp/r5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_snmp/r5/show_yang_interface_isis_adjacencies.ref
index 994e8166ce..994e8166ce 100644
--- a/tests/topotests/isis-snmp/r5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_snmp/r5/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-snmp/r5/snmpd.conf b/tests/topotests/isis_snmp/r5/snmpd.conf
index 5bebbdebd4..5bebbdebd4 100644
--- a/tests/topotests/isis-snmp/r5/snmpd.conf
+++ b/tests/topotests/isis_snmp/r5/snmpd.conf
diff --git a/tests/topotests/isis-snmp/r5/zebra.conf b/tests/topotests/isis_snmp/r5/zebra.conf
index 7230129f22..7230129f22 100644
--- a/tests/topotests/isis-snmp/r5/zebra.conf
+++ b/tests/topotests/isis_snmp/r5/zebra.conf
diff --git a/tests/topotests/isis-snmp/test_isis_snmp.dot b/tests/topotests/isis_snmp/test_isis_snmp.dot
index 6d8c893712..6d8c893712 100644
--- a/tests/topotests/isis-snmp/test_isis_snmp.dot
+++ b/tests/topotests/isis_snmp/test_isis_snmp.dot
diff --git a/tests/topotests/isis-snmp/test_isis_snmp.py b/tests/topotests/isis_snmp/test_isis_snmp.py
index 04e043847d..04e043847d 100755
--- a/tests/topotests/isis-snmp/test_isis_snmp.py
+++ b/tests/topotests/isis_snmp/test_isis_snmp.py
diff --git a/tests/topotests/isis-sr-te-topo1/dst/zebra.conf b/tests/topotests/isis_sr_te_topo1/dst/zebra.conf
index e873ac8a5c..e873ac8a5c 100644
--- a/tests/topotests/isis-sr-te-topo1/dst/zebra.conf
+++ b/tests/topotests/isis_sr_te_topo1/dst/zebra.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/bgpd.conf b/tests/topotests/isis_sr_te_topo1/rt1/bgpd.conf
index efc03701b5..efc03701b5 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/bgpd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt1/bgpd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf
index 70ae1b07f5..70ae1b07f5 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/pathd.conf b/tests/topotests/isis_sr_te_topo1/rt1/pathd.conf
index 911971496e..911971496e 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/pathd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt1/pathd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step1/show_mpls_table_with_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt1/step1/show_mpls_table_with_candidate.ref
index d4b27d157d..d4b27d157d 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step1/show_mpls_table_with_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step1/show_mpls_table_with_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step1/show_mpls_table_without_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt1/step1/show_mpls_table_without_candidate.ref
index 5fe58d0824..5fe58d0824 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step1/show_mpls_table_without_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step1/show_mpls_table_without_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step2/show_operational_data.ref b/tests/topotests/isis_sr_te_topo1/rt1/step2/show_operational_data.ref
index 4ef8d946f2..4ef8d946f2 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step2/show_operational_data.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step2/show_operational_data.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step2/show_operational_data_with_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt1/step2/show_operational_data_with_candidate.ref
index 9b28f6a42b..9b28f6a42b 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step2/show_operational_data_with_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step2/show_operational_data_with_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step3/show_operational_data_with_single_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt1/step3/show_operational_data_with_single_candidate.ref
index 9b28f6a42b..9b28f6a42b 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step3/show_operational_data_with_single_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step3/show_operational_data_with_single_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step3/show_operational_data_with_two_candidates.ref b/tests/topotests/isis_sr_te_topo1/rt1/step3/show_operational_data_with_two_candidates.ref
index 249117198a..249117198a 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step3/show_operational_data_with_two_candidates.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step3/show_operational_data_with_two_candidates.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table.ref b/tests/topotests/isis_sr_te_topo1/rt1/step4/show_mpls_table.ref
index 21f71f1254..21f71f1254 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table_add_segment.ref b/tests/topotests/isis_sr_te_topo1/rt1/step4/show_mpls_table_add_segment.ref
index 3635c89efb..3635c89efb 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table_add_segment.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step4/show_mpls_table_add_segment.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table_change_segment.ref b/tests/topotests/isis_sr_te_topo1/rt1/step4/show_mpls_table_change_segment.ref
index 5712d210d4..5712d210d4 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table_change_segment.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step4/show_mpls_table_change_segment.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_ip_route_bgp_active_srte.ref b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_ip_route_bgp_active_srte.ref
index 5a76246e50..5a76246e50 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_ip_route_bgp_active_srte.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_ip_route_bgp_active_srte.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_ip_route_bgp_inactive_srte.ref b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_ip_route_bgp_inactive_srte.ref
index 09d5958305..09d5958305 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_ip_route_bgp_inactive_srte.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_ip_route_bgp_inactive_srte.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_operational_data_active.ref b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_operational_data_active.ref
index e26039b835..e26039b835 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_operational_data_active.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_operational_data_active.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_operational_data_inactive.ref b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_operational_data_inactive.ref
index 01505c0318..01505c0318 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/step5/show_operational_data_inactive.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt1/step5/show_operational_data_inactive.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt1/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt1/zebra.conf
index 9d71d3005f..9d71d3005f 100644
--- a/tests/topotests/isis-sr-te-topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt1/zebra.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt2/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf
index 733f26bc62..733f26bc62 100644
--- a/tests/topotests/isis-sr-te-topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt2/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt2/zebra.conf
index dcb0686dc2..dcb0686dc2 100644
--- a/tests/topotests/isis-sr-te-topo1/rt2/zebra.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt2/zebra.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt3/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf
index 2395906cbf..2395906cbf 100644
--- a/tests/topotests/isis-sr-te-topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt3/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt3/zebra.conf
index 3254529386..3254529386 100644
--- a/tests/topotests/isis-sr-te-topo1/rt3/zebra.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt3/zebra.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt4/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf
index 07a7867cbb..07a7867cbb 100644
--- a/tests/topotests/isis-sr-te-topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt4/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt4/zebra.conf
index 4945897e9d..4945897e9d 100644
--- a/tests/topotests/isis-sr-te-topo1/rt4/zebra.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt4/zebra.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt5/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf
index b0fcdede07..b0fcdede07 100644
--- a/tests/topotests/isis-sr-te-topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt5/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt5/zebra.conf
index 4cfea1a59f..4cfea1a59f 100644
--- a/tests/topotests/isis-sr-te-topo1/rt5/zebra.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt5/zebra.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/bgpd.conf b/tests/topotests/isis_sr_te_topo1/rt6/bgpd.conf
index e72ee52fce..e72ee52fce 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/bgpd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt6/bgpd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf
index 3be24ad24c..3be24ad24c 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/pathd.conf b/tests/topotests/isis_sr_te_topo1/rt6/pathd.conf
index 3bada7147c..3bada7147c 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/pathd.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt6/pathd.conf
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/step1/show_mpls_table_with_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt6/step1/show_mpls_table_with_candidate.ref
index 2bb000346f..2bb000346f 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/step1/show_mpls_table_with_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt6/step1/show_mpls_table_with_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/step1/show_mpls_table_without_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt6/step1/show_mpls_table_without_candidate.ref
index 348f7761eb..348f7761eb 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/step1/show_mpls_table_without_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt6/step1/show_mpls_table_without_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/step2/show_operational_data.ref b/tests/topotests/isis_sr_te_topo1/rt6/step2/show_operational_data.ref
index 241c80bdd7..241c80bdd7 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/step2/show_operational_data.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt6/step2/show_operational_data.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/step2/show_operational_data_with_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt6/step2/show_operational_data_with_candidate.ref
index 20ea69e386..20ea69e386 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/step2/show_operational_data_with_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt6/step2/show_operational_data_with_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/step3/show_operational_data_with_single_candidate.ref b/tests/topotests/isis_sr_te_topo1/rt6/step3/show_operational_data_with_single_candidate.ref
index 20ea69e386..20ea69e386 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/step3/show_operational_data_with_single_candidate.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt6/step3/show_operational_data_with_single_candidate.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/step3/show_operational_data_with_two_candidates.ref b/tests/topotests/isis_sr_te_topo1/rt6/step3/show_operational_data_with_two_candidates.ref
index 10cafe9091..10cafe9091 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/step3/show_operational_data_with_two_candidates.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt6/step3/show_operational_data_with_two_candidates.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/step4/show_mpls_table.ref b/tests/topotests/isis_sr_te_topo1/rt6/step4/show_mpls_table.ref
index 95bf995e2e..95bf995e2e 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_te_topo1/rt6/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-te-topo1/rt6/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt6/zebra.conf
index 32c6e6c4e0..32c6e6c4e0 100644
--- a/tests/topotests/isis-sr-te-topo1/rt6/zebra.conf
+++ b/tests/topotests/isis_sr_te_topo1/rt6/zebra.conf
diff --git a/tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py b/tests/topotests/isis_sr_te_topo1/test_isis_sr_te_topo1.py
index 6bbb570267..6bbb570267 100755
--- a/tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py
+++ b/tests/topotests/isis_sr_te_topo1/test_isis_sr_te_topo1.py
diff --git a/tests/topotests/isis-sr-topo1/__init__.py b/tests/topotests/isis_sr_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-sr-topo1/__init__.py
+++ b/tests/topotests/isis_sr_topo1/__init__.py
diff --git a/tests/topotests/isis-sr-topo1/rt1/isisd.conf b/tests/topotests/isis_sr_topo1/rt1/isisd.conf
index f441527597..f441527597 100644
--- a/tests/topotests/isis-sr-topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt1/isisd.conf
diff --git a/tests/topotests/isis-sr-topo1/rt1/step1/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step1/show_ip_route.ref
index 53bf8cb445..53bf8cb445 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step1/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step1/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step1/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step1/show_mpls_table.ref
index 5b1950d8cb..5b1950d8cb 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index 26f0dffa7a..26f0dffa7a 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step10/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step10/show_ip_route.ref
index c712538c00..c712538c00 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step10/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step10/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step10/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step10/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step10/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step10/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step10/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step10/show_mpls_table.ref
index 7e6c72627a..7e6c72627a 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step10/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step10/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step2/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step2/show_ip_route.ref
index c712538c00..c712538c00 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step2/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step2/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step2/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step2/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step2/show_mpls_table.ref
index 5b1950d8cb..5b1950d8cb 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step2/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step2/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step3/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step3/show_ip_route.ref
index 71f9ebddfb..71f9ebddfb 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step3/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step3/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step3/show_ipv6_route.ref
index 304c0a475b..304c0a475b 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step3/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step3/show_mpls_table.ref
index 94b3cb6d1a..94b3cb6d1a 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step3/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step3/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step4/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step4/show_ip_route.ref
index c712538c00..c712538c00 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step4/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step4/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step4/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step4/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step4/show_mpls_table.ref
index 6500a47fbf..6500a47fbf 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step5/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step5/show_ip_route.ref
index 16d9358468..16d9358468 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step5/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step5/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step5/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step5/show_ipv6_route.ref
index f2093a3fc0..f2093a3fc0 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step5/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step5/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step5/show_mpls_table.ref
index 94b3cb6d1a..94b3cb6d1a 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step5/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step5/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step6/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step6/show_ip_route.ref
index c712538c00..c712538c00 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step6/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step6/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step6/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step6/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step6/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step6/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step6/show_mpls_table.ref
index 5b1950d8cb..5b1950d8cb 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step6/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step6/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step7/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step7/show_ip_route.ref
index c712538c00..c712538c00 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step7/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step7/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step7/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step7/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step7/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step7/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step7/show_mpls_table.ref
index 5b1950d8cb..5b1950d8cb 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step7/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step7/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step8/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step8/show_ip_route.ref
index c712538c00..c712538c00 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step8/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step8/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step8/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step8/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step8/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step8/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step8/show_mpls_table.ref
index 5b1950d8cb..5b1950d8cb 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step8/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step8/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step9/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt1/step9/show_ip_route.ref
index c712538c00..c712538c00 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step9/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step9/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step9/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt1/step9/show_ipv6_route.ref
index 0b39584717..0b39584717 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step9/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step9/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt1/step9/show_mpls_table.ref
index 7e6c72627a..7e6c72627a 100644
--- a/tests/topotests/isis-sr-topo1/rt1/step9/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step9/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt1/zebra.conf b/tests/topotests/isis_sr_topo1/rt1/zebra.conf
index 9d71d3005f..9d71d3005f 100644
--- a/tests/topotests/isis-sr-topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_sr_topo1/rt1/zebra.conf
diff --git a/tests/topotests/isis-sr-topo1/rt2/isisd.conf b/tests/topotests/isis_sr_topo1/rt2/isisd.conf
index 796b6ed32c..796b6ed32c 100644
--- a/tests/topotests/isis-sr-topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt2/isisd.conf
diff --git a/tests/topotests/isis-sr-topo1/rt2/step1/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step1/show_ip_route.ref
index 109b94f7a1..109b94f7a1 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step1/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step1/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step1/show_ipv6_route.ref
index eae700ee47..eae700ee47 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step1/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step1/show_mpls_table.ref
index a32cd1d1bf..a32cd1d1bf 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index 07f43e5999..07f43e5999 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step10/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step10/show_ip_route.ref
index b7d52cecca..b7d52cecca 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step10/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step10/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step10/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step10/show_ipv6_route.ref
index 355436cbfc..355436cbfc 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step10/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step10/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step10/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step10/show_mpls_table.ref
index 4cbdb9fda9..4cbdb9fda9 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step10/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step10/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step2/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step2/show_ip_route.ref
index 159392f7f7..159392f7f7 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step2/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step2/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step2/show_ipv6_route.ref
index e9f63849d8..e9f63849d8 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step2/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step2/show_mpls_table.ref
index 0692553808..0692553808 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step2/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step2/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step3/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step3/show_ip_route.ref
index 16f49ffe46..16f49ffe46 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step3/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step3/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step3/show_ipv6_route.ref
index bde83c30d0..bde83c30d0 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step3/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step3/show_mpls_table.ref
index cbb0d5c695..cbb0d5c695 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step3/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step3/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step4/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step4/show_ip_route.ref
index 159392f7f7..159392f7f7 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step4/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step4/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step4/show_ipv6_route.ref
index e9f63849d8..e9f63849d8 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step4/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step4/show_mpls_table.ref
index 0692553808..0692553808 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step5/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step5/show_ip_route.ref
index fbfcce10aa..fbfcce10aa 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step5/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step5/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step5/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step5/show_ipv6_route.ref
index f747a96518..f747a96518 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step5/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step5/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step5/show_mpls_table.ref
index cbb0d5c695..cbb0d5c695 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step5/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step5/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step6/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step6/show_ip_route.ref
index 159392f7f7..159392f7f7 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step6/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step6/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step6/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step6/show_ipv6_route.ref
index e9f63849d8..e9f63849d8 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step6/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step6/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step6/show_mpls_table.ref
index 0692553808..0692553808 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step6/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step6/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step7/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step7/show_ip_route.ref
index 09ab6d4f8a..09ab6d4f8a 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step7/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step7/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step7/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step7/show_ipv6_route.ref
index 851275fbf7..851275fbf7 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step7/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step7/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step7/show_mpls_table.ref
index 87946aa7b9..87946aa7b9 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step7/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step7/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step8/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step8/show_ip_route.ref
index 159392f7f7..159392f7f7 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step8/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step8/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step8/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step8/show_ipv6_route.ref
index e9f63849d8..e9f63849d8 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step8/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step8/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step8/show_mpls_table.ref
index 0692553808..0692553808 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step8/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step8/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step9/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt2/step9/show_ip_route.ref
index fc82ada7e3..fc82ada7e3 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step9/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step9/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step9/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt2/step9/show_ipv6_route.ref
index 355436cbfc..355436cbfc 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step9/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step9/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt2/step9/show_mpls_table.ref
index 05201724f4..05201724f4 100644
--- a/tests/topotests/isis-sr-topo1/rt2/step9/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step9/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt2/zebra.conf b/tests/topotests/isis_sr_topo1/rt2/zebra.conf
index dcb0686dc2..dcb0686dc2 100644
--- a/tests/topotests/isis-sr-topo1/rt2/zebra.conf
+++ b/tests/topotests/isis_sr_topo1/rt2/zebra.conf
diff --git a/tests/topotests/isis-sr-topo1/rt3/isisd.conf b/tests/topotests/isis_sr_topo1/rt3/isisd.conf
index cc2aa1782b..cc2aa1782b 100644
--- a/tests/topotests/isis-sr-topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt3/isisd.conf
diff --git a/tests/topotests/isis-sr-topo1/rt3/step1/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step1/show_ip_route.ref
index 241f768859..241f768859 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step1/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step1/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step1/show_ipv6_route.ref
index dd78c7d318..dd78c7d318 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step1/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step1/show_mpls_table.ref
index 8c6fca7b57..8c6fca7b57 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index 7fa6f5cf47..7fa6f5cf47 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step10/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step10/show_ip_route.ref
index 40a98ab7c6..40a98ab7c6 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step10/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step10/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step10/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step10/show_ipv6_route.ref
index 1fb50407bd..1fb50407bd 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step10/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step10/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step10/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step10/show_mpls_table.ref
index 44ddc4bc14..44ddc4bc14 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step10/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step10/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step2/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step2/show_ip_route.ref
index 55d8213c4e..55d8213c4e 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step2/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step2/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step2/show_ipv6_route.ref
index 4f6441e7b9..4f6441e7b9 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step2/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step2/show_mpls_table.ref
index db8253f83d..db8253f83d 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step2/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step2/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step3/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step3/show_ip_route.ref
index ed5cef8a5b..ed5cef8a5b 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step3/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step3/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step3/show_ipv6_route.ref
index b33058c3bd..b33058c3bd 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step3/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step3/show_mpls_table.ref
index 70cccc0f0b..70cccc0f0b 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step3/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step3/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step4/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step4/show_ip_route.ref
index 55d8213c4e..55d8213c4e 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step4/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step4/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step4/show_ipv6_route.ref
index 4f6441e7b9..4f6441e7b9 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step4/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step4/show_mpls_table.ref
index db8253f83d..db8253f83d 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step5/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step5/show_ip_route.ref
index 3adcdce58c..3adcdce58c 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step5/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step5/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step5/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step5/show_ipv6_route.ref
index 863e26c30e..863e26c30e 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step5/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step5/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step5/show_mpls_table.ref
index 70cccc0f0b..70cccc0f0b 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step5/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step5/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step6/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step6/show_ip_route.ref
index 55d8213c4e..55d8213c4e 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step6/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step6/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step6/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step6/show_ipv6_route.ref
index 4f6441e7b9..4f6441e7b9 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step6/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step6/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step6/show_mpls_table.ref
index db8253f83d..db8253f83d 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step6/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step6/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step7/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step7/show_ip_route.ref
index 7f6e05f08b..7f6e05f08b 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step7/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step7/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step7/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step7/show_ipv6_route.ref
index f4770e2ac9..f4770e2ac9 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step7/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step7/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step7/show_mpls_table.ref
index cb49505f55..cb49505f55 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step7/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step7/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step8/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step8/show_ip_route.ref
index 55d8213c4e..55d8213c4e 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step8/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step8/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step8/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step8/show_ipv6_route.ref
index 4f6441e7b9..4f6441e7b9 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step8/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step8/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step8/show_mpls_table.ref
index db8253f83d..db8253f83d 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step8/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step8/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step9/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt3/step9/show_ip_route.ref
index 40a98ab7c6..40a98ab7c6 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step9/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step9/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step9/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt3/step9/show_ipv6_route.ref
index 1fb50407bd..1fb50407bd 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step9/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step9/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt3/step9/show_mpls_table.ref
index 44ddc4bc14..44ddc4bc14 100644
--- a/tests/topotests/isis-sr-topo1/rt3/step9/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step9/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt3/zebra.conf b/tests/topotests/isis_sr_topo1/rt3/zebra.conf
index 3254529386..3254529386 100644
--- a/tests/topotests/isis-sr-topo1/rt3/zebra.conf
+++ b/tests/topotests/isis_sr_topo1/rt3/zebra.conf
diff --git a/tests/topotests/isis-sr-topo1/rt4/isisd.conf b/tests/topotests/isis_sr_topo1/rt4/isisd.conf
index 3852b1962b..3852b1962b 100644
--- a/tests/topotests/isis-sr-topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt4/isisd.conf
diff --git a/tests/topotests/isis-sr-topo1/rt4/step1/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step1/show_ip_route.ref
index 493f3ab60d..493f3ab60d 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step1/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step1/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step1/show_ipv6_route.ref
index 217a4a5379..217a4a5379 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step1/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step1/show_mpls_table.ref
index 307403964a..307403964a 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index 2eb64b6fc9..2eb64b6fc9 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step10/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step10/show_ip_route.ref
index 11bc948319..11bc948319 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step10/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step10/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step10/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step10/show_ipv6_route.ref
index 844f6becf9..844f6becf9 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step10/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step10/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step10/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step10/show_mpls_table.ref
index f275056070..f275056070 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step10/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step10/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref
index 761cb2fd2f..761cb2fd2f 120000
--- a/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step2/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step2/show_ip_route.ref
index c2fbdeb30e..c2fbdeb30e 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step2/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step2/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step2/show_ipv6_route.ref
index 7f823b6896..7f823b6896 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step2/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step2/show_mpls_table.ref
index 8dd37880d0..8dd37880d0 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step2/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step2/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
index be1e00b8a2..be1e00b8a2 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step3/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step3/show_ip_route.ref
index f2a54bf958..f2a54bf958 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step3/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step3/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step3/show_ipv6_route.ref
index 34afda1966..34afda1966 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step3/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step3/show_mpls_table.ref
index 65336d88d1..65336d88d1 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step3/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step3/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
index bcade1ca90..bcade1ca90 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step4/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step4/show_ip_route.ref
index e930657f8d..e930657f8d 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step4/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step4/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step4/show_ipv6_route.ref
index ca61c6e81f..ca61c6e81f 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step4/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step4/show_mpls_table.ref
index eb95fa94c9..eb95fa94c9 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref
index 761cb2fd2f..761cb2fd2f 120000
--- a/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step5/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step5/show_ip_route.ref
index 8b0ddd4ee5..8b0ddd4ee5 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step5/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step5/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step5/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step5/show_ipv6_route.ref
index 94e1fac450..94e1fac450 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step5/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step5/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step5/show_mpls_table.ref
index cd47cfa3a7..cd47cfa3a7 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step5/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step5/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref
index 761cb2fd2f..761cb2fd2f 120000
--- a/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step6/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step6/show_ip_route.ref
index e930657f8d..e930657f8d 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step6/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step6/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step6/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step6/show_ipv6_route.ref
index ca61c6e81f..ca61c6e81f 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step6/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step6/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step6/show_mpls_table.ref
index eb95fa94c9..eb95fa94c9 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step6/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step6/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref
index 761cb2fd2f..761cb2fd2f 120000
--- a/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step7/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step7/show_ip_route.ref
index f5ac45504e..f5ac45504e 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step7/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step7/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step7/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step7/show_ipv6_route.ref
index 1599c88122..1599c88122 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step7/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step7/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step7/show_mpls_table.ref
index 19b0beb164..19b0beb164 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step7/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step7/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref
index 761cb2fd2f..761cb2fd2f 120000
--- a/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step8/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step8/show_ip_route.ref
index e930657f8d..e930657f8d 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step8/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step8/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step8/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step8/show_ipv6_route.ref
index ca61c6e81f..ca61c6e81f 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step8/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step8/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step8/show_mpls_table.ref
index eb95fa94c9..eb95fa94c9 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step8/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step8/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref
index 761cb2fd2f..761cb2fd2f 120000
--- a/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step9/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt4/step9/show_ip_route.ref
index a2b939a418..a2b939a418 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step9/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step9/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step9/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt4/step9/show_ipv6_route.ref
index 844f6becf9..844f6becf9 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step9/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step9/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt4/step9/show_mpls_table.ref
index 5805bf3556..5805bf3556 100644
--- a/tests/topotests/isis-sr-topo1/rt4/step9/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step9/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref
index 761cb2fd2f..761cb2fd2f 120000
--- a/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt4/zebra.conf b/tests/topotests/isis_sr_topo1/rt4/zebra.conf
index 5889901c56..5889901c56 100644
--- a/tests/topotests/isis-sr-topo1/rt4/zebra.conf
+++ b/tests/topotests/isis_sr_topo1/rt4/zebra.conf
diff --git a/tests/topotests/isis-sr-topo1/rt5/isisd.conf b/tests/topotests/isis_sr_topo1/rt5/isisd.conf
index f7beea796c..f7beea796c 100644
--- a/tests/topotests/isis-sr-topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt5/isisd.conf
diff --git a/tests/topotests/isis-sr-topo1/rt5/step1/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step1/show_ip_route.ref
index 0497bd8399..0497bd8399 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step1/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step1/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step1/show_ipv6_route.ref
index 294567edc8..294567edc8 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step1/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step1/show_mpls_table.ref
index 99d1f773b7..99d1f773b7 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index 1ff8c2cd4e..1ff8c2cd4e 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step10/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step10/show_ip_route.ref
index 29f4782482..29f4782482 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step10/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step10/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step10/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step10/show_ipv6_route.ref
index c02d3cfaea..c02d3cfaea 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step10/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step10/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step10/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step10/show_mpls_table.ref
index 7cfea2a329..7cfea2a329 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step10/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step10/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref
index 7cdaabf53f..7cdaabf53f 120000
--- a/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step2/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step2/show_ip_route.ref
index dc61b86410..dc61b86410 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step2/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step2/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step2/show_ipv6_route.ref
index fa426317ba..fa426317ba 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step2/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step2/show_mpls_table.ref
index 08f1635a39..08f1635a39 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step2/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step2/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
index d9ac0a8d00..d9ac0a8d00 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step3/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step3/show_ip_route.ref
index 2d983c43b6..2d983c43b6 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step3/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step3/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step3/show_ipv6_route.ref
index a3e705f384..a3e705f384 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step3/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step3/show_mpls_table.ref
index 9980058b12..9980058b12 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step3/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step3/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
index 0b8e6ba5b9..0b8e6ba5b9 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step4/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step4/show_ip_route.ref
index 0a64db60f6..0a64db60f6 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step4/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step4/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step4/show_ipv6_route.ref
index e9f8fe227c..e9f8fe227c 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step4/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step4/show_mpls_table.ref
index a84ed90b25..a84ed90b25 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
index d9ac0a8d00..d9ac0a8d00 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step5/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step5/show_ip_route.ref
index 88485477e3..88485477e3 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step5/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step5/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step5/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step5/show_ipv6_route.ref
index 60c645092e..60c645092e 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step5/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step5/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step5/show_mpls_table.ref
index 36c21b041f..36c21b041f 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step5/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step5/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref
index 7cdaabf53f..7cdaabf53f 120000
--- a/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step6/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step6/show_ip_route.ref
index 0a64db60f6..0a64db60f6 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step6/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step6/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step6/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step6/show_ipv6_route.ref
index e9f8fe227c..e9f8fe227c 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step6/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step6/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step6/show_mpls_table.ref
index a84ed90b25..a84ed90b25 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step6/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step6/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref
index 7cdaabf53f..7cdaabf53f 120000
--- a/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step7/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step7/show_ip_route.ref
index 769bc4d31e..769bc4d31e 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step7/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step7/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step7/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step7/show_ipv6_route.ref
index e05cc1e282..e05cc1e282 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step7/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step7/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step7/show_mpls_table.ref
index c98da7effd..c98da7effd 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step7/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step7/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref
index 7cdaabf53f..7cdaabf53f 120000
--- a/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step8/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step8/show_ip_route.ref
index 0a64db60f6..0a64db60f6 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step8/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step8/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step8/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step8/show_ipv6_route.ref
index e9f8fe227c..e9f8fe227c 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step8/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step8/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step8/show_mpls_table.ref
index a84ed90b25..a84ed90b25 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step8/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step8/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref
index 7cdaabf53f..7cdaabf53f 120000
--- a/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step9/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt5/step9/show_ip_route.ref
index 34cbf68b21..34cbf68b21 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step9/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step9/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step9/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt5/step9/show_ipv6_route.ref
index c02d3cfaea..c02d3cfaea 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step9/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step9/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt5/step9/show_mpls_table.ref
index 7cfea2a329..7cfea2a329 100644
--- a/tests/topotests/isis-sr-topo1/rt5/step9/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step9/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref
index 7cdaabf53f..7cdaabf53f 120000
--- a/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt5/zebra.conf b/tests/topotests/isis_sr_topo1/rt5/zebra.conf
index a0c8f2cd7e..a0c8f2cd7e 100644
--- a/tests/topotests/isis-sr-topo1/rt5/zebra.conf
+++ b/tests/topotests/isis_sr_topo1/rt5/zebra.conf
diff --git a/tests/topotests/isis-sr-topo1/rt6/isisd.conf b/tests/topotests/isis_sr_topo1/rt6/isisd.conf
index a29b78f0a4..a29b78f0a4 100644
--- a/tests/topotests/isis-sr-topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_sr_topo1/rt6/isisd.conf
diff --git a/tests/topotests/isis-sr-topo1/rt6/step1/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step1/show_ip_route.ref
index 7b62b0a9c6..7b62b0a9c6 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step1/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step1/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step1/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step1/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step1/show_mpls_table.ref
index 2c526e74f0..2c526e74f0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index 734832358f..734832358f 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step10/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step10/show_ip_route.ref
index d430ef5a33..d430ef5a33 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step10/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step10/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step10/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step10/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step10/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step10/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step10/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step10/show_mpls_table.ref
index be87ed90a0..be87ed90a0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step10/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step10/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step2/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step2/show_ip_route.ref
index 4b204dbc4c..4b204dbc4c 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step2/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step2/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step2/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step2/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step2/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step2/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step2/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step2/show_mpls_table.ref
index 2c526e74f0..2c526e74f0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step2/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step2/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step3/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step3/show_ip_route.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step3/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step3/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step3/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step3/show_ipv6_route.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step3/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step3/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step3/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step3/show_mpls_table.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step3/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step3/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step3/show_yang_interface_isis_adjacencies.ref
index 0db3279e44..0db3279e44 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step4/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step4/show_ip_route.ref
index 4b204dbc4c..4b204dbc4c 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step4/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step4/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step4/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step4/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step4/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step4/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step4/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step4/show_mpls_table.ref
index be87ed90a0..be87ed90a0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step4/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step4/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step5/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step5/show_ip_route.ref
index 4b204dbc4c..4b204dbc4c 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step5/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step5/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step5/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step5/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step5/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step5/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step5/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step5/show_mpls_table.ref
index be87ed90a0..be87ed90a0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step5/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step5/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step6/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step6/show_ip_route.ref
index 4b204dbc4c..4b204dbc4c 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step6/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step6/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step6/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step6/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step6/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step6/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step6/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step6/show_mpls_table.ref
index be87ed90a0..be87ed90a0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step6/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step6/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step7/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step7/show_ip_route.ref
index 1787988207..1787988207 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step7/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step7/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step7/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step7/show_ipv6_route.ref
index 367d0ed173..367d0ed173 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step7/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step7/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step7/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step7/show_mpls_table.ref
index b44dda298e..b44dda298e 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step7/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step7/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step8/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step8/show_ip_route.ref
index 4b204dbc4c..4b204dbc4c 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step8/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step8/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step8/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step8/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step8/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step8/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step8/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step8/show_mpls_table.ref
index be87ed90a0..be87ed90a0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step8/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step8/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step9/show_ip_route.ref b/tests/topotests/isis_sr_topo1/rt6/step9/show_ip_route.ref
index 4b204dbc4c..4b204dbc4c 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step9/show_ip_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step9/show_ip_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step9/show_ipv6_route.ref b/tests/topotests/isis_sr_topo1/rt6/step9/show_ipv6_route.ref
index 834cdfe6ca..834cdfe6ca 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step9/show_ipv6_route.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step9/show_ipv6_route.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step9/show_mpls_table.ref b/tests/topotests/isis_sr_topo1/rt6/step9/show_mpls_table.ref
index be87ed90a0..be87ed90a0 100644
--- a/tests/topotests/isis-sr-topo1/rt6/step9/show_mpls_table.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step9/show_mpls_table.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_sr_topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref
index 0879b84d23..0879b84d23 120000
--- a/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_sr_topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-sr-topo1/rt6/zebra.conf b/tests/topotests/isis_sr_topo1/rt6/zebra.conf
index 6084010a93..6084010a93 100644
--- a/tests/topotests/isis-sr-topo1/rt6/zebra.conf
+++ b/tests/topotests/isis_sr_topo1/rt6/zebra.conf
diff --git a/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py b/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py
index c22bd65d2d..c22bd65d2d 100644
--- a/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py
+++ b/tests/topotests/isis_sr_topo1/test_isis_sr_topo1.py
diff --git a/tests/topotests/isis-tilfa-topo1/__init__.py b/tests/topotests/isis_tilfa_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/__init__.py
+++ b/tests/topotests/isis_tilfa_topo1/__init__.py
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf
index a447a2aa5a..a447a2aa5a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_ip_route.ref b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_ip_route.ref
index 92b7437324..92b7437324 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_ip_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_ipv6_route.ref b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_ipv6_route.ref
index 3232121a0f..3232121a0f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_mpls_table.ref b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_mpls_table.ref
index aa0357d750..aa0357d750 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index 26f0dffa7a..26f0dffa7a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step2/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step2/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step2/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step2/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step2/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step2/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step2/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step2/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step2/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step3/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step3/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step3/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step3/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step3/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step3/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step3/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step3/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step3/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step4/show_ip_route.ref.diff
index 10b336f5b8..10b336f5b8 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step4/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step4/show_ipv6_route.ref.diff
index 904aaa1ce2..904aaa1ce2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step4/show_mpls_table.ref.diff
index d7d8753131..d7d8753131 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step4/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step5/show_ip_route.ref.diff
index b583fa97bd..b583fa97bd 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step5/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step5/show_ipv6_route.ref.diff
index d608abec98..d608abec98 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step5/show_mpls_table.ref.diff
index b5161fcd55..b5161fcd55 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step5/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step6/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step6/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step6/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step6/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step6/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step6/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step6/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step6/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step6/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step7/show_ip_route.ref.diff
index 726aed514f..726aed514f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step7/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step7/show_ipv6_route.ref.diff
index 2049f6fa19..2049f6fa19 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step7/show_mpls_table.ref.diff
index 22301ba1ff..22301ba1ff 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step7/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step8/show_ip_route.ref.diff
index 4a1d4805a4..4a1d4805a4 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step8/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step8/show_ipv6_route.ref.diff
index eaece74e48..eaece74e48 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step8/show_mpls_table.ref.diff
index 46c17de019..46c17de019 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step8/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step9/show_ip_route.ref.diff
index 06efdc96ce..06efdc96ce 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step9/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step9/show_ipv6_route.ref.diff
index a58f2d447c..a58f2d447c 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt1/step9/show_mpls_table.ref.diff
index c0a1ac592b..c0a1ac592b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt1/step9/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt1/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf
index 9d71d3005f..9d71d3005f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt1/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf
index 1a756e2c72..1a756e2c72 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_ip_route.ref
index 7e1ccd10a2..7e1ccd10a2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_ipv6_route.ref
index 6d31f6f26b..6d31f6f26b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_mpls_table.ref
index b9b906a31d..b9b906a31d 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index 1ea72a528b..1ea72a528b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step2/show_ip_route.ref.diff
index 90e0895639..90e0895639 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step2/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step2/show_ipv6_route.ref.diff
index 2d19f20f63..2d19f20f63 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step2/show_mpls_table.ref.diff
index 01fc74a60b..01fc74a60b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step2/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step3/show_ip_route.ref.diff
index d93f036229..d93f036229 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step3/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step3/show_ipv6_route.ref.diff
index 68b618e91d..68b618e91d 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step3/show_mpls_table.ref.diff
index 966e153a6b..966e153a6b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step3/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step4/show_ip_route.ref.diff
index dd75d76b9b..dd75d76b9b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step4/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step4/show_ipv6_route.ref.diff
index 63731237ec..63731237ec 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step4/show_mpls_table.ref.diff
index 3872ce4980..3872ce4980 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step4/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step5/show_ip_route.ref.diff
index 4d5636436c..4d5636436c 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step5/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step5/show_ipv6_route.ref.diff
index f9e0276f85..f9e0276f85 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step5/show_mpls_table.ref.diff
index 6aebbd6c82..6aebbd6c82 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step5/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step6/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step6/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step6/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step6/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step6/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step6/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step6/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step6/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step6/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step7/show_ip_route.ref.diff
index 5e73b97844..5e73b97844 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step7/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step7/show_ipv6_route.ref.diff
index 5dc4e59151..5dc4e59151 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step7/show_mpls_table.ref.diff
index 6c0d7392f0..6c0d7392f0 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step7/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step8/show_ip_route.ref.diff
index f5df607613..f5df607613 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step8/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step8/show_ipv6_route.ref.diff
index 125f36b1b4..125f36b1b4 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step8/show_mpls_table.ref.diff
index a1d5d795c5..a1d5d795c5 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step8/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step9/show_ip_route.ref.diff
index 2475c639c1..2475c639c1 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step9/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step9/show_ipv6_route.ref.diff
index 2d21fbcde2..2d21fbcde2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt2/step9/show_mpls_table.ref.diff
index bc0ec3157e..bc0ec3157e 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt2/step9/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt2/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf
index dcb0686dc2..dcb0686dc2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt2/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf
index 986bf2804a..986bf2804a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_ip_route.ref
index d70e9fe882..d70e9fe882 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_ipv6_route.ref
index 058d33609b..058d33609b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_mpls_table.ref
index 1912df3f05..1912df3f05 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index d174b4a475..d174b4a475 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step2/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step2/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step2/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step2/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step2/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step2/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step2/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step2/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step2/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step3/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step3/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step3/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step3/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step3/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step3/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step3/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step3/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step3/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step4/show_ip_route.ref.diff
index 9ba73b057a..9ba73b057a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step4/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step4/show_ipv6_route.ref.diff
index 04f61c4eb4..04f61c4eb4 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step4/show_mpls_table.ref.diff
index b3588ca791..b3588ca791 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step4/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step5/show_ip_route.ref.diff
index 1af024fc2e..1af024fc2e 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step5/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step5/show_ipv6_route.ref.diff
index 7cc79d0e58..7cc79d0e58 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step5/show_mpls_table.ref.diff
index 75a0f01f55..75a0f01f55 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step5/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step6/show_ip_route.ref.diff
index c814a2876b..c814a2876b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step6/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step6/show_ipv6_route.ref.diff
index 6f9405f20c..6f9405f20c 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step6/show_mpls_table.ref.diff
index d8c39685de..d8c39685de 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step6/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step7/show_ip_route.ref.diff
index c928fcdb4b..c928fcdb4b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step7/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step7/show_ipv6_route.ref.diff
index 0170971781..0170971781 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step7/show_mpls_table.ref.diff
index d7a3ed978f..d7a3ed978f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step7/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step8/show_ip_route.ref.diff
index 41a7ff3255..41a7ff3255 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step8/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step8/show_ipv6_route.ref.diff
index bd49f8606b..bd49f8606b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step8/show_mpls_table.ref.diff
index 4cc69b66f2..4cc69b66f2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step8/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step9/show_ip_route.ref.diff
index cc0a482eee..cc0a482eee 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step9/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step9/show_ipv6_route.ref.diff
index 650b982f0b..650b982f0b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt3/step9/show_mpls_table.ref.diff
index 8ce4f1d266..8ce4f1d266 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt3/step9/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt3/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf
index 3254529386..3254529386 100644
--- a/tests/topotests/isis-tilfa-topo1/rt3/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf
index 7d411069d1..7d411069d1 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_ip_route.ref
index 0ef5d1bc3f..0ef5d1bc3f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_ipv6_route.ref
index b640df30c1..b640df30c1 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_mpls_table.ref
index f60937ccbc..f60937ccbc 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index 2eb64b6fc9..2eb64b6fc9 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step2/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step2/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step2/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step2/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step2/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step2/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step2/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step2/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step2/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step3/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step3/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step3/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step3/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step3/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step3/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step3/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step3/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step3/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step4/show_ip_route.ref.diff
index 8b115c2058..8b115c2058 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step4/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step4/show_ipv6_route.ref.diff
index 7f39285089..7f39285089 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step4/show_mpls_table.ref.diff
index 3dcd36c176..3dcd36c176 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step4/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step5/show_ip_route.ref.diff
index 484a3147dc..484a3147dc 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step5/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step5/show_ipv6_route.ref.diff
index 3ad0085120..3ad0085120 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step5/show_mpls_table.ref.diff
index 20e363375b..20e363375b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step5/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step6/show_ip_route.ref.diff
index 9070414730..9070414730 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step6/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step6/show_ipv6_route.ref.diff
index 57a57647a1..57a57647a1 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step6/show_mpls_table.ref.diff
index 94f87854d1..94f87854d1 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step6/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step7/show_ip_route.ref.diff
index e54873d5ab..e54873d5ab 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step7/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step7/show_ipv6_route.ref.diff
index 92e08f99a0..92e08f99a0 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step7/show_mpls_table.ref.diff
index fb614ebf6a..fb614ebf6a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step7/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step8/show_ip_route.ref.diff
index 252da6e764..252da6e764 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step8/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step8/show_ipv6_route.ref.diff
index 7057d2166a..7057d2166a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step8/show_mpls_table.ref.diff
index 3dc4303b9b..3dc4303b9b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step8/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step9/show_ip_route.ref.diff
index 56f9cc534f..56f9cc534f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step9/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step9/show_ipv6_route.ref.diff
index 41e552177a..41e552177a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt4/step9/show_mpls_table.ref.diff
index 627e292518..627e292518 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt4/step9/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt4/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf
index 4945897e9d..4945897e9d 100644
--- a/tests/topotests/isis-tilfa-topo1/rt4/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf
index be52eb0322..be52eb0322 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_ip_route.ref
index 93740e22e0..93740e22e0 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_ipv6_route.ref
index 6dafa69adb..6dafa69adb 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_mpls_table.ref
index 0c5861b5e8..0c5861b5e8 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index 1ff8c2cd4e..1ff8c2cd4e 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step2/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step2/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step2/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step2/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step2/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step2/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step2/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step2/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step2/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step3/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step3/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step3/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step3/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step3/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step3/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step3/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step3/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step3/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step4/show_ip_route.ref.diff
index 7545a31b9b..7545a31b9b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step4/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step4/show_ipv6_route.ref.diff
index 1de62bb58e..1de62bb58e 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step4/show_mpls_table.ref.diff
index b3d5252430..b3d5252430 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step4/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ip_route.ref.diff
index be5d83f463..be5d83f463 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ipv6_route.ref.diff
index a856019622..a856019622 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_mpls_table.ref.diff
index 74caa8620e..74caa8620e 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step5/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step6/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step6/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step6/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step6/show_mpls_table.ref.diff
index 2883c046fd..2883c046fd 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step6/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step7/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step7/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step7/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step7/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step7/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step7/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step7/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step7/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step7/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step8/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step8/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step8/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step8/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step8/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step8/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step8/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step8/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step8/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step9/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step9/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step9/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step9/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step9/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/step9/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt5/step9/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/step9/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt5/step9/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt5/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf
index 4cfea1a59f..4cfea1a59f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt5/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf
index db47622a10..db47622a10 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/isisd.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_ip_route.ref
index b9b43c4139..b9b43c4139 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_ip_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_ipv6_route.ref
index 1b1942939d..1b1942939d 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_ipv6_route.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_mpls_table.ref
index 5b52a16f48..5b52a16f48 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_mpls_table.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index 734832358f..734832358f 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step2/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step2/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step2/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step2/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step2/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step2/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step2/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step2/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step2/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step2/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step2/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step2/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step3/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step3/show_ip_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step3/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step3/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step3/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step3/show_ipv6_route.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step3/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step3/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step3/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step3/show_mpls_table.ref.diff
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step3/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step3/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step4/show_ip_route.ref.diff
index 7c2f00419a..7c2f00419a 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step4/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step4/show_ipv6_route.ref.diff
index 70f872e9de..70f872e9de 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step4/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step4/show_mpls_table.ref.diff
index c191763a73..c191763a73 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step4/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step5/show_ip_route.ref.diff
index 9f017d2492..9f017d2492 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step5/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step5/show_ipv6_route.ref.diff
index 1209504e94..1209504e94 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step5/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step5/show_mpls_table.ref.diff
index abf7c2a32d..abf7c2a32d 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step5/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step6/show_ip_route.ref.diff
index f318f95e21..f318f95e21 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step6/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step6/show_ipv6_route.ref.diff
index 9208491fc8..9208491fc8 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step6/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step6/show_mpls_table.ref.diff
index aee8969ded..aee8969ded 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step6/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step7/show_ip_route.ref.diff
index 0e6c3ff5cd..0e6c3ff5cd 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step7/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step7/show_ipv6_route.ref.diff
index 2fe46c8265..2fe46c8265 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step7/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step7/show_mpls_table.ref.diff
index 179a4f460b..179a4f460b 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step7/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step8/show_ip_route.ref.diff
index 9d5c440a22..9d5c440a22 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step8/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step8/show_ipv6_route.ref.diff
index 21cab20a47..21cab20a47 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step8/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step8/show_mpls_table.ref.diff
index 760c5542cb..760c5542cb 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step8/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ip_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step9/show_ip_route.ref.diff
index ee296470c0..ee296470c0 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ip_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step9/show_ip_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ipv6_route.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step9/show_ipv6_route.ref.diff
index bebca4dcf1..bebca4dcf1 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_ipv6_route.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step9/show_ipv6_route.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff b/tests/topotests/isis_tilfa_topo1/rt6/step9/show_mpls_table.ref.diff
index 57347d15be..57347d15be 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff
+++ b/tests/topotests/isis_tilfa_topo1/rt6/step9/show_mpls_table.ref.diff
diff --git a/tests/topotests/isis-tilfa-topo1/rt6/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf
index 6084010a93..6084010a93 100644
--- a/tests/topotests/isis-tilfa-topo1/rt6/zebra.conf
+++ b/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf
diff --git a/tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py b/tests/topotests/isis_tilfa_topo1/test_isis_tilfa_topo1.py
index 00cb623999..00cb623999 100755
--- a/tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py
+++ b/tests/topotests/isis_tilfa_topo1/test_isis_tilfa_topo1.py
diff --git a/tests/topotests/isis-topo1-vrf/__init__.py b/tests/topotests/isis_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-topo1-vrf/__init__.py
+++ b/tests/topotests/isis_topo1/__init__.py
diff --git a/tests/topotests/isis-topo1/r1/isisd.conf b/tests/topotests/isis_topo1/r1/isisd.conf
index 4e3761e5a1..4e3761e5a1 100644
--- a/tests/topotests/isis-topo1/r1/isisd.conf
+++ b/tests/topotests/isis_topo1/r1/isisd.conf
diff --git a/tests/topotests/isis-topo1/r1/r1_route.json b/tests/topotests/isis_topo1/r1/r1_route.json
index f94233a80f..f94233a80f 100644
--- a/tests/topotests/isis-topo1/r1/r1_route.json
+++ b/tests/topotests/isis_topo1/r1/r1_route.json
diff --git a/tests/topotests/isis-topo1/r1/r1_route6.json b/tests/topotests/isis_topo1/r1/r1_route6.json
index bd09839fea..bd09839fea 100644
--- a/tests/topotests/isis-topo1/r1/r1_route6.json
+++ b/tests/topotests/isis_topo1/r1/r1_route6.json
diff --git a/tests/topotests/isis-topo1/r1/r1_route6_linux.json b/tests/topotests/isis_topo1/r1/r1_route6_linux.json
index 139747c1cd..139747c1cd 100644
--- a/tests/topotests/isis-topo1/r1/r1_route6_linux.json
+++ b/tests/topotests/isis_topo1/r1/r1_route6_linux.json
diff --git a/tests/topotests/isis-topo1/r1/r1_route_linux.json b/tests/topotests/isis_topo1/r1/r1_route_linux.json
index 6420dec5d7..6420dec5d7 100644
--- a/tests/topotests/isis-topo1/r1/r1_route_linux.json
+++ b/tests/topotests/isis_topo1/r1/r1_route_linux.json
diff --git a/tests/topotests/isis-topo1/r1/r1_topology.json b/tests/topotests/isis_topo1/r1/r1_topology.json
index 337d6bf5ef..337d6bf5ef 100644
--- a/tests/topotests/isis-topo1/r1/r1_topology.json
+++ b/tests/topotests/isis_topo1/r1/r1_topology.json
diff --git a/tests/topotests/isis-topo1/r1/zebra.conf b/tests/topotests/isis_topo1/r1/zebra.conf
index 23cf6252a6..23cf6252a6 100644
--- a/tests/topotests/isis-topo1/r1/zebra.conf
+++ b/tests/topotests/isis_topo1/r1/zebra.conf
diff --git a/tests/topotests/isis-topo1/r2/isisd.conf b/tests/topotests/isis_topo1/r2/isisd.conf
index 14db0940ec..14db0940ec 100644
--- a/tests/topotests/isis-topo1/r2/isisd.conf
+++ b/tests/topotests/isis_topo1/r2/isisd.conf
diff --git a/tests/topotests/isis-topo1/r2/r2_route.json b/tests/topotests/isis_topo1/r2/r2_route.json
index aab651eff0..aab651eff0 100644
--- a/tests/topotests/isis-topo1/r2/r2_route.json
+++ b/tests/topotests/isis_topo1/r2/r2_route.json
diff --git a/tests/topotests/isis-topo1/r2/r2_route6.json b/tests/topotests/isis_topo1/r2/r2_route6.json
index 78c31b3cc5..78c31b3cc5 100644
--- a/tests/topotests/isis-topo1/r2/r2_route6.json
+++ b/tests/topotests/isis_topo1/r2/r2_route6.json
diff --git a/tests/topotests/isis-topo1/r2/r2_route6_linux.json b/tests/topotests/isis_topo1/r2/r2_route6_linux.json
index 50688615a7..50688615a7 100644
--- a/tests/topotests/isis-topo1/r2/r2_route6_linux.json
+++ b/tests/topotests/isis_topo1/r2/r2_route6_linux.json
diff --git a/tests/topotests/isis-topo1/r2/r2_route_linux.json b/tests/topotests/isis_topo1/r2/r2_route_linux.json
index dd3035a1ac..dd3035a1ac 100644
--- a/tests/topotests/isis-topo1/r2/r2_route_linux.json
+++ b/tests/topotests/isis_topo1/r2/r2_route_linux.json
diff --git a/tests/topotests/isis-topo1/r2/r2_topology.json b/tests/topotests/isis_topo1/r2/r2_topology.json
index de90fb5a32..de90fb5a32 100644
--- a/tests/topotests/isis-topo1/r2/r2_topology.json
+++ b/tests/topotests/isis_topo1/r2/r2_topology.json
diff --git a/tests/topotests/isis-topo1/r2/zebra.conf b/tests/topotests/isis_topo1/r2/zebra.conf
index cf6f8f67d4..cf6f8f67d4 100644
--- a/tests/topotests/isis-topo1/r2/zebra.conf
+++ b/tests/topotests/isis_topo1/r2/zebra.conf
diff --git a/tests/topotests/isis-topo1/r3/isisd.conf b/tests/topotests/isis_topo1/r3/isisd.conf
index 6f36c0fa36..6f36c0fa36 100644
--- a/tests/topotests/isis-topo1/r3/isisd.conf
+++ b/tests/topotests/isis_topo1/r3/isisd.conf
diff --git a/tests/topotests/isis-topo1/r3/r3_route.json b/tests/topotests/isis_topo1/r3/r3_route.json
index 61d05e80bb..61d05e80bb 100644
--- a/tests/topotests/isis-topo1/r3/r3_route.json
+++ b/tests/topotests/isis_topo1/r3/r3_route.json
diff --git a/tests/topotests/isis-topo1/r3/r3_route6.json b/tests/topotests/isis_topo1/r3/r3_route6.json
index 41040240ea..41040240ea 100644
--- a/tests/topotests/isis-topo1/r3/r3_route6.json
+++ b/tests/topotests/isis_topo1/r3/r3_route6.json
diff --git a/tests/topotests/isis-topo1/r3/r3_route6_linux.json b/tests/topotests/isis_topo1/r3/r3_route6_linux.json
index 78993ff420..78993ff420 100644
--- a/tests/topotests/isis-topo1/r3/r3_route6_linux.json
+++ b/tests/topotests/isis_topo1/r3/r3_route6_linux.json
diff --git a/tests/topotests/isis-topo1/r3/r3_route_linux.json b/tests/topotests/isis_topo1/r3/r3_route_linux.json
index 04a2418d00..04a2418d00 100644
--- a/tests/topotests/isis-topo1/r3/r3_route_linux.json
+++ b/tests/topotests/isis_topo1/r3/r3_route_linux.json
diff --git a/tests/topotests/isis-topo1/r3/r3_topology.json b/tests/topotests/isis_topo1/r3/r3_topology.json
index 2d36f9b427..2d36f9b427 100644
--- a/tests/topotests/isis-topo1/r3/r3_topology.json
+++ b/tests/topotests/isis_topo1/r3/r3_topology.json
diff --git a/tests/topotests/isis-topo1/r3/zebra.conf b/tests/topotests/isis_topo1/r3/zebra.conf
index 1e4c0d752e..1e4c0d752e 100644
--- a/tests/topotests/isis-topo1/r3/zebra.conf
+++ b/tests/topotests/isis_topo1/r3/zebra.conf
diff --git a/tests/topotests/isis-topo1/r4/isisd.conf b/tests/topotests/isis_topo1/r4/isisd.conf
index 502e035f50..502e035f50 100644
--- a/tests/topotests/isis-topo1/r4/isisd.conf
+++ b/tests/topotests/isis_topo1/r4/isisd.conf
diff --git a/tests/topotests/isis-topo1/r4/r4_route.json b/tests/topotests/isis_topo1/r4/r4_route.json
index 79361af4b5..79361af4b5 100644
--- a/tests/topotests/isis-topo1/r4/r4_route.json
+++ b/tests/topotests/isis_topo1/r4/r4_route.json
diff --git a/tests/topotests/isis-topo1/r4/r4_route6.json b/tests/topotests/isis_topo1/r4/r4_route6.json
index c0ace9a193..c0ace9a193 100644
--- a/tests/topotests/isis-topo1/r4/r4_route6.json
+++ b/tests/topotests/isis_topo1/r4/r4_route6.json
diff --git a/tests/topotests/isis-topo1/r4/r4_route6_linux.json b/tests/topotests/isis_topo1/r4/r4_route6_linux.json
index 32ea366396..32ea366396 100644
--- a/tests/topotests/isis-topo1/r4/r4_route6_linux.json
+++ b/tests/topotests/isis_topo1/r4/r4_route6_linux.json
diff --git a/tests/topotests/isis-topo1/r4/r4_route_linux.json b/tests/topotests/isis_topo1/r4/r4_route_linux.json
index 5d6553f70d..5d6553f70d 100644
--- a/tests/topotests/isis-topo1/r4/r4_route_linux.json
+++ b/tests/topotests/isis_topo1/r4/r4_route_linux.json
diff --git a/tests/topotests/isis-topo1/r4/r4_topology.json b/tests/topotests/isis_topo1/r4/r4_topology.json
index e7d7841912..e7d7841912 100644
--- a/tests/topotests/isis-topo1/r4/r4_topology.json
+++ b/tests/topotests/isis_topo1/r4/r4_topology.json
diff --git a/tests/topotests/isis-topo1/r4/zebra.conf b/tests/topotests/isis_topo1/r4/zebra.conf
index 5ca9a3db72..5ca9a3db72 100644
--- a/tests/topotests/isis-topo1/r4/zebra.conf
+++ b/tests/topotests/isis_topo1/r4/zebra.conf
diff --git a/tests/topotests/isis-topo1/r5/isisd.conf b/tests/topotests/isis_topo1/r5/isisd.conf
index 42493a4991..42493a4991 100644
--- a/tests/topotests/isis-topo1/r5/isisd.conf
+++ b/tests/topotests/isis_topo1/r5/isisd.conf
diff --git a/tests/topotests/isis-topo1/r5/r5_route.json b/tests/topotests/isis_topo1/r5/r5_route.json
index cca844b27c..cca844b27c 100644
--- a/tests/topotests/isis-topo1/r5/r5_route.json
+++ b/tests/topotests/isis_topo1/r5/r5_route.json
diff --git a/tests/topotests/isis-topo1/r5/r5_route6.json b/tests/topotests/isis_topo1/r5/r5_route6.json
index b9468764d4..b9468764d4 100644
--- a/tests/topotests/isis-topo1/r5/r5_route6.json
+++ b/tests/topotests/isis_topo1/r5/r5_route6.json
diff --git a/tests/topotests/isis-topo1/r5/r5_route6_linux.json b/tests/topotests/isis_topo1/r5/r5_route6_linux.json
index a7343b5330..a7343b5330 100644
--- a/tests/topotests/isis-topo1/r5/r5_route6_linux.json
+++ b/tests/topotests/isis_topo1/r5/r5_route6_linux.json
diff --git a/tests/topotests/isis-topo1/r5/r5_route_linux.json b/tests/topotests/isis_topo1/r5/r5_route_linux.json
index b809896468..b809896468 100644
--- a/tests/topotests/isis-topo1/r5/r5_route_linux.json
+++ b/tests/topotests/isis_topo1/r5/r5_route_linux.json
diff --git a/tests/topotests/isis-topo1/r5/r5_topology.json b/tests/topotests/isis_topo1/r5/r5_topology.json
index 3d887b7cea..3d887b7cea 100644
--- a/tests/topotests/isis-topo1/r5/r5_topology.json
+++ b/tests/topotests/isis_topo1/r5/r5_topology.json
diff --git a/tests/topotests/isis-topo1/r5/zebra.conf b/tests/topotests/isis_topo1/r5/zebra.conf
index 48fed69662..48fed69662 100644
--- a/tests/topotests/isis-topo1/r5/zebra.conf
+++ b/tests/topotests/isis_topo1/r5/zebra.conf
diff --git a/tests/topotests/isis-topo1/test_isis_topo1.dot b/tests/topotests/isis_topo1/test_isis_topo1.dot
index 01f9ba780f..01f9ba780f 100644
--- a/tests/topotests/isis-topo1/test_isis_topo1.dot
+++ b/tests/topotests/isis_topo1/test_isis_topo1.dot
diff --git a/tests/topotests/isis-topo1/test_isis_topo1.jpg b/tests/topotests/isis_topo1/test_isis_topo1.jpg
index 4ad730f2a0..4ad730f2a0 100644
--- a/tests/topotests/isis-topo1/test_isis_topo1.jpg
+++ b/tests/topotests/isis_topo1/test_isis_topo1.jpg
diff --git a/tests/topotests/isis-topo1/test_isis_topo1.py b/tests/topotests/isis_topo1/test_isis_topo1.py
index 083a8b1e8d..083a8b1e8d 100644
--- a/tests/topotests/isis-topo1/test_isis_topo1.py
+++ b/tests/topotests/isis_topo1/test_isis_topo1.py
diff --git a/tests/topotests/isis-topo1/__init__.py b/tests/topotests/isis_topo1_vrf/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/isis-topo1/__init__.py
+++ b/tests/topotests/isis_topo1_vrf/__init__.py
diff --git a/tests/topotests/isis-topo1-vrf/r1/isisd.conf b/tests/topotests/isis_topo1_vrf/r1/isisd.conf
index 5fb4c14d0b..5fb4c14d0b 100755
--- a/tests/topotests/isis-topo1-vrf/r1/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r1/isisd.conf
diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route.json b/tests/topotests/isis_topo1_vrf/r1/r1_route.json
index f0a3593a4c..f0a3593a4c 100644
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_route.json
diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json b/tests/topotests/isis_topo1_vrf/r1/r1_route6.json
index 888b9e2c42..888b9e2c42 100644
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_route6.json
diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route6_linux.json b/tests/topotests/isis_topo1_vrf/r1/r1_route6_linux.json
index d1ace402ba..d1ace402ba 100755
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route6_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_route6_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route_linux.json b/tests/topotests/isis_topo1_vrf/r1/r1_route_linux.json
index 6af22297e9..6af22297e9 100755
--- a/tests/topotests/isis-topo1-vrf/r1/r1_route_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_route_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_topology.json b/tests/topotests/isis_topo1_vrf/r1/r1_topology.json
index 1a6fe6d5c6..1a6fe6d5c6 100644
--- a/tests/topotests/isis-topo1-vrf/r1/r1_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_topology.json
diff --git a/tests/topotests/isis-topo1-vrf/r1/zebra.conf b/tests/topotests/isis_topo1_vrf/r1/zebra.conf
index fa1c02e5f8..fa1c02e5f8 100755
--- a/tests/topotests/isis-topo1-vrf/r1/zebra.conf
+++ b/tests/topotests/isis_topo1_vrf/r1/zebra.conf
diff --git a/tests/topotests/isis-topo1-vrf/r2/isisd.conf b/tests/topotests/isis_topo1_vrf/r2/isisd.conf
index 0d2bc7ab72..0d2bc7ab72 100755
--- a/tests/topotests/isis-topo1-vrf/r2/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r2/isisd.conf
diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route.json b/tests/topotests/isis_topo1_vrf/r2/r2_route.json
index a26cdfad8e..a26cdfad8e 100644
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_route.json
diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json b/tests/topotests/isis_topo1_vrf/r2/r2_route6.json
index b01789b8d9..b01789b8d9 100644
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_route6.json
diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route6_linux.json b/tests/topotests/isis_topo1_vrf/r2/r2_route6_linux.json
index 27423e1936..27423e1936 100755
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route6_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_route6_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route_linux.json b/tests/topotests/isis_topo1_vrf/r2/r2_route_linux.json
index 744b0780f3..744b0780f3 100755
--- a/tests/topotests/isis-topo1-vrf/r2/r2_route_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_route_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_topology.json b/tests/topotests/isis_topo1_vrf/r2/r2_topology.json
index a77f7977f9..a77f7977f9 100644
--- a/tests/topotests/isis-topo1-vrf/r2/r2_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_topology.json
diff --git a/tests/topotests/isis-topo1-vrf/r2/zebra.conf b/tests/topotests/isis_topo1_vrf/r2/zebra.conf
index a62af1749e..a62af1749e 100755
--- a/tests/topotests/isis-topo1-vrf/r2/zebra.conf
+++ b/tests/topotests/isis_topo1_vrf/r2/zebra.conf
diff --git a/tests/topotests/isis-topo1-vrf/r3/isisd.conf b/tests/topotests/isis_topo1_vrf/r3/isisd.conf
index 66092407ab..66092407ab 100755
--- a/tests/topotests/isis-topo1-vrf/r3/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r3/isisd.conf
diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route.json b/tests/topotests/isis_topo1_vrf/r3/r3_route.json
index 9717df5c1a..9717df5c1a 100644
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_route.json
diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route6.json b/tests/topotests/isis_topo1_vrf/r3/r3_route6.json
index 31a1e4620f..31a1e4620f 100644
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_route6.json
diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route6_linux.json b/tests/topotests/isis_topo1_vrf/r3/r3_route6_linux.json
index bc527d2e1e..bc527d2e1e 100755
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route6_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_route6_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route_linux.json b/tests/topotests/isis_topo1_vrf/r3/r3_route_linux.json
index 515d376475..515d376475 100755
--- a/tests/topotests/isis-topo1-vrf/r3/r3_route_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_route_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_topology.json b/tests/topotests/isis_topo1_vrf/r3/r3_topology.json
index 1e5d331965..1e5d331965 100644
--- a/tests/topotests/isis-topo1-vrf/r3/r3_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_topology.json
diff --git a/tests/topotests/isis-topo1-vrf/r3/zebra.conf b/tests/topotests/isis_topo1_vrf/r3/zebra.conf
index ac0b810fce..ac0b810fce 100755
--- a/tests/topotests/isis-topo1-vrf/r3/zebra.conf
+++ b/tests/topotests/isis_topo1_vrf/r3/zebra.conf
diff --git a/tests/topotests/isis-topo1-vrf/r4/isisd.conf b/tests/topotests/isis_topo1_vrf/r4/isisd.conf
index 05815e8418..05815e8418 100755
--- a/tests/topotests/isis-topo1-vrf/r4/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r4/isisd.conf
diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route.json b/tests/topotests/isis_topo1_vrf/r4/r4_route.json
index 6cb79b0301..6cb79b0301 100644
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_route.json
diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json b/tests/topotests/isis_topo1_vrf/r4/r4_route6.json
index 88a91749c2..88a91749c2 100644
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_route6.json
diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route6_linux.json b/tests/topotests/isis_topo1_vrf/r4/r4_route6_linux.json
index b1cd5b9db9..b1cd5b9db9 100755
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route6_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_route6_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route_linux.json b/tests/topotests/isis_topo1_vrf/r4/r4_route_linux.json
index 3198b85789..3198b85789 100755
--- a/tests/topotests/isis-topo1-vrf/r4/r4_route_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_route_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_topology.json b/tests/topotests/isis_topo1_vrf/r4/r4_topology.json
index 34f5ac9ca4..34f5ac9ca4 100644
--- a/tests/topotests/isis-topo1-vrf/r4/r4_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_topology.json
diff --git a/tests/topotests/isis-topo1-vrf/r4/zebra.conf b/tests/topotests/isis_topo1_vrf/r4/zebra.conf
index 9c8941f7a5..9c8941f7a5 100755
--- a/tests/topotests/isis-topo1-vrf/r4/zebra.conf
+++ b/tests/topotests/isis_topo1_vrf/r4/zebra.conf
diff --git a/tests/topotests/isis-topo1-vrf/r5/isisd.conf b/tests/topotests/isis_topo1_vrf/r5/isisd.conf
index f663c33fe9..f663c33fe9 100755
--- a/tests/topotests/isis-topo1-vrf/r5/isisd.conf
+++ b/tests/topotests/isis_topo1_vrf/r5/isisd.conf
diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route.json b/tests/topotests/isis_topo1_vrf/r5/r5_route.json
index 5efa36bce6..5efa36bce6 100644
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route.json
diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json b/tests/topotests/isis_topo1_vrf/r5/r5_route6.json
index 5e8f6364af..5e8f6364af 100644
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route6.json
diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route6_linux.json b/tests/topotests/isis_topo1_vrf/r5/r5_route6_linux.json
index 3db3c93ea6..3db3c93ea6 100755
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route6_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route6_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route_linux.json b/tests/topotests/isis_topo1_vrf/r5/r5_route_linux.json
index 6a38ba864a..6a38ba864a 100755
--- a/tests/topotests/isis-topo1-vrf/r5/r5_route_linux.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route_linux.json
diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_topology.json b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json
index ace56536e9..ace56536e9 100644
--- a/tests/topotests/isis-topo1-vrf/r5/r5_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json
diff --git a/tests/topotests/isis-topo1-vrf/r5/zebra.conf b/tests/topotests/isis_topo1_vrf/r5/zebra.conf
index c6bc6302fc..c6bc6302fc 100755
--- a/tests/topotests/isis-topo1-vrf/r5/zebra.conf
+++ b/tests/topotests/isis_topo1_vrf/r5/zebra.conf
diff --git a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.dot b/tests/topotests/isis_topo1_vrf/test_isis_topo1_vrf.dot
index 01f9ba780f..01f9ba780f 100755
--- a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.dot
+++ b/tests/topotests/isis_topo1_vrf/test_isis_topo1_vrf.dot
diff --git a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.jpg b/tests/topotests/isis_topo1_vrf/test_isis_topo1_vrf.jpg
index 4ad730f2a0..4ad730f2a0 100755
--- a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.jpg
+++ b/tests/topotests/isis_topo1_vrf/test_isis_topo1_vrf.jpg
diff --git a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py b/tests/topotests/isis_topo1_vrf/test_isis_topo1_vrf.py
index b7fe0c2ddb..b7fe0c2ddb 100644
--- a/tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py
+++ b/tests/topotests/isis_topo1_vrf/test_isis_topo1_vrf.py
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r1/ldpd.conf
index 85bb970fdf..85bb970fdf 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/ldpd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/ospfd.conf b/tests/topotests/ldp_oc_acl_topo1/r1/ospfd.conf
index 877e14ff36..877e14ff36 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/ospfd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_acl_topo1/r1/show_ip_ospf_neighbor.json
index aa3f74fc5f..aa3f74fc5f 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_route.ref b/tests/topotests/ldp_oc_acl_topo1/r1/show_ip_route.ref
index 2131668fc3..2131668fc3 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_all_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_all_binding.ref
index 99a59668f8..99a59668f8 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_all_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_all_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_binding.ref
index ccc8413646..ccc8413646 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_discovery.ref b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_discovery.ref
index b349f4418f..b349f4418f 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_neighbor.ref
index 4bff444a46..4bff444a46 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/zebra.conf b/tests/topotests/ldp_oc_acl_topo1/r1/zebra.conf
index 83aea46e64..83aea46e64 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r1/zebra.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r2/ldpd.conf
index e1a552c701..e1a552c701 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/ldpd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/ospfd.conf b/tests/topotests/ldp_oc_acl_topo1/r2/ospfd.conf
index 8cba1529e8..8cba1529e8 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/ospfd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_acl_topo1/r2/show_ip_ospf_neighbor.json
index aa68198957..aa68198957 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_route.ref b/tests/topotests/ldp_oc_acl_topo1/r2/show_ip_route.ref
index 4b1d31a5d3..4b1d31a5d3 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_all_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_all_binding.ref
index 95fb847c1e..95fb847c1e 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_all_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_all_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_binding.ref
index ea32de3eda..ea32de3eda 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_discovery.ref b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_discovery.ref
index 8129570082..8129570082 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_neighbor.ref
index eed35289ea..eed35289ea 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/zebra.conf b/tests/topotests/ldp_oc_acl_topo1/r2/zebra.conf
index 1f1e3e391a..1f1e3e391a 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r2/zebra.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r3/ldpd.conf
index 4e66b140ac..4e66b140ac 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/ldpd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/ospfd.conf b/tests/topotests/ldp_oc_acl_topo1/r3/ospfd.conf
index 0d3a74c4ac..0d3a74c4ac 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/ospfd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_acl_topo1/r3/show_ip_ospf_neighbor.json
index 905774fc46..905774fc46 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_route.ref b/tests/topotests/ldp_oc_acl_topo1/r3/show_ip_route.ref
index 4d115caf3e..4d115caf3e 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_all_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_all_binding.ref
index 100dd307ea..100dd307ea 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_all_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_all_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_binding.ref
index bb1b2b3023..bb1b2b3023 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_discovery.ref b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_discovery.ref
index c3a07e7e38..c3a07e7e38 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_neighbor.ref
index 4bff444a46..4bff444a46 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/zebra.conf b/tests/topotests/ldp_oc_acl_topo1/r3/zebra.conf
index 234c215ddf..234c215ddf 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r3/zebra.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r4/ldpd.conf
index 6b7d28f983..6b7d28f983 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/ldpd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/ldpd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/ospfd.conf b/tests/topotests/ldp_oc_acl_topo1/r4/ospfd.conf
index 7bbd228d02..7bbd228d02 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/ospfd.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/ospfd.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_acl_topo1/r4/show_ip_ospf_neighbor.json
index 67593952ca..67593952ca 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_route.ref b/tests/topotests/ldp_oc_acl_topo1/r4/show_ip_route.ref
index 223cbded84..223cbded84 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_all_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_all_binding.ref
index 2a46c40346..2a46c40346 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_all_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_all_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_binding.ref b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_binding.ref
index 2a46c40346..2a46c40346 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_discovery.ref b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_discovery.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_neighbor.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/zebra.conf b/tests/topotests/ldp_oc_acl_topo1/r4/zebra.conf
index 7e291053e5..7e291053e5 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/zebra.conf
+++ b/tests/topotests/ldp_oc_acl_topo1/r4/zebra.conf
diff --git a/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.dot b/tests/topotests/ldp_oc_acl_topo1/test_ldp_oc_acl_topo1.dot
index 62058e3cb1..62058e3cb1 100644
--- a/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.dot
+++ b/tests/topotests/ldp_oc_acl_topo1/test_ldp_oc_acl_topo1.dot
diff --git a/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py b/tests/topotests/ldp_oc_acl_topo1/test_ldp_oc_acl_topo1.py
index 9aa4024598..9aa4024598 100644
--- a/tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py
+++ b/tests/topotests/ldp_oc_acl_topo1/test_ldp_oc_acl_topo1.py
diff --git a/tests/topotests/ldp-oc-topo1/r1/ldpd.conf b/tests/topotests/ldp_oc_topo1/r1/ldpd.conf
index 2a8e023832..2a8e023832 100644
--- a/tests/topotests/ldp-oc-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp_oc_topo1/r1/ldpd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r1/ospfd.conf b/tests/topotests/ldp_oc_topo1/r1/ospfd.conf
index 877e14ff36..877e14ff36 100644
--- a/tests/topotests/ldp-oc-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp_oc_topo1/r1/ospfd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r1/show_ip_ospf_neighbor.json
index aa3f74fc5f..aa3f74fc5f 100644
--- a/tests/topotests/ldp-oc-topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r1/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-topo1/r1/show_ip_route.ref b/tests/topotests/ldp_oc_topo1/r1/show_ip_route.ref
index 2131668fc3..2131668fc3 100644
--- a/tests/topotests/ldp-oc-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_topo1/r1/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-topo1/r1/show_ldp_binding.ref b/tests/topotests/ldp_oc_topo1/r1/show_ldp_binding.ref
index 99a59668f8..99a59668f8 100644
--- a/tests/topotests/ldp-oc-topo1/r1/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_topo1/r1/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-topo1/r1/show_ldp_discovery.ref b/tests/topotests/ldp_oc_topo1/r1/show_ldp_discovery.ref
index b349f4418f..b349f4418f 100644
--- a/tests/topotests/ldp-oc-topo1/r1/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_topo1/r1/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-topo1/r1/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_topo1/r1/show_ldp_neighbor.ref
index 4bff444a46..4bff444a46 100644
--- a/tests/topotests/ldp-oc-topo1/r1/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_topo1/r1/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-topo1/r1/zebra.conf b/tests/topotests/ldp_oc_topo1/r1/zebra.conf
index 83aea46e64..83aea46e64 100644
--- a/tests/topotests/ldp-oc-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp_oc_topo1/r1/zebra.conf
diff --git a/tests/topotests/ldp-oc-topo1/r2/ldpd.conf b/tests/topotests/ldp_oc_topo1/r2/ldpd.conf
index e1a552c701..e1a552c701 100644
--- a/tests/topotests/ldp-oc-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp_oc_topo1/r2/ldpd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r2/ospfd.conf b/tests/topotests/ldp_oc_topo1/r2/ospfd.conf
index 8cba1529e8..8cba1529e8 100644
--- a/tests/topotests/ldp-oc-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp_oc_topo1/r2/ospfd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r2/show_ip_ospf_neighbor.json
index aa68198957..aa68198957 100644
--- a/tests/topotests/ldp-oc-topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r2/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-topo1/r2/show_ip_route.ref b/tests/topotests/ldp_oc_topo1/r2/show_ip_route.ref
index 4b1d31a5d3..4b1d31a5d3 100644
--- a/tests/topotests/ldp-oc-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_topo1/r2/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-topo1/r2/show_ldp_binding.ref b/tests/topotests/ldp_oc_topo1/r2/show_ldp_binding.ref
index 95fb847c1e..95fb847c1e 100644
--- a/tests/topotests/ldp-oc-topo1/r2/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_topo1/r2/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-topo1/r2/show_ldp_discovery.ref b/tests/topotests/ldp_oc_topo1/r2/show_ldp_discovery.ref
index 8129570082..8129570082 100644
--- a/tests/topotests/ldp-oc-topo1/r2/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_topo1/r2/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-topo1/r2/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_topo1/r2/show_ldp_neighbor.ref
index eed35289ea..eed35289ea 100644
--- a/tests/topotests/ldp-oc-topo1/r2/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_topo1/r2/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-topo1/r2/zebra.conf b/tests/topotests/ldp_oc_topo1/r2/zebra.conf
index 1f1e3e391a..1f1e3e391a 100644
--- a/tests/topotests/ldp-oc-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp_oc_topo1/r2/zebra.conf
diff --git a/tests/topotests/ldp-oc-topo1/r3/ldpd.conf b/tests/topotests/ldp_oc_topo1/r3/ldpd.conf
index 4e66b140ac..4e66b140ac 100644
--- a/tests/topotests/ldp-oc-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp_oc_topo1/r3/ldpd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r3/ospfd.conf b/tests/topotests/ldp_oc_topo1/r3/ospfd.conf
index 0d3a74c4ac..0d3a74c4ac 100644
--- a/tests/topotests/ldp-oc-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp_oc_topo1/r3/ospfd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r3/show_ip_ospf_neighbor.json
index 905774fc46..905774fc46 100644
--- a/tests/topotests/ldp-oc-topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r3/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-topo1/r3/show_ip_route.ref b/tests/topotests/ldp_oc_topo1/r3/show_ip_route.ref
index 4d115caf3e..4d115caf3e 100644
--- a/tests/topotests/ldp-oc-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_topo1/r3/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-topo1/r3/show_ldp_binding.ref b/tests/topotests/ldp_oc_topo1/r3/show_ldp_binding.ref
index 100dd307ea..100dd307ea 100644
--- a/tests/topotests/ldp-oc-topo1/r3/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_topo1/r3/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-topo1/r3/show_ldp_discovery.ref b/tests/topotests/ldp_oc_topo1/r3/show_ldp_discovery.ref
index c3a07e7e38..c3a07e7e38 100644
--- a/tests/topotests/ldp-oc-topo1/r3/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_topo1/r3/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-topo1/r3/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_topo1/r3/show_ldp_neighbor.ref
index 4bff444a46..4bff444a46 100644
--- a/tests/topotests/ldp-oc-topo1/r3/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_topo1/r3/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-topo1/r3/zebra.conf b/tests/topotests/ldp_oc_topo1/r3/zebra.conf
index 234c215ddf..234c215ddf 100644
--- a/tests/topotests/ldp-oc-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp_oc_topo1/r3/zebra.conf
diff --git a/tests/topotests/ldp-oc-topo1/r4/ldpd.conf b/tests/topotests/ldp_oc_topo1/r4/ldpd.conf
index 6b7d28f983..6b7d28f983 100644
--- a/tests/topotests/ldp-oc-topo1/r4/ldpd.conf
+++ b/tests/topotests/ldp_oc_topo1/r4/ldpd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r4/ospfd.conf b/tests/topotests/ldp_oc_topo1/r4/ospfd.conf
index 7bbd228d02..7bbd228d02 100644
--- a/tests/topotests/ldp-oc-topo1/r4/ospfd.conf
+++ b/tests/topotests/ldp_oc_topo1/r4/ospfd.conf
diff --git a/tests/topotests/ldp-oc-topo1/r4/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r4/show_ip_ospf_neighbor.json
index 67593952ca..67593952ca 100644
--- a/tests/topotests/ldp-oc-topo1/r4/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r4/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-oc-topo1/r4/show_ip_route.ref b/tests/topotests/ldp_oc_topo1/r4/show_ip_route.ref
index 223cbded84..223cbded84 100644
--- a/tests/topotests/ldp-oc-topo1/r4/show_ip_route.ref
+++ b/tests/topotests/ldp_oc_topo1/r4/show_ip_route.ref
diff --git a/tests/topotests/ldp-oc-topo1/r4/show_ldp_binding.ref b/tests/topotests/ldp_oc_topo1/r4/show_ldp_binding.ref
index 2a46c40346..2a46c40346 100644
--- a/tests/topotests/ldp-oc-topo1/r4/show_ldp_binding.ref
+++ b/tests/topotests/ldp_oc_topo1/r4/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-oc-topo1/r4/show_ldp_discovery.ref b/tests/topotests/ldp_oc_topo1/r4/show_ldp_discovery.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-oc-topo1/r4/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_oc_topo1/r4/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-oc-topo1/r4/show_ldp_neighbor.ref b/tests/topotests/ldp_oc_topo1/r4/show_ldp_neighbor.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-oc-topo1/r4/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_oc_topo1/r4/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-oc-topo1/r4/zebra.conf b/tests/topotests/ldp_oc_topo1/r4/zebra.conf
index 7e291053e5..7e291053e5 100644
--- a/tests/topotests/ldp-oc-topo1/r4/zebra.conf
+++ b/tests/topotests/ldp_oc_topo1/r4/zebra.conf
diff --git a/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.dot b/tests/topotests/ldp_oc_topo1/test_ldp_oc_topo1.dot
index 62058e3cb1..62058e3cb1 100644
--- a/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.dot
+++ b/tests/topotests/ldp_oc_topo1/test_ldp_oc_topo1.dot
diff --git a/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.py b/tests/topotests/ldp_oc_topo1/test_ldp_oc_topo1.py
index aef22c395d..aef22c395d 100644
--- a/tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.py
+++ b/tests/topotests/ldp_oc_topo1/test_ldp_oc_topo1.py
diff --git a/tests/topotests/ldp-snmp/ce1/zebra.conf b/tests/topotests/ldp_snmp/ce1/zebra.conf
index 6f165e2724..6f165e2724 100644
--- a/tests/topotests/ldp-snmp/ce1/zebra.conf
+++ b/tests/topotests/ldp_snmp/ce1/zebra.conf
diff --git a/tests/topotests/ldp-snmp/ce2/zebra.conf b/tests/topotests/ldp_snmp/ce2/zebra.conf
index ac02d0f9a4..ac02d0f9a4 100644
--- a/tests/topotests/ldp-snmp/ce2/zebra.conf
+++ b/tests/topotests/ldp_snmp/ce2/zebra.conf
diff --git a/tests/topotests/ldp-snmp/ce3/zebra.conf b/tests/topotests/ldp_snmp/ce3/zebra.conf
index c6a5824d15..c6a5824d15 100644
--- a/tests/topotests/ldp-snmp/ce3/zebra.conf
+++ b/tests/topotests/ldp_snmp/ce3/zebra.conf
diff --git a/tests/topotests/ldp-snmp/r1/isisd.conf b/tests/topotests/ldp_snmp/r1/isisd.conf
index da2970d94e..da2970d94e 100644
--- a/tests/topotests/ldp-snmp/r1/isisd.conf
+++ b/tests/topotests/ldp_snmp/r1/isisd.conf
diff --git a/tests/topotests/ldp-snmp/r1/ldpd.conf b/tests/topotests/ldp_snmp/r1/ldpd.conf
index 01fc039b09..01fc039b09 100644
--- a/tests/topotests/ldp-snmp/r1/ldpd.conf
+++ b/tests/topotests/ldp_snmp/r1/ldpd.conf
diff --git a/tests/topotests/ldp-snmp/r1/show_ip_route.ref b/tests/topotests/ldp_snmp/r1/show_ip_route.ref
index b1a55ba103..b1a55ba103 100644
--- a/tests/topotests/ldp-snmp/r1/show_ip_route.ref
+++ b/tests/topotests/ldp_snmp/r1/show_ip_route.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_isis_interface_detail.ref b/tests/topotests/ldp_snmp/r1/show_isis_interface_detail.ref
index d8fb27af8c..d8fb27af8c 100644
--- a/tests/topotests/ldp-snmp/r1/show_isis_interface_detail.ref
+++ b/tests/topotests/ldp_snmp/r1/show_isis_interface_detail.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_isis_interface_detail_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r1/show_isis_interface_detail_r1_eth1_shutdown.ref
index f77d65ebc1..f77d65ebc1 100644
--- a/tests/topotests/ldp-snmp/r1/show_isis_interface_detail_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r1/show_isis_interface_detail_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_isis_interface_detail_r2_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r1/show_isis_interface_detail_r2_eth1_shutdown.ref
index f77d65ebc1..f77d65ebc1 100644
--- a/tests/topotests/ldp-snmp/r1/show_isis_interface_detail_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r1/show_isis_interface_detail_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_isis_ldp_sync.ref b/tests/topotests/ldp_snmp/r1/show_isis_ldp_sync.ref
index b699e8c145..b699e8c145 100644
--- a/tests/topotests/ldp-snmp/r1/show_isis_ldp_sync.ref
+++ b/tests/topotests/ldp_snmp/r1/show_isis_ldp_sync.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref
index c28cd4cc7d..c28cd4cc7d 100644
--- a/tests/topotests/ldp-snmp/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref
index c63bbea77f..c63bbea77f 100644
--- a/tests/topotests/ldp-snmp/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_l2vpn_binding.ref b/tests/topotests/ldp_snmp/r1/show_l2vpn_binding.ref
index b3de7e2c66..b3de7e2c66 100644
--- a/tests/topotests/ldp-snmp/r1/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_snmp/r1/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_snmp/r1/show_l2vpn_vc.ref
index 29e9df1089..29e9df1089 100644
--- a/tests/topotests/ldp-snmp/r1/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_snmp/r1/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_ldp_binding.ref b/tests/topotests/ldp_snmp/r1/show_ldp_binding.ref
index b3a12ec53f..b3a12ec53f 100644
--- a/tests/topotests/ldp-snmp/r1/show_ldp_binding.ref
+++ b/tests/topotests/ldp_snmp/r1/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_ldp_discovery.ref b/tests/topotests/ldp_snmp/r1/show_ldp_discovery.ref
index 9301e60c67..9301e60c67 100644
--- a/tests/topotests/ldp-snmp/r1/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_snmp/r1/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_ldp_igp_sync.ref b/tests/topotests/ldp_snmp/r1/show_ldp_igp_sync.ref
index 54d015fef9..54d015fef9 100644
--- a/tests/topotests/ldp-snmp/r1/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_snmp/r1/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
index 2232069f68..2232069f68 100644
--- a/tests/topotests/ldp-snmp/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_ldp_neighbor.ref b/tests/topotests/ldp_snmp/r1/show_ldp_neighbor.ref
index 40d8ebeb90..40d8ebeb90 100644
--- a/tests/topotests/ldp-snmp/r1/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_snmp/r1/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-snmp/r1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/ldp_snmp/r1/show_yang_interface_isis_adjacencies.ref
index 6138d03672..6138d03672 100644
--- a/tests/topotests/ldp-snmp/r1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/ldp_snmp/r1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/ldp-snmp/r1/snmpd.conf b/tests/topotests/ldp_snmp/r1/snmpd.conf
index b37911da36..b37911da36 100644
--- a/tests/topotests/ldp-snmp/r1/snmpd.conf
+++ b/tests/topotests/ldp_snmp/r1/snmpd.conf
diff --git a/tests/topotests/ldp-snmp/r1/zebra.conf b/tests/topotests/ldp_snmp/r1/zebra.conf
index ea047355ad..ea047355ad 100644
--- a/tests/topotests/ldp-snmp/r1/zebra.conf
+++ b/tests/topotests/ldp_snmp/r1/zebra.conf
diff --git a/tests/topotests/ldp-snmp/r2/isisd.conf b/tests/topotests/ldp_snmp/r2/isisd.conf
index b29a2b93ee..b29a2b93ee 100644
--- a/tests/topotests/ldp-snmp/r2/isisd.conf
+++ b/tests/topotests/ldp_snmp/r2/isisd.conf
diff --git a/tests/topotests/ldp-snmp/r2/ldpd.conf b/tests/topotests/ldp_snmp/r2/ldpd.conf
index c93e1a6ac5..c93e1a6ac5 100644
--- a/tests/topotests/ldp-snmp/r2/ldpd.conf
+++ b/tests/topotests/ldp_snmp/r2/ldpd.conf
diff --git a/tests/topotests/ldp-snmp/r2/ospfd.conf b/tests/topotests/ldp_snmp/r2/ospfd.conf
index f93f6aed56..f93f6aed56 100644
--- a/tests/topotests/ldp-snmp/r2/ospfd.conf
+++ b/tests/topotests/ldp_snmp/r2/ospfd.conf
diff --git a/tests/topotests/ldp-snmp/r2/show_ip_route.ref b/tests/topotests/ldp_snmp/r2/show_ip_route.ref
index 04f141aba4..04f141aba4 100644
--- a/tests/topotests/ldp-snmp/r2/show_ip_route.ref
+++ b/tests/topotests/ldp_snmp/r2/show_ip_route.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_isis_interface_detail.ref b/tests/topotests/ldp_snmp/r2/show_isis_interface_detail.ref
index 844aa9402a..844aa9402a 100644
--- a/tests/topotests/ldp-snmp/r2/show_isis_interface_detail.ref
+++ b/tests/topotests/ldp_snmp/r2/show_isis_interface_detail.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_isis_interface_detail_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r2/show_isis_interface_detail_r1_eth1_shutdown.ref
index 821ec70ba5..821ec70ba5 100644
--- a/tests/topotests/ldp-snmp/r2/show_isis_interface_detail_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r2/show_isis_interface_detail_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_isis_interface_detail_r2_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r2/show_isis_interface_detail_r2_eth1_shutdown.ref
index 821ec70ba5..821ec70ba5 100644
--- a/tests/topotests/ldp-snmp/r2/show_isis_interface_detail_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r2/show_isis_interface_detail_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_isis_ldp_sync.ref b/tests/topotests/ldp_snmp/r2/show_isis_ldp_sync.ref
index 433d89bd16..433d89bd16 100644
--- a/tests/topotests/ldp-snmp/r2/show_isis_ldp_sync.ref
+++ b/tests/topotests/ldp_snmp/r2/show_isis_ldp_sync.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref
index 2f3eae47c8..2f3eae47c8 100644
--- a/tests/topotests/ldp-snmp/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref
index c3d97a3c73..c3d97a3c73 100644
--- a/tests/topotests/ldp-snmp/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_l2vpn_binding.ref b/tests/topotests/ldp_snmp/r2/show_l2vpn_binding.ref
index 42c5a1cbd9..42c5a1cbd9 100644
--- a/tests/topotests/ldp-snmp/r2/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_snmp/r2/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_snmp/r2/show_l2vpn_vc.ref
index 942ed23a1e..942ed23a1e 100644
--- a/tests/topotests/ldp-snmp/r2/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_snmp/r2/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_ldp_binding.ref b/tests/topotests/ldp_snmp/r2/show_ldp_binding.ref
index c641fb47e6..c641fb47e6 100644
--- a/tests/topotests/ldp-snmp/r2/show_ldp_binding.ref
+++ b/tests/topotests/ldp_snmp/r2/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_ldp_discovery.ref b/tests/topotests/ldp_snmp/r2/show_ldp_discovery.ref
index 26801acade..26801acade 100644
--- a/tests/topotests/ldp-snmp/r2/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_snmp/r2/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_ldp_igp_sync.ref b/tests/topotests/ldp_snmp/r2/show_ldp_igp_sync.ref
index f2b24d7d62..f2b24d7d62 100644
--- a/tests/topotests/ldp-snmp/r2/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_snmp/r2/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
index b5508dd35c..b5508dd35c 100644
--- a/tests/topotests/ldp-snmp/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref
index f2b24d7d62..f2b24d7d62 100644
--- a/tests/topotests/ldp-snmp/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_ldp_neighbor.ref b/tests/topotests/ldp_snmp/r2/show_ldp_neighbor.ref
index eed35289ea..eed35289ea 100644
--- a/tests/topotests/ldp-snmp/r2/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_snmp/r2/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-snmp/r2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/ldp_snmp/r2/show_yang_interface_isis_adjacencies.ref
index 4dd6ddd76b..4dd6ddd76b 100644
--- a/tests/topotests/ldp-snmp/r2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/ldp_snmp/r2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/ldp-snmp/r2/snmpd.conf b/tests/topotests/ldp_snmp/r2/snmpd.conf
index 0f779b8b91..0f779b8b91 100644
--- a/tests/topotests/ldp-snmp/r2/snmpd.conf
+++ b/tests/topotests/ldp_snmp/r2/snmpd.conf
diff --git a/tests/topotests/ldp-snmp/r2/zebra.conf b/tests/topotests/ldp_snmp/r2/zebra.conf
index c244442876..c244442876 100644
--- a/tests/topotests/ldp-snmp/r2/zebra.conf
+++ b/tests/topotests/ldp_snmp/r2/zebra.conf
diff --git a/tests/topotests/ldp-snmp/r3/isisd.conf b/tests/topotests/ldp_snmp/r3/isisd.conf
index 4c8499f23d..4c8499f23d 100644
--- a/tests/topotests/ldp-snmp/r3/isisd.conf
+++ b/tests/topotests/ldp_snmp/r3/isisd.conf
diff --git a/tests/topotests/ldp-snmp/r3/ldpd.conf b/tests/topotests/ldp_snmp/r3/ldpd.conf
index b7eeb258f1..b7eeb258f1 100644
--- a/tests/topotests/ldp-snmp/r3/ldpd.conf
+++ b/tests/topotests/ldp_snmp/r3/ldpd.conf
diff --git a/tests/topotests/ldp-snmp/r3/show_ip_route.ref b/tests/topotests/ldp_snmp/r3/show_ip_route.ref
index 22504046ed..22504046ed 100644
--- a/tests/topotests/ldp-snmp/r3/show_ip_route.ref
+++ b/tests/topotests/ldp_snmp/r3/show_ip_route.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_isis_interface_detail.ref b/tests/topotests/ldp_snmp/r3/show_isis_interface_detail.ref
index e323f61f25..e323f61f25 100644
--- a/tests/topotests/ldp-snmp/r3/show_isis_interface_detail.ref
+++ b/tests/topotests/ldp_snmp/r3/show_isis_interface_detail.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_isis_interface_detail_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r3/show_isis_interface_detail_r1_eth1_shutdown.ref
index e323f61f25..e323f61f25 100644
--- a/tests/topotests/ldp-snmp/r3/show_isis_interface_detail_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r3/show_isis_interface_detail_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_isis_interface_detail_r2_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r3/show_isis_interface_detail_r2_eth1_shutdown.ref
index e323f61f25..e323f61f25 100644
--- a/tests/topotests/ldp-snmp/r3/show_isis_interface_detail_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r3/show_isis_interface_detail_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_isis_ldp_sync.ref b/tests/topotests/ldp_snmp/r3/show_isis_ldp_sync.ref
index 9cb70a4758..9cb70a4758 100644
--- a/tests/topotests/ldp-snmp/r3/show_isis_ldp_sync.ref
+++ b/tests/topotests/ldp_snmp/r3/show_isis_ldp_sync.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref
index 9cb70a4758..9cb70a4758 100644
--- a/tests/topotests/ldp-snmp/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref
index 9cb70a4758..9cb70a4758 100644
--- a/tests/topotests/ldp-snmp/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_l2vpn_binding.ref b/tests/topotests/ldp_snmp/r3/show_l2vpn_binding.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-snmp/r3/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_snmp/r3/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_l2vpn_vc.ref b/tests/topotests/ldp_snmp/r3/show_l2vpn_vc.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-snmp/r3/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_snmp/r3/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_ldp_binding.ref b/tests/topotests/ldp_snmp/r3/show_ldp_binding.ref
index e54bd6e755..e54bd6e755 100644
--- a/tests/topotests/ldp-snmp/r3/show_ldp_binding.ref
+++ b/tests/topotests/ldp_snmp/r3/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_ldp_discovery.ref b/tests/topotests/ldp_snmp/r3/show_ldp_discovery.ref
index 42fa98d4da..42fa98d4da 100644
--- a/tests/topotests/ldp-snmp/r3/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_snmp/r3/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_ldp_igp_sync.ref b/tests/topotests/ldp_snmp/r3/show_ldp_igp_sync.ref
index 73261830c9..73261830c9 100644
--- a/tests/topotests/ldp-snmp/r3/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_snmp/r3/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_snmp/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
index 73261830c9..73261830c9 100644
--- a/tests/topotests/ldp-snmp/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_snmp/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_ldp_neighbor.ref b/tests/topotests/ldp_snmp/r3/show_ldp_neighbor.ref
index 5c482da697..5c482da697 100644
--- a/tests/topotests/ldp-snmp/r3/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_snmp/r3/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-snmp/r3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/ldp_snmp/r3/show_yang_interface_isis_adjacencies.ref
index 0922192361..0922192361 100644
--- a/tests/topotests/ldp-snmp/r3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/ldp_snmp/r3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/ldp-snmp/r3/zebra.conf b/tests/topotests/ldp_snmp/r3/zebra.conf
index b1919bd296..b1919bd296 100644
--- a/tests/topotests/ldp-snmp/r3/zebra.conf
+++ b/tests/topotests/ldp_snmp/r3/zebra.conf
diff --git a/tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py b/tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py
index f47d906157..f47d906157 100644
--- a/tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py
+++ b/tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py
diff --git a/tests/topotests/ldp-sync-isis-topo1/ce1/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/ce1/zebra.conf
index 6f165e2724..6f165e2724 100644
--- a/tests/topotests/ldp-sync-isis-topo1/ce1/zebra.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/ce1/zebra.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/ce2/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/ce2/zebra.conf
index ac02d0f9a4..ac02d0f9a4 100644
--- a/tests/topotests/ldp-sync-isis-topo1/ce2/zebra.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/ce2/zebra.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/ce3/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/ce3/zebra.conf
index c6a5824d15..c6a5824d15 100644
--- a/tests/topotests/ldp-sync-isis-topo1/ce3/zebra.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/ce3/zebra.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/isisd.conf b/tests/topotests/ldp_sync_isis_topo1/r1/isisd.conf
index da2970d94e..da2970d94e 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/isisd.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/isisd.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/ldpd.conf b/tests/topotests/ldp_sync_isis_topo1/r1/ldpd.conf
index b9c32d3000..b9c32d3000 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/ldpd.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_ip_route.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_ip_route.ref
index b1a55ba103..b1a55ba103 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_ip_route.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_interface_detail.ref
index d8fb27af8c..d8fb27af8c 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_interface_detail.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_interface_detail_r1_eth1_shutdown.ref
index f77d65ebc1..f77d65ebc1 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_interface_detail_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_interface_detail_r2_eth1_shutdown.ref
index f77d65ebc1..f77d65ebc1 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_interface_detail_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_ldp_sync.ref
index b699e8c145..b699e8c145 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_ldp_sync.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref
index c28cd4cc7d..c28cd4cc7d 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref
index c63bbea77f..c63bbea77f 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_l2vpn_binding.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_binding.ref
index b3de7e2c66..b3de7e2c66 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_vc.ref
index 29e9df1089..29e9df1089 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_binding.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_binding.ref
index b3a12ec53f..b3a12ec53f 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_binding.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_discovery.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_discovery.ref
index 9301e60c67..9301e60c67 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_igp_sync.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_igp_sync.ref
index 54d015fef9..54d015fef9 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
index 2232069f68..2232069f68 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_neighbor.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_neighbor.ref
index 40d8ebeb90..40d8ebeb90 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/ldp_sync_isis_topo1/r1/show_yang_interface_isis_adjacencies.ref
index 6138d03672..6138d03672 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r1/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/r1/zebra.conf
index ea047355ad..ea047355ad 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r1/zebra.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/isisd.conf b/tests/topotests/ldp_sync_isis_topo1/r2/isisd.conf
index b29a2b93ee..b29a2b93ee 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/isisd.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/isisd.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/ldpd.conf b/tests/topotests/ldp_sync_isis_topo1/r2/ldpd.conf
index 52398b1b72..52398b1b72 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/ldpd.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ip_route.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_ip_route.ref
index 04f141aba4..04f141aba4 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_ip_route.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_interface_detail.ref
index 844aa9402a..844aa9402a 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_interface_detail.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_interface_detail_r1_eth1_shutdown.ref
index 821ec70ba5..821ec70ba5 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_interface_detail_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_interface_detail_r2_eth1_shutdown.ref
index 821ec70ba5..821ec70ba5 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_interface_detail_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_ldp_sync.ref
index 433d89bd16..433d89bd16 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_ldp_sync.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref
index 2f3eae47c8..2f3eae47c8 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref
index c3d97a3c73..c3d97a3c73 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_l2vpn_binding.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_binding.ref
index 42c5a1cbd9..42c5a1cbd9 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_vc.ref
index 942ed23a1e..942ed23a1e 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_binding.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_binding.ref
index c641fb47e6..c641fb47e6 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_binding.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_discovery.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_discovery.ref
index 26801acade..26801acade 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_igp_sync.ref
index f2b24d7d62..f2b24d7d62 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
index b5508dd35c..b5508dd35c 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref
index f2b24d7d62..f2b24d7d62 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_neighbor.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_neighbor.ref
index eed35289ea..eed35289ea 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/ldp_sync_isis_topo1/r2/show_yang_interface_isis_adjacencies.ref
index 4dd6ddd76b..4dd6ddd76b 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r2/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/r2/zebra.conf
index c244442876..c244442876 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r2/zebra.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/isisd.conf b/tests/topotests/ldp_sync_isis_topo1/r3/isisd.conf
index 4c8499f23d..4c8499f23d 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/isisd.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/isisd.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/ldpd.conf b/tests/topotests/ldp_sync_isis_topo1/r3/ldpd.conf
index 2935caf13b..2935caf13b 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/ldpd.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_ip_route.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_ip_route.ref
index 22504046ed..22504046ed 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_ip_route.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_interface_detail.ref
index e323f61f25..e323f61f25 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_interface_detail.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_interface_detail_r1_eth1_shutdown.ref
index e323f61f25..e323f61f25 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_interface_detail_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_interface_detail_r2_eth1_shutdown.ref
index e323f61f25..e323f61f25 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_interface_detail_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_ldp_sync.ref
index 7180f84d1a..7180f84d1a 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_ldp_sync.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref
index 7180f84d1a..7180f84d1a 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref
index 7180f84d1a..7180f84d1a 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_l2vpn_binding.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_l2vpn_binding.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_l2vpn_vc.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_binding.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_binding.ref
index e54bd6e755..e54bd6e755 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_binding.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_discovery.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_discovery.ref
index 42fa98d4da..42fa98d4da 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_igp_sync.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_igp_sync.ref
index 73261830c9..73261830c9 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
index 73261830c9..73261830c9 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_neighbor.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_neighbor.ref
index 5c482da697..5c482da697 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/ldp_sync_isis_topo1/r3/show_yang_interface_isis_adjacencies.ref
index 0922192361..0922192361 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/show_yang_interface_isis_adjacencies.ref
diff --git a/tests/topotests/ldp-sync-isis-topo1/r3/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/r3/zebra.conf
index b1919bd296..b1919bd296 100644
--- a/tests/topotests/ldp-sync-isis-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp_sync_isis_topo1/r3/zebra.conf
diff --git a/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.dot b/tests/topotests/ldp_sync_isis_topo1/test_ldp_sync_isis_topo1.dot
index 4f1bd22f7c..4f1bd22f7c 100644
--- a/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.dot
+++ b/tests/topotests/ldp_sync_isis_topo1/test_ldp_sync_isis_topo1.dot
diff --git a/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py b/tests/topotests/ldp_sync_isis_topo1/test_ldp_sync_isis_topo1.py
index 331e6fafd4..331e6fafd4 100644
--- a/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
+++ b/tests/topotests/ldp_sync_isis_topo1/test_ldp_sync_isis_topo1.py
diff --git a/tests/topotests/ldp-sync-ospf-topo1/ce1/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/ce1/zebra.conf
index 6f165e2724..6f165e2724 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/ce1/zebra.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/ce1/zebra.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/ce2/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/ce2/zebra.conf
index ac02d0f9a4..ac02d0f9a4 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/ce2/zebra.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/ce2/zebra.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/ce3/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/ce3/zebra.conf
index c6a5824d15..c6a5824d15 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/ce3/zebra.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/ce3/zebra.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/ldpd.conf b/tests/topotests/ldp_sync_ospf_topo1/r1/ldpd.conf
index b9c32d3000..b9c32d3000 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/ldpd.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/ospf-nbrs.txt b/tests/topotests/ldp_sync_ospf_topo1/r1/ospf-nbrs.txt
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/ospf-nbrs.txt
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/ospf-nbrs.txt
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/ospfd.conf b/tests/topotests/ldp_sync_ospf_topo1/r1/ospfd.conf
index eefcd1e71c..eefcd1e71c 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/ospfd.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_interface.ref
index 8b2884786d..8b2884786d 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_interface.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_interface_r1_eth1_shutdown.ref
index b1a263e422..b1a263e422 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_interface_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_interface_r2_eth1_shutdown.ref
index 0c147338e3..0c147338e3 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_interface_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_neighbor.json
index 3bfda39071..3bfda39071 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_route.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_route.ref
index fdb81f212d..fdb81f212d 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ip_route.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_l2vpn_binding.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_binding.ref
index b3de7e2c66..b3de7e2c66 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_vc.ref
index 29e9df1089..29e9df1089 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_binding.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_binding.ref
index b3a12ec53f..b3a12ec53f 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_binding.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_discovery.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_discovery.ref
index 9301e60c67..9301e60c67 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_igp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_igp_sync.ref
index 54d015fef9..54d015fef9 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
index 2232069f68..2232069f68 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_neighbor.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_neighbor.ref
index 40d8ebeb90..40d8ebeb90 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ospf_ldp_sync.ref
index 3782071bf9..3782071bf9 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ospf_ldp_sync.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ospf_ldp_sync_r1_eth1_shutdown.ref
index c2642c6483..c2642c6483 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ospf_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ospf_ldp_sync_r2_eth1_shutdown.ref
index 6f180b048a..6f180b048a 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/show_ospf_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r1/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/r1/zebra.conf
index ea047355ad..ea047355ad 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r1/zebra.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/ldpd.conf b/tests/topotests/ldp_sync_ospf_topo1/r2/ldpd.conf
index 52398b1b72..52398b1b72 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/ldpd.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/ospfd.conf b/tests/topotests/ldp_sync_ospf_topo1/r2/ospfd.conf
index f93f6aed56..f93f6aed56 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/ospfd.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_interface.ref
index 82806721e7..82806721e7 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_interface.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_interface_r1_eth1_shutdown.ref
index 71e8af1778..71e8af1778 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_interface_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_interface_r2_eth1_shutdown.ref
index af9a9c80e5..af9a9c80e5 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_interface_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_neighbor.json
index 5b7a5ebbb9..5b7a5ebbb9 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_route.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_route.ref
index 6056feffe3..6056feffe3 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ip_route.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_l2vpn_binding.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_binding.ref
index 42c5a1cbd9..42c5a1cbd9 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_vc.ref
index 942ed23a1e..942ed23a1e 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_binding.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_binding.ref
index c641fb47e6..c641fb47e6 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_binding.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_discovery.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_discovery.ref
index 26801acade..26801acade 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_igp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_igp_sync.ref
index f2b24d7d62..f2b24d7d62 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
index b5508dd35c..b5508dd35c 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_neighbor.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_neighbor.ref
index eed35289ea..eed35289ea 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref
index 6c27a10427..6c27a10427 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref
index 889f69ed7f..889f69ed7f 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref
index d9036e124b..d9036e124b 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r2/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/r2/zebra.conf
index c244442876..c244442876 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r2/zebra.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/ldpd.conf b/tests/topotests/ldp_sync_ospf_topo1/r3/ldpd.conf
index 2935caf13b..2935caf13b 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/ldpd.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/ospfd.conf b/tests/topotests/ldp_sync_ospf_topo1/r3/ospfd.conf
index 09eea759ad..09eea759ad 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/ospfd.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_interface.ref
index aec97b30cb..aec97b30cb 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_interface.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_interface_r1_eth1_shutdown.ref
index aec97b30cb..aec97b30cb 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_interface_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_interface_r2_eth1_shutdown.ref
index aec97b30cb..aec97b30cb 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_interface_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_neighbor.json
index 1b29b9f947..1b29b9f947 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_route.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_route.ref
index fc96ada443..fc96ada443 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ip_route.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_l2vpn_binding.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_l2vpn_binding.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_l2vpn_vc.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_l2vpn_vc.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_binding.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_binding.ref
index e54bd6e755..e54bd6e755 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_binding.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_discovery.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_discovery.ref
index 42fa98d4da..42fa98d4da 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_igp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_igp_sync.ref
index 73261830c9..73261830c9 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_igp_sync.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_igp_sync.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
index 73261830c9..73261830c9 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_neighbor.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_neighbor.ref
index 5c482da697..5c482da697 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref
index b417ab040a..b417ab040a 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref
index b417ab040a..b417ab040a 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref
index b417ab040a..b417ab040a 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref
diff --git a/tests/topotests/ldp-sync-ospf-topo1/r3/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/r3/zebra.conf
index b1919bd296..b1919bd296 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp_sync_ospf_topo1/r3/zebra.conf
diff --git a/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.dot b/tests/topotests/ldp_sync_ospf_topo1/test_ldp_sync_ospf_topo1.dot
index 4f1bd22f7c..4f1bd22f7c 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.dot
+++ b/tests/topotests/ldp_sync_ospf_topo1/test_ldp_sync_ospf_topo1.dot
diff --git a/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py b/tests/topotests/ldp_sync_ospf_topo1/test_ldp_sync_ospf_topo1.py
index 57b45e5fdf..57b45e5fdf 100644
--- a/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
+++ b/tests/topotests/ldp_sync_ospf_topo1/test_ldp_sync_ospf_topo1.py
diff --git a/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref b/tests/topotests/ldp_topo1/r1/ip_mpls_route.ref
index a13c1d459b..a13c1d459b 100644
--- a/tests/topotests/ldp-topo1/r1/ip_mpls_route.ref
+++ b/tests/topotests/ldp_topo1/r1/ip_mpls_route.ref
diff --git a/tests/topotests/ldp-topo1/r1/ldpd.conf b/tests/topotests/ldp_topo1/r1/ldpd.conf
index 3c6cbddc2a..3c6cbddc2a 100644
--- a/tests/topotests/ldp-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp_topo1/r1/ldpd.conf
diff --git a/tests/topotests/ldp-topo1/r1/ospfd.conf b/tests/topotests/ldp_topo1/r1/ospfd.conf
index 87d5703d9e..87d5703d9e 100644
--- a/tests/topotests/ldp-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp_topo1/r1/ospfd.conf
diff --git a/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref b/tests/topotests/ldp_topo1/r1/show_ipv4_route.ref
index 7d398887c4..7d398887c4 100644
--- a/tests/topotests/ldp-topo1/r1/show_ipv4_route.ref
+++ b/tests/topotests/ldp_topo1/r1/show_ipv4_route.ref
diff --git a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_binding.ref b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_binding.ref
index 32aa60c30d..32aa60c30d 100644
--- a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_binding.ref
+++ b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_binding.ref
diff --git a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_discovery.ref b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_discovery.ref
index 373755ab87..373755ab87 100644
--- a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_discovery.ref
+++ b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_discovery.ref
diff --git a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_interface.ref b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_interface.ref
index 0fb15d2da7..0fb15d2da7 100644
--- a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_interface.ref
+++ b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_interface.ref
diff --git a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_neighbor.ref b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_neighbor.ref
index 29e264ff3c..29e264ff3c 100644
--- a/tests/topotests/ldp-topo1/r1/show_mpls_ldp_neighbor.ref
+++ b/tests/topotests/ldp_topo1/r1/show_mpls_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-topo1/r1/show_mpls_table.ref b/tests/topotests/ldp_topo1/r1/show_mpls_table.ref
index 7e24359af3..7e24359af3 100644
--- a/tests/topotests/ldp-topo1/r1/show_mpls_table.ref
+++ b/tests/topotests/ldp_topo1/r1/show_mpls_table.ref
diff --git a/tests/topotests/ldp-topo1/r1/zebra.conf b/tests/topotests/ldp_topo1/r1/zebra.conf
index 55b4b0e9c6..55b4b0e9c6 100644
--- a/tests/topotests/ldp-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp_topo1/r1/zebra.conf
diff --git a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref b/tests/topotests/ldp_topo1/r2/ip_mpls_route.ref
index f962070c36..f962070c36 100644
--- a/tests/topotests/ldp-topo1/r2/ip_mpls_route.ref
+++ b/tests/topotests/ldp_topo1/r2/ip_mpls_route.ref
diff --git a/tests/topotests/ldp-topo1/r2/ldpd.conf b/tests/topotests/ldp_topo1/r2/ldpd.conf
index bfdef21b75..bfdef21b75 100644
--- a/tests/topotests/ldp-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp_topo1/r2/ldpd.conf
diff --git a/tests/topotests/ldp-topo1/r2/ospfd.conf b/tests/topotests/ldp_topo1/r2/ospfd.conf
index dbed6189c8..dbed6189c8 100644
--- a/tests/topotests/ldp-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp_topo1/r2/ospfd.conf
diff --git a/tests/topotests/ldp-topo1/r2/show_ipv4_route.ref b/tests/topotests/ldp_topo1/r2/show_ipv4_route.ref
index 90e18962a8..90e18962a8 100644
--- a/tests/topotests/ldp-topo1/r2/show_ipv4_route.ref
+++ b/tests/topotests/ldp_topo1/r2/show_ipv4_route.ref
diff --git a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_binding.ref b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_binding.ref
index d7df72e854..d7df72e854 100644
--- a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_binding.ref
+++ b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_binding.ref
diff --git a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_discovery.ref b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_discovery.ref
index 6405b5e388..6405b5e388 100644
--- a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_discovery.ref
+++ b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_discovery.ref
diff --git a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_interface.ref b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_interface.ref
index f9fc98408c..f9fc98408c 100644
--- a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_interface.ref
+++ b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_interface.ref
diff --git a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_neighbor.ref b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_neighbor.ref
index 1172cbfc2b..1172cbfc2b 100644
--- a/tests/topotests/ldp-topo1/r2/show_mpls_ldp_neighbor.ref
+++ b/tests/topotests/ldp_topo1/r2/show_mpls_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-topo1/r2/show_mpls_table.ref b/tests/topotests/ldp_topo1/r2/show_mpls_table.ref
index df05a6b31a..df05a6b31a 100644
--- a/tests/topotests/ldp-topo1/r2/show_mpls_table.ref
+++ b/tests/topotests/ldp_topo1/r2/show_mpls_table.ref
diff --git a/tests/topotests/ldp-topo1/r2/zebra.conf b/tests/topotests/ldp_topo1/r2/zebra.conf
index dd1dbac32b..dd1dbac32b 100644
--- a/tests/topotests/ldp-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp_topo1/r2/zebra.conf
diff --git a/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref b/tests/topotests/ldp_topo1/r3/ip_mpls_route.ref
index 21750b4a23..21750b4a23 100644
--- a/tests/topotests/ldp-topo1/r3/ip_mpls_route.ref
+++ b/tests/topotests/ldp_topo1/r3/ip_mpls_route.ref
diff --git a/tests/topotests/ldp-topo1/r3/ldpd.conf b/tests/topotests/ldp_topo1/r3/ldpd.conf
index dbf1d72b5f..dbf1d72b5f 100644
--- a/tests/topotests/ldp-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp_topo1/r3/ldpd.conf
diff --git a/tests/topotests/ldp-topo1/r3/ospfd.conf b/tests/topotests/ldp_topo1/r3/ospfd.conf
index bd86fe4f24..bd86fe4f24 100644
--- a/tests/topotests/ldp-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp_topo1/r3/ospfd.conf
diff --git a/tests/topotests/ldp-topo1/r3/show_ipv4_route.ref b/tests/topotests/ldp_topo1/r3/show_ipv4_route.ref
index 9b9c763339..9b9c763339 100644
--- a/tests/topotests/ldp-topo1/r3/show_ipv4_route.ref
+++ b/tests/topotests/ldp_topo1/r3/show_ipv4_route.ref
diff --git a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_binding.ref b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_binding.ref
index 058a245f59..058a245f59 100644
--- a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_binding.ref
+++ b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_binding.ref
diff --git a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_discovery.ref b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_discovery.ref
index e3dbf06c2e..e3dbf06c2e 100644
--- a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_discovery.ref
+++ b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_discovery.ref
diff --git a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_interface.ref b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_interface.ref
index 243811e3a9..243811e3a9 100644
--- a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_interface.ref
+++ b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_interface.ref
diff --git a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_neighbor.ref b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_neighbor.ref
index 769f78277b..769f78277b 100644
--- a/tests/topotests/ldp-topo1/r3/show_mpls_ldp_neighbor.ref
+++ b/tests/topotests/ldp_topo1/r3/show_mpls_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-topo1/r3/show_mpls_table.ref b/tests/topotests/ldp_topo1/r3/show_mpls_table.ref
index 3978895613..3978895613 100644
--- a/tests/topotests/ldp-topo1/r3/show_mpls_table.ref
+++ b/tests/topotests/ldp_topo1/r3/show_mpls_table.ref
diff --git a/tests/topotests/ldp-topo1/r3/zebra.conf b/tests/topotests/ldp_topo1/r3/zebra.conf
index 456820fdb4..456820fdb4 100644
--- a/tests/topotests/ldp-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp_topo1/r3/zebra.conf
diff --git a/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref b/tests/topotests/ldp_topo1/r4/ip_mpls_route.ref
index aef2fefd57..aef2fefd57 100644
--- a/tests/topotests/ldp-topo1/r4/ip_mpls_route.ref
+++ b/tests/topotests/ldp_topo1/r4/ip_mpls_route.ref
diff --git a/tests/topotests/ldp-topo1/r4/ldpd.conf b/tests/topotests/ldp_topo1/r4/ldpd.conf
index 8f3533527d..8f3533527d 100644
--- a/tests/topotests/ldp-topo1/r4/ldpd.conf
+++ b/tests/topotests/ldp_topo1/r4/ldpd.conf
diff --git a/tests/topotests/ldp-topo1/r4/ospfd.conf b/tests/topotests/ldp_topo1/r4/ospfd.conf
index 5aae885a12..5aae885a12 100644
--- a/tests/topotests/ldp-topo1/r4/ospfd.conf
+++ b/tests/topotests/ldp_topo1/r4/ospfd.conf
diff --git a/tests/topotests/ldp-topo1/r4/show_ipv4_route.ref b/tests/topotests/ldp_topo1/r4/show_ipv4_route.ref
index 7444cc924b..7444cc924b 100644
--- a/tests/topotests/ldp-topo1/r4/show_ipv4_route.ref
+++ b/tests/topotests/ldp_topo1/r4/show_ipv4_route.ref
diff --git a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_binding.ref b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_binding.ref
index 1e9dfa3d16..1e9dfa3d16 100644
--- a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_binding.ref
+++ b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_binding.ref
diff --git a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_discovery.ref b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_discovery.ref
index a7026570db..a7026570db 100644
--- a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_discovery.ref
+++ b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_discovery.ref
diff --git a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_interface.ref b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_interface.ref
index dd57656f15..dd57656f15 100644
--- a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_interface.ref
+++ b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_interface.ref
diff --git a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_neighbor.ref b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_neighbor.ref
index 7c60522f9b..7c60522f9b 100644
--- a/tests/topotests/ldp-topo1/r4/show_mpls_ldp_neighbor.ref
+++ b/tests/topotests/ldp_topo1/r4/show_mpls_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-topo1/r4/show_mpls_table.ref b/tests/topotests/ldp_topo1/r4/show_mpls_table.ref
index 174dcebd4d..174dcebd4d 100644
--- a/tests/topotests/ldp-topo1/r4/show_mpls_table.ref
+++ b/tests/topotests/ldp_topo1/r4/show_mpls_table.ref
diff --git a/tests/topotests/ldp-topo1/r4/zebra.conf b/tests/topotests/ldp_topo1/r4/zebra.conf
index 4a270af578..4a270af578 100644
--- a/tests/topotests/ldp-topo1/r4/zebra.conf
+++ b/tests/topotests/ldp_topo1/r4/zebra.conf
diff --git a/tests/topotests/ldp-topo1/test_ldp_topo1.py b/tests/topotests/ldp_topo1/test_ldp_topo1.py
index 06e7734094..06e7734094 100644
--- a/tests/topotests/ldp-topo1/test_ldp_topo1.py
+++ b/tests/topotests/ldp_topo1/test_ldp_topo1.py
diff --git a/tests/topotests/ldp-vpls-topo1/__init__.py b/tests/topotests/ldp_vpls_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/ldp-vpls-topo1/__init__.py
+++ b/tests/topotests/ldp_vpls_topo1/__init__.py
diff --git a/tests/topotests/ldp-vpls-topo1/ce1/zebra.conf b/tests/topotests/ldp_vpls_topo1/ce1/zebra.conf
index 6f165e2724..6f165e2724 100644
--- a/tests/topotests/ldp-vpls-topo1/ce1/zebra.conf
+++ b/tests/topotests/ldp_vpls_topo1/ce1/zebra.conf
diff --git a/tests/topotests/ldp-vpls-topo1/ce2/zebra.conf b/tests/topotests/ldp_vpls_topo1/ce2/zebra.conf
index ac02d0f9a4..ac02d0f9a4 100644
--- a/tests/topotests/ldp-vpls-topo1/ce2/zebra.conf
+++ b/tests/topotests/ldp_vpls_topo1/ce2/zebra.conf
diff --git a/tests/topotests/ldp-vpls-topo1/ce3/zebra.conf b/tests/topotests/ldp_vpls_topo1/ce3/zebra.conf
index c6a5824d15..c6a5824d15 100644
--- a/tests/topotests/ldp-vpls-topo1/ce3/zebra.conf
+++ b/tests/topotests/ldp_vpls_topo1/ce3/zebra.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r1/ldpd.conf b/tests/topotests/ldp_vpls_topo1/r1/ldpd.conf
index a1c0c822d6..a1c0c822d6 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/ldpd.conf
+++ b/tests/topotests/ldp_vpls_topo1/r1/ldpd.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r1/ospf-nbrs.txt b/tests/topotests/ldp_vpls_topo1/r1/ospf-nbrs.txt
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/ospf-nbrs.txt
+++ b/tests/topotests/ldp_vpls_topo1/r1/ospf-nbrs.txt
diff --git a/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf b/tests/topotests/ldp_vpls_topo1/r1/ospfd.conf
index a66fb92ba3..a66fb92ba3 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp_vpls_topo1/r1/ospfd.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp_vpls_topo1/r1/show_ip_ospf_neighbor.json
index 7e281abb5f..7e281abb5f 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_vpls_topo1/r1/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ip_route.ref b/tests/topotests/ldp_vpls_topo1/r1/show_ip_route.ref
index fdb81f212d..fdb81f212d 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/ldp_vpls_topo1/r1/show_ip_route.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_l2vpn_binding.ref b/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_binding.ref
index b3de7e2c66..b3de7e2c66 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_l2vpn_vc.ref b/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_vc.ref
index 29e9df1089..29e9df1089 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_vpls_topo1/r1/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ldp_binding.ref b/tests/topotests/ldp_vpls_topo1/r1/show_ldp_binding.ref
index b3a12ec53f..b3a12ec53f 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ldp_binding.ref
+++ b/tests/topotests/ldp_vpls_topo1/r1/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ldp_discovery.ref b/tests/topotests/ldp_vpls_topo1/r1/show_ldp_discovery.ref
index 9301e60c67..9301e60c67 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_vpls_topo1/r1/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ldp_neighbor.ref b/tests/topotests/ldp_vpls_topo1/r1/show_ldp_neighbor.ref
index 40d8ebeb90..40d8ebeb90 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_vpls_topo1/r1/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r1/zebra.conf b/tests/topotests/ldp_vpls_topo1/r1/zebra.conf
index ea047355ad..ea047355ad 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/zebra.conf
+++ b/tests/topotests/ldp_vpls_topo1/r1/zebra.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r2/ldpd.conf b/tests/topotests/ldp_vpls_topo1/r2/ldpd.conf
index 06e5973040..06e5973040 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/ldpd.conf
+++ b/tests/topotests/ldp_vpls_topo1/r2/ldpd.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf b/tests/topotests/ldp_vpls_topo1/r2/ospfd.conf
index b4692feec8..b4692feec8 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp_vpls_topo1/r2/ospfd.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp_vpls_topo1/r2/show_ip_ospf_neighbor.json
index 22fd98f519..22fd98f519 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_vpls_topo1/r2/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ip_route.ref b/tests/topotests/ldp_vpls_topo1/r2/show_ip_route.ref
index 6056feffe3..6056feffe3 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/ldp_vpls_topo1/r2/show_ip_route.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_l2vpn_binding.ref b/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_binding.ref
index 42c5a1cbd9..42c5a1cbd9 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_l2vpn_vc.ref b/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_vc.ref
index 942ed23a1e..942ed23a1e 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_vpls_topo1/r2/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ldp_binding.ref b/tests/topotests/ldp_vpls_topo1/r2/show_ldp_binding.ref
index c641fb47e6..c641fb47e6 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ldp_binding.ref
+++ b/tests/topotests/ldp_vpls_topo1/r2/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ldp_discovery.ref b/tests/topotests/ldp_vpls_topo1/r2/show_ldp_discovery.ref
index 26801acade..26801acade 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_vpls_topo1/r2/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ldp_neighbor.ref b/tests/topotests/ldp_vpls_topo1/r2/show_ldp_neighbor.ref
index eed35289ea..eed35289ea 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_vpls_topo1/r2/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r2/zebra.conf b/tests/topotests/ldp_vpls_topo1/r2/zebra.conf
index c244442876..c244442876 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/zebra.conf
+++ b/tests/topotests/ldp_vpls_topo1/r2/zebra.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r3/ldpd.conf b/tests/topotests/ldp_vpls_topo1/r3/ldpd.conf
index 57a203bce3..57a203bce3 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/ldpd.conf
+++ b/tests/topotests/ldp_vpls_topo1/r3/ldpd.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf b/tests/topotests/ldp_vpls_topo1/r3/ospfd.conf
index 2413bfa9d5..2413bfa9d5 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp_vpls_topo1/r3/ospfd.conf
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp_vpls_topo1/r3/show_ip_ospf_neighbor.json
index 970eb2fc1d..970eb2fc1d 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_vpls_topo1/r3/show_ip_ospf_neighbor.json
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ip_route.ref b/tests/topotests/ldp_vpls_topo1/r3/show_ip_route.ref
index fc96ada443..fc96ada443 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/ldp_vpls_topo1/r3/show_ip_route.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_l2vpn_binding.ref b/tests/topotests/ldp_vpls_topo1/r3/show_l2vpn_binding.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_l2vpn_binding.ref
+++ b/tests/topotests/ldp_vpls_topo1/r3/show_l2vpn_binding.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_l2vpn_vc.ref b/tests/topotests/ldp_vpls_topo1/r3/show_l2vpn_vc.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_l2vpn_vc.ref
+++ b/tests/topotests/ldp_vpls_topo1/r3/show_l2vpn_vc.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ldp_binding.ref b/tests/topotests/ldp_vpls_topo1/r3/show_ldp_binding.ref
index e54bd6e755..e54bd6e755 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ldp_binding.ref
+++ b/tests/topotests/ldp_vpls_topo1/r3/show_ldp_binding.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ldp_discovery.ref b/tests/topotests/ldp_vpls_topo1/r3/show_ldp_discovery.ref
index 42fa98d4da..42fa98d4da 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ldp_discovery.ref
+++ b/tests/topotests/ldp_vpls_topo1/r3/show_ldp_discovery.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ldp_neighbor.ref b/tests/topotests/ldp_vpls_topo1/r3/show_ldp_neighbor.ref
index 5c482da697..5c482da697 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ldp_neighbor.ref
+++ b/tests/topotests/ldp_vpls_topo1/r3/show_ldp_neighbor.ref
diff --git a/tests/topotests/ldp-vpls-topo1/r3/zebra.conf b/tests/topotests/ldp_vpls_topo1/r3/zebra.conf
index 6b1eaa2ca0..6b1eaa2ca0 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/zebra.conf
+++ b/tests/topotests/ldp_vpls_topo1/r3/zebra.conf
diff --git a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.dot b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.dot
index 4f1bd22f7c..4f1bd22f7c 100644
--- a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.dot
+++ b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.dot
diff --git a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.pdf
index 4d26732ea7..4d26732ea7 100644
--- a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf
+++ b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.pdf
diff --git a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.py
index 0ea7aca3eb..0ea7aca3eb 100644
--- a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py
+++ b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.py
diff --git a/tests/topotests/multicast-pim-bsm-topo1/mcast_pim_bsmp_01.json b/tests/topotests/multicast_pim_bsm_topo1/mcast_pim_bsmp_01.json
index 14cb0bee1d..14cb0bee1d 100644
--- a/tests/topotests/multicast-pim-bsm-topo1/mcast_pim_bsmp_01.json
+++ b/tests/topotests/multicast_pim_bsm_topo1/mcast_pim_bsmp_01.json
diff --git a/tests/topotests/multicast-pim-bsm-topo1/test_mcast_pim_bsmp_01.py b/tests/topotests/multicast_pim_bsm_topo1/test_mcast_pim_bsmp_01.py
index cd398a5111..cd398a5111 100644
--- a/tests/topotests/multicast-pim-bsm-topo1/test_mcast_pim_bsmp_01.py
+++ b/tests/topotests/multicast_pim_bsm_topo1/test_mcast_pim_bsmp_01.py
diff --git a/tests/topotests/multicast-pim-bsm-topo2/mcast_pim_bsmp_02.json b/tests/topotests/multicast_pim_bsm_topo2/mcast_pim_bsmp_02.json
index 14cb0bee1d..14cb0bee1d 100644
--- a/tests/topotests/multicast-pim-bsm-topo2/mcast_pim_bsmp_02.json
+++ b/tests/topotests/multicast_pim_bsm_topo2/mcast_pim_bsmp_02.json
diff --git a/tests/topotests/multicast-pim-bsm-topo2/test_mcast_pim_bsmp_02.py b/tests/topotests/multicast_pim_bsm_topo2/test_mcast_pim_bsmp_02.py
index 199746d5f6..199746d5f6 100644
--- a/tests/topotests/multicast-pim-bsm-topo2/test_mcast_pim_bsmp_02.py
+++ b/tests/topotests/multicast_pim_bsm_topo2/test_mcast_pim_bsmp_02.py
diff --git a/tests/topotests/multicast-pim-sm-topo1/multicast_pim_sm_topo1.json b/tests/topotests/multicast_pim_sm_topo1/multicast_pim_sm_topo1.json
index 71454c2ab2..71454c2ab2 100644
--- a/tests/topotests/multicast-pim-sm-topo1/multicast_pim_sm_topo1.json
+++ b/tests/topotests/multicast_pim_sm_topo1/multicast_pim_sm_topo1.json
diff --git a/tests/topotests/multicast-pim-sm-topo1/test_multicast_pim_sm_topo1.py b/tests/topotests/multicast_pim_sm_topo1/test_multicast_pim_sm_topo1.py
index e55e30270d..e55e30270d 100755
--- a/tests/topotests/multicast-pim-sm-topo1/test_multicast_pim_sm_topo1.py
+++ b/tests/topotests/multicast_pim_sm_topo1/test_multicast_pim_sm_topo1.py
diff --git a/tests/topotests/multicast-pim-sm-topo2/multicast_pim_sm_topo2.json b/tests/topotests/multicast_pim_sm_topo2/multicast_pim_sm_topo2.json
index 71454c2ab2..71454c2ab2 100644
--- a/tests/topotests/multicast-pim-sm-topo2/multicast_pim_sm_topo2.json
+++ b/tests/topotests/multicast_pim_sm_topo2/multicast_pim_sm_topo2.json
diff --git a/tests/topotests/multicast-pim-sm-topo2/test_multicast_pim_sm_topo2.py b/tests/topotests/multicast_pim_sm_topo2/test_multicast_pim_sm_topo2.py
index 7e409c2a05..7e409c2a05 100755
--- a/tests/topotests/multicast-pim-sm-topo2/test_multicast_pim_sm_topo2.py
+++ b/tests/topotests/multicast_pim_sm_topo2/test_multicast_pim_sm_topo2.py
diff --git a/tests/topotests/multicast-pim-sm-topo3/multicast_pim_sm_topo3.json b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo3.json
index f582f4929d..f582f4929d 100644
--- a/tests/topotests/multicast-pim-sm-topo3/multicast_pim_sm_topo3.json
+++ b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo3.json
diff --git a/tests/topotests/multicast-pim-sm-topo3/multicast_pim_sm_topo4.json b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo4.json
index 4635dac7d2..4635dac7d2 100644
--- a/tests/topotests/multicast-pim-sm-topo3/multicast_pim_sm_topo4.json
+++ b/tests/topotests/multicast_pim_sm_topo3/multicast_pim_sm_topo4.json
diff --git a/tests/topotests/multicast-pim-sm-topo3/test_multicast_pim_sm_topo3.py b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py
index 33f476de44..33f476de44 100755
--- a/tests/topotests/multicast-pim-sm-topo3/test_multicast_pim_sm_topo3.py
+++ b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py
diff --git a/tests/topotests/multicast-pim-sm-topo3/test_multicast_pim_sm_topo4.py b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo4.py
index 1081b764ac..1081b764ac 100755
--- a/tests/topotests/multicast-pim-sm-topo3/test_multicast_pim_sm_topo4.py
+++ b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo4.py
diff --git a/tests/topotests/multicast-pim-static-rp-topo1/__init__.py b/tests/topotests/multicast_pim_static_rp_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/multicast-pim-static-rp-topo1/__init__.py
+++ b/tests/topotests/multicast_pim_static_rp_topo1/__init__.py
diff --git a/tests/topotests/multicast-pim-static-rp-topo1/multicast_pim_static_rp.json b/tests/topotests/multicast_pim_static_rp_topo1/multicast_pim_static_rp.json
index 6d6c047b00..6d6c047b00 100644
--- a/tests/topotests/multicast-pim-static-rp-topo1/multicast_pim_static_rp.json
+++ b/tests/topotests/multicast_pim_static_rp_topo1/multicast_pim_static_rp.json
diff --git a/tests/topotests/multicast-pim-static-rp-topo1/test_multicast_pim_static_rp.py b/tests/topotests/multicast_pim_static_rp_topo1/test_multicast_pim_static_rp.py
index 7bef57b629..7bef57b629 100755
--- a/tests/topotests/multicast-pim-static-rp-topo1/test_multicast_pim_static_rp.py
+++ b/tests/topotests/multicast_pim_static_rp_topo1/test_multicast_pim_static_rp.py
diff --git a/tests/topotests/nhrp-topo/r1/nhrp4_cache.json b/tests/topotests/nhrp_topo/r1/nhrp4_cache.json
index 6426a939be..6426a939be 100644
--- a/tests/topotests/nhrp-topo/r1/nhrp4_cache.json
+++ b/tests/topotests/nhrp_topo/r1/nhrp4_cache.json
diff --git a/tests/topotests/nhrp-topo/r1/nhrp_route4.json b/tests/topotests/nhrp_topo/r1/nhrp_route4.json
index 68b5a6ece2..68b5a6ece2 100644
--- a/tests/topotests/nhrp-topo/r1/nhrp_route4.json
+++ b/tests/topotests/nhrp_topo/r1/nhrp_route4.json
diff --git a/tests/topotests/nhrp-topo/r1/nhrpd.conf b/tests/topotests/nhrp_topo/r1/nhrpd.conf
index 04114bdbe6..04114bdbe6 100644
--- a/tests/topotests/nhrp-topo/r1/nhrpd.conf
+++ b/tests/topotests/nhrp_topo/r1/nhrpd.conf
diff --git a/tests/topotests/nhrp-topo/r1/zebra.conf b/tests/topotests/nhrp_topo/r1/zebra.conf
index b45670fcb2..b45670fcb2 100644
--- a/tests/topotests/nhrp-topo/r1/zebra.conf
+++ b/tests/topotests/nhrp_topo/r1/zebra.conf
diff --git a/tests/topotests/nhrp-topo/r2/nhrp4_cache.json b/tests/topotests/nhrp_topo/r2/nhrp4_cache.json
index 34558e0c28..34558e0c28 100644
--- a/tests/topotests/nhrp-topo/r2/nhrp4_cache.json
+++ b/tests/topotests/nhrp_topo/r2/nhrp4_cache.json
diff --git a/tests/topotests/nhrp-topo/r2/nhrp_route4.json b/tests/topotests/nhrp_topo/r2/nhrp_route4.json
index 7393cba893..7393cba893 100644
--- a/tests/topotests/nhrp-topo/r2/nhrp_route4.json
+++ b/tests/topotests/nhrp_topo/r2/nhrp_route4.json
diff --git a/tests/topotests/nhrp-topo/r2/nhrpd.conf b/tests/topotests/nhrp_topo/r2/nhrpd.conf
index e4f6fb7445..e4f6fb7445 100644
--- a/tests/topotests/nhrp-topo/r2/nhrpd.conf
+++ b/tests/topotests/nhrp_topo/r2/nhrpd.conf
diff --git a/tests/topotests/nhrp-topo/r2/zebra.conf b/tests/topotests/nhrp_topo/r2/zebra.conf
index 9f40d4d72e..9f40d4d72e 100644
--- a/tests/topotests/nhrp-topo/r2/zebra.conf
+++ b/tests/topotests/nhrp_topo/r2/zebra.conf
diff --git a/tests/topotests/nhrp-topo/r3/zebra.conf b/tests/topotests/nhrp_topo/r3/zebra.conf
index 6d3d267978..6d3d267978 100644
--- a/tests/topotests/nhrp-topo/r3/zebra.conf
+++ b/tests/topotests/nhrp_topo/r3/zebra.conf
diff --git a/tests/topotests/nhrp-topo/test_nhrp_topo.dot b/tests/topotests/nhrp_topo/test_nhrp_topo.dot
index 6b68fb398f..6b68fb398f 100644
--- a/tests/topotests/nhrp-topo/test_nhrp_topo.dot
+++ b/tests/topotests/nhrp_topo/test_nhrp_topo.dot
diff --git a/tests/topotests/nhrp-topo/test_nhrp_topo.py b/tests/topotests/nhrp_topo/test_nhrp_topo.py
index 1687961f34..1687961f34 100644
--- a/tests/topotests/nhrp-topo/test_nhrp_topo.py
+++ b/tests/topotests/nhrp_topo/test_nhrp_topo.py
diff --git a/tests/topotests/ospf6-topo1/README.md b/tests/topotests/ospf6_topo1/README.md
index 526c019c6a..526c019c6a 100644
--- a/tests/topotests/ospf6-topo1/README.md
+++ b/tests/topotests/ospf6_topo1/README.md
diff --git a/tests/topotests/ospf6-topo1-vrf/r1/ip_6_address.nhg.ref b/tests/topotests/ospf6_topo1/r1/ip_6_address.nhg.ref
index 11fd9fe3c4..11fd9fe3c4 100644
--- a/tests/topotests/ospf6-topo1-vrf/r1/ip_6_address.nhg.ref
+++ b/tests/topotests/ospf6_topo1/r1/ip_6_address.nhg.ref
diff --git a/tests/topotests/ospf6-topo1/r1/ip_6_address.ref b/tests/topotests/ospf6_topo1/r1/ip_6_address.ref
index 8c48f22381..8c48f22381 100644
--- a/tests/topotests/ospf6-topo1/r1/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1/r1/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1/r1/ospf6d.conf b/tests/topotests/ospf6_topo1/r1/ospf6d.conf
index 9f7e058931..9f7e058931 100644
--- a/tests/topotests/ospf6-topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r1/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1/r1/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r1/show_ipv6_route.ref
index a2ddf7c5ae..a2ddf7c5ae 100644
--- a/tests/topotests/ospf6-topo1/r1/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r1/show_ipv6_route.ref
diff --git a/tests/topotests/ospf6-topo1/r1/zebra.conf b/tests/topotests/ospf6_topo1/r1/zebra.conf
index dfbcea8d21..dfbcea8d21 100644
--- a/tests/topotests/ospf6-topo1/r1/zebra.conf
+++ b/tests/topotests/ospf6_topo1/r1/zebra.conf
diff --git a/tests/topotests/ospf6-topo1/r2/ip_6_address.nhg.ref b/tests/topotests/ospf6_topo1/r2/ip_6_address.nhg.ref
index 032acb5341..032acb5341 100644
--- a/tests/topotests/ospf6-topo1/r2/ip_6_address.nhg.ref
+++ b/tests/topotests/ospf6_topo1/r2/ip_6_address.nhg.ref
diff --git a/tests/topotests/ospf6-topo1/r2/ip_6_address.ref b/tests/topotests/ospf6_topo1/r2/ip_6_address.ref
index edb6c864be..edb6c864be 100644
--- a/tests/topotests/ospf6-topo1/r2/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1/r2/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1/r2/ospf6d.conf b/tests/topotests/ospf6_topo1/r2/ospf6d.conf
index 26ebc2c0ea..26ebc2c0ea 100644
--- a/tests/topotests/ospf6-topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r2/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1/r2/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r2/show_ipv6_route.ref
index 1f642b1b22..1f642b1b22 100644
--- a/tests/topotests/ospf6-topo1/r2/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r2/show_ipv6_route.ref
diff --git a/tests/topotests/ospf6-topo1/r2/zebra.conf b/tests/topotests/ospf6_topo1/r2/zebra.conf
index f05d1a60ff..f05d1a60ff 100644
--- a/tests/topotests/ospf6-topo1/r2/zebra.conf
+++ b/tests/topotests/ospf6_topo1/r2/zebra.conf
diff --git a/tests/topotests/ospf6-topo1/r3/ip_6_address.nhg.ref b/tests/topotests/ospf6_topo1/r3/ip_6_address.nhg.ref
index 101fcc95b4..101fcc95b4 100644
--- a/tests/topotests/ospf6-topo1/r3/ip_6_address.nhg.ref
+++ b/tests/topotests/ospf6_topo1/r3/ip_6_address.nhg.ref
diff --git a/tests/topotests/ospf6-topo1/r3/ip_6_address.ref b/tests/topotests/ospf6_topo1/r3/ip_6_address.ref
index 1a3a4ea86f..1a3a4ea86f 100644
--- a/tests/topotests/ospf6-topo1/r3/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1/r3/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1/r3/ospf6d.conf b/tests/topotests/ospf6_topo1/r3/ospf6d.conf
index e902496530..e902496530 100644
--- a/tests/topotests/ospf6-topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r3/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1/r3/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r3/show_ipv6_route.ref
index 8e3afa583a..8e3afa583a 100644
--- a/tests/topotests/ospf6-topo1/r3/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r3/show_ipv6_route.ref
diff --git a/tests/topotests/ospf6-topo1/r3/zebra.conf b/tests/topotests/ospf6_topo1/r3/zebra.conf
index d8051c350d..d8051c350d 100644
--- a/tests/topotests/ospf6-topo1/r3/zebra.conf
+++ b/tests/topotests/ospf6_topo1/r3/zebra.conf
diff --git a/tests/topotests/ospf6-topo1/r4/ip_6_address.nhg.ref b/tests/topotests/ospf6_topo1/r4/ip_6_address.nhg.ref
index 4f11670ce3..4f11670ce3 100644
--- a/tests/topotests/ospf6-topo1/r4/ip_6_address.nhg.ref
+++ b/tests/topotests/ospf6_topo1/r4/ip_6_address.nhg.ref
diff --git a/tests/topotests/ospf6-topo1/r4/ip_6_address.ref b/tests/topotests/ospf6_topo1/r4/ip_6_address.ref
index cb3b745de5..cb3b745de5 100644
--- a/tests/topotests/ospf6-topo1/r4/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1/r4/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1/r4/ospf6d.conf b/tests/topotests/ospf6_topo1/r4/ospf6d.conf
index 5607a789de..5607a789de 100644
--- a/tests/topotests/ospf6-topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1/r4/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1/r4/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r4/show_ipv6_route.ref
index 0df652ffb3..0df652ffb3 100644
--- a/tests/topotests/ospf6-topo1/r4/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r4/show_ipv6_route.ref
diff --git a/tests/topotests/ospf6-topo1/r4/zebra.conf b/tests/topotests/ospf6_topo1/r4/zebra.conf
index cada58bd01..cada58bd01 100644
--- a/tests/topotests/ospf6-topo1/r4/zebra.conf
+++ b/tests/topotests/ospf6_topo1/r4/zebra.conf
diff --git a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py b/tests/topotests/ospf6_topo1/test_ospf6_topo1.py
index f8c3476e18..f8c3476e18 100644
--- a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py
+++ b/tests/topotests/ospf6_topo1/test_ospf6_topo1.py
diff --git a/tests/topotests/ospf6-topo1-vrf/README.md b/tests/topotests/ospf6_topo1_vrf/README.md
index 3ed0b8fbe2..3ed0b8fbe2 100644
--- a/tests/topotests/ospf6-topo1-vrf/README.md
+++ b/tests/topotests/ospf6_topo1_vrf/README.md
diff --git a/tests/topotests/ospf6-topo1/r1/ip_6_address.nhg.ref b/tests/topotests/ospf6_topo1_vrf/r1/ip_6_address.nhg.ref
index 11fd9fe3c4..11fd9fe3c4 100644
--- a/tests/topotests/ospf6-topo1/r1/ip_6_address.nhg.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r1/ip_6_address.nhg.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r1/ip_6_address.ref b/tests/topotests/ospf6_topo1_vrf/r1/ip_6_address.ref
index f17e1fed16..f17e1fed16 100644
--- a/tests/topotests/ospf6-topo1-vrf/r1/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r1/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r1/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
index ed480354e4..ed480354e4 100644
--- a/tests/topotests/ospf6-topo1-vrf/r1/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/r1/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r1/show_ipv6_vrf_route.ref
index a2ddf7c5ae..a2ddf7c5ae 100644
--- a/tests/topotests/ospf6-topo1-vrf/r1/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r1/show_ipv6_vrf_route.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r1/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r1/zebra.conf
index abe8a9bc45..abe8a9bc45 100644
--- a/tests/topotests/ospf6-topo1-vrf/r1/zebra.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r1/zebra.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/r2/ip_6_address.ref b/tests/topotests/ospf6_topo1_vrf/r2/ip_6_address.ref
index 1a3e67bb09..1a3e67bb09 100644
--- a/tests/topotests/ospf6-topo1-vrf/r2/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r2/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r2/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
index 485771e7d5..485771e7d5 100644
--- a/tests/topotests/ospf6-topo1-vrf/r2/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/r2/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r2/show_ipv6_vrf_route.ref
index 3289619414..3289619414 100644
--- a/tests/topotests/ospf6-topo1-vrf/r2/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r2/show_ipv6_vrf_route.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r2/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r2/zebra.conf
index e1011bd3b6..e1011bd3b6 100644
--- a/tests/topotests/ospf6-topo1-vrf/r2/zebra.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r2/zebra.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/r3/ip_6_address.ref b/tests/topotests/ospf6_topo1_vrf/r3/ip_6_address.ref
index d70027fb9e..d70027fb9e 100644
--- a/tests/topotests/ospf6-topo1-vrf/r3/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r3/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r3/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
index f5837bf6fd..f5837bf6fd 100644
--- a/tests/topotests/ospf6-topo1-vrf/r3/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/r3/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r3/show_ipv6_vrf_route.ref
index ac713190ff..ac713190ff 100644
--- a/tests/topotests/ospf6-topo1-vrf/r3/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r3/show_ipv6_vrf_route.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r3/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r3/zebra.conf
index f489f3ac73..f489f3ac73 100644
--- a/tests/topotests/ospf6-topo1-vrf/r3/zebra.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r3/zebra.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/r4/ip_6_address.ref b/tests/topotests/ospf6_topo1_vrf/r4/ip_6_address.ref
index 0883f3c588..0883f3c588 100644
--- a/tests/topotests/ospf6-topo1-vrf/r4/ip_6_address.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r4/ip_6_address.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r4/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
index ab67d06ff4..ab67d06ff4 100644
--- a/tests/topotests/ospf6-topo1-vrf/r4/ospf6d.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/r4/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r4/show_ipv6_vrf_route.ref
index 0df652ffb3..0df652ffb3 100644
--- a/tests/topotests/ospf6-topo1-vrf/r4/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r4/show_ipv6_vrf_route.ref
diff --git a/tests/topotests/ospf6-topo1-vrf/r4/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r4/zebra.conf
index c59116df8c..c59116df8c 100644
--- a/tests/topotests/ospf6-topo1-vrf/r4/zebra.conf
+++ b/tests/topotests/ospf6_topo1_vrf/r4/zebra.conf
diff --git a/tests/topotests/ospf6-topo1-vrf/test_ospf6_topo1_vrf.py b/tests/topotests/ospf6_topo1_vrf/test_ospf6_topo1_vrf.py
index fa2784ee7e..fa2784ee7e 100755
--- a/tests/topotests/ospf6-topo1-vrf/test_ospf6_topo1_vrf.py
+++ b/tests/topotests/ospf6_topo1_vrf/test_ospf6_topo1_vrf.py
diff --git a/tests/topotests/ospf6-topo2/r1/ospf6d.conf b/tests/topotests/ospf6_topo2/r1/ospf6d.conf
index c403fcd8dc..c403fcd8dc 100644
--- a/tests/topotests/ospf6-topo2/r1/ospf6d.conf
+++ b/tests/topotests/ospf6_topo2/r1/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo2/r1/zebra.conf b/tests/topotests/ospf6_topo2/r1/zebra.conf
index 7fee2da8ba..7fee2da8ba 100644
--- a/tests/topotests/ospf6-topo2/r1/zebra.conf
+++ b/tests/topotests/ospf6_topo2/r1/zebra.conf
diff --git a/tests/topotests/ospf6-topo2/r2/ospf6d.conf b/tests/topotests/ospf6_topo2/r2/ospf6d.conf
index d4bb0e2a41..d4bb0e2a41 100644
--- a/tests/topotests/ospf6-topo2/r2/ospf6d.conf
+++ b/tests/topotests/ospf6_topo2/r2/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo2/r2/zebra.conf b/tests/topotests/ospf6_topo2/r2/zebra.conf
index 891945a4e7..891945a4e7 100644
--- a/tests/topotests/ospf6-topo2/r2/zebra.conf
+++ b/tests/topotests/ospf6_topo2/r2/zebra.conf
diff --git a/tests/topotests/ospf6-topo2/r3/ospf6d.conf b/tests/topotests/ospf6_topo2/r3/ospf6d.conf
index aaef00d5bb..aaef00d5bb 100644
--- a/tests/topotests/ospf6-topo2/r3/ospf6d.conf
+++ b/tests/topotests/ospf6_topo2/r3/ospf6d.conf
diff --git a/tests/topotests/ospf6-topo2/r3/zebra.conf b/tests/topotests/ospf6_topo2/r3/zebra.conf
index dea2fe4778..dea2fe4778 100644
--- a/tests/topotests/ospf6-topo2/r3/zebra.conf
+++ b/tests/topotests/ospf6_topo2/r3/zebra.conf
diff --git a/tests/topotests/ospf6-topo2/test_ospf6_topo2.dot b/tests/topotests/ospf6_topo2/test_ospf6_topo2.dot
index ba7a36f2b5..ba7a36f2b5 100644
--- a/tests/topotests/ospf6-topo2/test_ospf6_topo2.dot
+++ b/tests/topotests/ospf6_topo2/test_ospf6_topo2.dot
diff --git a/tests/topotests/ospf6-topo2/test_ospf6_topo2.png b/tests/topotests/ospf6_topo2/test_ospf6_topo2.png
index ee1de60736..ee1de60736 100644
--- a/tests/topotests/ospf6-topo2/test_ospf6_topo2.png
+++ b/tests/topotests/ospf6_topo2/test_ospf6_topo2.png
diff --git a/tests/topotests/ospf6-topo2/test_ospf6_topo2.py b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py
index efc8565bb3..efc8565bb3 100644
--- a/tests/topotests/ospf6-topo2/test_ospf6_topo2.py
+++ b/tests/topotests/ospf6_topo2/test_ospf6_topo2.py
diff --git a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.dot b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.dot
index 2c6d0aab16..2c6d0aab16 100644
--- a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.dot
+++ b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.dot
diff --git a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.jpg b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.jpg
index 44efda8390..44efda8390 100644
--- a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.jpg
+++ b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.jpg
diff --git a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.json b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.json
index c8a3ce783b..c8a3ce783b 100644
--- a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.json
+++ b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.json
diff --git a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.py b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.py
index 5e7802fa04..5e7802fa04 100644
--- a/tests/topotests/ospf-dual-stack/test_ospf_dual_stack.py
+++ b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.py
diff --git a/tests/topotests/ospf-sr-topo1/__init__.py b/tests/topotests/ospf_sr_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/ospf-sr-topo1/__init__.py
+++ b/tests/topotests/ospf_sr_topo1/__init__.py
diff --git a/tests/topotests/ospf-sr-topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf
index 94dba7c061..94dba7c061 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step1/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step1/show_ip_route.ref
index 374184e60a..374184e60a 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step1/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step1/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step1/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step1/show_mpls_table.ref
index de906c270d..de906c270d 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step1/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step1/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step10/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step10/show_ip_route.ref
index 37f73629fd..37f73629fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step10/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step10/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step10/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step10/show_mpls_table.ref
index 2006392564..2006392564 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step10/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step10/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step2/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step2/show_ip_route.ref
index 37f73629fd..37f73629fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step2/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step2/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step2/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step2/show_mpls_table.ref
index de906c270d..de906c270d 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step2/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step2/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step3/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step3/show_ip_route.ref
index f6ead5cb91..f6ead5cb91 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step3/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step3/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step3/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step3/show_mpls_table.ref
index 96e05913ed..96e05913ed 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step3/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step3/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step4/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step4/show_ip_route.ref
index 37f73629fd..37f73629fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step4/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step4/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step4/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step4/show_mpls_table.ref
index de906c270d..de906c270d 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step4/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step4/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step5/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step5/show_ip_route.ref
index f2b8924b85..f2b8924b85 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step5/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step5/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step5/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step5/show_mpls_table.ref
index 96e05913ed..96e05913ed 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step5/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step5/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step6/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step6/show_ip_route.ref
index 37f73629fd..37f73629fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step6/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step6/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step6/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step6/show_mpls_table.ref
index de906c270d..de906c270d 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step6/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step6/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step7/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step7/show_ip_route.ref
index 37f73629fd..37f73629fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step7/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step7/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step7/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step7/show_mpls_table.ref
index de906c270d..de906c270d 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step7/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step7/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step8/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step8/show_ip_route.ref
index 37f73629fd..37f73629fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step8/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step8/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step8/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step8/show_mpls_table.ref
index de906c270d..de906c270d 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step8/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step8/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step9/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt1/step9/show_ip_route.ref
index 37f73629fd..37f73629fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step9/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step9/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/step9/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt1/step9/show_mpls_table.ref
index 2006392564..2006392564 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/step9/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt1/step9/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt1/zebra.conf b/tests/topotests/ospf_sr_topo1/rt1/zebra.conf
index 7d3139a80e..7d3139a80e 100644
--- a/tests/topotests/ospf-sr-topo1/rt1/zebra.conf
+++ b/tests/topotests/ospf_sr_topo1/rt1/zebra.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt2/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf
index b47e788062..b47e788062 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step1/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step1/show_ip_route.ref
index 3dde042b51..3dde042b51 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step1/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step1/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step1/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step1/show_mpls_table.ref
index eba7c403d3..eba7c403d3 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step1/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step1/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step10/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step10/show_ip_route.ref
index 9a06059df2..9a06059df2 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step10/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step10/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step10/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step10/show_mpls_table.ref
index be44a7521d..be44a7521d 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step10/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step10/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step2/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step2/show_ip_route.ref
index 384aac032d..384aac032d 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step2/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step2/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step2/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step2/show_mpls_table.ref
index 5088aa2f7a..5088aa2f7a 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step2/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step2/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step3/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step3/show_ip_route.ref
index 879cd1e0c5..879cd1e0c5 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step3/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step3/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step3/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step3/show_mpls_table.ref
index 6333e7f7f9..6333e7f7f9 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step3/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step3/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step4/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step4/show_ip_route.ref
index 384aac032d..384aac032d 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step4/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step4/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step4/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step4/show_mpls_table.ref
index 5088aa2f7a..5088aa2f7a 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step4/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step4/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step5/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step5/show_ip_route.ref
index 07edd42dc8..07edd42dc8 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step5/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step5/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step5/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step5/show_mpls_table.ref
index 6333e7f7f9..6333e7f7f9 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step5/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step5/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step6/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step6/show_ip_route.ref
index 384aac032d..384aac032d 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step6/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step6/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step6/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step6/show_mpls_table.ref
index 5088aa2f7a..5088aa2f7a 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step6/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step6/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step7/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step7/show_ip_route.ref
index 274931bef7..274931bef7 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step7/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step7/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step7/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step7/show_mpls_table.ref
index cd23725a80..cd23725a80 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step7/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step7/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step8/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step8/show_ip_route.ref
index 384aac032d..384aac032d 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step8/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step8/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step8/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step8/show_mpls_table.ref
index 5088aa2f7a..5088aa2f7a 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step8/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step8/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step9/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt2/step9/show_ip_route.ref
index c71515f3ff..c71515f3ff 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step9/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step9/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/step9/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt2/step9/show_mpls_table.ref
index 2f06641f7f..2f06641f7f 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/step9/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt2/step9/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt2/zebra.conf b/tests/topotests/ospf_sr_topo1/rt2/zebra.conf
index c4ed4276d9..c4ed4276d9 100644
--- a/tests/topotests/ospf-sr-topo1/rt2/zebra.conf
+++ b/tests/topotests/ospf_sr_topo1/rt2/zebra.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt3/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf
index 238d82ff97..238d82ff97 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step1/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step1/show_ip_route.ref
index 4b1500ef97..4b1500ef97 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step1/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step1/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step1/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step1/show_mpls_table.ref
index 39cc3e8ffd..39cc3e8ffd 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step1/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step1/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step10/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step10/show_ip_route.ref
index 14a2ac1e8a..14a2ac1e8a 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step10/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step10/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step10/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step10/show_mpls_table.ref
index a0f7c790a0..a0f7c790a0 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step10/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step10/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step2/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step2/show_ip_route.ref
index 63c6a1845f..63c6a1845f 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step2/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step2/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step2/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step2/show_mpls_table.ref
index 1ab2242b7e..1ab2242b7e 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step2/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step2/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step3/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step3/show_ip_route.ref
index 0894c51cf2..0894c51cf2 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step3/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step3/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step3/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step3/show_mpls_table.ref
index 4dcaedeca1..4dcaedeca1 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step3/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step3/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step4/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step4/show_ip_route.ref
index 63c6a1845f..63c6a1845f 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step4/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step4/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step4/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step4/show_mpls_table.ref
index 1ab2242b7e..1ab2242b7e 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step4/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step4/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step5/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step5/show_ip_route.ref
index 3e74ff039c..3e74ff039c 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step5/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step5/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step5/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step5/show_mpls_table.ref
index 4dcaedeca1..4dcaedeca1 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step5/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step5/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step6/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step6/show_ip_route.ref
index 63c6a1845f..63c6a1845f 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step6/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step6/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step6/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step6/show_mpls_table.ref
index 1ab2242b7e..1ab2242b7e 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step6/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step6/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step7/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step7/show_ip_route.ref
index 41544d4296..41544d4296 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step7/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step7/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step7/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step7/show_mpls_table.ref
index bf055bad78..bf055bad78 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step7/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step7/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step8/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step8/show_ip_route.ref
index 63c6a1845f..63c6a1845f 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step8/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step8/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step8/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step8/show_mpls_table.ref
index 1ab2242b7e..1ab2242b7e 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step8/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step8/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step9/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt3/step9/show_ip_route.ref
index 14a2ac1e8a..14a2ac1e8a 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step9/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step9/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/step9/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt3/step9/show_mpls_table.ref
index a0f7c790a0..a0f7c790a0 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/step9/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt3/step9/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt3/zebra.conf b/tests/topotests/ospf_sr_topo1/rt3/zebra.conf
index 89a781fe3c..89a781fe3c 100644
--- a/tests/topotests/ospf-sr-topo1/rt3/zebra.conf
+++ b/tests/topotests/ospf_sr_topo1/rt3/zebra.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt4/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf
index b12e0729ad..b12e0729ad 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step1/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step1/show_ip_route.ref
index 4a2d3aa10f..4a2d3aa10f 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step1/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step1/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step1/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step1/show_mpls_table.ref
index 3246d22842..3246d22842 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step1/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step1/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step10/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step10/show_ip_route.ref
index db4cf5b3f5..db4cf5b3f5 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step10/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step10/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step10/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step10/show_mpls_table.ref
index 58cf526a83..58cf526a83 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step10/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step10/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step2/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step2/show_ip_route.ref
index c44b3eef30..c44b3eef30 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step2/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step2/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step2/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step2/show_mpls_table.ref
index 05f9f28cbd..05f9f28cbd 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step2/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step2/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step3/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step3/show_ip_route.ref
index a078dd2daf..a078dd2daf 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step3/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step3/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step3/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step3/show_mpls_table.ref
index f5515636d2..f5515636d2 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step3/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step3/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step4/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step4/show_ip_route.ref
index b63812ab1d..b63812ab1d 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step4/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step4/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step4/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step4/show_mpls_table.ref
index f2e56c2e19..f2e56c2e19 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step4/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step4/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step5/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step5/show_ip_route.ref
index 3157ae1ea1..3157ae1ea1 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step5/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step5/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step5/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step5/show_mpls_table.ref
index 8213840652..8213840652 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step5/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step5/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step6/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step6/show_ip_route.ref
index b63812ab1d..b63812ab1d 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step6/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step6/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step6/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step6/show_mpls_table.ref
index f2e56c2e19..f2e56c2e19 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step6/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step6/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step7/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step7/show_ip_route.ref
index 775d8c4034..775d8c4034 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step7/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step7/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step7/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step7/show_mpls_table.ref
index 8a5fdef806..8a5fdef806 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step7/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step7/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step8/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step8/show_ip_route.ref
index b63812ab1d..b63812ab1d 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step8/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step8/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step8/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step8/show_mpls_table.ref
index f2e56c2e19..f2e56c2e19 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step8/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step8/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step9/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt4/step9/show_ip_route.ref
index 48e306d393..48e306d393 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step9/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step9/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/step9/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt4/step9/show_mpls_table.ref
index 275abab715..275abab715 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/step9/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt4/step9/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt4/zebra.conf b/tests/topotests/ospf_sr_topo1/rt4/zebra.conf
index 13c621eb31..13c621eb31 100644
--- a/tests/topotests/ospf-sr-topo1/rt4/zebra.conf
+++ b/tests/topotests/ospf_sr_topo1/rt4/zebra.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt5/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf
index 4e7b24c03a..4e7b24c03a 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step1/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step1/show_ip_route.ref
index 0a43788a18..0a43788a18 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step1/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step1/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step1/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step1/show_mpls_table.ref
index e8c46085be..e8c46085be 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step1/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step1/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step10/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step10/show_ip_route.ref
index 2bad2eb7bf..2bad2eb7bf 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step10/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step10/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step10/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step10/show_mpls_table.ref
index c5ed18d76f..c5ed18d76f 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step10/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step10/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step2/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step2/show_ip_route.ref
index 3572ec713f..3572ec713f 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step2/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step2/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step2/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step2/show_mpls_table.ref
index d9cadeb513..d9cadeb513 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step2/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step2/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step3/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step3/show_ip_route.ref
index 2f7b0cc242..2f7b0cc242 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step3/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step3/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step3/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step3/show_mpls_table.ref
index 7c78d2ce53..7c78d2ce53 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step3/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step3/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step4/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step4/show_ip_route.ref
index 1a12715086..1a12715086 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step4/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step4/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step4/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step4/show_mpls_table.ref
index 42e476e9d1..42e476e9d1 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step4/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step4/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step5/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step5/show_ip_route.ref
index e50fa10ccb..e50fa10ccb 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step5/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step5/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step5/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step5/show_mpls_table.ref
index bb95379228..bb95379228 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step5/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step5/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step6/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step6/show_ip_route.ref
index 1a12715086..1a12715086 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step6/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step6/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step6/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step6/show_mpls_table.ref
index 42e476e9d1..42e476e9d1 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step6/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step6/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step7/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step7/show_ip_route.ref
index 15a024d18b..15a024d18b 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step7/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step7/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step7/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step7/show_mpls_table.ref
index cff0d25e25..cff0d25e25 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step7/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step7/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step8/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step8/show_ip_route.ref
index 1a12715086..1a12715086 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step8/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step8/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step8/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step8/show_mpls_table.ref
index 42e476e9d1..42e476e9d1 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step8/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step8/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step9/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt5/step9/show_ip_route.ref
index d9ddad2462..d9ddad2462 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step9/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step9/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/step9/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt5/step9/show_mpls_table.ref
index c5ed18d76f..c5ed18d76f 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/step9/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt5/step9/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt5/zebra.conf b/tests/topotests/ospf_sr_topo1/rt5/zebra.conf
index ca2d6df665..ca2d6df665 100644
--- a/tests/topotests/ospf-sr-topo1/rt5/zebra.conf
+++ b/tests/topotests/ospf_sr_topo1/rt5/zebra.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt6/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf
index c6d07d169e..c6d07d169e 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/ospfd.conf
+++ b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step1/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step1/show_ip_route.ref
index 9f05ec7688..9f05ec7688 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step1/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step1/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step1/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step1/show_mpls_table.ref
index baa2314454..baa2314454 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step1/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step1/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step10/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step10/show_ip_route.ref
index 6abb3805a2..6abb3805a2 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step10/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step10/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step10/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step10/show_mpls_table.ref
index 09ecec29d9..09ecec29d9 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step10/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step10/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step2/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step2/show_ip_route.ref
index 80b3c426d4..80b3c426d4 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step2/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step2/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step2/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step2/show_mpls_table.ref
index baa2314454..baa2314454 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step2/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step2/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step3/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step3/show_ip_route.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step3/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step3/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step3/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step3/show_mpls_table.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step3/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step3/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step4/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step4/show_ip_route.ref
index 80b3c426d4..80b3c426d4 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step4/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step4/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step4/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step4/show_mpls_table.ref
index 09ecec29d9..09ecec29d9 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step4/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step4/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step5/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step5/show_ip_route.ref
index 0e4b3eba12..0e4b3eba12 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step5/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step5/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step5/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step5/show_mpls_table.ref
index 2c63c08510..2c63c08510 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step5/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step5/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step6/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step6/show_ip_route.ref
index 80b3c426d4..80b3c426d4 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step6/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step6/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step6/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step6/show_mpls_table.ref
index 09ecec29d9..09ecec29d9 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step6/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step6/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step7/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step7/show_ip_route.ref
index aa2329a04a..aa2329a04a 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step7/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step7/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step7/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step7/show_mpls_table.ref
index 800b1ae2fd..800b1ae2fd 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step7/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step7/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step8/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step8/show_ip_route.ref
index 80b3c426d4..80b3c426d4 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step8/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step8/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step8/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step8/show_mpls_table.ref
index 09ecec29d9..09ecec29d9 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step8/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step8/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step9/show_ip_route.ref b/tests/topotests/ospf_sr_topo1/rt6/step9/show_ip_route.ref
index 80b3c426d4..80b3c426d4 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step9/show_ip_route.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step9/show_ip_route.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/step9/show_mpls_table.ref b/tests/topotests/ospf_sr_topo1/rt6/step9/show_mpls_table.ref
index 09ecec29d9..09ecec29d9 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/step9/show_mpls_table.ref
+++ b/tests/topotests/ospf_sr_topo1/rt6/step9/show_mpls_table.ref
diff --git a/tests/topotests/ospf-sr-topo1/rt6/zebra.conf b/tests/topotests/ospf_sr_topo1/rt6/zebra.conf
index 4b739d0bca..4b739d0bca 100644
--- a/tests/topotests/ospf-sr-topo1/rt6/zebra.conf
+++ b/tests/topotests/ospf_sr_topo1/rt6/zebra.conf
diff --git a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py b/tests/topotests/ospf_sr_topo1/test_ospf_sr_topo1.py
index b6e5e14830..b6e5e14830 100644
--- a/tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py
+++ b/tests/topotests/ospf_sr_topo1/test_ospf_sr_topo1.py
diff --git a/tests/topotests/ospf-te-topo1/__init__.py b/tests/topotests/ospf_te_topo1/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/ospf-te-topo1/__init__.py
+++ b/tests/topotests/ospf_te_topo1/__init__.py
diff --git a/tests/topotests/ospf-te-topo1/r1/ospfd.conf b/tests/topotests/ospf_te_topo1/r1/ospfd.conf
index 312dd2697e..312dd2697e 100644
--- a/tests/topotests/ospf-te-topo1/r1/ospfd.conf
+++ b/tests/topotests/ospf_te_topo1/r1/ospfd.conf
diff --git a/tests/topotests/ospf-te-topo1/r1/zebra.conf b/tests/topotests/ospf_te_topo1/r1/zebra.conf
index 7c5dc3ffe0..7c5dc3ffe0 100644
--- a/tests/topotests/ospf-te-topo1/r1/zebra.conf
+++ b/tests/topotests/ospf_te_topo1/r1/zebra.conf
diff --git a/tests/topotests/ospf-te-topo1/r2/ospfd.conf b/tests/topotests/ospf_te_topo1/r2/ospfd.conf
index e9c3f65bc2..e9c3f65bc2 100644
--- a/tests/topotests/ospf-te-topo1/r2/ospfd.conf
+++ b/tests/topotests/ospf_te_topo1/r2/ospfd.conf
diff --git a/tests/topotests/ospf-te-topo1/r2/zebra.conf b/tests/topotests/ospf_te_topo1/r2/zebra.conf
index 69e10191f3..69e10191f3 100644
--- a/tests/topotests/ospf-te-topo1/r2/zebra.conf
+++ b/tests/topotests/ospf_te_topo1/r2/zebra.conf
diff --git a/tests/topotests/ospf-te-topo1/r3/ospfd.conf b/tests/topotests/ospf_te_topo1/r3/ospfd.conf
index caa5f1e1eb..caa5f1e1eb 100644
--- a/tests/topotests/ospf-te-topo1/r3/ospfd.conf
+++ b/tests/topotests/ospf_te_topo1/r3/ospfd.conf
diff --git a/tests/topotests/ospf-te-topo1/r3/zebra.conf b/tests/topotests/ospf_te_topo1/r3/zebra.conf
index 4cf9077085..4cf9077085 100644
--- a/tests/topotests/ospf-te-topo1/r3/zebra.conf
+++ b/tests/topotests/ospf_te_topo1/r3/zebra.conf
diff --git a/tests/topotests/ospf-te-topo1/r4/ospfd.conf b/tests/topotests/ospf_te_topo1/r4/ospfd.conf
index e454673153..e454673153 100644
--- a/tests/topotests/ospf-te-topo1/r4/ospfd.conf
+++ b/tests/topotests/ospf_te_topo1/r4/ospfd.conf
diff --git a/tests/topotests/ospf-te-topo1/r4/zebra.conf b/tests/topotests/ospf_te_topo1/r4/zebra.conf
index 18c003b230..18c003b230 100644
--- a/tests/topotests/ospf-te-topo1/r4/zebra.conf
+++ b/tests/topotests/ospf_te_topo1/r4/zebra.conf
diff --git a/tests/topotests/ospf-te-topo1/reference/ted_step1.json b/tests/topotests/ospf_te_topo1/reference/ted_step1.json
index 9624292ccd..9624292ccd 100644
--- a/tests/topotests/ospf-te-topo1/reference/ted_step1.json
+++ b/tests/topotests/ospf_te_topo1/reference/ted_step1.json
diff --git a/tests/topotests/ospf-te-topo1/reference/ted_step2.json b/tests/topotests/ospf_te_topo1/reference/ted_step2.json
index 623d1dc7e0..623d1dc7e0 100644
--- a/tests/topotests/ospf-te-topo1/reference/ted_step2.json
+++ b/tests/topotests/ospf_te_topo1/reference/ted_step2.json
diff --git a/tests/topotests/ospf-te-topo1/reference/ted_step3.json b/tests/topotests/ospf_te_topo1/reference/ted_step3.json
index 117011a43a..117011a43a 100644
--- a/tests/topotests/ospf-te-topo1/reference/ted_step3.json
+++ b/tests/topotests/ospf_te_topo1/reference/ted_step3.json
diff --git a/tests/topotests/ospf-te-topo1/reference/ted_step4.json b/tests/topotests/ospf_te_topo1/reference/ted_step4.json
index 5c2dee1e4b..5c2dee1e4b 100644
--- a/tests/topotests/ospf-te-topo1/reference/ted_step4.json
+++ b/tests/topotests/ospf_te_topo1/reference/ted_step4.json
diff --git a/tests/topotests/ospf-te-topo1/reference/ted_step5.json b/tests/topotests/ospf_te_topo1/reference/ted_step5.json
index 47e747f3ca..47e747f3ca 100644
--- a/tests/topotests/ospf-te-topo1/reference/ted_step5.json
+++ b/tests/topotests/ospf_te_topo1/reference/ted_step5.json
diff --git a/tests/topotests/ospf-te-topo1/reference/ted_step6.json b/tests/topotests/ospf_te_topo1/reference/ted_step6.json
index 74bd83fbdb..74bd83fbdb 100644
--- a/tests/topotests/ospf-te-topo1/reference/ted_step6.json
+++ b/tests/topotests/ospf_te_topo1/reference/ted_step6.json
diff --git a/tests/topotests/ospf-te-topo1/reference/ted_step7.json b/tests/topotests/ospf_te_topo1/reference/ted_step7.json
index 1cea9f0455..1cea9f0455 100644
--- a/tests/topotests/ospf-te-topo1/reference/ted_step7.json
+++ b/tests/topotests/ospf_te_topo1/reference/ted_step7.json
diff --git a/tests/topotests/ospf-te-topo1/test_ospf_te_topo1.py b/tests/topotests/ospf_te_topo1/test_ospf_te_topo1.py
index 32f9b3453e..32f9b3453e 100644
--- a/tests/topotests/ospf-te-topo1/test_ospf_te_topo1.py
+++ b/tests/topotests/ospf_te_topo1/test_ospf_te_topo1.py
diff --git a/tests/topotests/ospf-tilfa-topo1/__init__.py b/tests/topotests/ospf_tilfa_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/ospf-tilfa-topo1/__init__.py
+++ b/tests/topotests/ospf_tilfa_topo1/__init__.py
diff --git a/tests/topotests/ospf-tilfa-topo1/rt1/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf
index eaef49225f..eaef49225f 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt1/ospfd.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt1/step1/show_ip_route_initial.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step1/show_ip_route_initial.ref
index 0ad2aaeade..0ad2aaeade 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt1/step1/show_ip_route_initial.ref
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step1/show_ip_route_initial.ref
diff --git a/tests/topotests/ospf-tilfa-topo1/rt1/step2/show_ip_route_initial.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_initial.ref
index 0ad2aaeade..0ad2aaeade 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt1/step2/show_ip_route_initial.ref
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_initial.ref
diff --git a/tests/topotests/ospf-tilfa-topo1/rt1/step2/show_ip_route_link_protection.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_link_protection.ref
index 968570e193..968570e193 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt1/step2/show_ip_route_link_protection.ref
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_link_protection.ref
diff --git a/tests/topotests/ospf-tilfa-topo1/rt1/step3/show_ip_route_initial.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_initial.ref
index 0ad2aaeade..0ad2aaeade 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt1/step3/show_ip_route_initial.ref
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_initial.ref
diff --git a/tests/topotests/ospf-tilfa-topo1/rt1/step3/show_ip_route_node_protection.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_node_protection.ref
index 46a80d298e..46a80d298e 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt1/step3/show_ip_route_node_protection.ref
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_node_protection.ref
diff --git a/tests/topotests/ospf-tilfa-topo1/rt1/zebra.conf b/tests/topotests/ospf_tilfa_topo1/rt1/zebra.conf
index bf0e77a17b..bf0e77a17b 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt1/zebra.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/zebra.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt2/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf
index 7548aad7f8..7548aad7f8 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt2/ospfd.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt2/zebra.conf b/tests/topotests/ospf_tilfa_topo1/rt2/zebra.conf
index add2933571..add2933571 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt2/zebra.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt2/zebra.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt3/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf
index 6258295b6f..6258295b6f 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt3/ospfd.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt3/zebra.conf b/tests/topotests/ospf_tilfa_topo1/rt3/zebra.conf
index 1bb64bc585..1bb64bc585 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt3/zebra.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt3/zebra.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt4/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf
index ad02214017..ad02214017 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt4/ospfd.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt4/zebra.conf b/tests/topotests/ospf_tilfa_topo1/rt4/zebra.conf
index 306f0d4925..306f0d4925 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt4/zebra.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt4/zebra.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt5/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf
index 1b95858f53..1b95858f53 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt5/ospfd.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/rt5/zebra.conf b/tests/topotests/ospf_tilfa_topo1/rt5/zebra.conf
index 46f759580e..46f759580e 100644
--- a/tests/topotests/ospf-tilfa-topo1/rt5/zebra.conf
+++ b/tests/topotests/ospf_tilfa_topo1/rt5/zebra.conf
diff --git a/tests/topotests/ospf-tilfa-topo1/test_ospf_tilfa_topo1.py b/tests/topotests/ospf_tilfa_topo1/test_ospf_tilfa_topo1.py
index 489690471c..489690471c 100644
--- a/tests/topotests/ospf-tilfa-topo1/test_ospf_tilfa_topo1.py
+++ b/tests/topotests/ospf_tilfa_topo1/test_ospf_tilfa_topo1.py
diff --git a/tests/topotests/ospf-topo1-vrf/__init__.py b/tests/topotests/ospf_topo1/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/ospf-topo1-vrf/__init__.py
+++ b/tests/topotests/ospf_topo1/__init__.py
diff --git a/tests/topotests/ospf-topo1/r1/ospf6d.conf b/tests/topotests/ospf_topo1/r1/ospf6d.conf
index ca3497b4a5..ca3497b4a5 100644
--- a/tests/topotests/ospf-topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r1/ospf6d.conf
diff --git a/tests/topotests/ospf-topo1/r1/ospf6route.txt b/tests/topotests/ospf_topo1/r1/ospf6route.txt
index 1bfd6942ea..1bfd6942ea 100644
--- a/tests/topotests/ospf-topo1/r1/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r1/ospf6route.txt
diff --git a/tests/topotests/ospf-topo1/r1/ospf6route_down.txt b/tests/topotests/ospf_topo1/r1/ospf6route_down.txt
index 1ce96c86c0..1ce96c86c0 100644
--- a/tests/topotests/ospf-topo1/r1/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r1/ospf6route_down.txt
diff --git a/tests/topotests/ospf-topo1/r1/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r1/ospf6route_ecmp.txt
index 4df6e5ec00..4df6e5ec00 100644
--- a/tests/topotests/ospf-topo1/r1/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r1/ospf6route_ecmp.txt
diff --git a/tests/topotests/ospf-topo1/r1/ospfd.conf b/tests/topotests/ospf_topo1/r1/ospfd.conf
index 3b5aa192c5..3b5aa192c5 100644
--- a/tests/topotests/ospf-topo1/r1/ospfd.conf
+++ b/tests/topotests/ospf_topo1/r1/ospfd.conf
diff --git a/tests/topotests/ospf-topo1/r1/ospfroute.txt b/tests/topotests/ospf_topo1/r1/ospfroute.txt
index db648722f5..db648722f5 100644
--- a/tests/topotests/ospf-topo1/r1/ospfroute.txt
+++ b/tests/topotests/ospf_topo1/r1/ospfroute.txt
diff --git a/tests/topotests/ospf-topo1/r1/ospfroute_down.txt b/tests/topotests/ospf_topo1/r1/ospfroute_down.txt
index 5c07d81334..5c07d81334 100644
--- a/tests/topotests/ospf-topo1/r1/ospfroute_down.txt
+++ b/tests/topotests/ospf_topo1/r1/ospfroute_down.txt
diff --git a/tests/topotests/ospf-topo1/r1/zebra.conf b/tests/topotests/ospf_topo1/r1/zebra.conf
index f6e8efe7f2..f6e8efe7f2 100644
--- a/tests/topotests/ospf-topo1/r1/zebra.conf
+++ b/tests/topotests/ospf_topo1/r1/zebra.conf
diff --git a/tests/topotests/ospf-topo1/r2/ospf6d.conf b/tests/topotests/ospf_topo1/r2/ospf6d.conf
index 44047e1a4e..44047e1a4e 100644
--- a/tests/topotests/ospf-topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r2/ospf6d.conf
diff --git a/tests/topotests/ospf-topo1/r2/ospf6route.txt b/tests/topotests/ospf_topo1/r2/ospf6route.txt
index 7d3ce5b207..7d3ce5b207 100644
--- a/tests/topotests/ospf-topo1/r2/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r2/ospf6route.txt
diff --git a/tests/topotests/ospf-topo1/r2/ospf6route_down.txt b/tests/topotests/ospf_topo1/r2/ospf6route_down.txt
index acfffc9f1c..acfffc9f1c 100644
--- a/tests/topotests/ospf-topo1/r2/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r2/ospf6route_down.txt
diff --git a/tests/topotests/ospf-topo1/r2/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r2/ospf6route_ecmp.txt
index f58b501e31..f58b501e31 100644
--- a/tests/topotests/ospf-topo1/r2/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r2/ospf6route_ecmp.txt
diff --git a/tests/topotests/ospf-topo1/r2/ospfd.conf b/tests/topotests/ospf_topo1/r2/ospfd.conf
index 1a7ccdf728..1a7ccdf728 100644
--- a/tests/topotests/ospf-topo1/r2/ospfd.conf
+++ b/tests/topotests/ospf_topo1/r2/ospfd.conf
diff --git a/tests/topotests/ospf-topo1/r2/ospfroute.txt b/tests/topotests/ospf_topo1/r2/ospfroute.txt
index 79b389baab..79b389baab 100644
--- a/tests/topotests/ospf-topo1/r2/ospfroute.txt
+++ b/tests/topotests/ospf_topo1/r2/ospfroute.txt
diff --git a/tests/topotests/ospf-topo1/r2/ospfroute_down.txt b/tests/topotests/ospf_topo1/r2/ospfroute_down.txt
index b8411e19f3..b8411e19f3 100644
--- a/tests/topotests/ospf-topo1/r2/ospfroute_down.txt
+++ b/tests/topotests/ospf_topo1/r2/ospfroute_down.txt
diff --git a/tests/topotests/ospf-topo1/r2/zebra.conf b/tests/topotests/ospf_topo1/r2/zebra.conf
index 407416cdc4..407416cdc4 100644
--- a/tests/topotests/ospf-topo1/r2/zebra.conf
+++ b/tests/topotests/ospf_topo1/r2/zebra.conf
diff --git a/tests/topotests/ospf-topo1/r3/ospf6d.conf b/tests/topotests/ospf_topo1/r3/ospf6d.conf
index 13ad9a7356..13ad9a7356 100644
--- a/tests/topotests/ospf-topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r3/ospf6d.conf
diff --git a/tests/topotests/ospf-topo1/r3/ospf6route.txt b/tests/topotests/ospf_topo1/r3/ospf6route.txt
index b123c42650..b123c42650 100644
--- a/tests/topotests/ospf-topo1/r3/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r3/ospf6route.txt
diff --git a/tests/topotests/ospf-topo1/r3/ospf6route_down.txt b/tests/topotests/ospf_topo1/r3/ospf6route_down.txt
index ed69a8376b..ed69a8376b 100644
--- a/tests/topotests/ospf-topo1/r3/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r3/ospf6route_down.txt
diff --git a/tests/topotests/ospf-topo1/r3/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r3/ospf6route_ecmp.txt
index 54e575adcb..54e575adcb 100644
--- a/tests/topotests/ospf-topo1/r3/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r3/ospf6route_ecmp.txt
diff --git a/tests/topotests/ospf-topo1/r3/ospfd.conf b/tests/topotests/ospf_topo1/r3/ospfd.conf
index 3b378c0f27..3b378c0f27 100644
--- a/tests/topotests/ospf-topo1/r3/ospfd.conf
+++ b/tests/topotests/ospf_topo1/r3/ospfd.conf
diff --git a/tests/topotests/ospf-topo1/r3/ospfroute.txt b/tests/topotests/ospf_topo1/r3/ospfroute.txt
index c7799065d9..c7799065d9 100644
--- a/tests/topotests/ospf-topo1/r3/ospfroute.txt
+++ b/tests/topotests/ospf_topo1/r3/ospfroute.txt
diff --git a/tests/topotests/ospf-topo1/r3/ospfroute_down.txt b/tests/topotests/ospf_topo1/r3/ospfroute_down.txt
index 692a74aa6c..692a74aa6c 100644
--- a/tests/topotests/ospf-topo1/r3/ospfroute_down.txt
+++ b/tests/topotests/ospf_topo1/r3/ospfroute_down.txt
diff --git a/tests/topotests/ospf-topo1/r3/zebra.conf b/tests/topotests/ospf_topo1/r3/zebra.conf
index a635a889bb..a635a889bb 100644
--- a/tests/topotests/ospf-topo1/r3/zebra.conf
+++ b/tests/topotests/ospf_topo1/r3/zebra.conf
diff --git a/tests/topotests/ospf-topo1/r4/ospf6d.conf b/tests/topotests/ospf_topo1/r4/ospf6d.conf
index f9bde0e83c..f9bde0e83c 100644
--- a/tests/topotests/ospf-topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf_topo1/r4/ospf6d.conf
diff --git a/tests/topotests/ospf-topo1/r4/ospf6route.txt b/tests/topotests/ospf_topo1/r4/ospf6route.txt
index ceeee2cac8..ceeee2cac8 100644
--- a/tests/topotests/ospf-topo1/r4/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r4/ospf6route.txt
diff --git a/tests/topotests/ospf-topo1/r4/ospf6route_down.txt b/tests/topotests/ospf_topo1/r4/ospf6route_down.txt
index 4ad636dd98..4ad636dd98 100644
--- a/tests/topotests/ospf-topo1/r4/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r4/ospf6route_down.txt
diff --git a/tests/topotests/ospf-topo1/r4/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt
index b5cb10b72b..b5cb10b72b 100644
--- a/tests/topotests/ospf-topo1/r4/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt
diff --git a/tests/topotests/ospf-topo1/r4/ospfd.conf b/tests/topotests/ospf_topo1/r4/ospfd.conf
index 52d29322f8..52d29322f8 100644
--- a/tests/topotests/ospf-topo1/r4/ospfd.conf
+++ b/tests/topotests/ospf_topo1/r4/ospfd.conf
diff --git a/tests/topotests/ospf-topo1/r4/ospfroute.txt b/tests/topotests/ospf_topo1/r4/ospfroute.txt
index b582ef043b..b582ef043b 100644
--- a/tests/topotests/ospf-topo1/r4/ospfroute.txt
+++ b/tests/topotests/ospf_topo1/r4/ospfroute.txt
diff --git a/tests/topotests/ospf-topo1/r4/ospfroute_down.txt b/tests/topotests/ospf_topo1/r4/ospfroute_down.txt
index b0bd0eec78..b0bd0eec78 100644
--- a/tests/topotests/ospf-topo1/r4/ospfroute_down.txt
+++ b/tests/topotests/ospf_topo1/r4/ospfroute_down.txt
diff --git a/tests/topotests/ospf-topo1/r4/zebra.conf b/tests/topotests/ospf_topo1/r4/zebra.conf
index 39ecbb2401..39ecbb2401 100644
--- a/tests/topotests/ospf-topo1/r4/zebra.conf
+++ b/tests/topotests/ospf_topo1/r4/zebra.conf
diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.dot b/tests/topotests/ospf_topo1/test_ospf_topo1.dot
index 469a7ea792..469a7ea792 100644
--- a/tests/topotests/ospf-topo1/test_ospf_topo1.dot
+++ b/tests/topotests/ospf_topo1/test_ospf_topo1.dot
diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.jpg b/tests/topotests/ospf_topo1/test_ospf_topo1.jpg
index 1e931709e0..1e931709e0 100644
--- a/tests/topotests/ospf-topo1/test_ospf_topo1.jpg
+++ b/tests/topotests/ospf_topo1/test_ospf_topo1.jpg
diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.py b/tests/topotests/ospf_topo1/test_ospf_topo1.py
index 42634ce906..42634ce906 100644
--- a/tests/topotests/ospf-topo1/test_ospf_topo1.py
+++ b/tests/topotests/ospf_topo1/test_ospf_topo1.py
diff --git a/tests/topotests/ospf-topo1/__init__.py b/tests/topotests/ospf_topo1_vrf/__init__.py
index e69de29bb2..e69de29bb2 100755
--- a/tests/topotests/ospf-topo1/__init__.py
+++ b/tests/topotests/ospf_topo1_vrf/__init__.py
diff --git a/tests/topotests/ospf-topo1-vrf/r1/ospfd.conf b/tests/topotests/ospf_topo1_vrf/r1/ospfd.conf
index 9a68635568..9a68635568 100644
--- a/tests/topotests/ospf-topo1-vrf/r1/ospfd.conf
+++ b/tests/topotests/ospf_topo1_vrf/r1/ospfd.conf
diff --git a/tests/topotests/ospf-topo1-vrf/r1/ospfroute.txt b/tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt
index 134a10a454..134a10a454 100644
--- a/tests/topotests/ospf-topo1-vrf/r1/ospfroute.txt
+++ b/tests/topotests/ospf_topo1_vrf/r1/ospfroute.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r1/ospfroute_down.txt b/tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt
index 083d77126c..083d77126c 100644
--- a/tests/topotests/ospf-topo1-vrf/r1/ospfroute_down.txt
+++ b/tests/topotests/ospf_topo1_vrf/r1/ospfroute_down.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r1/zebra.conf b/tests/topotests/ospf_topo1_vrf/r1/zebra.conf
index e826793657..e826793657 100644
--- a/tests/topotests/ospf-topo1-vrf/r1/zebra.conf
+++ b/tests/topotests/ospf_topo1_vrf/r1/zebra.conf
diff --git a/tests/topotests/ospf-topo1-vrf/r1/zebraroute.txt b/tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt
index d72aa3b8e5..d72aa3b8e5 100644
--- a/tests/topotests/ospf-topo1-vrf/r1/zebraroute.txt
+++ b/tests/topotests/ospf_topo1_vrf/r1/zebraroute.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r1/zebraroutedown.txt b/tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt
index 5ea6bdc04d..5ea6bdc04d 100644
--- a/tests/topotests/ospf-topo1-vrf/r1/zebraroutedown.txt
+++ b/tests/topotests/ospf_topo1_vrf/r1/zebraroutedown.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r2/ospfd.conf b/tests/topotests/ospf_topo1_vrf/r2/ospfd.conf
index ad481a996d..ad481a996d 100644
--- a/tests/topotests/ospf-topo1-vrf/r2/ospfd.conf
+++ b/tests/topotests/ospf_topo1_vrf/r2/ospfd.conf
diff --git a/tests/topotests/ospf-topo1-vrf/r2/ospfroute.txt b/tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt
index a49cb77249..a49cb77249 100644
--- a/tests/topotests/ospf-topo1-vrf/r2/ospfroute.txt
+++ b/tests/topotests/ospf_topo1_vrf/r2/ospfroute.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r2/ospfroute_down.txt b/tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt
index 2227bedf07..2227bedf07 100644
--- a/tests/topotests/ospf-topo1-vrf/r2/ospfroute_down.txt
+++ b/tests/topotests/ospf_topo1_vrf/r2/ospfroute_down.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r2/zebra.conf b/tests/topotests/ospf_topo1_vrf/r2/zebra.conf
index 8dcb713da6..8dcb713da6 100644
--- a/tests/topotests/ospf-topo1-vrf/r2/zebra.conf
+++ b/tests/topotests/ospf_topo1_vrf/r2/zebra.conf
diff --git a/tests/topotests/ospf-topo1-vrf/r2/zebraroute.txt b/tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt
index ce5e5f3bab..ce5e5f3bab 100644
--- a/tests/topotests/ospf-topo1-vrf/r2/zebraroute.txt
+++ b/tests/topotests/ospf_topo1_vrf/r2/zebraroute.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r2/zebraroutedown.txt b/tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt
index 157811ec77..157811ec77 100644
--- a/tests/topotests/ospf-topo1-vrf/r2/zebraroutedown.txt
+++ b/tests/topotests/ospf_topo1_vrf/r2/zebraroutedown.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r3/ospfd.conf b/tests/topotests/ospf_topo1_vrf/r3/ospfd.conf
index d5214f734e..d5214f734e 100644
--- a/tests/topotests/ospf-topo1-vrf/r3/ospfd.conf
+++ b/tests/topotests/ospf_topo1_vrf/r3/ospfd.conf
diff --git a/tests/topotests/ospf-topo1-vrf/r3/ospfroute.txt b/tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt
index 3b16bfbd55..3b16bfbd55 100644
--- a/tests/topotests/ospf-topo1-vrf/r3/ospfroute.txt
+++ b/tests/topotests/ospf_topo1_vrf/r3/ospfroute.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r3/ospfroute_down.txt b/tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt
index 39beac7a73..39beac7a73 100644
--- a/tests/topotests/ospf-topo1-vrf/r3/ospfroute_down.txt
+++ b/tests/topotests/ospf_topo1_vrf/r3/ospfroute_down.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r3/zebra.conf b/tests/topotests/ospf_topo1_vrf/r3/zebra.conf
index b548694330..b548694330 100644
--- a/tests/topotests/ospf-topo1-vrf/r3/zebra.conf
+++ b/tests/topotests/ospf_topo1_vrf/r3/zebra.conf
diff --git a/tests/topotests/ospf-topo1-vrf/r3/zebraroute.txt b/tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt
index f40b7b09af..f40b7b09af 100644
--- a/tests/topotests/ospf-topo1-vrf/r3/zebraroute.txt
+++ b/tests/topotests/ospf_topo1_vrf/r3/zebraroute.txt
diff --git a/tests/topotests/ospf-topo1-vrf/r3/zebraroutedown.txt b/tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt
index 89cd6f56c4..89cd6f56c4 100644
--- a/tests/topotests/ospf-topo1-vrf/r3/zebraroutedown.txt
+++ b/tests/topotests/ospf_topo1_vrf/r3/zebraroutedown.txt
diff --git a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1-vrf.dot b/tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot
index 789fdd7c09..789fdd7c09 100644
--- a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1-vrf.dot
+++ b/tests/topotests/ospf_topo1_vrf/test_ospf_topo1-vrf.dot
diff --git a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.jpg b/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg
index 85f2e52f8e..85f2e52f8e 100644
--- a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.jpg
+++ b/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.jpg
diff --git a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py b/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py
index e2cb7bff03..e2cb7bff03 100644
--- a/tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py
+++ b/tests/topotests/ospf_topo1_vrf/test_ospf_topo1_vrf.py
diff --git a/tests/topotests/ospf-topo2/r1/ospf-route.json b/tests/topotests/ospf_topo2/r1/ospf-route.json
index 6beb7e9bed..6beb7e9bed 100644
--- a/tests/topotests/ospf-topo2/r1/ospf-route.json
+++ b/tests/topotests/ospf_topo2/r1/ospf-route.json
diff --git a/tests/topotests/ospf-topo2/r1/ospfd.conf b/tests/topotests/ospf_topo2/r1/ospfd.conf
index 65843cbb83..65843cbb83 100644
--- a/tests/topotests/ospf-topo2/r1/ospfd.conf
+++ b/tests/topotests/ospf_topo2/r1/ospfd.conf
diff --git a/tests/topotests/ospf-topo2/r1/v4_route.json b/tests/topotests/ospf_topo2/r1/v4_route.json
index 76c6396169..76c6396169 100644
--- a/tests/topotests/ospf-topo2/r1/v4_route.json
+++ b/tests/topotests/ospf_topo2/r1/v4_route.json
diff --git a/tests/topotests/ospf-topo2/r1/zebra.conf b/tests/topotests/ospf_topo2/r1/zebra.conf
index d96d9707c1..d96d9707c1 100644
--- a/tests/topotests/ospf-topo2/r1/zebra.conf
+++ b/tests/topotests/ospf_topo2/r1/zebra.conf
diff --git a/tests/topotests/ospf-topo2/r2/ospf-route.json b/tests/topotests/ospf_topo2/r2/ospf-route.json
index 3cfd255bfd..3cfd255bfd 100644
--- a/tests/topotests/ospf-topo2/r2/ospf-route.json
+++ b/tests/topotests/ospf_topo2/r2/ospf-route.json
diff --git a/tests/topotests/ospf-topo2/r2/ospfd.conf b/tests/topotests/ospf_topo2/r2/ospfd.conf
index b032f1a8ac..b032f1a8ac 100644
--- a/tests/topotests/ospf-topo2/r2/ospfd.conf
+++ b/tests/topotests/ospf_topo2/r2/ospfd.conf
diff --git a/tests/topotests/ospf-topo2/r2/v4_route.json b/tests/topotests/ospf_topo2/r2/v4_route.json
index 1638536388..1638536388 100644
--- a/tests/topotests/ospf-topo2/r2/v4_route.json
+++ b/tests/topotests/ospf_topo2/r2/v4_route.json
diff --git a/tests/topotests/ospf-topo2/r2/zebra.conf b/tests/topotests/ospf_topo2/r2/zebra.conf
index f9dd2c4471..f9dd2c4471 100644
--- a/tests/topotests/ospf-topo2/r2/zebra.conf
+++ b/tests/topotests/ospf_topo2/r2/zebra.conf
diff --git a/tests/topotests/ospf-topo2/test_ospf_topo2.py b/tests/topotests/ospf_topo2/test_ospf_topo2.py
index 6451f5fb32..6451f5fb32 100644
--- a/tests/topotests/ospf-topo2/test_ospf_topo2.py
+++ b/tests/topotests/ospf_topo2/test_ospf_topo2.py
diff --git a/tests/topotests/pbr-topo1/__init__.py b/tests/topotests/pbr_topo1/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/pbr-topo1/__init__.py
+++ b/tests/topotests/pbr_topo1/__init__.py
diff --git a/tests/topotests/pbr-topo1/r1/linux-rules.json b/tests/topotests/pbr_topo1/r1/linux-rules.json
index 5af4363418..5af4363418 100644
--- a/tests/topotests/pbr-topo1/r1/linux-rules.json
+++ b/tests/topotests/pbr_topo1/r1/linux-rules.json
diff --git a/tests/topotests/pbr-topo1/r1/pbr-interface.json b/tests/topotests/pbr_topo1/r1/pbr-interface.json
index e28d9fb149..e28d9fb149 100644
--- a/tests/topotests/pbr-topo1/r1/pbr-interface.json
+++ b/tests/topotests/pbr_topo1/r1/pbr-interface.json
diff --git a/tests/topotests/pbr-topo1/r1/pbr-map.json b/tests/topotests/pbr_topo1/r1/pbr-map.json
index bfa0ecb849..bfa0ecb849 100644
--- a/tests/topotests/pbr-topo1/r1/pbr-map.json
+++ b/tests/topotests/pbr_topo1/r1/pbr-map.json
diff --git a/tests/topotests/pbr-topo1/r1/pbr-nexthop-groups.json b/tests/topotests/pbr_topo1/r1/pbr-nexthop-groups.json
index 540ea28158..540ea28158 100644
--- a/tests/topotests/pbr-topo1/r1/pbr-nexthop-groups.json
+++ b/tests/topotests/pbr_topo1/r1/pbr-nexthop-groups.json
diff --git a/tests/topotests/pbr-topo1/r1/pbrd.conf b/tests/topotests/pbr_topo1/r1/pbrd.conf
index 45cb7656ab..45cb7656ab 100644
--- a/tests/topotests/pbr-topo1/r1/pbrd.conf
+++ b/tests/topotests/pbr_topo1/r1/pbrd.conf
diff --git a/tests/topotests/pbr-topo1/r1/zebra.conf b/tests/topotests/pbr_topo1/r1/zebra.conf
index 2ec947c275..2ec947c275 100644
--- a/tests/topotests/pbr-topo1/r1/zebra.conf
+++ b/tests/topotests/pbr_topo1/r1/zebra.conf
diff --git a/tests/topotests/pbr-topo1/test_pbr_topo1.py b/tests/topotests/pbr_topo1/test_pbr_topo1.py
index 1a024063b8..1a024063b8 100644
--- a/tests/topotests/pbr-topo1/test_pbr_topo1.py
+++ b/tests/topotests/pbr_topo1/test_pbr_topo1.py
diff --git a/tests/topotests/pim-basic/mcast-rx.py b/tests/topotests/pim_basic/mcast-rx.py
index 862ad46af4..862ad46af4 100755
--- a/tests/topotests/pim-basic/mcast-rx.py
+++ b/tests/topotests/pim_basic/mcast-rx.py
diff --git a/tests/topotests/pim-basic/mcast-tx.py b/tests/topotests/pim_basic/mcast-tx.py
index 87038ad5cf..87038ad5cf 100755
--- a/tests/topotests/pim-basic/mcast-tx.py
+++ b/tests/topotests/pim_basic/mcast-tx.py
diff --git a/tests/topotests/pim-basic/r1/bgpd.conf b/tests/topotests/pim_basic/r1/bgpd.conf
index 84d9598bc6..84d9598bc6 100644
--- a/tests/topotests/pim-basic/r1/bgpd.conf
+++ b/tests/topotests/pim_basic/r1/bgpd.conf
diff --git a/tests/topotests/pim-basic/r1/pimd.conf b/tests/topotests/pim_basic/r1/pimd.conf
index f64a46deb3..f64a46deb3 100644
--- a/tests/topotests/pim-basic/r1/pimd.conf
+++ b/tests/topotests/pim_basic/r1/pimd.conf
diff --git a/tests/topotests/pim-basic/r1/rp-info.json b/tests/topotests/pim_basic/r1/rp-info.json
index 1f713c2d28..1f713c2d28 100644
--- a/tests/topotests/pim-basic/r1/rp-info.json
+++ b/tests/topotests/pim_basic/r1/rp-info.json
diff --git a/tests/topotests/pim-basic/r1/zebra.conf b/tests/topotests/pim_basic/r1/zebra.conf
index e43041758b..e43041758b 100644
--- a/tests/topotests/pim-basic/r1/zebra.conf
+++ b/tests/topotests/pim_basic/r1/zebra.conf
diff --git a/tests/topotests/pim-basic/r2/pimd.conf b/tests/topotests/pim_basic/r2/pimd.conf
index 932cff6f3b..932cff6f3b 100644
--- a/tests/topotests/pim-basic/r2/pimd.conf
+++ b/tests/topotests/pim_basic/r2/pimd.conf
diff --git a/tests/topotests/pim-basic/r2/zebra.conf b/tests/topotests/pim_basic/r2/zebra.conf
index cb30858f58..cb30858f58 100644
--- a/tests/topotests/pim-basic/r2/zebra.conf
+++ b/tests/topotests/pim_basic/r2/zebra.conf
diff --git a/tests/topotests/pim-basic/r3/pimd.conf b/tests/topotests/pim_basic/r3/pimd.conf
index f94ee99930..f94ee99930 100644
--- a/tests/topotests/pim-basic/r3/pimd.conf
+++ b/tests/topotests/pim_basic/r3/pimd.conf
diff --git a/tests/topotests/pim-basic/r3/zebra.conf b/tests/topotests/pim_basic/r3/zebra.conf
index 8e58e8c66a..8e58e8c66a 100644
--- a/tests/topotests/pim-basic/r3/zebra.conf
+++ b/tests/topotests/pim_basic/r3/zebra.conf
diff --git a/tests/topotests/pim-basic/rp/bgpd.conf b/tests/topotests/pim_basic/rp/bgpd.conf
index 1bfae6059b..1bfae6059b 100644
--- a/tests/topotests/pim-basic/rp/bgpd.conf
+++ b/tests/topotests/pim_basic/rp/bgpd.conf
diff --git a/tests/topotests/pim-basic/rp/pimd.conf b/tests/topotests/pim_basic/rp/pimd.conf
index 6e35c97971..6e35c97971 100644
--- a/tests/topotests/pim-basic/rp/pimd.conf
+++ b/tests/topotests/pim_basic/rp/pimd.conf
diff --git a/tests/topotests/pim-basic/rp/upstream.json b/tests/topotests/pim_basic/rp/upstream.json
index c33dea49e9..c33dea49e9 100644
--- a/tests/topotests/pim-basic/rp/upstream.json
+++ b/tests/topotests/pim_basic/rp/upstream.json
diff --git a/tests/topotests/pim-basic/rp/zebra.conf b/tests/topotests/pim_basic/rp/zebra.conf
index 0a1359ecd0..0a1359ecd0 100644
--- a/tests/topotests/pim-basic/rp/zebra.conf
+++ b/tests/topotests/pim_basic/rp/zebra.conf
diff --git a/tests/topotests/pim-basic/test_pim.py b/tests/topotests/pim_basic/test_pim.py
index 4debbeb851..4debbeb851 100644
--- a/tests/topotests/pim-basic/test_pim.py
+++ b/tests/topotests/pim_basic/test_pim.py
diff --git a/tests/topotests/pim-basic-topo2/__init__.py b/tests/topotests/pim_basic_topo2/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/topotests/pim-basic-topo2/__init__.py
+++ b/tests/topotests/pim_basic_topo2/__init__.py
diff --git a/tests/topotests/pim-basic-topo2/r1/bfdd.conf b/tests/topotests/pim_basic_topo2/r1/bfdd.conf
index 76c6f82190..76c6f82190 100644
--- a/tests/topotests/pim-basic-topo2/r1/bfdd.conf
+++ b/tests/topotests/pim_basic_topo2/r1/bfdd.conf
diff --git a/tests/topotests/pim-basic-topo2/r1/pimd.conf b/tests/topotests/pim_basic_topo2/r1/pimd.conf
index b895d7d573..b895d7d573 100644
--- a/tests/topotests/pim-basic-topo2/r1/pimd.conf
+++ b/tests/topotests/pim_basic_topo2/r1/pimd.conf
diff --git a/tests/topotests/pim-basic-topo2/r1/zebra.conf b/tests/topotests/pim_basic_topo2/r1/zebra.conf
index 6bf02a3ee8..6bf02a3ee8 100644
--- a/tests/topotests/pim-basic-topo2/r1/zebra.conf
+++ b/tests/topotests/pim_basic_topo2/r1/zebra.conf
diff --git a/tests/topotests/pim-basic-topo2/r2/bfdd.conf b/tests/topotests/pim_basic_topo2/r2/bfdd.conf
index ca61e467dc..ca61e467dc 100644
--- a/tests/topotests/pim-basic-topo2/r2/bfdd.conf
+++ b/tests/topotests/pim_basic_topo2/r2/bfdd.conf
diff --git a/tests/topotests/pim-basic-topo2/r2/pimd.conf b/tests/topotests/pim_basic_topo2/r2/pimd.conf
index 0b32ded19a..0b32ded19a 100644
--- a/tests/topotests/pim-basic-topo2/r2/pimd.conf
+++ b/tests/topotests/pim_basic_topo2/r2/pimd.conf
diff --git a/tests/topotests/pim-basic-topo2/r2/zebra.conf b/tests/topotests/pim_basic_topo2/r2/zebra.conf
index 3ceb5f0fc2..3ceb5f0fc2 100644
--- a/tests/topotests/pim-basic-topo2/r2/zebra.conf
+++ b/tests/topotests/pim_basic_topo2/r2/zebra.conf
diff --git a/tests/topotests/pim-basic-topo2/r3/bfdd.conf b/tests/topotests/pim_basic_topo2/r3/bfdd.conf
index ca61e467dc..ca61e467dc 100644
--- a/tests/topotests/pim-basic-topo2/r3/bfdd.conf
+++ b/tests/topotests/pim_basic_topo2/r3/bfdd.conf
diff --git a/tests/topotests/pim-basic-topo2/r3/pimd.conf b/tests/topotests/pim_basic_topo2/r3/pimd.conf
index 691a28ea27..691a28ea27 100644
--- a/tests/topotests/pim-basic-topo2/r3/pimd.conf
+++ b/tests/topotests/pim_basic_topo2/r3/pimd.conf
diff --git a/tests/topotests/pim-basic-topo2/r3/zebra.conf b/tests/topotests/pim_basic_topo2/r3/zebra.conf
index 3df218ee16..3df218ee16 100644
--- a/tests/topotests/pim-basic-topo2/r3/zebra.conf
+++ b/tests/topotests/pim_basic_topo2/r3/zebra.conf
diff --git a/tests/topotests/pim-basic-topo2/r4/bfdd.conf b/tests/topotests/pim_basic_topo2/r4/bfdd.conf
index ca61e467dc..ca61e467dc 100644
--- a/tests/topotests/pim-basic-topo2/r4/bfdd.conf
+++ b/tests/topotests/pim_basic_topo2/r4/bfdd.conf
diff --git a/tests/topotests/pim-basic-topo2/r4/pimd.conf b/tests/topotests/pim_basic_topo2/r4/pimd.conf
index 2277b3e1f1..2277b3e1f1 100644
--- a/tests/topotests/pim-basic-topo2/r4/pimd.conf
+++ b/tests/topotests/pim_basic_topo2/r4/pimd.conf
diff --git a/tests/topotests/pim-basic-topo2/r4/zebra.conf b/tests/topotests/pim_basic_topo2/r4/zebra.conf
index 6ac5c78fc3..6ac5c78fc3 100644
--- a/tests/topotests/pim-basic-topo2/r4/zebra.conf
+++ b/tests/topotests/pim_basic_topo2/r4/zebra.conf
diff --git a/tests/topotests/pim-basic-topo2/test_pim_basic_topo2.dot b/tests/topotests/pim_basic_topo2/test_pim_basic_topo2.dot
index 22fce27e22..22fce27e22 100644
--- a/tests/topotests/pim-basic-topo2/test_pim_basic_topo2.dot
+++ b/tests/topotests/pim_basic_topo2/test_pim_basic_topo2.dot
diff --git a/tests/topotests/pim-basic-topo2/test_pim_basic_topo2.png b/tests/topotests/pim_basic_topo2/test_pim_basic_topo2.png
index 39139a35b1..39139a35b1 100644
--- a/tests/topotests/pim-basic-topo2/test_pim_basic_topo2.png
+++ b/tests/topotests/pim_basic_topo2/test_pim_basic_topo2.png
diff --git a/tests/topotests/pim-basic-topo2/test_pim_basic_topo2.py b/tests/topotests/pim_basic_topo2/test_pim_basic_topo2.py
index 883125cfc7..883125cfc7 100644
--- a/tests/topotests/pim-basic-topo2/test_pim_basic_topo2.py
+++ b/tests/topotests/pim_basic_topo2/test_pim_basic_topo2.py
diff --git a/tests/topotests/pytest.ini b/tests/topotests/pytest.ini
index 562e754f21..885c249b31 100644
--- a/tests/topotests/pytest.ini
+++ b/tests/topotests/pytest.ini
@@ -1,6 +1,6 @@
 # Skip pytests example directory
 [pytest]
-norecursedirs = .git example-test example-topojson-test lib docker
+norecursedirs = .git example_test example_topojson_test lib docker
 
 # Markers
 #
diff --git a/tests/topotests/rip-topo1/r1/rip_status.ref b/tests/topotests/rip_topo1/r1/rip_status.ref
index 31ad46ab2e..31ad46ab2e 100644
--- a/tests/topotests/rip-topo1/r1/rip_status.ref
+++ b/tests/topotests/rip_topo1/r1/rip_status.ref
diff --git a/tests/topotests/rip-topo1/r1/ripd.conf b/tests/topotests/rip_topo1/r1/ripd.conf
index 54f1774214..54f1774214 100644
--- a/tests/topotests/rip-topo1/r1/ripd.conf
+++ b/tests/topotests/rip_topo1/r1/ripd.conf
diff --git a/tests/topotests/rip-topo1/r1/show_ip_rip.ref b/tests/topotests/rip_topo1/r1/show_ip_rip.ref
index a0b77c886e..a0b77c886e 100644
--- a/tests/topotests/rip-topo1/r1/show_ip_rip.ref
+++ b/tests/topotests/rip_topo1/r1/show_ip_rip.ref
diff --git a/tests/topotests/rip-topo1/r1/show_ip_route.ref b/tests/topotests/rip_topo1/r1/show_ip_route.ref
index 2ff26045aa..2ff26045aa 100644
--- a/tests/topotests/rip-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/rip_topo1/r1/show_ip_route.ref
diff --git a/tests/topotests/rip-topo1/r1/zebra.conf b/tests/topotests/rip_topo1/r1/zebra.conf
index 7c8f2c502b..7c8f2c502b 100644
--- a/tests/topotests/rip-topo1/r1/zebra.conf
+++ b/tests/topotests/rip_topo1/r1/zebra.conf
diff --git a/tests/topotests/rip-topo1/r2/rip_status.ref b/tests/topotests/rip_topo1/r2/rip_status.ref
index 99841a62b0..99841a62b0 100644
--- a/tests/topotests/rip-topo1/r2/rip_status.ref
+++ b/tests/topotests/rip_topo1/r2/rip_status.ref
diff --git a/tests/topotests/rip-topo1/r2/ripd.conf b/tests/topotests/rip_topo1/r2/ripd.conf
index 2e94cfa262..2e94cfa262 100644
--- a/tests/topotests/rip-topo1/r2/ripd.conf
+++ b/tests/topotests/rip_topo1/r2/ripd.conf
diff --git a/tests/topotests/rip-topo1/r2/show_ip_rip.ref b/tests/topotests/rip_topo1/r2/show_ip_rip.ref
index b61fb45eac..b61fb45eac 100644
--- a/tests/topotests/rip-topo1/r2/show_ip_rip.ref
+++ b/tests/topotests/rip_topo1/r2/show_ip_rip.ref
diff --git a/tests/topotests/rip-topo1/r2/show_ip_route.ref b/tests/topotests/rip_topo1/r2/show_ip_route.ref
index 80f51a92c7..80f51a92c7 100644
--- a/tests/topotests/rip-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/rip_topo1/r2/show_ip_route.ref
diff --git a/tests/topotests/rip-topo1/r2/zebra.conf b/tests/topotests/rip_topo1/r2/zebra.conf
index c440f3a350..c440f3a350 100644
--- a/tests/topotests/rip-topo1/r2/zebra.conf
+++ b/tests/topotests/rip_topo1/r2/zebra.conf
diff --git a/tests/topotests/rip-topo1/r3/rip_status.ref b/tests/topotests/rip_topo1/r3/rip_status.ref
index 040d3c32a1..040d3c32a1 100644
--- a/tests/topotests/rip-topo1/r3/rip_status.ref
+++ b/tests/topotests/rip_topo1/r3/rip_status.ref
diff --git a/tests/topotests/rip-topo1/r3/ripd.conf b/tests/topotests/rip_topo1/r3/ripd.conf
index e27e67503f..e27e67503f 100644
--- a/tests/topotests/rip-topo1/r3/ripd.conf
+++ b/tests/topotests/rip_topo1/r3/ripd.conf
diff --git a/tests/topotests/rip-topo1/r3/show_ip_rip.ref b/tests/topotests/rip_topo1/r3/show_ip_rip.ref
index 1df299b5e6..1df299b5e6 100644
--- a/tests/topotests/rip-topo1/r3/show_ip_rip.ref
+++ b/tests/topotests/rip_topo1/r3/show_ip_rip.ref
diff --git a/tests/topotests/rip-topo1/r3/show_ip_route.ref b/tests/topotests/rip_topo1/r3/show_ip_route.ref
index 2b739f0489..2b739f0489 100644
--- a/tests/topotests/rip-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/rip_topo1/r3/show_ip_route.ref
diff --git a/tests/topotests/rip-topo1/r3/zebra.conf b/tests/topotests/rip_topo1/r3/zebra.conf
index 7f145b4583..7f145b4583 100644
--- a/tests/topotests/rip-topo1/r3/zebra.conf
+++ b/tests/topotests/rip_topo1/r3/zebra.conf
diff --git a/tests/topotests/rip-topo1/test_rip_topo1.dot b/tests/topotests/rip_topo1/test_rip_topo1.dot
index f052b697ea..f052b697ea 100644
--- a/tests/topotests/rip-topo1/test_rip_topo1.dot
+++ b/tests/topotests/rip_topo1/test_rip_topo1.dot
diff --git a/tests/topotests/rip-topo1/test_rip_topo1.pdf b/tests/topotests/rip_topo1/test_rip_topo1.pdf
index c201ac1f07..c201ac1f07 100644
--- a/tests/topotests/rip-topo1/test_rip_topo1.pdf
+++ b/tests/topotests/rip_topo1/test_rip_topo1.pdf
diff --git a/tests/topotests/rip-topo1/test_rip_topo1.py b/tests/topotests/rip_topo1/test_rip_topo1.py
index 78672ac871..78672ac871 100644
--- a/tests/topotests/rip-topo1/test_rip_topo1.py
+++ b/tests/topotests/rip_topo1/test_rip_topo1.py
diff --git a/tests/topotests/ripng-topo1/r1/ripng_status.ref b/tests/topotests/ripng_topo1/r1/ripng_status.ref
index b02cc69d0e..b02cc69d0e 100644
--- a/tests/topotests/ripng-topo1/r1/ripng_status.ref
+++ b/tests/topotests/ripng_topo1/r1/ripng_status.ref
diff --git a/tests/topotests/ripng-topo1/r1/ripngd.conf b/tests/topotests/ripng_topo1/r1/ripngd.conf
index 07ed7296d9..07ed7296d9 100644
--- a/tests/topotests/ripng-topo1/r1/ripngd.conf
+++ b/tests/topotests/ripng_topo1/r1/ripngd.conf
diff --git a/tests/topotests/ripng-topo1/r1/show_ipv6_ripng.ref b/tests/topotests/ripng_topo1/r1/show_ipv6_ripng.ref
index 30d0f31e18..30d0f31e18 100644
--- a/tests/topotests/ripng-topo1/r1/show_ipv6_ripng.ref
+++ b/tests/topotests/ripng_topo1/r1/show_ipv6_ripng.ref
diff --git a/tests/topotests/ripng-topo1/r1/show_ipv6_route.ref b/tests/topotests/ripng_topo1/r1/show_ipv6_route.ref
index 55fbbc34f3..55fbbc34f3 100644
--- a/tests/topotests/ripng-topo1/r1/show_ipv6_route.ref
+++ b/tests/topotests/ripng_topo1/r1/show_ipv6_route.ref
diff --git a/tests/topotests/ripng-topo1/r1/zebra.conf b/tests/topotests/ripng_topo1/r1/zebra.conf
index 11c1cdc5b9..11c1cdc5b9 100644
--- a/tests/topotests/ripng-topo1/r1/zebra.conf
+++ b/tests/topotests/ripng_topo1/r1/zebra.conf
diff --git a/tests/topotests/ripng-topo1/r2/ripng_status.ref b/tests/topotests/ripng_topo1/r2/ripng_status.ref
index 640df9a4a0..640df9a4a0 100644
--- a/tests/topotests/ripng-topo1/r2/ripng_status.ref
+++ b/tests/topotests/ripng_topo1/r2/ripng_status.ref
diff --git a/tests/topotests/ripng-topo1/r2/ripngd.conf b/tests/topotests/ripng_topo1/r2/ripngd.conf
index ef2c42195d..ef2c42195d 100644
--- a/tests/topotests/ripng-topo1/r2/ripngd.conf
+++ b/tests/topotests/ripng_topo1/r2/ripngd.conf
diff --git a/tests/topotests/ripng-topo1/r2/show_ipv6_ripng.ref b/tests/topotests/ripng_topo1/r2/show_ipv6_ripng.ref
index fe5bcc8b31..fe5bcc8b31 100644
--- a/tests/topotests/ripng-topo1/r2/show_ipv6_ripng.ref
+++ b/tests/topotests/ripng_topo1/r2/show_ipv6_ripng.ref
diff --git a/tests/topotests/ripng-topo1/r2/show_ipv6_route.ref b/tests/topotests/ripng_topo1/r2/show_ipv6_route.ref
index 72e1f926a2..72e1f926a2 100644
--- a/tests/topotests/ripng-topo1/r2/show_ipv6_route.ref
+++ b/tests/topotests/ripng_topo1/r2/show_ipv6_route.ref
diff --git a/tests/topotests/ripng-topo1/r2/zebra.conf b/tests/topotests/ripng_topo1/r2/zebra.conf
index 59006317d3..59006317d3 100644
--- a/tests/topotests/ripng-topo1/r2/zebra.conf
+++ b/tests/topotests/ripng_topo1/r2/zebra.conf
diff --git a/tests/topotests/ripng-topo1/r3/ripng_status.ref b/tests/topotests/ripng_topo1/r3/ripng_status.ref
index f4bfff0c59..f4bfff0c59 100644
--- a/tests/topotests/ripng-topo1/r3/ripng_status.ref
+++ b/tests/topotests/ripng_topo1/r3/ripng_status.ref
diff --git a/tests/topotests/ripng-topo1/r3/ripngd.conf b/tests/topotests/ripng_topo1/r3/ripngd.conf
index 506eaac442..506eaac442 100644
--- a/tests/topotests/ripng-topo1/r3/ripngd.conf
+++ b/tests/topotests/ripng_topo1/r3/ripngd.conf
diff --git a/tests/topotests/ripng-topo1/r3/show_ipv6_ripng.ref b/tests/topotests/ripng_topo1/r3/show_ipv6_ripng.ref
index 909ad663ba..909ad663ba 100644
--- a/tests/topotests/ripng-topo1/r3/show_ipv6_ripng.ref
+++ b/tests/topotests/ripng_topo1/r3/show_ipv6_ripng.ref
diff --git a/tests/topotests/ripng-topo1/r3/show_ipv6_route.ref b/tests/topotests/ripng_topo1/r3/show_ipv6_route.ref
index 25a7440111..25a7440111 100644
--- a/tests/topotests/ripng-topo1/r3/show_ipv6_route.ref
+++ b/tests/topotests/ripng_topo1/r3/show_ipv6_route.ref
diff --git a/tests/topotests/ripng-topo1/r3/zebra.conf b/tests/topotests/ripng_topo1/r3/zebra.conf
index b43ba69834..b43ba69834 100644
--- a/tests/topotests/ripng-topo1/r3/zebra.conf
+++ b/tests/topotests/ripng_topo1/r3/zebra.conf
diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.dot b/tests/topotests/ripng_topo1/test_ripng_topo1.dot
index 7d66a2a306..7d66a2a306 100644
--- a/tests/topotests/ripng-topo1/test_ripng_topo1.dot
+++ b/tests/topotests/ripng_topo1/test_ripng_topo1.dot
diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.pdf b/tests/topotests/ripng_topo1/test_ripng_topo1.pdf
index cb1adde239..cb1adde239 100644
--- a/tests/topotests/ripng-topo1/test_ripng_topo1.pdf
+++ b/tests/topotests/ripng_topo1/test_ripng_topo1.pdf
diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.py b/tests/topotests/ripng_topo1/test_ripng_topo1.py
index 4a5a59cd75..4a5a59cd75 100644
--- a/tests/topotests/ripng-topo1/test_ripng_topo1.py
+++ b/tests/topotests/ripng_topo1/test_ripng_topo1.py
diff --git a/tests/topotests/route-scale/r1/installed.routes.json b/tests/topotests/route_scale/r1/installed.routes.json
index 25d209f9eb..25d209f9eb 100644
--- a/tests/topotests/route-scale/r1/installed.routes.json
+++ b/tests/topotests/route_scale/r1/installed.routes.json
diff --git a/tests/topotests/route-scale/r1/no.routes.json b/tests/topotests/route_scale/r1/no.routes.json
index abebd1b143..abebd1b143 100644
--- a/tests/topotests/route-scale/r1/no.routes.json
+++ b/tests/topotests/route_scale/r1/no.routes.json
diff --git a/tests/topotests/route-scale/r1/sharpd.conf b/tests/topotests/route_scale/r1/sharpd.conf
index 0848f34ddf..0848f34ddf 100644
--- a/tests/topotests/route-scale/r1/sharpd.conf
+++ b/tests/topotests/route_scale/r1/sharpd.conf
diff --git a/tests/topotests/route-scale/r1/zebra.conf b/tests/topotests/route_scale/r1/zebra.conf
index 48a01f48ab..48a01f48ab 100644
--- a/tests/topotests/route-scale/r1/zebra.conf
+++ b/tests/topotests/route_scale/r1/zebra.conf
diff --git a/tests/topotests/route-scale/test_route_scale.py b/tests/topotests/route_scale/test_route_scale.py
index bbd6ef8d60..bbd6ef8d60 100644
--- a/tests/topotests/route-scale/test_route_scale.py
+++ b/tests/topotests/route_scale/test_route_scale.py
diff --git a/tests/topotests/simple-snmp-test/r1/bgpd.conf b/tests/topotests/simple_snmp_test/r1/bgpd.conf
index 00d1e17670..00d1e17670 100644
--- a/tests/topotests/simple-snmp-test/r1/bgpd.conf
+++ b/tests/topotests/simple_snmp_test/r1/bgpd.conf
diff --git a/tests/topotests/simple-snmp-test/r1/isisd.conf b/tests/topotests/simple_snmp_test/r1/isisd.conf
index b5ca993da3..b5ca993da3 100644
--- a/tests/topotests/simple-snmp-test/r1/isisd.conf
+++ b/tests/topotests/simple_snmp_test/r1/isisd.conf
diff --git a/tests/topotests/simple-snmp-test/r1/snmpd.conf b/tests/topotests/simple_snmp_test/r1/snmpd.conf
index b37911da36..b37911da36 100644
--- a/tests/topotests/simple-snmp-test/r1/snmpd.conf
+++ b/tests/topotests/simple_snmp_test/r1/snmpd.conf
diff --git a/tests/topotests/simple-snmp-test/r1/zebra.conf b/tests/topotests/simple_snmp_test/r1/zebra.conf
index 5281d0055d..5281d0055d 100644
--- a/tests/topotests/simple-snmp-test/r1/zebra.conf
+++ b/tests/topotests/simple_snmp_test/r1/zebra.conf
diff --git a/tests/topotests/simple-snmp-test/test_simple_snmp.py b/tests/topotests/simple_snmp_test/test_simple_snmp.py
index 5647e2b663..5647e2b663 100755
--- a/tests/topotests/simple-snmp-test/test_simple_snmp.py
+++ b/tests/topotests/simple_snmp_test/test_simple_snmp.py
diff --git a/zebra/connected.c b/zebra/connected.c
index 1e03f8b639..883334d509 100644
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -38,7 +38,6 @@
 #include "zebra/connected.h"
 #include "zebra/rtadv.h"
 #include "zebra/zebra_mpls.h"
-#include "zebra/debug.h"
 #include "zebra/zebra_errors.h"
 #include "zebra/zebra_router.h"
 
@@ -223,6 +222,9 @@ void connected_up(struct interface *ifp, struct connected *ifc)
 	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL))
 		return;
 
+	/* Ensure 'down' flag is cleared */
+	UNSET_FLAG(ifc->conf, ZEBRA_IFC_DOWN);
+
 	PREFIX_COPY(&p, CONNECTED_PREFIX(ifc));
 
 	/* Apply mask to the network. */
@@ -280,7 +282,8 @@ void connected_up(struct interface *ifp, struct connected *ifc)
 		PREFIX_COPY(&cp, CONNECTED_PREFIX(c));
 		apply_mask(&cp);
 
-		if (prefix_same(&cp, &p))
+		if (prefix_same(&cp, &p) &&
+		    !CHECK_FLAG(c->conf, ZEBRA_IFC_DOWN))
 			count++;
 
 		if (count >= 2)
@@ -390,7 +393,7 @@ void connected_down(struct interface *ifp, struct connected *ifc)
 	if (!zvrf) {
 		flog_err(
 			EC_ZEBRA_VRF_NOT_FOUND,
-			"%s: Received Up for interface but no associated zvrf: %d",
+			"%s: Received Down for interface but no associated zvrf: %d",
 			__func__, ifp->vrf_id);
 		return;
 	}
@@ -398,6 +401,17 @@ void connected_down(struct interface *ifp, struct connected *ifc)
 	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL))
 		return;
 
+	/* Skip if we've already done this; this can happen if we have a
+	 * config change that takes an interface down, then we receive kernel
+	 * notifications about the downed interface and its addresses.
+	 */
+	if (CHECK_FLAG(ifc->conf, ZEBRA_IFC_DOWN)) {
+		if (IS_ZEBRA_DEBUG_RIB)
+			zlog_debug("%s: ifc %p, %pFX already DOWN",
+				   __func__, ifc, ifc->address);
+		return;
+	}
+
 	PREFIX_COPY(&p, CONNECTED_PREFIX(ifc));
 
 	/* Apply mask to the network. */
@@ -423,6 +437,9 @@ void connected_down(struct interface *ifp, struct connected *ifc)
 		break;
 	}
 
+	/* Mark the address as 'down' */
+	SET_FLAG(ifc->conf, ZEBRA_IFC_DOWN);
+
 	/*
 	 * It's possible to have X number of addresses
 	 * on a interface that all resolve to the same
@@ -436,10 +453,11 @@ void connected_down(struct interface *ifp, struct connected *ifc)
 		PREFIX_COPY(&cp, CONNECTED_PREFIX(c));
 		apply_mask(&cp);
 
-		if (prefix_same(&p, &cp))
+		if (prefix_same(&p, &cp) &&
+		    !CHECK_FLAG(c->conf, ZEBRA_IFC_DOWN))
 			count++;
 
-		if (count >= 2)
+		if (count >= 1)
 			return;
 	}
 
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 55f8edd272..544bb07fbe 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -985,8 +985,7 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
 	union sockunion ip;
 
 	if (IS_ZEBRA_DEBUG_PACKET)
-		zlog_debug("%s: Notifying Neighbor entry (%u)",
-			   __PRETTY_FUNCTION__, cmd);
+		zlog_debug("%s: Notifying Neighbor entry (%u)", __func__, cmd);
 
 	sockunion_family(&ip) = ipaddr_family(ipaddr);
 	afi = family2afi(sockunion_family(&ip));
@@ -2509,7 +2508,7 @@ static void zread_sr_policy_set(ZAPI_HANDLER_ARGS)
 	if (zapi_sr_policy_decode(s, &zp) < 0) {
 		if (IS_ZEBRA_DEBUG_RECV)
 			zlog_debug("%s: Unable to decode zapi_sr_policy sent",
-				   __PRETTY_FUNCTION__);
+				   __func__);
 		return;
 	}
 	zt = &zp.segment_list;
@@ -2517,7 +2516,7 @@ static void zread_sr_policy_set(ZAPI_HANDLER_ARGS)
 		if (IS_ZEBRA_DEBUG_RECV)
 			zlog_debug(
 				"%s: SR-TE tunnel must contain at least one label",
-				__PRETTY_FUNCTION__);
+				__func__);
 		return;
 	}
 
@@ -2544,7 +2543,7 @@ static void zread_sr_policy_delete(ZAPI_HANDLER_ARGS)
 	if (zapi_sr_policy_decode(s, &zp) < 0) {
 		if (IS_ZEBRA_DEBUG_RECV)
 			zlog_debug("%s: Unable to decode zapi_sr_policy sent",
-				   __PRETTY_FUNCTION__);
+				   __func__);
 		return;
 	}
 
@@ -2554,8 +2553,7 @@ static void zread_sr_policy_delete(ZAPI_HANDLER_ARGS)
 	policy = zebra_sr_policy_find(zp.color, &zp.endpoint);
 	if (!policy) {
 		if (IS_ZEBRA_DEBUG_RECV)
-			zlog_debug("%s: Unable to find SR-TE policy",
-				   __PRETTY_FUNCTION__);
+			zlog_debug("%s: Unable to find SR-TE policy", __func__);
 		return;
 	}
 
diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c
index 0038689e85..d6ae92a03d 100644
--- a/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@ -2476,8 +2476,8 @@ void zebra_evpn_proc_remote_es(ZAPI_HANDLER_ARGS)
 
 	if (!is_evpn_enabled()) {
 		zlog_debug(
-				"%s: EVPN not enabled yet we received a es_add zapi call",
-				__PRETTY_FUNCTION__);
+			"%s: EVPN not enabled yet we received a es_add zapi call",
+			__func__);
 		return;
 	}
 
diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c
index c4004842e6..73c2c3dda3 100644
--- a/zebra/zebra_pbr.c
+++ b/zebra/zebra_pbr.c
@@ -512,7 +512,7 @@ void zebra_pbr_add_rule(struct zebra_pbr_rule *rule)
 		if (pbr_rule_release(found))
 			zlog_debug(
 				"%s: Rule being updated we know nothing about",
-				__PRETTY_FUNCTION__);
+				__func__);
 
 	} else {
 		if (IS_ZEBRA_DEBUG_PBR)