Revert "Merge pull request #15614 from louis-6wind/fix-6pe-address"

This reverts commit b3600d82dca4f23db4f42c46b25d3db48e1a4312, reversing
changes made to 51119823d02847f6095725e520264c85af94b37f.

64 files changed, 99 insertions, 2095 deletions

diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 504428b0d..f75df1e12 100644
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -320,6 +320,11 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
 			afi = BGP_ATTR_MP_NEXTHOP_LEN_IP6(pi->attr) ? AFI_IP6
 								    : AFI_IP;
 
+		/* Validation for the ipv4 mapped ipv6 nexthop. */
+		if (IS_MAPPED_IPV6(&pi->attr->mp_nexthop_global)) {
+			afi = AFI_IP;
+		}
+
 		/* This will return true if the global IPv6 NH is a link local
 		 * addr */
 		if (make_prefix(afi, pi, &p) < 0)
@@ -1035,11 +1040,19 @@ static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p)
 			p->u.prefix4 = p_orig->u.prefix4;
 			p->prefixlen = p_orig->prefixlen;
 		} else {
-			if (p_orig->family == AF_EVPN)
-				p->u.prefix4 = pi->attr->mp_nexthop_global_in;
-			else
-				p->u.prefix4 = pi->attr->nexthop;
-			p->prefixlen = IPV4_MAX_BITLEN;
+			if (IS_MAPPED_IPV6(&pi->attr->mp_nexthop_global)) {
+				ipv4_mapped_ipv6_to_ipv4(
+					&pi->attr->mp_nexthop_global, &ipv4);
+				p->u.prefix4 = ipv4;
+				p->prefixlen = IPV4_MAX_BITLEN;
+			} else {
+				if (p_orig->family == AF_EVPN)
+					p->u.prefix4 =
+						pi->attr->mp_nexthop_global_in;
+				else
+					p->u.prefix4 = pi->attr->nexthop;
+				p->prefixlen = IPV4_MAX_BITLEN;
+			}
 		}
 		break;
 	case AFI_IP6:
@@ -1055,7 +1068,6 @@ static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p)
 			/* If we receive MP_REACH nexthop with ::(LL)
 			 * or LL(LL), use LL address as nexthop cache.
 			 */
-			p->prefixlen = IPV6_MAX_BITLEN;
 			if (pi->attr &&
 			    pi->attr->mp_nexthop_len ==
 				    BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL &&
@@ -1070,22 +1082,15 @@ static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p)
 				 pi->attr->mp_nexthop_len ==
 					 BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL) {
 				if (CHECK_FLAG(pi->attr->nh_flags,
-					       BGP_ATTR_NH_MP_PREFER_GLOBAL)) {
-					if (IS_MAPPED_IPV6(
-						    &pi->attr->mp_nexthop_global)) {
-						ipv4_mapped_ipv6_to_ipv4(
-							&pi->attr->mp_nexthop_global,
-							&ipv4);
-						p->u.prefix4 = ipv4;
-						p->prefixlen = IPV4_MAX_BITLEN;
-					} else
-						p->u.prefix6 =
-							pi->attr->mp_nexthop_global;
-				} else
+					       BGP_ATTR_NH_MP_PREFER_GLOBAL))
+					p->u.prefix6 =
+						pi->attr->mp_nexthop_global;
+				else
 					p->u.prefix6 =
 						pi->attr->mp_nexthop_local;
 			} else
 				p->u.prefix6 = pi->attr->mp_nexthop_global;
+			p->prefixlen = IPV6_MAX_BITLEN;
 		}
 		break;
 	default:
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 11bb65d35..982f64a86 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9674,7 +9674,10 @@ void route_vty_out(struct vty *vty, const struct prefix *p,
 				json_object_string_add(json_nexthop_ll, "scope",
 						       "link-local");
 
-				if (!CHECK_FLAG(attr->nh_flags,
+				if ((IPV6_ADDR_CMP(&attr->mp_nexthop_global,
+						   &attr->mp_nexthop_local) !=
+				     0) &&
+				    !CHECK_FLAG(attr->nh_flags,
 						BGP_ATTR_NH_MP_PREFER_GLOBAL))
 					json_object_boolean_true_add(
 						json_nexthop_ll, "used");
diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index b7d5f6645..b359b2c25 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -525,9 +525,12 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
 
 		if (peer->nexthop.v4.s_addr != INADDR_ANY &&
 		    (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg) ||
-		     (IN6_IS_ADDR_LINKLOCAL(mod_v6nhg) &&
-		      peer->connection->su.sa.sa_family == AF_INET6 &&
-		      paf->afi == AFI_IP))) {
+		     (peer->connection->su.sa.sa_family == AF_INET &&
+		      paf->afi == AFI_IP6))) {
+			/* set a IPv4 mapped IPv6 address if no global IPv6
+			 * address is found or if announcing IPv6 prefix
+			 * over an IPv4 BGP session.
+			 */
 			ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, peer->nexthop.v4);
 			gnh_modified = 1;
 		}
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 52c5f5129..2d9100b89 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -302,12 +302,11 @@ static int bgp_ifp_down(struct interface *ifp)
 
 static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
 {
-	struct connected *ifc, *connected;
+	struct connected *ifc;
 	struct bgp *bgp;
 	struct peer *peer;
 	struct prefix *addr;
 	struct listnode *node, *nnode;
-	bool v6_ll_in_nh_global;
 	afi_t afi;
 	safi_t safi;
 
@@ -325,70 +324,56 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
 	if (!bgp)
 		return 0;
 
-	if (!if_is_operative(ifc->ifp))
-		return 0;
-
-	bgp_connected_add(bgp, ifc);
+	if (if_is_operative(ifc->ifp)) {
+		bgp_connected_add(bgp, ifc);
 
-	/* If we have learnt of any neighbors on this interface,
-	 * check to kick off any BGP interface-based neighbors,
-	 * but only if this is a link-local address.
-	 */
-	if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6) &&
-	    !list_isempty(ifc->ifp->nbr_connected))
-		bgp_start_interface_nbrs(bgp, ifc->ifp);
-	else if (ifc->address->family == AF_INET6 &&
-		 !IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)) {
-		addr = ifc->address;
+		/* If we have learnt of any neighbors on this interface,
+		 * check to kick off any BGP interface-based neighbors,
+		 * but only if this is a link-local address.
+		 */
+		if (IN6_IS_ADDR_LINKLOCAL(&ifc->address->u.prefix6)
+		    && !list_isempty(ifc->ifp->nbr_connected))
+			bgp_start_interface_nbrs(bgp, ifc->ifp);
+		else {
+			addr = ifc->address;
 
-		for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
-			v6_ll_in_nh_global = false;
-
-			if (IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_global)) {
-				frr_each (if_connected, ifc->ifp->connected,
-					  connected) {
-					if (connected->address->family !=
-					    AF_INET6)
-						continue;
-					if (!IPV6_ADDR_SAME(&connected->address
-								     ->u.prefix6,
-							    &peer->nexthop
-								     .v6_global))
-						continue;
-					/* peer->nexthop.v6_global contains a link-local address
-					 * that needs to be replaced by the global address.
-					 */
-					v6_ll_in_nh_global = true;
-					break;
-				}
-			}
+			for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
+				if (addr->family == AF_INET)
+					continue;
 
-			/*
-			 * If the Peer's interface name matches the
-			 * interface name for which BGP received the
-			 * update and if the received interface address
-			 * is a globalV6 and if the peer is currently
-			 * using a v4-mapped-v6 addr or a link local
-			 * address, then copy the Rxed global v6 addr
-			 * into peer's v6_global and send updates out
-			 * with new nexthop addr.
-			 */
-			if (v6_ll_in_nh_global ||
-			    (peer->conf_if &&
-			     strcmp(peer->conf_if, ifc->ifp->name) == 0 &&
-			     (IS_MAPPED_IPV6(&peer->nexthop.v6_global) ||
-			      IN6_IS_ADDR_LINKLOCAL(&peer->nexthop.v6_global)))) {
-				if (bgp_debug_zebra(ifc->address)) {
-					zlog_debug("Update peer %pBP's current intf global addr from %pI6 to %pI6 and send updates",
-						   peer,
-						   &peer->nexthop.v6_global,
-						   &addr->u.prefix6);
+				/*
+				 * If the Peer's interface name matches the
+				 * interface name for which BGP received the
+				 * update and if the received interface address
+				 * is a globalV6 and if the peer is currently
+				 * using a v4-mapped-v6 addr or a link local
+				 * address, then copy the Rxed global v6 addr
+				 * into peer's v6_global and send updates out
+				 * with new nexthop addr.
+				 */
+				if ((peer->conf_if &&
+				     (strcmp(peer->conf_if, ifc->ifp->name) ==
+				      0)) &&
+				    !IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6) &&
+				    ((IS_MAPPED_IPV6(
+					     &peer->nexthop.v6_global)) ||
+				     IN6_IS_ADDR_LINKLOCAL(
+					     &peer->nexthop.v6_global))) {
+
+					if (bgp_debug_zebra(ifc->address)) {
+						zlog_debug(
+							"Update peer %pBP's current intf addr %pI6 and send updates",
+							peer,
+							&peer->nexthop
+								 .v6_global);
+					}
+					memcpy(&peer->nexthop.v6_global,
+					       &addr->u.prefix6,
+					       IPV6_MAX_BYTELEN);
+					FOREACH_AFI_SAFI (afi, safi)
+						bgp_announce_route(peer, afi,
+								   safi, true);
 				}
-				memcpy(&peer->nexthop.v6_global,
-				       &addr->u.prefix6, IPV6_MAX_BYTELEN);
-				FOREACH_AFI_SAFI (afi, safi)
-					bgp_announce_route(peer, afi, safi,
-							   true);
 			}
 		}
 	}
@@ -399,14 +384,10 @@ static int bgp_interface_address_add(ZAPI_CALLBACK_ARGS)
 static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS)
 {
 	struct listnode *node, *nnode;
-	struct connected *ifc, *connected;
+	struct connected *ifc;
 	struct peer *peer;
 	struct bgp *bgp;
 	struct prefix *addr;
-	struct in6_addr *v6_global = NULL;
-	struct in6_addr *v6_local = NULL;
-	afi_t afi;
-	safi_t safi;
 
 	bgp = bgp_lookup_by_vrf_id(vrf_id);
 
@@ -425,18 +406,7 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS)
 
 	addr = ifc->address;
 
-	if (bgp && addr->family == AF_INET6 &&
-	    !IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6)) {
-		/* find another IPv6 global if possible and find the IPv6 link-local */
-		frr_each (if_connected, ifc->ifp->connected, connected) {
-			if (connected->address->family != AF_INET6)
-				continue;
-			if (IN6_IS_ADDR_LINKLOCAL(&connected->address->u.prefix6))
-				v6_local = &connected->address->u.prefix6;
-			else
-				v6_global = &connected->address->u.prefix6;
-		}
-
+	if (bgp) {
 		/*
 		 * When we are using the v6 global as part of the peering
 		 * nexthops and we are removing it, then we need to
@@ -445,17 +415,17 @@ static int bgp_interface_address_delete(ZAPI_CALLBACK_ARGS)
 		 * we do not want the peering to bounce.
 		 */
 		for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
-			if (IPV6_ADDR_SAME(&peer->nexthop.v6_global,
-					   &addr->u.prefix6)) {
-				if (v6_global)
-					IPV6_ADDR_COPY(&peer->nexthop.v6_global,
-						       v6_global);
-				else if (v6_local)
-					IPV6_ADDR_COPY(&peer->nexthop.v6_global,
-						       v6_local);
-				else
-					memset(&peer->nexthop.v6_global, 0,
-					       IPV6_MAX_BYTELEN);
+			afi_t afi;
+			safi_t safi;
+
+			if (addr->family == AF_INET)
+				continue;
+
+			if (!IN6_IS_ADDR_LINKLOCAL(&addr->u.prefix6)
+			    && memcmp(&peer->nexthop.v6_global,
+				      &addr->u.prefix6, 16)
+				       == 0) {
+				memset(&peer->nexthop.v6_global, 0, 16);
 				FOREACH_AFI_SAFI (afi, safi)
 					bgp_announce_route(peer, afi, safi,
 							   true);
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py b/tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/__init__.py
+++ /dev/null
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf
deleted file mode 100644
index 9b19b2cfb..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/h1/zebra.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ipv6 route ::/0 fd00:100::2
-ip route 0.0.0.0/0 192.168.1.2
-interface eth-r1
- ip address 192.168.1.1/24
- ipv6 address fd00:100::1/64
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf
deleted file mode 100644
index 2bf4a6668..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/h2/zebra.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ipv6 route ::/0 fd00:700::2
-ip route 0.0.0.0/0 192.168.7.2
-interface eth-r7
- ip address 192.168.7.1/24
- ipv6 address fd00:700::1/64
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf
deleted file mode 100644
index e8b6ac6e2..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/h3/zebra.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-ipv6 route ::/0 fd00:800::2
-ip route 0.0.0.0/0 192.168.8.2
-interface eth-r8
- ip address 192.168.8.1/24
- ipv6 address fd00:800::1/64
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json
deleted file mode 100755
index 12fecee39..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv4.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "0.0.0.0",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "172.16.1.3",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "172.16.0.2",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "172.16.1.3",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "172.16.0.2",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json
deleted file mode 100755
index f7c5c7c3b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json
deleted file mode 100755
index f7c5c7c3b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::3",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::2",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf
deleted file mode 100644
index 23b986d13..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/bgpd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-router bgp 65100
- no bgp ebgp-requires-policy
- neighbor 172.16.0.2 remote-as external
- neighbor 172.16.1.3 remote-as external
- ! neighbor 172.16.0.2 capability extended-nexthop
- !
- address-family ipv4 unicast
-  redistribute connected route-map RMAP4
- !
- address-family ipv6 unicast
-  redistribute connected route-map RMAP6
-  neighbor 172.16.0.2 activate
-  neighbor 172.16.1.3 activate
- !
-
-ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24
-ipv6 prefix-list RANGE6 seq 10 permit fd00:100::0/64
-
-route-map RMAP4 permit 10
- match ip address prefix-list RANGE4
-!
-route-map RMAP6 permit 10
- match ipv6 address prefix-list RANGE6
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf
deleted file mode 100644
index 79cbafb5b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r1/zebra.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-!
-interface eth-h1
- ip address 192.168.1.2/24
- ipv6 address fd00:100::2/64
-!
-interface eth-r2
- ip address 172.16.0.1/24
- ipv6 address fd00:0:1::1/64
-!
-interface eth-r3
- ip address 172.16.1.1/24
- ipv6 address fd00:0:2::1/64
-!
-interface lo
- ip address 192.0.2.1/32
- ipv6 address 2001:db8::1/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json
deleted file mode 100755
index 64dadf680..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json
deleted file mode 100644
index 4f86a1a64..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json
deleted file mode 100644
index 21f36089b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf
deleted file mode 100644
index badb11cbe..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/bgpd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-router bgp 65000
- no bgp ebgp-requires-policy
- neighbor 172.16.0.1 remote-as external
- ! neighbor 172.16.0.1 capability extended-nexthop
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.101 update-source 192.0.2.2
- !
- address-family ipv6 unicast
-  neighbor 172.16.0.1 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf
deleted file mode 100644
index 16963798f..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/isisd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r1
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-router isis 1
- net 49.0000.0000.0000.0002.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf
deleted file mode 100644
index 8997115d8..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r2/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r1
- ip address 172.16.0.2/24
- ipv6 address fd00:0:1::2/64
-!
-interface eth-rr1
- ip address 10.0.0.2/24
- ipv6 address fd00:0:3::2/64
-!
-interface lo
- ip address 192.0.2.2/32
- ipv6 address 2001:db8::2/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json
deleted file mode 100644
index 0f18a43bf..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.1.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json
deleted file mode 100644
index f44121c30..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::1",
-            "afi": "ipv6",
-            "scope": "global"
-          },
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json
deleted file mode 100644
index 21f36089b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "afi": "ipv6",
-            "scope": "link-local",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf
deleted file mode 100644
index 4dec311f5..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/bgpd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-router bgp 65000
- no bgp ebgp-requires-policy
- neighbor 172.16.1.1 remote-as external
- ! neighbor 172.16.1.1 capability extended-nexthop
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.101 update-source 192.0.2.3
- !
- address-family ipv6 unicast
-  neighbor 172.16.1.1 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf
deleted file mode 100644
index fe3e307b4..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/isisd.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r1
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-router isis 1
- net 49.0000.0000.0000.0003.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf
deleted file mode 100644
index 8074bbdcd..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r3/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r1
- ip address 172.16.1.3/24
- ipv6 address fd00:0:2::3/64
-!
-interface eth-rr1
- ip address 10.0.1.3/24
- ipv6 address fd00:0:4::3/64
-!
-interface lo
- ip address 192.0.2.3/32
- ipv6 address 2001:db8::3/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json
deleted file mode 100755
index 64dadf680..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json
deleted file mode 100755
index 756a78e3b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json
deleted file mode 100755
index 7d0786c0e..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf
deleted file mode 100644
index 2dbc4acdd..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/bgpd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-router bgp 65000
- neighbor 192.0.2.5 remote-as internal
- neighbor 192.0.2.6 remote-as internal
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.5 update-source 192.0.2.4
- neighbor 192.0.2.6 update-source 192.0.2.4
- neighbor 192.0.2.101 update-source 192.0.2.4
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.5 activate
-  neighbor 192.0.2.6 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf
deleted file mode 100644
index 21eb80f58..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/isisd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r6
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-router isis 1
- net 49.0000.0000.0000.0004.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf
deleted file mode 100644
index c598b345e..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r4/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r6
- ip address 10.0.4.4/24
- ipv6 address fd00:0:7::4/64
-!
-interface eth-rr1
- ip address 10.0.2.4/24
- ipv6 address fd00:0:5::4/64
-!
-interface lo
- ip address 192.0.2.4/32
- ipv6 address 2001:db8::4/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json
deleted file mode 100755
index 64dadf680..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json
deleted file mode 100755
index 756a78e3b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json
deleted file mode 100755
index 7d0786c0e..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf
deleted file mode 100644
index 101edbd71..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/bgpd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-router bgp 65000
- neighbor 192.0.2.4 remote-as internal
- neighbor 192.0.2.6 remote-as internal
- neighbor 192.0.2.101 remote-as internal
- neighbor 192.0.2.4 update-source 192.0.2.5
- neighbor 192.0.2.6 update-source 192.0.2.5
- neighbor 192.0.2.101 update-source 192.0.2.5
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.4 activate
-  neighbor 192.0.2.6 activate
-  neighbor 192.0.2.101 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf
deleted file mode 100644
index f998e805b..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/isisd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-rr1
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r6
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-router isis 1
- net 49.0000.0000.0000.0005.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf
deleted file mode 100644
index 7b43db095..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r5/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-r6
- ip address 10.0.5.5/24
- ipv6 address fd00:0:8::5/64
-!
-interface eth-rr1
- ip address 10.0.3.5/24
- ipv6 address fd00:0:6::5/64
-!
-interface lo
- ip address 192.0.2.5/32
- ipv6 address 2001:db8::5/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json
deleted file mode 100644
index 64dadf680..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json
deleted file mode 100644
index 1a01ead2c..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json
deleted file mode 100644
index 55912dd74..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf
deleted file mode 100644
index e036a779a..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/bgpd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-router bgp 65000
- no bgp ebgp-requires-policy
- no bgp enforce-first-as
- neighbor 192.0.2.4 remote-as internal
- neighbor 192.0.2.5 remote-as internal
- neighbor 192.0.2.101 remote-as internal
- neighbor 172.17.0.201 remote-as external
- neighbor 192.0.2.4 update-source 192.0.2.6
- neighbor 192.0.2.5 update-source 192.0.2.6
- neighbor 192.0.2.101 update-source 192.0.2.6
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.4 activate
-  neighbor 192.0.2.5 activate
-  neighbor 192.0.2.101 activate
-  neighbor 172.17.0.201 activate
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf
deleted file mode 100644
index b575290e9..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/isisd.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-r4
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r5
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-sw1
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-router isis 1
- net 49.0000.0000.0000.0006.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf
deleted file mode 100644
index fce74c146..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r6/zebra.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-!
-interface eth-r4
- ip address 10.0.4.6/24
- ipv6 address fd00:0:7::6/64
-!
-interface eth-r5
- ip address 10.0.5.6/24
- ipv6 address fd00:0:8::6/64
-!
-interface eth-sw1
- ip address 172.17.0.6/24
- ipv6 address fd00:0:9::6/64
-!
-interface lo
- ip address 192.0.2.6/32
- ipv6 address 2001:db8::6/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json
deleted file mode 100644
index 72b0f03c5..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "172.17.0.6",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "0.0.0.0",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json
deleted file mode 100644
index 8fe5f7c1d..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json
deleted file mode 100644
index 8fe5f7c1d..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf
deleted file mode 100644
index a707b23af..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/bgpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-router bgp 65700
- no bgp ebgp-requires-policy
- no bgp enforce-first-as
- neighbor 172.17.0.201 remote-as external
- !
- address-family ipv4 unicast
-  redistribute connected route-map RMAP4
- !
- address-family ipv6 unicast
-  redistribute connected route-map RMAP6
-  neighbor 172.17.0.201 activate
- !
-
-ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24
-ipv6 prefix-list RANGE6 seq 10 permit fd00:700::0/64
-
-route-map RMAP4 permit 10
- match ip address prefix-list RANGE4
-!
-route-map RMAP6 permit 10
- match ipv6 address prefix-list RANGE6
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf
deleted file mode 100644
index 75448297e..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r7/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-h2
- ip address 192.168.7.2/24
- ipv6 address fd00:700::2/64
-!
-interface eth-sw1
- ip address 172.17.0.7/24
- ipv6 address fd00:0:9::7/64
-!
-interface lo
- ip address 192.0.2.7/32
- ipv6 address 2001:db8::7/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json
deleted file mode 100644
index 596ee4b40..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv4.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "172.17.0.6",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "0.0.0.0",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json
deleted file mode 100644
index 20f494032..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json
deleted file mode 100644
index 20f494032..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65000 65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::6",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "",
-        "nexthops": [
-          {
-            "ip": "::",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf
deleted file mode 100644
index d57712dcd..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/bgpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-router bgp 65800
- no bgp ebgp-requires-policy
- no bgp enforce-first-as
- neighbor 172.17.0.201 remote-as external
- !
- address-family ipv4 unicast
-  redistribute connected route-map RMAP4
- !
- address-family ipv6 unicast
-  redistribute connected route-map RMAP6
-  neighbor 172.17.0.201 activate
- !
-
-ip prefix-list RANGE4 seq 10 permit 192.168.0.0/16 le 24
-ipv6 prefix-list RANGE6 seq 10 permit fd00:800::0/64
-
-route-map RMAP4 permit 10
- match ip address prefix-list RANGE4
-!
-route-map RMAP6 permit 10
- match ipv6 address prefix-list RANGE6
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf
deleted file mode 100644
index 7e2479b75..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/r8/zebra.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-interface eth-h3
- ip address 192.168.8.2/24
- ipv6 address fd00:800::2/64
-!
-interface eth-sw1
- ip address 172.17.0.8/24
- ipv6 address fd00:0:9::8/64
-!
-interface lo
- ip address 192.0.2.8/32
- ipv6 address 2001:db8::8/128
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json
deleted file mode 100644
index ac67fe069..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv4.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "routes": {
-    "192.168.1.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.0.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "172.16.1.1",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.7.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "172.17.0.7",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "192.168.8.0/24": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "172.17.0.8",
-            "afi": "ipv4",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json
deleted file mode 100644
index 4e359fd97..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step1.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:1::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "fd00:0:2::1",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "scope": "global",
-            "afi": "ipv6",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json
deleted file mode 100644
index 4ab0e1c2a..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgp_ipv6_step2.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "routes": {
-    "fd00:100::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::2",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      },
-      {
-        "valid": true,
-        "multipath": true,
-        "path": "65100",
-        "nexthops": [
-          {
-            "ip": "2001:db8::3",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:700::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65700",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::7",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ],
-    "fd00:800::/64": [
-      {
-        "valid": true,
-        "bestpath": true,
-        "path": "65800",
-        "nexthops": [
-          {
-            "ip": "fd00:0:9::8",
-            "afi": "ipv6",
-            "scope": "global",
-            "used": true
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf
deleted file mode 100644
index 9bbac8b68..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/bgpd.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-router bgp 65000
- neighbor 192.0.2.2 remote-as internal
- neighbor 192.0.2.3 remote-as internal
- neighbor 192.0.2.4 remote-as internal
- neighbor 192.0.2.5 remote-as internal
- neighbor 192.0.2.6 remote-as internal
- neighbor 192.0.2.2 update-source 192.0.2.101
- neighbor 192.0.2.3 update-source 192.0.2.101
- neighbor 192.0.2.4 update-source 192.0.2.101
- neighbor 192.0.2.5 update-source 192.0.2.101
- neighbor 192.0.2.6 update-source 192.0.2.101
- !
- address-family ipv4 unicast
-  neighbor 192.0.2.2 route-reflector-client
-  neighbor 192.0.2.3 route-reflector-client
-
- !
- address-family ipv6 unicast
-  neighbor 192.0.2.2 activate
-  neighbor 192.0.2.3 activate
-  neighbor 192.0.2.4 activate
-  neighbor 192.0.2.5 activate
-  neighbor 192.0.2.6 activate
-  neighbor 192.0.2.2 route-reflector-client
-  neighbor 192.0.2.3 route-reflector-client
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf
deleted file mode 100644
index fe5bcfb9f..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/isisd.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-r2
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r3
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r4
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-interface eth-r5
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
- isis network point-to-point
-!
-router isis 1
- net 49.0000.0000.0000.0101.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf
deleted file mode 100644
index 7f5c8d1c6..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rr1/zebra.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-!
-interface eth-r2
- ip address 10.0.0.101/24
- ipv6 address fd00:0:3::101/64
-!
-interface eth-r3
- ip address 10.0.1.101/24
- ipv6 address fd00:0:4::101/64
-!
-interface eth-r4
- ip address 10.0.2.101/24
- ipv6 address fd00:0:5::101/64
-!
-interface eth-r5
- ip address 10.0.3.101/24
- ipv6 address fd00:0:6::101/64
-!
-interface lo
- ip address 192.0.2.101/32
- ipv6 address 2001:db8::101/128
-
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf
deleted file mode 100644
index 596cc3e25..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/bgpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-router bgp 65200 view RS
- bgp router-id 192.0.2.201
- no bgp ebgp-requires-policy
- neighbor 172.17.0.6 remote-as external
- neighbor 172.17.0.7 remote-as external
- neighbor 172.17.0.8 remote-as external
- !
- address-family ipv4 unicast
-  neighbor 172.17.0.6 route-server-client
-  neighbor 172.17.0.7 route-server-client
-  neighbor 172.17.0.8 route-server-client
-
- !
- address-family ipv6 unicast
-  neighbor 172.17.0.6 activate
-  neighbor 172.17.0.7 activate
-  neighbor 172.17.0.8 activate
-  neighbor 172.17.0.6 route-server-client
-  neighbor 172.17.0.7 route-server-client
-  neighbor 172.17.0.8 route-server-client
- !
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf
deleted file mode 100644
index 892b4e7b7..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/isisd.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-!
-interface lo
- ip router isis 1
- ipv6 router isis 1
- isis passive
-!
-interface eth-r2
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-interface eth-r3
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-interface eth-r4
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-interface eth-r5
- ip router isis 1
- ipv6 router isis 1
- isis hello-interval 1
- isis hello-multiplier 3
-!
-router isis 1
- net 49.0000.0000.0000.0101.00
- is-type level-1
- lsp-gen-interval 1
- topology ipv6-unicast
-!
diff --git a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf b/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf
deleted file mode 100644
index 75ee08363..000000000
--- a/tests/topotests/bgp_nexthop_mp_ipv4_6/rs1/zebra.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-interface eth-sw1
- ip address 172.17.0.201/24
- ipv6 address fd00:0:9::201/64
-!
-interface lo
- ip address 192.0.2.201/32
- ipv6 address 2001:db8::201/128
-
diff --git a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json
index f664bb6b5..768bffbe9 100644
--- a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json
+++ b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf10_ipv4_unicast.json
@@ -15,16 +15,15 @@
                 "origin": "incomplete",
                 "nexthops": [
                     {
-                        "ip": "::ffff:c000:202",
                         "hostname": "ce1",
                         "afi": "ipv6",
-                        "scope": "global"
+                        "scope": "global",
+                        "used": true
                     },
                     {
                         "hostname": "ce1",
                         "afi": "ipv6",
-                        "scope": "link-local",
-                        "used": true
+                        "scope": "link-local"
                     }
                 ]
             }
diff --git a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json
index 3498ed432..1e9371527 100644
--- a/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json
+++ b/tests/topotests/bgp_vrf_leaking_5549_routes/pe1/results/vrf20_ipv4_unicast.json
@@ -17,16 +17,15 @@
                 "nhVrfName": "vrf10",
                 "nexthops": [
                     {
-                        "ip": "::ffff:c000:202",
                         "hostname": "pe1",
                         "afi": "ipv6",
-                        "scope": "global"
+                        "scope": "global",
+                        "used": true
                     },
                     {
                         "hostname": "pe1",
                         "afi": "ipv6",
-                        "scope": "link-local",
-                        "used": true
+                        "scope": "link-local"
                     }
                 ]
             }