tests: Unify directory naming for topotests

Change every `-` to `_` in directory names. This is to avoid mixing _ and -.

Just for consistency and directory sorting properly.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

2082 files changed, 0 insertions, 0 deletions

diff --git a/tests/topotests/all-protocol-startup/r1/babeld.conf b/tests/topotests/all_protocol_startup/r1/babeld.conf
index 3e119bf24..3e119bf24 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 32dcb727e..32dcb727e 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 1da4da4df..1da4da4df 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 044cffae7..044cffae7 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 0255ecdee..0255ecdee 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 ef12d615d..ef12d615d 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 413f8d15a..413f8d15a 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 02332a4e7..02332a4e7 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 74e0f12e3..74e0f12e3 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 5c6f07164..5c6f07164 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 6d870f355..6d870f355 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 bac9f6162..bac9f6162 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 360fb13a1..360fb13a1 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 4a5255fe1..4a5255fe1 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 ace760887..ace760887 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 5d67c1467..5d67c1467 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 2e0aef3a1..2e0aef3a1 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 b38701a53..b38701a53 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 82b64c0d9..82b64c0d9 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 fd333b308..fd333b308 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 3be6cd3d7..3be6cd3d7 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 20034b740..20034b740 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 fffee63c6..fffee63c6 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 5b5f8596c..5b5f8596c 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 024668720..024668720 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 deeae87fa..deeae87fa 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 ff8567925..ff8567925 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 e69de29bb..e69de29bb 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 6fbf40bbb..6fbf40bbb 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 0534b64d3..0534b64d3 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 c6bb01c34..c6bb01c34 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 612d0a729..612d0a729 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 c5ef79630..c5ef79630 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 f39f8f87b..f39f8f87b 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 23f69bcdd..23f69bcdd 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 c10e32ad0..c10e32ad0 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 e69de29bb..e69de29bb 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 f35e77279..f35e77279 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 5cba71ef2..5cba71ef2 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 689797a5e..689797a5e 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 8eea18328..8eea18328 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 b436d5562..b436d5562 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 4984b52cf..4984b52cf 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 3a30cd42f..3a30cd42f 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 0f70be1bd..0f70be1bd 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 f35e77279..f35e77279 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 c0cb3c4ac..c0cb3c4ac 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 1f5aac42e..1f5aac42e 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 09808cc09..09808cc09 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 fc9e14534..fc9e14534 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 620c6ddcd..620c6ddcd 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 7759251dc..7759251dc 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 270de829c..270de829c 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 560d6eebe..560d6eebe 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 e69de29bb..e69de29bb 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 57f9cd9e3..57f9cd9e3 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 8026aad49..8026aad49 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 af6e45cf3..af6e45cf3 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 68d3fe2c4..68d3fe2c4 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 cb4083d2f..cb4083d2f 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 cb4083d2f..cb4083d2f 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 f00b9f3d3..f00b9f3d3 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 f5bd276a4..f5bd276a4 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 af6e45cf3..af6e45cf3 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 b8366bc0b..b8366bc0b 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 42bd6abf8..42bd6abf8 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 68d3fe2c4..68d3fe2c4 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 200053c3e..200053c3e 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 4297f163b..4297f163b 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 6003125b6..6003125b6 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 6b34e337d..6b34e337d 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 b0fde64a5..b0fde64a5 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 8a90649ef..8a90649ef 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 5fc7fc5b2..5fc7fc5b2 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 22937fe46..22937fe46 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 5c36e96c0..5c36e96c0 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 13eb2a2c6..13eb2a2c6 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 d368de9bb..d368de9bb 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 f35e77279..f35e77279 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 3eac40777..3eac40777 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 7b053bac3..7b053bac3 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 f35e77279..f35e77279 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 5d449f6f9..5d449f6f9 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 0b7c9e02f..0b7c9e02f 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 fcb5672dc..fcb5672dc 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 e69de29bb..e69de29bb 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 610a20f88..610a20f88 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 18def599b..18def599b 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 07b42f988..07b42f988 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 f354eff69..f354eff69 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 6465efb8b..6465efb8b 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 63f0d5078..63f0d5078 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 42051f958..42051f958 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 d844ee681..d844ee681 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 32799084f..32799084f 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 f354eff69..f354eff69 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 43eecd0b7..43eecd0b7 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 409af6308..409af6308 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 6465efb8b..6465efb8b 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 cfb1ef1bb..cfb1ef1bb 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 58b44da5c..58b44da5c 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 6003125b6..6003125b6 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 437f063d8..437f063d8 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 2f3509956..2f3509956 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 a05d8b58c..a05d8b58c 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 d6df1ebfb..d6df1ebfb 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 5fc7fc5b2..5fc7fc5b2 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 437f063d8..437f063d8 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 3e8777019..3e8777019 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 1196e6d18..1196e6d18 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 d6df1ebfb..d6df1ebfb 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 d368de9bb..d368de9bb 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 f35e77279..f35e77279 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 bccd1e75b..bccd1e75b 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 3a2568b4a..3a2568b4a 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 7b053bac3..7b053bac3 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 f35e77279..f35e77279 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 766862276..766862276 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 a35de5f45..a35de5f45 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 0b7c9e02f..0b7c9e02f 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 ae148f948..ae148f948 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 e69de29bb..e69de29bb 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 86a7e5139..86a7e5139 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 688f2e839..688f2e839 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 fcea5d48f..fcea5d48f 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 4b7982b23..4b7982b23 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 503f776ae..503f776ae 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 700c46ba1..700c46ba1 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 0c3db97bc..0c3db97bc 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 6acef139b..6acef139b 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 d987a0ae7..d987a0ae7 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 08eb0468d..08eb0468d 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 65647b39e..65647b39e 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 ca965e395..ca965e395 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 2297bfafe..2297bfafe 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 9ab747997..9ab747997 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 4f5e02207..4f5e02207 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 200937a9a..200937a9a 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 d8ffc9bc2..d8ffc9bc2 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 4ef28c39c..4ef28c39c 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 753041f95..753041f95 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 0fe56d576..0fe56d576 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 74dae5a60..74dae5a60 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 20b53cfc5..20b53cfc5 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 de8ae1644..de8ae1644 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 ec973eb36..ec973eb36 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 74dae5a60..74dae5a60 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 d8fce344a..d8fce344a 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 c0804b94a..c0804b94a 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 a3936093a..a3936093a 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 775fae13f..775fae13f 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 4a2c8ee00..4a2c8ee00 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 e69de29bb..e69de29bb 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 410200033..410200033 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 1262f5e98..1262f5e98 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 fa07d60df..fa07d60df 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 57bde1f23..57bde1f23 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 f49768ff7..f49768ff7 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 a14cd7ac8..a14cd7ac8 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 412450ca1..412450ca1 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 0d47c0fc3..0d47c0fc3 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 c0ef11ac5..c0ef11ac5 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 50d75ab67..50d75ab67 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 267459c7a..267459c7a 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 568abe751..568abe751 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 4cf20bb90..4cf20bb90 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 36fca17bb..36fca17bb 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 d47833377..d47833377 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 ce6055d51..ce6055d51 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 ef3800864..ef3800864 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 b4fd80fa1..b4fd80fa1 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 34b88c9a3..34b88c9a3 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 efe7d47b1..efe7d47b1 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 7d81784b5..7d81784b5 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 0d032b4cd..0d032b4cd 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 37140089e..37140089e 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 afdd44b1a..afdd44b1a 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 c84ace278..c84ace278 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 4d6d56e07..4d6d56e07 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 86bdcfed0..86bdcfed0 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 e69de29bb..e69de29bb 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 f03135021..f03135021 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 0918796e9..0918796e9 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 650c0a81b..650c0a81b 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 50c1f9ad8..50c1f9ad8 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 9bce991d0..9bce991d0 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 7fe5eb218..7fe5eb218 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 f35e77279..f35e77279 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 55d48560e..55d48560e 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 3d49b178b..3d49b178b 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 4f3c74c5e..4f3c74c5e 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 48a729ce1..48a729ce1 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 c786f1fe4..c786f1fe4 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 ec2135ce3..ec2135ce3 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 cccbf6574..cccbf6574 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 f35e77279..f35e77279 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 e96fdc0b1..e96fdc0b1 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 2c63c0851..2c63c0851 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 932ab4da6..932ab4da6 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 c19c98033..c19c98033 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 96fd08c72..96fd08c72 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 0173dc9be..0173dc9be 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 dc394aa89..dc394aa89 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 c828575c8..c828575c8 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 57f7f6c07..57f7f6c07 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 dd26b9b58..dd26b9b58 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 e4f8fd851..e4f8fd851 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 6b68fb398..6b68fb398 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 35fe562a8..35fe562a8 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 e85b2644d..e85b2644d 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 e69de29bb..e69de29bb 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 f8a354fc2..f8a354fc2 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 8e40b76d4..8e40b76d4 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 4c75d669c..4c75d669c 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 64aee4843..64aee4843 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 786d66dbe..786d66dbe 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 2a92e463e..2a92e463e 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 75225765e..75225765e 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 c7e22d480..c7e22d480 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 1f58663a4..1f58663a4 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 f7972c6ce..f7972c6ce 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 82adf8be9..82adf8be9 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 14248fb6f..14248fb6f 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 5477f3912..5477f3912 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 f44abc0b8..f44abc0b8 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 0aab6e301..0aab6e301 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 bf0cfcf42..bf0cfcf42 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 502cea11f..502cea11f 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 6b532560b..6b532560b 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 6bb223e20..6bb223e20 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 e69de29bb..e69de29bb 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 5e736a7fc..5e736a7fc 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 1262f5e98..1262f5e98 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 fa07d60df..fa07d60df 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 5bb45b986..5bb45b986 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 f49768ff7..f49768ff7 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 fcd1e7db1..fcd1e7db1 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 94f502c7d..94f502c7d 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 0d47c0fc3..0d47c0fc3 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 c0ef11ac5..c0ef11ac5 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 b2aac7468..b2aac7468 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 267459c7a..267459c7a 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 daffd1912..daffd1912 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 76910ac92..76910ac92 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 36fca17bb..36fca17bb 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 d47833377..d47833377 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 1d7c73039..1d7c73039 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 ef3800864..ef3800864 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 f727c2d63..f727c2d63 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 63d0da780..63d0da780 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 efe7d47b1..efe7d47b1 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 7d81784b5..7d81784b5 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 f34035d46..f34035d46 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 37140089e..37140089e 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 69770dd2b..69770dd2b 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 c84ace278..c84ace278 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 4d6d56e07..4d6d56e07 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 8a1ffe085..8a1ffe085 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 e69de29bb..e69de29bb 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 3486c64c5..3486c64c5 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 0a283c06d..0a283c06d 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 b2d945583..b2d945583 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 606c17bec..606c17bec 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 be07fab87..be07fab87 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 e69de29bb..e69de29bb 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 7fb55cf00..7fb55cf00 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 0a283c06d..0a283c06d 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 b2d945583..b2d945583 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 606c17bec..606c17bec 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 484f40251..484f40251 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 e69de29bb..e69de29bb 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 28e642360..28e642360 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 b3f25272d..b3f25272d 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 002a5c78c..002a5c78c 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 22a26ac61..22a26ac61 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 c4bbdce2c..c4bbdce2c 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 1cb26c653..1cb26c653 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 dde3c090b..dde3c090b 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 7e15720c7..7e15720c7 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 9200b0501..9200b0501 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 781f906d3..781f906d3 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 d68951b40..d68951b40 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 79eb0e33d..79eb0e33d 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 e2a28000b..e2a28000b 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 0b7fbae8c..0b7fbae8c 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 a0b062c44..a0b062c44 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 fa2a570ef..fa2a570ef 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 d5f70edf6..d5f70edf6 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 d5f70edf6..d5f70edf6 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 fa2a570ef..fa2a570ef 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 d1f384742..d1f384742 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 d1f384742..d1f384742 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 028b546a0..028b546a0 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 a05dfb8e4..a05dfb8e4 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 b198d352e..b198d352e 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 fed4c27c1..fed4c27c1 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 deccfd418..deccfd418 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 fe3e64d8d..fe3e64d8d 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 fe3e64d8d..fe3e64d8d 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 deccfd418..deccfd418 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 c109aa801..c109aa801 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 c109aa801..c109aa801 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 0f0a2e926..0f0a2e926 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 f32d2a842..f32d2a842 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 6465b635a..6465b635a 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 d49c98b16..d49c98b16 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 b2cdef1c9..b2cdef1c9 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 e69de29bb..e69de29bb 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 ee1f1b74c..ee1f1b74c 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 374cce21f..374cce21f 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 e69de29bb..e69de29bb 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 12161d2fa..12161d2fa 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 0a283c06d..0a283c06d 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 33231b527..33231b527 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 606c17bec..606c17bec 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 81bf8da31..81bf8da31 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 e69de29bb..e69de29bb 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 2cf84d0b7..2cf84d0b7 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 b29940f46..b29940f46 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 517ef70f2..517ef70f2 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 cffe82736..cffe82736 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 a43e5f937..a43e5f937 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 e69de29bb..e69de29bb 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 bf39152ea..bf39152ea 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 697765168..697765168 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 abbd1b86f..abbd1b86f 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 606c17bec..606c17bec 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 a405c047c..a405c047c 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 e9fdfb70c..e9fdfb70c 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 f9aa94fd1..f9aa94fd1 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 e69de29bb..e69de29bb 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 8699d62ff..8699d62ff 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 0a283c06d..0a283c06d 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 00c96cc58..00c96cc58 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 606c17bec..606c17bec 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 d8de0f0ac..d8de0f0ac 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 e69de29bb..e69de29bb 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 97b440f5c..97b440f5c 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 9e581a7be..9e581a7be 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 00c96cc58..00c96cc58 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 606c17bec..606c17bec 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 089c9a964..089c9a964 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 e69de29bb..e69de29bb 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 6ef8b1c0f..6ef8b1c0f 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 9e581a7be..9e581a7be 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 00c96cc58..00c96cc58 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 606c17bec..606c17bec 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 d9ea5db27..d9ea5db27 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 e69de29bb..e69de29bb 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 cb07ea9fd..cb07ea9fd 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 0a283c06d..0a283c06d 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 00c96cc58..00c96cc58 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 606c17bec..606c17bec 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 9a22c58b1..9a22c58b1 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 e69de29bb..e69de29bb 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 c320bb5d1..c320bb5d1 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 1782edc2a..1782edc2a 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 cb712e9a8..cb712e9a8 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 968171e7b..968171e7b 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 a6e3260d1..a6e3260d1 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 ddcf86213..ddcf86213 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 3b99065fe..3b99065fe 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 e69de29bb..e69de29bb 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 90295e199..90295e199 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 b4d4f6a5e..b4d4f6a5e 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 a328e0496..a328e0496 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 2d0ca89f0..2d0ca89f0 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 0c842a0e7..0c842a0e7 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 936dc572b..936dc572b 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 56b33eae8..56b33eae8 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 b933ffb5c..b933ffb5c 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 bcfa41eb2..bcfa41eb2 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 022e83579..022e83579 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 0649202f1..0649202f1 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 0aeeed9d9..0aeeed9d9 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 352c030ed..352c030ed 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 9913c226f..9913c226f 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 46b436d2a..46b436d2a 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 17fb816a7..17fb816a7 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 acd57756b..acd57756b 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 4c9a989b5..4c9a989b5 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 eba2aae37..eba2aae37 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 38b6af0e8..38b6af0e8 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 7631e4375..7631e4375 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 1cd1cd902..1cd1cd902 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 031ff455c..031ff455c 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 d9ae3d190..d9ae3d190 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 577155396..577155396 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 49981ac58..49981ac58 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 f0929536d..f0929536d 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 9015f485f..9015f485f 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 77c76cd49..77c76cd49 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 75506d1a5..75506d1a5 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 34f11c0a2..34f11c0a2 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 9eea9073c..9eea9073c 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 fffcbbd0e..fffcbbd0e 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 342a0a4b2..342a0a4b2 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 8858e2149..8858e2149 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 2e26f60f4..2e26f60f4 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 68e686e8c..68e686e8c 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 80e9e5a26..80e9e5a26 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 ec2e78927..ec2e78927 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 c1566240e..c1566240e 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 1cd1df8c8..1cd1df8c8 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 f389632b1..f389632b1 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 01f4b6570..01f4b6570 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 fbba73587..fbba73587 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 33e89c06a..33e89c06a 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 2c13024bb..2c13024bb 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 3dd63b44c..3dd63b44c 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 419f62b2a..419f62b2a 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 2a2ba061c..2a2ba061c 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 71aa91a06..71aa91a06 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 525f5eb09..525f5eb09 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 432135c94..432135c94 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 46f330f5c..46f330f5c 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 398064df6..398064df6 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 cdf4cb4fe..cdf4cb4fe 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 2db7edb80..2db7edb80 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 95b5da840..95b5da840 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 991a1e7e5..991a1e7e5 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 e500a1d85..e500a1d85 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 f1c2b42dc..f1c2b42dc 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 e2699475c..e2699475c 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 52f8687bc..52f8687bc 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 0a56a235b..0a56a235b 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 065c99330..065c99330 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 9738916ab..9738916ab 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 e69de29bb..e69de29bb 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 cdf4cb4fe..cdf4cb4fe 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 cdf4cb4fe..cdf4cb4fe 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 91fae9eeb..91fae9eeb 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 cdf4cb4fe..cdf4cb4fe 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 cdf4cb4fe..cdf4cb4fe 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 df9adeb3b..df9adeb3b 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 086bad648..086bad648 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 e69de29bb..e69de29bb 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 de2bffa33..de2bffa33 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 a9541a55c..a9541a55c 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 e69de29bb..e69de29bb 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 19b490a35..19b490a35 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 e2c399e53..e2c399e53 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 0880ee9fa..0880ee9fa 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 606c17bec..606c17bec 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 eb2fca15f..eb2fca15f 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 e9fdfb70c..e9fdfb70c 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 21dc72579..21dc72579 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 6c554f5fa..6c554f5fa 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 031ff455c..031ff455c 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 9e689a27e..9e689a27e 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 4a7dc4812..4a7dc4812 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 031ff455c..031ff455c 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 9e689a27e..9e689a27e 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 b53b05455..b53b05455 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 031ff455c..031ff455c 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 9e689a27e..9e689a27e 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 6a1cc2fb3..6a1cc2fb3 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 031ff455c..031ff455c 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 9e689a27e..9e689a27e 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 2cc26cb80..2cc26cb80 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 038f108aa..038f108aa 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 11dad786f..11dad786f 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 c62183215..c62183215 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 22ec2c298..22ec2c298 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 facddcda4..facddcda4 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 5399ceefc..5399ceefc 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 7da95aed1..7da95aed1 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 a90669a47..a90669a47 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 1bf38efcc..1bf38efcc 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 33d0f2d1c..33d0f2d1c 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 6ac2512a6..6ac2512a6 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 911aa1c39..911aa1c39 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 2362a19f2..2362a19f2 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 35ebe0dc6..35ebe0dc6 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 900e7d4fb..900e7d4fb 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 39a0beeb1..39a0beeb1 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 e69de29bb..e69de29bb 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 3bb07ad99..3bb07ad99 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 22952f645..22952f645 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-route-map/bgp_route_map_topo1.json b/tests/topotests/bgp_route_map/bgp_route_map_topo1.json
index e89263961..e89263961 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 c22a4c3ea..c22a4c3ea 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 0158e24d3..0158e24d3 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 958eceba6..958eceba6 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 e69de29bb..e69de29bb 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 719d76392..719d76392 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 9904bb4e1..9904bb4e1 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 a4a654d7b..a4a654d7b 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 f0d357c5f..f0d357c5f 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 2e24de0b2..2e24de0b2 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 a10fe3a3c..a10fe3a3c 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 dffe24f3a..dffe24f3a 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 e69de29bb..e69de29bb 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 57e2f5818..57e2f5818 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 6e9b0b4a7..6e9b0b4a7 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 82a01d457..82a01d457 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 93e359044..93e359044 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 65e092b0f..65e092b0f 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 b5e060c3d..b5e060c3d 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 af6464895..af6464895 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 b598666df..b598666df 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 36218d353..36218d353 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 8ad2ddc48..8ad2ddc48 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 e388ccba8..e388ccba8 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 714585cb9..714585cb9 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 fa2e968e5..fa2e968e5 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 e388ccba8..e388ccba8 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 36218d353..36218d353 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 ea91e21ba..ea91e21ba 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 e388ccba8..e388ccba8 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 36218d353..36218d353 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 0866fa975..0866fa975 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 098e55d0e..098e55d0e 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 b5ca993da..b5ca993da 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 c903c1ad2..c903c1ad2 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 7228ae6bd..7228ae6bd 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 3dfa43831..3dfa43831 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 0cfebc723..0cfebc723 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 9bc4331ba..9bc4331ba 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 578ebafad..578ebafad 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 b9eb00ea5..b9eb00ea5 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 4d2007e78..4d2007e78 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 2a834c799..2a834c799 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 3e9e9af45..3e9e9af45 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 ec35f9f9c..ec35f9f9c 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 c48407c10..c48407c10 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 b830e16b9..b830e16b9 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 03dfbf932..03dfbf932 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 35038557d..35038557d 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 fb67953fe..fb67953fe 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 71f64e9b7..71f64e9b7 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 6c800abd9..6c800abd9 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 be0fdcfed..be0fdcfed 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 a2d7b3307..a2d7b3307 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 26fa7ca41..26fa7ca41 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 56ae4a66f..56ae4a66f 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 56c747d97..56c747d97 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 ae9f441a3..ae9f441a3 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 cce49cda0..cce49cda0 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 71c931b17..71c931b17 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 c440f3a35..c440f3a35 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 53ad1bb6a..53ad1bb6a 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 83db66c8c..83db66c8c 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 70f3d3f98..70f3d3f98 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 5e0b79d81..5e0b79d81 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 7f145b458..7f145b458 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 ca3a0fe5b..ca3a0fe5b 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 6993bc53e..6993bc53e 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 cdf4cb4fe..cdf4cb4fe 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 63a44c133..63a44c133 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 45ad03101..45ad03101 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 cdf4cb4fe..cdf4cb4fe 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 63a44c133..63a44c133 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 bfae53017..bfae53017 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 97fd8662f..97fd8662f 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 293e25208..293e25208 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 581cc6e7b..581cc6e7b 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 91d9bd8c8..91d9bd8c8 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 08d5a19a2..08d5a19a2 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 1bcf8e1de..1bcf8e1de 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 5ff4b096f..5ff4b096f 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 81ab802f3..81ab802f3 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 3d135fb96..3d135fb96 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 56adda5cc..56adda5cc 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 2cb719486..2cb719486 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 260a197ac..260a197ac 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 e69de29bb..e69de29bb 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 72eceee61..72eceee61 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 b5e12020c..b5e12020c 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 b01ef73f5..b01ef73f5 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 0265dbe79..0265dbe79 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 3968348b1..3968348b1 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 09ac9f2fa..09ac9f2fa 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 e69de29bb..e69de29bb 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 629d2d6d7..629d2d6d7 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 26336d5de..26336d5de 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 e69de29bb..e69de29bb 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 c76c6264b..c76c6264b 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 012b05d37..012b05d37 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 e69de29bb..e69de29bb 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 2ad8c1253..2ad8c1253 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 10c61d53e..10c61d53e 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 d8a7c5a9c..d8a7c5a9c 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 d626cdca0..d626cdca0 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 f7f99c276..f7f99c276 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 3b767f1bf..3b767f1bf 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 504af5ac5..504af5ac5 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 efc56d983..efc56d983 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 cafbe490b..cafbe490b 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 47d8334a0..47d8334a0 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 b6a342df8..b6a342df8 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 fafa2999d..fafa2999d 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 1803e2cf5..1803e2cf5 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 306f72534..306f72534 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 3ffab46ee..3ffab46ee 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 317f1031d..317f1031d 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 39ff2570d..39ff2570d 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 036bfe1f4..036bfe1f4 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 681c5222a..681c5222a 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 9feaada79..9feaada79 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 8b0c7bd0d..8b0c7bd0d 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 a1aab400e..a1aab400e 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 1495e3228..1495e3228 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 48d732e72..48d732e72 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 86edee6ab..86edee6ab 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 6878e2fac..6878e2fac 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 d8cd565b5..d8cd565b5 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 bff10860c..bff10860c 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 7a7cfe557..7a7cfe557 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 f8181c776..f8181c776 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 d8cd565b5..d8cd565b5 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 ee1e46c96..ee1e46c96 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 20cb7769a..20cb7769a 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 e5f3c77ac..e5f3c77ac 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 d8cd565b5..d8cd565b5 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 410807889..410807889 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 713e6d39f..713e6d39f 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 0dff15e3f..0dff15e3f 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 d8a7c5a9c..d8a7c5a9c 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 353c9efa9..353c9efa9 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 dcfcd1143..dcfcd1143 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 e69de29bb..e69de29bb 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 90764a0d0..90764a0d0 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 8557f4b01..8557f4b01 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 fa7653375..fa7653375 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 26f0dffa7..26f0dffa7 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 c826efdcf..c826efdcf 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 a386b45da..a386b45da 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 2b281b74f..2b281b74f 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 4b920eda0..4b920eda0 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 8557f4b01..8557f4b01 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 fa7653375..fa7653375 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 9d71d3005..9d71d3005 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 2bc4c4ad9..2bc4c4ad9 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 d7e886ce8..d7e886ce8 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 a92272f6d..a92272f6d 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 c70b44e1c..c70b44e1c 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 234e10efa..234e10efa 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 9ad97109b..9ad97109b 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 55f0aedef..55f0aedef 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 5d6dfca76..5d6dfca76 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 6950086b1..6950086b1 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 9a0defd62..9a0defd62 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 e85412a71..e85412a71 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 2cf5c4063..2cf5c4063 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 cde728794..cde728794 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 233180ceb..233180ceb 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 adcf43324..adcf43324 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 2cab0c88f..2cab0c88f 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 358d0a230..358d0a230 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 7586c7385..7586c7385 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 f939a6abf..f939a6abf 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 0f10ce921..0f10ce921 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 249f945e0..249f945e0 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 40375792a..40375792a 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 278129f48..278129f48 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 b4e8c2318..b4e8c2318 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 8083be4cf..8083be4cf 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 2e982e0c3..2e982e0c3 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 1ba8c8cda..1ba8c8cda 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 9b53a1d76..9b53a1d76 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 40375792a..40375792a 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 278129f48..278129f48 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 6084010a9..6084010a9 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 27dc1073c..27dc1073c 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 e69de29bb..e69de29bb 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 a80f30dc7..a80f30dc7 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 f60fdb974..f60fdb974 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 680b31eb8..680b31eb8 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 c487d2740..c487d2740 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 3fe2b798a..3fe2b798a 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 ef5707f14..ef5707f14 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 acd2ce003..acd2ce003 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 f7f31ac02..f7f31ac02 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 e980031ad..e980031ad 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 f3ed764f0..f3ed764f0 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 57b0b1de1..57b0b1de1 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 107a0ba2f..107a0ba2f 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 9cf24082e..9cf24082e 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 09469501f..09469501f 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 70fb1a65c..70fb1a65c 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 4e4a5692a..4e4a5692a 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 c9ebb1e3f..c9ebb1e3f 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 33eb6577b..33eb6577b 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 7aaca3354..7aaca3354 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 741fc2d02..741fc2d02 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 7b4c6c50b..7b4c6c50b 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 0a815ef00..0a815ef00 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 657c69bf2..657c69bf2 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 17d58a9d1..17d58a9d1 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 40f1f5587..40f1f5587 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 86f5d2871..86f5d2871 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 1519fd4c1..1519fd4c1 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 569ecf733..569ecf733 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 1dd09bf83..1dd09bf83 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 caf747707..caf747707 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 519c3d362..519c3d362 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 7117a2a2e..7117a2a2e 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 cdf626723..cdf626723 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 a5b7062be..a5b7062be 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 c6344870b..c6344870b 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 8ab8fcb23..8ab8fcb23 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 26d428c4c..26d428c4c 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 4c5e0f112..4c5e0f112 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 abdc6a53a..abdc6a53a 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 1629f82de..1629f82de 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 f3f10f649..f3f10f649 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 9ad41c593..9ad41c593 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 c6a5824d1..c6a5824d1 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 dd32d3b8a..dd32d3b8a 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 4ec296ca5..4ec296ca5 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 dc8f19dad..dc8f19dad 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 390fda749..390fda749 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 b37911da3..b37911da3 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 6ac341e43..6ac341e43 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 4403d8913..4403d8913 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 eb963fe41..eb963fe41 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 2bcee9606..2bcee9606 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 52550daf1..52550daf1 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 0f779b8b9..0f779b8b9 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 4aa7440c3..4aa7440c3 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 e06fe8c1f..e06fe8c1f 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 2935caf13..2935caf13 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 da46f1dfe..da46f1dfe 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 3aafab4e2..3aafab4e2 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 3f3501a6f..3f3501a6f 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 6b76114d4..6b76114d4 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 1256141da..1256141da 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 b27952514..b27952514 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 da46f1dfe..da46f1dfe 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 86fcfea1a..86fcfea1a 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 e5e336d88..e5e336d88 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 fa1360116..fa1360116 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 58859041a..58859041a 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 f3ba867a9..f3ba867a9 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 fc700608b..fc700608b 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 da46f1dfe..da46f1dfe 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 994e8166c..994e8166c 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 5bebbdebd..5bebbdebd 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 7230129f2..7230129f2 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 6d8c89371..6d8c89371 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 04e043847..04e043847 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 e873ac8a5..e873ac8a5 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 efc03701b..efc03701b 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 70ae1b07f..70ae1b07f 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 911971496..911971496 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 d4b27d157..d4b27d157 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 5fe58d082..5fe58d082 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 4ef8d946f..4ef8d946f 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 9b28f6a42..9b28f6a42 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 9b28f6a42..9b28f6a42 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 249117198..249117198 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 21f71f125..21f71f125 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 3635c89ef..3635c89ef 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 5712d210d..5712d210d 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 5a76246e5..5a76246e5 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 09d595830..09d595830 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 e26039b83..e26039b83 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 01505c031..01505c031 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 9d71d3005..9d71d3005 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 733f26bc6..733f26bc6 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 dcb0686dc..dcb0686dc 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 2395906cb..2395906cb 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 325452938..325452938 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 07a7867cb..07a7867cb 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 4945897e9..4945897e9 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 b0fcdede0..b0fcdede0 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 4cfea1a59..4cfea1a59 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 e72ee52fc..e72ee52fc 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 3be24ad24..3be24ad24 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 3bada7147..3bada7147 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 2bb000346..2bb000346 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 348f7761e..348f7761e 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 241c80bdd..241c80bdd 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 20ea69e38..20ea69e38 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 20ea69e38..20ea69e38 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 10cafe909..10cafe909 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 95bf995e2..95bf995e2 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 32c6e6c4e..32c6e6c4e 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 6bbb57026..6bbb57026 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 e69de29bb..e69de29bb 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 f44152759..f44152759 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 53bf8cb44..53bf8cb44 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 0b3958471..0b3958471 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 5b1950d8c..5b1950d8c 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 26f0dffa7..26f0dffa7 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 c712538c0..c712538c0 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 0b3958471..0b3958471 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 7e6c72627..7e6c72627 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 0879b84d2..0879b84d2 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 c712538c0..c712538c0 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 0b3958471..0b3958471 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 5b1950d8c..5b1950d8c 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 0879b84d2..0879b84d2 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 71f9ebddf..71f9ebddf 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 304c0a475..304c0a475 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 94b3cb6d1..94b3cb6d1 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 0879b84d2..0879b84d2 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 c712538c0..c712538c0 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 0b3958471..0b3958471 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 6500a47fb..6500a47fb 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 0879b84d2..0879b84d2 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 16d935846..16d935846 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 f2093a3fc..f2093a3fc 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 94b3cb6d1..94b3cb6d1 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 0879b84d2..0879b84d2 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 c712538c0..c712538c0 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 0b3958471..0b3958471 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 5b1950d8c..5b1950d8c 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 0879b84d2..0879b84d2 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 c712538c0..c712538c0 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 0b3958471..0b3958471 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 5b1950d8c..5b1950d8c 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 0879b84d2..0879b84d2 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 c712538c0..c712538c0 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 0b3958471..0b3958471 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 5b1950d8c..5b1950d8c 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 0879b84d2..0879b84d2 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 c712538c0..c712538c0 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 0b3958471..0b3958471 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 7e6c72627..7e6c72627 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 0879b84d2..0879b84d2 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 9d71d3005..9d71d3005 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 796b6ed32..796b6ed32 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 109b94f7a..109b94f7a 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 eae700ee4..eae700ee4 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 a32cd1d1b..a32cd1d1b 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 07f43e599..07f43e599 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 b7d52cecc..b7d52cecc 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 355436cbf..355436cbf 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 4cbdb9fda..4cbdb9fda 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 0879b84d2..0879b84d2 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 159392f7f..159392f7f 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 e9f63849d..e9f63849d 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 069255380..069255380 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 0879b84d2..0879b84d2 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 16f49ffe4..16f49ffe4 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 bde83c30d..bde83c30d 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 cbb0d5c69..cbb0d5c69 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 0879b84d2..0879b84d2 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 159392f7f..159392f7f 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 e9f63849d..e9f63849d 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 069255380..069255380 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 0879b84d2..0879b84d2 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 fbfcce10a..fbfcce10a 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 f747a9651..f747a9651 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 cbb0d5c69..cbb0d5c69 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 0879b84d2..0879b84d2 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 159392f7f..159392f7f 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 e9f63849d..e9f63849d 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 069255380..069255380 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 0879b84d2..0879b84d2 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 09ab6d4f8..09ab6d4f8 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 851275fbf..851275fbf 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 87946aa7b..87946aa7b 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 0879b84d2..0879b84d2 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 159392f7f..159392f7f 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 e9f63849d..e9f63849d 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 069255380..069255380 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 0879b84d2..0879b84d2 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 fc82ada7e..fc82ada7e 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 355436cbf..355436cbf 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 05201724f..05201724f 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 0879b84d2..0879b84d2 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 dcb0686dc..dcb0686dc 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 cc2aa1782..cc2aa1782 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 241f76885..241f76885 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 dd78c7d31..dd78c7d31 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 8c6fca7b5..8c6fca7b5 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 7fa6f5cf4..7fa6f5cf4 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 40a98ab7c..40a98ab7c 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 1fb50407b..1fb50407b 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 44ddc4bc1..44ddc4bc1 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 0879b84d2..0879b84d2 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 55d8213c4..55d8213c4 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 4f6441e7b..4f6441e7b 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 db8253f83..db8253f83 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 0879b84d2..0879b84d2 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 ed5cef8a5..ed5cef8a5 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 b33058c3b..b33058c3b 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 70cccc0f0..70cccc0f0 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 0879b84d2..0879b84d2 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 55d8213c4..55d8213c4 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 4f6441e7b..4f6441e7b 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 db8253f83..db8253f83 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 0879b84d2..0879b84d2 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 3adcdce58..3adcdce58 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 863e26c30..863e26c30 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 70cccc0f0..70cccc0f0 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 0879b84d2..0879b84d2 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 55d8213c4..55d8213c4 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 4f6441e7b..4f6441e7b 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 db8253f83..db8253f83 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 0879b84d2..0879b84d2 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 7f6e05f08..7f6e05f08 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 f4770e2ac..f4770e2ac 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 cb49505f5..cb49505f5 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 0879b84d2..0879b84d2 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 55d8213c4..55d8213c4 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 4f6441e7b..4f6441e7b 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 db8253f83..db8253f83 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 0879b84d2..0879b84d2 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 40a98ab7c..40a98ab7c 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 1fb50407b..1fb50407b 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 44ddc4bc1..44ddc4bc1 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 0879b84d2..0879b84d2 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 325452938..325452938 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 3852b1962..3852b1962 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 493f3ab60..493f3ab60 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 217a4a537..217a4a537 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 307403964..307403964 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 2eb64b6fc..2eb64b6fc 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 11bc94831..11bc94831 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 844f6becf..844f6becf 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 f27505607..f27505607 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 761cb2fd2..761cb2fd2 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 c2fbdeb30..c2fbdeb30 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 7f823b689..7f823b689 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 8dd37880d..8dd37880d 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 be1e00b8a..be1e00b8a 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 f2a54bf95..f2a54bf95 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 34afda196..34afda196 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 65336d88d..65336d88d 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 bcade1ca9..bcade1ca9 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 e930657f8..e930657f8 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 ca61c6e81..ca61c6e81 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 eb95fa94c..eb95fa94c 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 761cb2fd2..761cb2fd2 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 8b0ddd4ee..8b0ddd4ee 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 94e1fac45..94e1fac45 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 cd47cfa3a..cd47cfa3a 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 761cb2fd2..761cb2fd2 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 e930657f8..e930657f8 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 ca61c6e81..ca61c6e81 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 eb95fa94c..eb95fa94c 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 761cb2fd2..761cb2fd2 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 f5ac45504..f5ac45504 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 1599c8812..1599c8812 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 19b0beb16..19b0beb16 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 761cb2fd2..761cb2fd2 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 e930657f8..e930657f8 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 ca61c6e81..ca61c6e81 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 eb95fa94c..eb95fa94c 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 761cb2fd2..761cb2fd2 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 a2b939a41..a2b939a41 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 844f6becf..844f6becf 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 5805bf355..5805bf355 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 761cb2fd2..761cb2fd2 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 5889901c5..5889901c5 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 f7beea796..f7beea796 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 0497bd839..0497bd839 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 294567edc..294567edc 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 99d1f773b..99d1f773b 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 1ff8c2cd4..1ff8c2cd4 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 29f478248..29f478248 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 c02d3cfae..c02d3cfae 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 7cfea2a32..7cfea2a32 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 7cdaabf53..7cdaabf53 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 dc61b8641..dc61b8641 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 fa426317b..fa426317b 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 08f1635a3..08f1635a3 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 d9ac0a8d0..d9ac0a8d0 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 2d983c43b..2d983c43b 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 a3e705f38..a3e705f38 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 9980058b1..9980058b1 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 0b8e6ba5b..0b8e6ba5b 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 0a64db60f..0a64db60f 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 e9f8fe227..e9f8fe227 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 a84ed90b2..a84ed90b2 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 d9ac0a8d0..d9ac0a8d0 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 88485477e..88485477e 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 60c645092..60c645092 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 36c21b041..36c21b041 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 7cdaabf53..7cdaabf53 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 0a64db60f..0a64db60f 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 e9f8fe227..e9f8fe227 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 a84ed90b2..a84ed90b2 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 7cdaabf53..7cdaabf53 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 769bc4d31..769bc4d31 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 e05cc1e28..e05cc1e28 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 c98da7eff..c98da7eff 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 7cdaabf53..7cdaabf53 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 0a64db60f..0a64db60f 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 e9f8fe227..e9f8fe227 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 a84ed90b2..a84ed90b2 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 7cdaabf53..7cdaabf53 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 34cbf68b2..34cbf68b2 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 c02d3cfae..c02d3cfae 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 7cfea2a32..7cfea2a32 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 7cdaabf53..7cdaabf53 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 a0c8f2cd7..a0c8f2cd7 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 a29b78f0a..a29b78f0a 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 7b62b0a9c..7b62b0a9c 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 834cdfe6c..834cdfe6c 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 2c526e74f..2c526e74f 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 734832358..734832358 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 d430ef5a3..d430ef5a3 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 834cdfe6c..834cdfe6c 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 be87ed90a..be87ed90a 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 0879b84d2..0879b84d2 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 4b204dbc4..4b204dbc4 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 834cdfe6c..834cdfe6c 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 2c526e74f..2c526e74f 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 0879b84d2..0879b84d2 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 0db3279e4..0db3279e4 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 4b204dbc4..4b204dbc4 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 834cdfe6c..834cdfe6c 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 be87ed90a..be87ed90a 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 0879b84d2..0879b84d2 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 4b204dbc4..4b204dbc4 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 834cdfe6c..834cdfe6c 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 be87ed90a..be87ed90a 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 0879b84d2..0879b84d2 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 4b204dbc4..4b204dbc4 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 834cdfe6c..834cdfe6c 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 be87ed90a..be87ed90a 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 0879b84d2..0879b84d2 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 178798820..178798820 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 367d0ed17..367d0ed17 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 b44dda298..b44dda298 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 0879b84d2..0879b84d2 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 4b204dbc4..4b204dbc4 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 834cdfe6c..834cdfe6c 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 be87ed90a..be87ed90a 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 0879b84d2..0879b84d2 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 4b204dbc4..4b204dbc4 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 834cdfe6c..834cdfe6c 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 be87ed90a..be87ed90a 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 0879b84d2..0879b84d2 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 6084010a9..6084010a9 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 c22bd65d2..c22bd65d2 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 e69de29bb..e69de29bb 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 a447a2aa5..a447a2aa5 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 92b743732..92b743732 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 3232121a0..3232121a0 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 aa0357d75..aa0357d75 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 26f0dffa7..26f0dffa7 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 10b336f5b..10b336f5b 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 904aaa1ce..904aaa1ce 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 d7d875313..d7d875313 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 b583fa97b..b583fa97b 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 d608abec9..d608abec9 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 b5161fcd5..b5161fcd5 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 726aed514..726aed514 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 2049f6fa1..2049f6fa1 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 22301ba1f..22301ba1f 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 4a1d4805a..4a1d4805a 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 eaece74e4..eaece74e4 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 46c17de01..46c17de01 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 06efdc96c..06efdc96c 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 a58f2d447..a58f2d447 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 c0a1ac592..c0a1ac592 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 9d71d3005..9d71d3005 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 1a756e2c7..1a756e2c7 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 7e1ccd10a..7e1ccd10a 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 6d31f6f26..6d31f6f26 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 b9b906a31..b9b906a31 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 1ea72a528..1ea72a528 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 90e089563..90e089563 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 2d19f20f6..2d19f20f6 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 01fc74a60..01fc74a60 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 d93f03622..d93f03622 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 68b618e91..68b618e91 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 966e153a6..966e153a6 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 dd75d76b9..dd75d76b9 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 63731237e..63731237e 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 3872ce498..3872ce498 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 4d5636436..4d5636436 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 f9e0276f8..f9e0276f8 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 6aebbd6c8..6aebbd6c8 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 5e73b9784..5e73b9784 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 5dc4e5915..5dc4e5915 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 6c0d7392f..6c0d7392f 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 f5df60761..f5df60761 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 125f36b1b..125f36b1b 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 a1d5d795c..a1d5d795c 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 2475c639c..2475c639c 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 2d21fbcde..2d21fbcde 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 bc0ec3157..bc0ec3157 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 dcb0686dc..dcb0686dc 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 986bf2804..986bf2804 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 d70e9fe88..d70e9fe88 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 058d33609..058d33609 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 1912df3f0..1912df3f0 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 d174b4a47..d174b4a47 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 9ba73b057..9ba73b057 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 04f61c4eb..04f61c4eb 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 b3588ca79..b3588ca79 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 1af024fc2..1af024fc2 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 7cc79d0e5..7cc79d0e5 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 75a0f01f5..75a0f01f5 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 c814a2876..c814a2876 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 6f9405f20..6f9405f20 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 d8c39685d..d8c39685d 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 c928fcdb4..c928fcdb4 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 017097178..017097178 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 d7a3ed978..d7a3ed978 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 41a7ff325..41a7ff325 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 bd49f8606..bd49f8606 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 4cc69b66f..4cc69b66f 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 cc0a482ee..cc0a482ee 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 650b982f0..650b982f0 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 8ce4f1d26..8ce4f1d26 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 325452938..325452938 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 7d411069d..7d411069d 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 0ef5d1bc3..0ef5d1bc3 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 b640df30c..b640df30c 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 f60937ccb..f60937ccb 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 2eb64b6fc..2eb64b6fc 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 8b115c205..8b115c205 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 7f3928508..7f3928508 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 3dcd36c17..3dcd36c17 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 484a3147d..484a3147d 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 3ad008512..3ad008512 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 20e363375..20e363375 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 907041473..907041473 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 57a57647a..57a57647a 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 94f87854d..94f87854d 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 e54873d5a..e54873d5a 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 92e08f99a..92e08f99a 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 fb614ebf6..fb614ebf6 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 252da6e76..252da6e76 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 7057d2166..7057d2166 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 3dc4303b9..3dc4303b9 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 56f9cc534..56f9cc534 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 41e552177..41e552177 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 627e29251..627e29251 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 4945897e9..4945897e9 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 be52eb032..be52eb032 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 93740e22e..93740e22e 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 6dafa69ad..6dafa69ad 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 0c5861b5e..0c5861b5e 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 1ff8c2cd4..1ff8c2cd4 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 7545a31b9..7545a31b9 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 1de62bb58..1de62bb58 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 b3d525243..b3d525243 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 be5d83f46..be5d83f46 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 a85601962..a85601962 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 74caa8620..74caa8620 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 2883c046f..2883c046f 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 4cfea1a59..4cfea1a59 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 db47622a1..db47622a1 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 b9b43c413..b9b43c413 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 1b1942939..1b1942939 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 5b52a16f4..5b52a16f4 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 734832358..734832358 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 e69de29bb..e69de29bb 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 7c2f00419..7c2f00419 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 70f872e9d..70f872e9d 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 c191763a7..c191763a7 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 9f017d249..9f017d249 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 1209504e9..1209504e9 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 abf7c2a32..abf7c2a32 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 f318f95e2..f318f95e2 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 9208491fc..9208491fc 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 aee8969de..aee8969de 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 0e6c3ff5c..0e6c3ff5c 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 2fe46c826..2fe46c826 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 179a4f460..179a4f460 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 9d5c440a2..9d5c440a2 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 21cab20a4..21cab20a4 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 760c5542c..760c5542c 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 ee296470c..ee296470c 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 bebca4dcf..bebca4dcf 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 57347d15b..57347d15b 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 6084010a9..6084010a9 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 00cb62399..00cb62399 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 e69de29bb..e69de29bb 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 4e3761e5a..4e3761e5a 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 f94233a80..f94233a80 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 bd09839fe..bd09839fe 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 139747c1c..139747c1c 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 6420dec5d..6420dec5d 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 337d6bf5e..337d6bf5e 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 23cf6252a..23cf6252a 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 14db0940e..14db0940e 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 aab651eff..aab651eff 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 78c31b3cc..78c31b3cc 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 50688615a..50688615a 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 dd3035a1a..dd3035a1a 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 de90fb5a3..de90fb5a3 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 cf6f8f67d..cf6f8f67d 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 6f36c0fa3..6f36c0fa3 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 61d05e80b..61d05e80b 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 41040240e..41040240e 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 78993ff42..78993ff42 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 04a2418d0..04a2418d0 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 2d36f9b42..2d36f9b42 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 1e4c0d752..1e4c0d752 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 502e035f5..502e035f5 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 79361af4b..79361af4b 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 c0ace9a19..c0ace9a19 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 32ea36639..32ea36639 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 5d6553f70..5d6553f70 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 e7d784191..e7d784191 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 5ca9a3db7..5ca9a3db7 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 42493a499..42493a499 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 cca844b27..cca844b27 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 b9468764d..b9468764d 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 a7343b533..a7343b533 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 b80989646..b80989646 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 3d887b7ce..3d887b7ce 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 48fed6966..48fed6966 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 01f9ba780..01f9ba780 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 4ad730f2a..4ad730f2a 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 083a8b1e8..083a8b1e8 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 e69de29bb..e69de29bb 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 5fb4c14d0..5fb4c14d0 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 f0a3593a4..f0a3593a4 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 888b9e2c4..888b9e2c4 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 d1ace402b..d1ace402b 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 6af22297e..6af22297e 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 1a6fe6d5c..1a6fe6d5c 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 fa1c02e5f..fa1c02e5f 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 0d2bc7ab7..0d2bc7ab7 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 a26cdfad8..a26cdfad8 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 b01789b8d..b01789b8d 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 27423e193..27423e193 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 744b0780f..744b0780f 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 a77f7977f..a77f7977f 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 a62af1749..a62af1749 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 66092407a..66092407a 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 9717df5c1..9717df5c1 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 31a1e4620..31a1e4620 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 bc527d2e1..bc527d2e1 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 515d37647..515d37647 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 1e5d33196..1e5d33196 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 ac0b810fc..ac0b810fc 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 05815e841..05815e841 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 6cb79b030..6cb79b030 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 88a91749c..88a91749c 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 b1cd5b9db..b1cd5b9db 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 3198b8578..3198b8578 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 34f5ac9ca..34f5ac9ca 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 9c8941f7a..9c8941f7a 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 f663c33fe..f663c33fe 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 5efa36bce..5efa36bce 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 5e8f6364a..5e8f6364a 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 3db3c93ea..3db3c93ea 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 6a38ba864..6a38ba864 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 ace56536e..ace56536e 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 c6bc6302f..c6bc6302f 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 01f9ba780..01f9ba780 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 4ad730f2a..4ad730f2a 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 b7fe0c2dd..b7fe0c2dd 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 85bb970fd..85bb970fd 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 877e14ff3..877e14ff3 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 aa3f74fc5..aa3f74fc5 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 2131668fc..2131668fc 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 99a59668f..99a59668f 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 ccc841364..ccc841364 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 b349f4418..b349f4418 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 4bff444a4..4bff444a4 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 83aea46e6..83aea46e6 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 e1a552c70..e1a552c70 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 8cba1529e..8cba1529e 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 aa6819895..aa6819895 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 4b1d31a5d..4b1d31a5d 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 95fb847c1..95fb847c1 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 ea32de3ed..ea32de3ed 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 812957008..812957008 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 eed35289e..eed35289e 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 1f1e3e391..1f1e3e391 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 4e66b140a..4e66b140a 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 0d3a74c4a..0d3a74c4a 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 905774fc4..905774fc4 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 4d115caf3..4d115caf3 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 100dd307e..100dd307e 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 bb1b2b302..bb1b2b302 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 c3a07e7e3..c3a07e7e3 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 4bff444a4..4bff444a4 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 234c215dd..234c215dd 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 6b7d28f98..6b7d28f98 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 7bbd228d0..7bbd228d0 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 67593952c..67593952c 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 223cbded8..223cbded8 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 2a46c4034..2a46c4034 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 2a46c4034..2a46c4034 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 7e291053e..7e291053e 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 62058e3cb..62058e3cb 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 9aa402459..9aa402459 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 2a8e02383..2a8e02383 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 877e14ff3..877e14ff3 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 aa3f74fc5..aa3f74fc5 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 2131668fc..2131668fc 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 99a59668f..99a59668f 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 b349f4418..b349f4418 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 4bff444a4..4bff444a4 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 83aea46e6..83aea46e6 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 e1a552c70..e1a552c70 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 8cba1529e..8cba1529e 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 aa6819895..aa6819895 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 4b1d31a5d..4b1d31a5d 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 95fb847c1..95fb847c1 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 812957008..812957008 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 eed35289e..eed35289e 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 1f1e3e391..1f1e3e391 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 4e66b140a..4e66b140a 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 0d3a74c4a..0d3a74c4a 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 905774fc4..905774fc4 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 4d115caf3..4d115caf3 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 100dd307e..100dd307e 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 c3a07e7e3..c3a07e7e3 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 4bff444a4..4bff444a4 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 234c215dd..234c215dd 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 6b7d28f98..6b7d28f98 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 7bbd228d0..7bbd228d0 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 67593952c..67593952c 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 223cbded8..223cbded8 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 2a46c4034..2a46c4034 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 7e291053e..7e291053e 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 62058e3cb..62058e3cb 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 aef22c395..aef22c395 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 6f165e272..6f165e272 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 ac02d0f9a..ac02d0f9a 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 c6a5824d1..c6a5824d1 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 da2970d94..da2970d94 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 01fc039b0..01fc039b0 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 b1a55ba10..b1a55ba10 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 d8fb27af8..d8fb27af8 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 f77d65ebc..f77d65ebc 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 f77d65ebc..f77d65ebc 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 b699e8c14..b699e8c14 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 c28cd4cc7..c28cd4cc7 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 c63bbea77..c63bbea77 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 b3de7e2c6..b3de7e2c6 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 29e9df108..29e9df108 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 b3a12ec53..b3a12ec53 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 9301e60c6..9301e60c6 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 54d015fef..54d015fef 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 2232069f6..2232069f6 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 40d8ebeb9..40d8ebeb9 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 6138d0367..6138d0367 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 b37911da3..b37911da3 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 ea047355a..ea047355a 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 b29a2b93e..b29a2b93e 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 c93e1a6ac..c93e1a6ac 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 f93f6aed5..f93f6aed5 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 04f141aba..04f141aba 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 844aa9402..844aa9402 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 821ec70ba..821ec70ba 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 821ec70ba..821ec70ba 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 433d89bd1..433d89bd1 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 2f3eae47c..2f3eae47c 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 c3d97a3c7..c3d97a3c7 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 42c5a1cbd..42c5a1cbd 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 942ed23a1..942ed23a1 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 c641fb47e..c641fb47e 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 26801acad..26801acad 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 f2b24d7d6..f2b24d7d6 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 b5508dd35..b5508dd35 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 f2b24d7d6..f2b24d7d6 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 eed35289e..eed35289e 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 4dd6ddd76..4dd6ddd76 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 0f779b8b9..0f779b8b9 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 c24444287..c24444287 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 4c8499f23..4c8499f23 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 b7eeb258f..b7eeb258f 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 22504046e..22504046e 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 e323f61f2..e323f61f2 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 e323f61f2..e323f61f2 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 e323f61f2..e323f61f2 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 9cb70a475..9cb70a475 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 9cb70a475..9cb70a475 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 9cb70a475..9cb70a475 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 e54bd6e75..e54bd6e75 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 42fa98d4d..42fa98d4d 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 73261830c..73261830c 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 73261830c..73261830c 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 5c482da69..5c482da69 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 092219236..092219236 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 b1919bd29..b1919bd29 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 f47d90615..f47d90615 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 6f165e272..6f165e272 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 ac02d0f9a..ac02d0f9a 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 c6a5824d1..c6a5824d1 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 da2970d94..da2970d94 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 b9c32d300..b9c32d300 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 b1a55ba10..b1a55ba10 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 d8fb27af8..d8fb27af8 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 f77d65ebc..f77d65ebc 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 f77d65ebc..f77d65ebc 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 b699e8c14..b699e8c14 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 c28cd4cc7..c28cd4cc7 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 c63bbea77..c63bbea77 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 b3de7e2c6..b3de7e2c6 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 29e9df108..29e9df108 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 b3a12ec53..b3a12ec53 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 9301e60c6..9301e60c6 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 54d015fef..54d015fef 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 2232069f6..2232069f6 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 40d8ebeb9..40d8ebeb9 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 6138d0367..6138d0367 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 ea047355a..ea047355a 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 b29a2b93e..b29a2b93e 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 52398b1b7..52398b1b7 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 04f141aba..04f141aba 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 844aa9402..844aa9402 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 821ec70ba..821ec70ba 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 821ec70ba..821ec70ba 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 433d89bd1..433d89bd1 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 2f3eae47c..2f3eae47c 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 c3d97a3c7..c3d97a3c7 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 42c5a1cbd..42c5a1cbd 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 942ed23a1..942ed23a1 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 c641fb47e..c641fb47e 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 26801acad..26801acad 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 f2b24d7d6..f2b24d7d6 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 b5508dd35..b5508dd35 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 f2b24d7d6..f2b24d7d6 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 eed35289e..eed35289e 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 4dd6ddd76..4dd6ddd76 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 c24444287..c24444287 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 4c8499f23..4c8499f23 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 2935caf13..2935caf13 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 22504046e..22504046e 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 e323f61f2..e323f61f2 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 e323f61f2..e323f61f2 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 e323f61f2..e323f61f2 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 7180f84d1..7180f84d1 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 7180f84d1..7180f84d1 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 7180f84d1..7180f84d1 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 e54bd6e75..e54bd6e75 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 42fa98d4d..42fa98d4d 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 73261830c..73261830c 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 73261830c..73261830c 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 5c482da69..5c482da69 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 092219236..092219236 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 b1919bd29..b1919bd29 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 4f1bd22f7..4f1bd22f7 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 331e6fafd..331e6fafd 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 6f165e272..6f165e272 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 ac02d0f9a..ac02d0f9a 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 c6a5824d1..c6a5824d1 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 b9c32d300..b9c32d300 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 e69de29bb..e69de29bb 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 eefcd1e71..eefcd1e71 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 8b2884786..8b2884786 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 b1a263e42..b1a263e42 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 0c147338e..0c147338e 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 3bfda3907..3bfda3907 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 fdb81f212..fdb81f212 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 b3de7e2c6..b3de7e2c6 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 29e9df108..29e9df108 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 b3a12ec53..b3a12ec53 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 9301e60c6..9301e60c6 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 54d015fef..54d015fef 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 2232069f6..2232069f6 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 40d8ebeb9..40d8ebeb9 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 3782071bf..3782071bf 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 c2642c648..c2642c648 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 6f180b048..6f180b048 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 ea047355a..ea047355a 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 52398b1b7..52398b1b7 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 f93f6aed5..f93f6aed5 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 82806721e..82806721e 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 71e8af177..71e8af177 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 af9a9c80e..af9a9c80e 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 5b7a5ebbb..5b7a5ebbb 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 6056feffe..6056feffe 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 42c5a1cbd..42c5a1cbd 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 942ed23a1..942ed23a1 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 c641fb47e..c641fb47e 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 26801acad..26801acad 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 f2b24d7d6..f2b24d7d6 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 b5508dd35..b5508dd35 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 eed35289e..eed35289e 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 6c27a1042..6c27a1042 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 889f69ed7..889f69ed7 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 d9036e124..d9036e124 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 c24444287..c24444287 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 2935caf13..2935caf13 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 09eea759a..09eea759a 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 aec97b30c..aec97b30c 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 aec97b30c..aec97b30c 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 aec97b30c..aec97b30c 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 1b29b9f94..1b29b9f94 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 fc96ada44..fc96ada44 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 e54bd6e75..e54bd6e75 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 42fa98d4d..42fa98d4d 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 73261830c..73261830c 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 73261830c..73261830c 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 5c482da69..5c482da69 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 b417ab040..b417ab040 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 b417ab040..b417ab040 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 b417ab040..b417ab040 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 b1919bd29..b1919bd29 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 4f1bd22f7..4f1bd22f7 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 57b45e5fd..57b45e5fd 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 a13c1d459..a13c1d459 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 3c6cbddc2..3c6cbddc2 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 87d5703d9..87d5703d9 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 7d398887c..7d398887c 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 32aa60c30..32aa60c30 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 373755ab8..373755ab8 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 0fb15d2da..0fb15d2da 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 29e264ff3..29e264ff3 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 7e24359af..7e24359af 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 55b4b0e9c..55b4b0e9c 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 f962070c3..f962070c3 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 bfdef21b7..bfdef21b7 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 dbed6189c..dbed6189c 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 90e18962a..90e18962a 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 d7df72e85..d7df72e85 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 6405b5e38..6405b5e38 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 f9fc98408..f9fc98408 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 1172cbfc2..1172cbfc2 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 df05a6b31..df05a6b31 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 dd1dbac32..dd1dbac32 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 21750b4a2..21750b4a2 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 dbf1d72b5..dbf1d72b5 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 bd86fe4f2..bd86fe4f2 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 9b9c76333..9b9c76333 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 058a245f5..058a245f5 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 e3dbf06c2..e3dbf06c2 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 243811e3a..243811e3a 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 769f78277..769f78277 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 397889561..397889561 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 456820fdb..456820fdb 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 aef2fefd5..aef2fefd5 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 8f3533527..8f3533527 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 5aae885a1..5aae885a1 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 7444cc924..7444cc924 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 1e9dfa3d1..1e9dfa3d1 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 a7026570d..a7026570d 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 dd57656f1..dd57656f1 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 7c60522f9..7c60522f9 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 174dcebd4..174dcebd4 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 4a270af57..4a270af57 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 06e773409..06e773409 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 e69de29bb..e69de29bb 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 6f165e272..6f165e272 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 ac02d0f9a..ac02d0f9a 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 c6a5824d1..c6a5824d1 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 a1c0c822d..a1c0c822d 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 e69de29bb..e69de29bb 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 a66fb92ba..a66fb92ba 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 7e281abb5..7e281abb5 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 fdb81f212..fdb81f212 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 b3de7e2c6..b3de7e2c6 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 29e9df108..29e9df108 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 b3a12ec53..b3a12ec53 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 9301e60c6..9301e60c6 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 40d8ebeb9..40d8ebeb9 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 ea047355a..ea047355a 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 06e597304..06e597304 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 b4692feec..b4692feec 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 22fd98f51..22fd98f51 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 6056feffe..6056feffe 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 42c5a1cbd..42c5a1cbd 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 942ed23a1..942ed23a1 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 c641fb47e..c641fb47e 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 26801acad..26801acad 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 eed35289e..eed35289e 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 c24444287..c24444287 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 57a203bce..57a203bce 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 2413bfa9d..2413bfa9d 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 970eb2fc1..970eb2fc1 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 fc96ada44..fc96ada44 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 e54bd6e75..e54bd6e75 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 42fa98d4d..42fa98d4d 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 5c482da69..5c482da69 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 6b1eaa2ca..6b1eaa2ca 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 4f1bd22f7..4f1bd22f7 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 4d26732ea..4d26732ea 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 0ea7aca3e..0ea7aca3e 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 14cb0bee1..14cb0bee1 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 cd398a511..cd398a511 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 14cb0bee1..14cb0bee1 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 199746d5f..199746d5f 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 71454c2ab..71454c2ab 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 e55e30270..e55e30270 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 71454c2ab..71454c2ab 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 7e409c2a0..7e409c2a0 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 f582f4929..f582f4929 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 4635dac7d..4635dac7d 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 33f476de4..33f476de4 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 1081b764a..1081b764a 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 e69de29bb..e69de29bb 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 6d6c047b0..6d6c047b0 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 7bef57b62..7bef57b62 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 6426a939b..6426a939b 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 68b5a6ece..68b5a6ece 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 04114bdbe..04114bdbe 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 b45670fcb..b45670fcb 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 34558e0c2..34558e0c2 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 7393cba89..7393cba89 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 e4f6fb744..e4f6fb744 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 9f40d4d72..9f40d4d72 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 6d3d26797..6d3d26797 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 6b68fb398..6b68fb398 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 1687961f3..1687961f3 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 526c019c6..526c019c6 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 11fd9fe3c..11fd9fe3c 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 8c48f2238..8c48f2238 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 9f7e05893..9f7e05893 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 a2ddf7c5a..a2ddf7c5a 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 dfbcea8d2..dfbcea8d2 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 032acb534..032acb534 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 edb6c864b..edb6c864b 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 26ebc2c0e..26ebc2c0e 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 1f642b1b2..1f642b1b2 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 f05d1a60f..f05d1a60f 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 101fcc95b..101fcc95b 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 1a3a4ea86..1a3a4ea86 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 e90249653..e90249653 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 8e3afa583..8e3afa583 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 d8051c350..d8051c350 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 4f11670ce..4f11670ce 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 cb3b745de..cb3b745de 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 5607a789d..5607a789d 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 0df652ffb..0df652ffb 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 cada58bd0..cada58bd0 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 f8c3476e1..f8c3476e1 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 3ed0b8fbe..3ed0b8fbe 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 11fd9fe3c..11fd9fe3c 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 f17e1fed1..f17e1fed1 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 ed480354e..ed480354e 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 a2ddf7c5a..a2ddf7c5a 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 abe8a9bc4..abe8a9bc4 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 1a3e67bb0..1a3e67bb0 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 485771e7d..485771e7d 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 328961941..328961941 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 e1011bd3b..e1011bd3b 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 d70027fb9..d70027fb9 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 f5837bf6f..f5837bf6f 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 ac713190f..ac713190f 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 f489f3ac7..f489f3ac7 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 0883f3c58..0883f3c58 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 ab67d06ff..ab67d06ff 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 0df652ffb..0df652ffb 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 c59116df8..c59116df8 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 fa2784ee7..fa2784ee7 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 c403fcd8d..c403fcd8d 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 7fee2da8b..7fee2da8b 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 d4bb0e2a4..d4bb0e2a4 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 891945a4e..891945a4e 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 aaef00d5b..aaef00d5b 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 dea2fe477..dea2fe477 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 ba7a36f2b..ba7a36f2b 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 ee1de6073..ee1de6073 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 efc8565bb..efc8565bb 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 2c6d0aab1..2c6d0aab1 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 44efda839..44efda839 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 c8a3ce783..c8a3ce783 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 5e7802fa0..5e7802fa0 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 e69de29bb..e69de29bb 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 94dba7c06..94dba7c06 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 374184e60..374184e60 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 de906c270..de906c270 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 37f73629f..37f73629f 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 200639256..200639256 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 37f73629f..37f73629f 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 de906c270..de906c270 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 f6ead5cb9..f6ead5cb9 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 96e05913e..96e05913e 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 37f73629f..37f73629f 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 de906c270..de906c270 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 f2b8924b8..f2b8924b8 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 96e05913e..96e05913e 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 37f73629f..37f73629f 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 de906c270..de906c270 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 37f73629f..37f73629f 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 de906c270..de906c270 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 37f73629f..37f73629f 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 de906c270..de906c270 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 37f73629f..37f73629f 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 200639256..200639256 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 7d3139a80..7d3139a80 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 b47e78806..b47e78806 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 3dde042b5..3dde042b5 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 eba7c403d..eba7c403d 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 9a06059df..9a06059df 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 be44a7521..be44a7521 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 384aac032..384aac032 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 5088aa2f7..5088aa2f7 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 879cd1e0c..879cd1e0c 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 6333e7f7f..6333e7f7f 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 384aac032..384aac032 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 5088aa2f7..5088aa2f7 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 07edd42dc..07edd42dc 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 6333e7f7f..6333e7f7f 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 384aac032..384aac032 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 5088aa2f7..5088aa2f7 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 274931bef..274931bef 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 cd23725a8..cd23725a8 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 384aac032..384aac032 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 5088aa2f7..5088aa2f7 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 c71515f3f..c71515f3f 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 2f06641f7..2f06641f7 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 c4ed4276d..c4ed4276d 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 238d82ff9..238d82ff9 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 4b1500ef9..4b1500ef9 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 39cc3e8ff..39cc3e8ff 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 14a2ac1e8..14a2ac1e8 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 a0f7c790a..a0f7c790a 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 63c6a1845..63c6a1845 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 1ab2242b7..1ab2242b7 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 0894c51cf..0894c51cf 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 4dcaedeca..4dcaedeca 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 63c6a1845..63c6a1845 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 1ab2242b7..1ab2242b7 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 3e74ff039..3e74ff039 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 4dcaedeca..4dcaedeca 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 63c6a1845..63c6a1845 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 1ab2242b7..1ab2242b7 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 41544d429..41544d429 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 bf055bad7..bf055bad7 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 63c6a1845..63c6a1845 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 1ab2242b7..1ab2242b7 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 14a2ac1e8..14a2ac1e8 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 a0f7c790a..a0f7c790a 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 89a781fe3..89a781fe3 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 b12e0729a..b12e0729a 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 4a2d3aa10..4a2d3aa10 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 3246d2284..3246d2284 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 db4cf5b3f..db4cf5b3f 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 58cf526a8..58cf526a8 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 c44b3eef3..c44b3eef3 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 05f9f28cb..05f9f28cb 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 a078dd2da..a078dd2da 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 f5515636d..f5515636d 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 b63812ab1..b63812ab1 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 f2e56c2e1..f2e56c2e1 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 3157ae1ea..3157ae1ea 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 821384065..821384065 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 b63812ab1..b63812ab1 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 f2e56c2e1..f2e56c2e1 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 775d8c403..775d8c403 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 8a5fdef80..8a5fdef80 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 b63812ab1..b63812ab1 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 f2e56c2e1..f2e56c2e1 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 48e306d39..48e306d39 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 275abab71..275abab71 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 13c621eb3..13c621eb3 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 4e7b24c03..4e7b24c03 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 0a43788a1..0a43788a1 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 e8c46085b..e8c46085b 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 2bad2eb7b..2bad2eb7b 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 c5ed18d76..c5ed18d76 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 3572ec713..3572ec713 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 d9cadeb51..d9cadeb51 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 2f7b0cc24..2f7b0cc24 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 7c78d2ce5..7c78d2ce5 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 1a1271508..1a1271508 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 42e476e9d..42e476e9d 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 e50fa10cc..e50fa10cc 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 bb9537922..bb9537922 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 1a1271508..1a1271508 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 42e476e9d..42e476e9d 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 15a024d18..15a024d18 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 cff0d25e2..cff0d25e2 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 1a1271508..1a1271508 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 42e476e9d..42e476e9d 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 d9ddad246..d9ddad246 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 c5ed18d76..c5ed18d76 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 ca2d6df66..ca2d6df66 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 c6d07d169..c6d07d169 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 9f05ec768..9f05ec768 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 baa231445..baa231445 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 6abb3805a..6abb3805a 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 09ecec29d..09ecec29d 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 80b3c426d..80b3c426d 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 baa231445..baa231445 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 2c63c0851..2c63c0851 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 2c63c0851..2c63c0851 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 80b3c426d..80b3c426d 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 09ecec29d..09ecec29d 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 0e4b3eba1..0e4b3eba1 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 2c63c0851..2c63c0851 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 80b3c426d..80b3c426d 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 09ecec29d..09ecec29d 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 aa2329a04..aa2329a04 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 800b1ae2f..800b1ae2f 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 80b3c426d..80b3c426d 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 09ecec29d..09ecec29d 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 80b3c426d..80b3c426d 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 09ecec29d..09ecec29d 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 4b739d0bc..4b739d0bc 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 b6e5e1483..b6e5e1483 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 e69de29bb..e69de29bb 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 312dd2697..312dd2697 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 7c5dc3ffe..7c5dc3ffe 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 e9c3f65bc..e9c3f65bc 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 69e10191f..69e10191f 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 caa5f1e1e..caa5f1e1e 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 4cf907708..4cf907708 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 e45467315..e45467315 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 18c003b23..18c003b23 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 9624292cc..9624292cc 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 623d1dc7e..623d1dc7e 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 117011a43..117011a43 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 5c2dee1e4..5c2dee1e4 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 47e747f3c..47e747f3c 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 74bd83fbd..74bd83fbd 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 1cea9f045..1cea9f045 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 32f9b3453..32f9b3453 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 e69de29bb..e69de29bb 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 eaef49225..eaef49225 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 0ad2aaead..0ad2aaead 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 0ad2aaead..0ad2aaead 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 968570e19..968570e19 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 0ad2aaead..0ad2aaead 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 46a80d298..46a80d298 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 bf0e77a17..bf0e77a17 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 7548aad7f..7548aad7f 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 add293357..add293357 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 6258295b6..6258295b6 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 1bb64bc58..1bb64bc58 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 ad0221401..ad0221401 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 306f0d492..306f0d492 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 1b95858f5..1b95858f5 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 46f759580..46f759580 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 489690471..489690471 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 e69de29bb..e69de29bb 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 ca3497b4a..ca3497b4a 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 1bfd6942e..1bfd6942e 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 1ce96c86c..1ce96c86c 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 4df6e5ec0..4df6e5ec0 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 3b5aa192c..3b5aa192c 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 db648722f..db648722f 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 5c07d8133..5c07d8133 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 f6e8efe7f..f6e8efe7f 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 44047e1a4..44047e1a4 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 7d3ce5b20..7d3ce5b20 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 acfffc9f1..acfffc9f1 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 f58b501e3..f58b501e3 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 1a7ccdf72..1a7ccdf72 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 79b389baa..79b389baa 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 b8411e19f..b8411e19f 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 407416cdc..407416cdc 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 13ad9a735..13ad9a735 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 b123c4265..b123c4265 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 ed69a8376..ed69a8376 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 54e575adc..54e575adc 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 3b378c0f2..3b378c0f2 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 c7799065d..c7799065d 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 692a74aa6..692a74aa6 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 a635a889b..a635a889b 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 f9bde0e83..f9bde0e83 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 ceeee2cac..ceeee2cac 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 4ad636dd9..4ad636dd9 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 b5cb10b72..b5cb10b72 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 52d29322f..52d29322f 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 b582ef043..b582ef043 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 b0bd0eec7..b0bd0eec7 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 39ecbb240..39ecbb240 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 469a7ea79..469a7ea79 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 1e931709e..1e931709e 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 42634ce90..42634ce90 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 e69de29bb..e69de29bb 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 9a6863556..9a6863556 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 134a10a45..134a10a45 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 083d77126..083d77126 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 e82679365..e82679365 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 d72aa3b8e..d72aa3b8e 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 5ea6bdc04..5ea6bdc04 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 ad481a996..ad481a996 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 a49cb7724..a49cb7724 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 2227bedf0..2227bedf0 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 8dcb713da..8dcb713da 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 ce5e5f3ba..ce5e5f3ba 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 157811ec7..157811ec7 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 d5214f734..d5214f734 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 3b16bfbd5..3b16bfbd5 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 39beac7a7..39beac7a7 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 b54869433..b54869433 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 f40b7b09a..f40b7b09a 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 89cd6f56c..89cd6f56c 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 789fdd7c0..789fdd7c0 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 85f2e52f8..85f2e52f8 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 e2cb7bff0..e2cb7bff0 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 6beb7e9be..6beb7e9be 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 65843cbb8..65843cbb8 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 76c639616..76c639616 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 d96d9707c..d96d9707c 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 3cfd255bf..3cfd255bf 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 b032f1a8a..b032f1a8a 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 163853638..163853638 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 f9dd2c447..f9dd2c447 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 6451f5fb3..6451f5fb3 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 e69de29bb..e69de29bb 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 5af436341..5af436341 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 e28d9fb14..e28d9fb14 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 bfa0ecb84..bfa0ecb84 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 540ea2815..540ea2815 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 45cb7656a..45cb7656a 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 2ec947c27..2ec947c27 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 1a024063b..1a024063b 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 862ad46af..862ad46af 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 87038ad5c..87038ad5c 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 84d9598bc..84d9598bc 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 f64a46deb..f64a46deb 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 1f713c2d2..1f713c2d2 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 e43041758..e43041758 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 932cff6f3..932cff6f3 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 cb30858f5..cb30858f5 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 f94ee9993..f94ee9993 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 8e58e8c66..8e58e8c66 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 1bfae6059..1bfae6059 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 6e35c9797..6e35c9797 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 c33dea49e..c33dea49e 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 0a1359ecd..0a1359ecd 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 4debbeb85..4debbeb85 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 e69de29bb..e69de29bb 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 76c6f8219..76c6f8219 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 b895d7d57..b895d7d57 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 6bf02a3ee..6bf02a3ee 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 ca61e467d..ca61e467d 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 0b32ded19..0b32ded19 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 3ceb5f0fc..3ceb5f0fc 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 ca61e467d..ca61e467d 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 691a28ea2..691a28ea2 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 3df218ee1..3df218ee1 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 ca61e467d..ca61e467d 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 2277b3e1f..2277b3e1f 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 6ac5c78fc..6ac5c78fc 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 22fce27e2..22fce27e2 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 39139a35b..39139a35b 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 883125cfc..883125cfc 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/rip-topo1/r1/rip_status.ref b/tests/topotests/rip_topo1/r1/rip_status.ref
index 31ad46ab2..31ad46ab2 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 54f177421..54f177421 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 a0b77c886..a0b77c886 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 2ff26045a..2ff26045a 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 7c8f2c502..7c8f2c502 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 99841a62b..99841a62b 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 2e94cfa26..2e94cfa26 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 b61fb45ea..b61fb45ea 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 80f51a92c..80f51a92c 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 c440f3a35..c440f3a35 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 040d3c32a..040d3c32a 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 e27e67503..e27e67503 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 1df299b5e..1df299b5e 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 2b739f048..2b739f048 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 7f145b458..7f145b458 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 f052b697e..f052b697e 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 c201ac1f0..c201ac1f0 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 78672ac87..78672ac87 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 b02cc69d0..b02cc69d0 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 07ed7296d..07ed7296d 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 30d0f31e1..30d0f31e1 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 55fbbc34f..55fbbc34f 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 11c1cdc5b..11c1cdc5b 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 640df9a4a..640df9a4a 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 ef2c42195..ef2c42195 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 fe5bcc8b3..fe5bcc8b3 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 72e1f926a..72e1f926a 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 59006317d..59006317d 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 f4bfff0c5..f4bfff0c5 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 506eaac44..506eaac44 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 909ad663b..909ad663b 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 25a744011..25a744011 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 b43ba6983..b43ba6983 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 7d66a2a30..7d66a2a30 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 cb1adde23..cb1adde23 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 4a5a59cd7..4a5a59cd7 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 25d209f9e..25d209f9e 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 abebd1b14..abebd1b14 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 0848f34dd..0848f34dd 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 48a01f48a..48a01f48a 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 bbd6ef8d6..bbd6ef8d6 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 00d1e1767..00d1e1767 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 b5ca993da..b5ca993da 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 b37911da3..b37911da3 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 5281d0055..5281d0055 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 5647e2b66..5647e2b66 100755
--- a/tests/topotests/simple-snmp-test/test_simple_snmp.py
+++ b/tests/topotests/simple_snmp_test/test_simple_snmp.py