From 764b81858f6c55153bc99bae3be5aeab92f59f05 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Mon, 10 May 2021 20:11:47 +0300 Subject: [PATCH] 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 --- .../r1/babeld.conf | 0 .../r1/bgpd.conf | 0 .../r1/ip_nht.ref | 0 .../r1/ipv4_routes.ref | 0 .../r1/ipv6_nht.ref | 0 .../r1/ipv6_routes.ref | 0 .../r1/isisd.conf | 0 .../r1/ldpd.conf | 0 .../r1/nhrpd.conf | 0 .../r1/ospf6d.conf | 0 .../r1/ospf6d.conf-pre-v4 | 0 .../r1/ospfd.conf | 0 .../r1/pbrd.conf | 0 .../r1/rip_status.ref | 0 .../r1/ripd.conf | 0 .../r1/ripng_status.ref | 0 .../r1/ripngd.conf | 0 .../r1/show_bgp_ipv4-post4.1.ref | 0 .../r1/show_bgp_ipv4-post5.0.ref | 0 .../r1/show_bgp_ipv4-post6.1.ref | 0 .../r1/show_bgp_ipv4.ref | 0 .../r1/show_bgp_ipv6-post4.1.ref | 0 .../r1/show_bgp_ipv6.ref | 0 .../r1/show_bgp_ipv6_post6.1.ref | 0 .../r1/show_bgp_ipv6_summary.ref | 0 .../r1/show_ip_bgp_summary.ref | 0 .../r1/show_ip_ospf_interface.ref | 0 .../r1/show_ipv6_ospf6_interface | 0 .../r1/show_ipv6_ospf6_interface.ref | 0 .../r1/show_isis_interface_detail.ref | 0 .../r1/show_mpls_ldp_interface.ref | 0 .../r1/show_route_map.ref | 0 .../r1/zebra.conf | 0 .../test_all_protocol_startup.dot | 0 .../test_all_protocol_startup.pdf | Bin .../test_all_protocol_startup.py | 0 .../__init__.py | 0 .../r1/bfdd.conf | 0 .../r1/bgp_ipv6_routes_down.json | 0 .../r1/bgpd.conf | 0 .../r1/ipv6_routes.json | 0 .../r1/peers.json | 0 .../r1/peers_down.json | 0 .../r1/zebra.conf | 0 .../r2/zebra.conf | 0 .../r3/bfdd.conf | 0 .../r3/bgp_ipv6_routes_down.json | 0 .../r3/bgpd.conf | 0 .../r3/ipv6_routes.json | 0 .../r3/peers.json | 0 .../r3/peers_down.json | 0 .../r3/zebra.conf | 0 .../test_bfd_bgp_cbit_topo3.dot | 0 .../test_bfd_bgp_cbit_topo3.py | 0 .../{bfd-isis-topo1 => bfd_isis_topo1}/__init__.py | 0 .../rt1/bfdd.conf | 0 .../rt1/isisd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_ipv6_route.ref | 0 .../rt1/step2/show_bfd_peers.ref | 0 .../rt1/step3/show_bfd_peers_healthy.ref | 0 .../rt1/step3/show_bfd_peers_rt2_down.ref | 0 .../rt1/step3/show_bfd_peers_rt3_down.ref | 0 .../rt1/step3/show_ip_route_healthy.ref | 0 .../rt1/step3/show_ip_route_rt2_down.ref | 0 .../rt1/step3/show_ip_route_rt3_down.ref | 0 .../rt1/step3/show_ipv6_route_healthy.ref | 0 .../rt1/step3/show_ipv6_route_rt2_down.ref | 0 .../rt1/step3/show_ipv6_route_rt3_down.ref | 0 .../rt1/zebra.conf | 0 .../rt2/bfdd.conf | 0 .../rt2/isisd.conf | 0 .../rt2/step2/show_bfd_peers.ref | 0 .../rt2/zebra.conf | 0 .../rt3/bfdd.conf | 0 .../rt3/isisd.conf | 0 .../rt3/step2/show_bfd_peers.ref | 0 .../rt3/zebra.conf | 0 .../rt4/bfdd.conf | 0 .../rt4/isisd.conf | 0 .../rt4/zebra.conf | 0 .../rt5/bfdd.conf | 0 .../rt5/isisd.conf | 0 .../rt5/zebra.conf | 0 .../test_bfd_isis_topo1.py | 0 .../{bfd-ospf-topo1 => bfd_ospf_topo1}/__init__.py | 0 .../rt1/bfdd.conf | 0 .../rt1/ospf6d.conf | 0 .../rt1/ospfd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_ipv6_route.ref | 0 .../rt1/step2/show_bfd_peers.ref | 0 .../rt1/step3/show_bfd_peers_healthy.ref | 0 .../rt1/step3/show_bfd_peers_rt2_down.ref | 0 .../rt1/step3/show_bfd_peers_rt3_down.ref | 0 .../rt1/step3/show_ip_route_healthy.ref | 0 .../rt1/step3/show_ip_route_rt2_down.ref | 0 .../rt1/step3/show_ip_route_rt3_down.ref | 0 .../rt1/step3/show_ipv6_route_healthy.ref | 0 .../rt1/step3/show_ipv6_route_rt2_down.ref | 0 .../rt1/step3/show_ipv6_route_rt3_down.ref | 0 .../rt1/zebra.conf | 0 .../rt2/bfdd.conf | 0 .../rt2/ospf6d.conf | 0 .../rt2/ospfd.conf | 0 .../rt2/step2/show_bfd_peers.ref | 0 .../rt2/zebra.conf | 0 .../rt3/bfdd.conf | 0 .../rt3/ospf6d.conf | 0 .../rt3/ospfd.conf | 0 .../rt3/step2/show_bfd_peers.ref | 0 .../rt3/zebra.conf | 0 .../rt4/bfdd.conf | 0 .../rt4/ospf6d.conf | 0 .../rt4/ospfd.conf | 0 .../rt4/zebra.conf | 0 .../rt5/bfdd.conf | 0 .../rt5/ospf6d.conf | 0 .../rt5/ospfd.conf | 0 .../rt5/zebra.conf | 0 .../test_bfd_ospf_topo1.py | 0 .../__init__.py | 0 .../r1/bfd-peers-initial.json | 0 .../r1/bfdd.conf | 0 .../r1/ospfd.conf | 0 .../r1/zebra.conf | 0 .../r2/bfd-peers-initial.json | 0 .../r2/bfdd.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../r3/bfd-peers-initial.json | 0 .../r3/bfdd.conf | 0 .../r3/bgpd.conf | 0 .../r3/isisd.conf | 0 .../r3/zebra.conf | 0 .../r4/bfd-peers-initial.json | 0 .../r4/bfdd.conf | 0 .../r4/bgpd.conf | 0 .../r4/isisd.conf | 0 .../r4/ospf6d.conf | 0 .../r4/zebra.conf | 0 .../r5/bfd-peers-initial.json | 0 .../r5/bfdd.conf | 0 .../r5/ospf6d.conf | 0 .../r5/zebra.conf | 0 .../r6/bfd-peers-initial.json | 0 .../r6/bfdd.conf | 0 .../r6/ospfd.conf | 0 .../r6/zebra.conf | 0 .../test_bfd_profiles_topo1.dot | 0 .../test_bfd_profiles_topo1.png | Bin .../test_bfd_profiles_topo1.py | 0 .../topotests/{bfd-topo1 => bfd_topo1}/__init__.py | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r1/bfdd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r1/bgp_prefixes.json | 0 .../{bfd-topo1 => bfd_topo1}/r1/bgp_summary.json | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r1/bgpd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r1/peers.json | 0 .../{bfd-topo1 => bfd_topo1}/r1/zebra.conf | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r2/bfdd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r2/bgp_prefixes.json | 0 .../{bfd-topo1 => bfd_topo1}/r2/bgp_summary.json | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r2/bgpd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r2/peers.json | 0 .../{bfd-topo1 => bfd_topo1}/r2/zebra.conf | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r3/bfdd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r3/bgp_prefixes.json | 0 .../{bfd-topo1 => bfd_topo1}/r3/bgp_summary.json | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r3/bgpd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r3/peers.json | 0 .../{bfd-topo1 => bfd_topo1}/r3/zebra.conf | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r4/bfdd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r4/bgp_prefixes.json | 0 .../{bfd-topo1 => bfd_topo1}/r4/bgp_summary.json | 0 .../topotests/{bfd-topo1 => bfd_topo1}/r4/bgpd.conf | 0 .../{bfd-topo1 => bfd_topo1}/r4/peers.json | 0 .../{bfd-topo1 => bfd_topo1}/r4/zebra.conf | 0 .../{bfd-topo1 => bfd_topo1}/test_bfd_topo1.dot | 0 .../{bfd-topo1 => bfd_topo1}/test_bfd_topo1.jpg | Bin .../{bfd-topo1 => bfd_topo1}/test_bfd_topo1.py | 0 .../topotests/{bfd-topo2 => bfd_topo2}/__init__.py | 0 .../topotests/{bfd-topo2 => bfd_topo2}/r1/bfdd.conf | 0 .../topotests/{bfd-topo2 => bfd_topo2}/r1/bgpd.conf | 0 .../{bfd-topo2 => bfd_topo2}/r1/ipv4_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r1/ipv6_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r1/peers.json | 0 .../{bfd-topo2 => bfd_topo2}/r1/zebra.conf | 0 .../topotests/{bfd-topo2 => bfd_topo2}/r2/bfdd.conf | 0 .../topotests/{bfd-topo2 => bfd_topo2}/r2/bgpd.conf | 0 .../{bfd-topo2 => bfd_topo2}/r2/ipv4_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r2/ipv6_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r2/ospf6d.conf | 0 .../{bfd-topo2 => bfd_topo2}/r2/ospfd.conf | 0 .../{bfd-topo2 => bfd_topo2}/r2/peers.json | 0 .../{bfd-topo2 => bfd_topo2}/r2/zebra.conf | 0 .../topotests/{bfd-topo2 => bfd_topo2}/r3/bfdd.conf | 0 .../{bfd-topo2 => bfd_topo2}/r3/ipv4_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r3/ipv6_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r3/ospfd.conf | 0 .../{bfd-topo2 => bfd_topo2}/r3/peers.json | 0 .../{bfd-topo2 => bfd_topo2}/r3/zebra.conf | 0 .../topotests/{bfd-topo2 => bfd_topo2}/r4/bfdd.conf | 0 .../{bfd-topo2 => bfd_topo2}/r4/ipv4_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r4/ipv6_routes.json | 0 .../{bfd-topo2 => bfd_topo2}/r4/ospf6d.conf | 0 .../{bfd-topo2 => bfd_topo2}/r4/peers.json | 0 .../{bfd-topo2 => bfd_topo2}/r4/zebra.conf | 0 .../{bfd-topo2 => bfd_topo2}/test_bfd_topo2.dot | 0 .../{bfd-topo2 => bfd_topo2}/test_bfd_topo2.jpg | Bin .../{bfd-topo2 => bfd_topo2}/test_bfd_topo2.py | 0 .../topotests/{bfd-topo3 => bfd_topo3}/__init__.py | 0 .../{bfd-topo3 => bfd_topo3}/r1/bfd-peers.json | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r1/bfdd.conf | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r1/bgpd.conf | 0 .../{bfd-topo3 => bfd_topo3}/r1/zebra.conf | 0 .../{bfd-topo3 => bfd_topo3}/r2/bfd-peers.json | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r2/bfdd.conf | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r2/bgpd.conf | 0 .../{bfd-topo3 => bfd_topo3}/r2/zebra.conf | 0 .../{bfd-topo3 => bfd_topo3}/r3/bfd-peers.json | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r3/bfdd.conf | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r3/bgpd.conf | 0 .../{bfd-topo3 => bfd_topo3}/r3/zebra.conf | 0 .../{bfd-topo3 => bfd_topo3}/r4/bfd-peers.json | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r4/bfdd.conf | 0 .../topotests/{bfd-topo3 => bfd_topo3}/r4/bgpd.conf | 0 .../{bfd-topo3 => bfd_topo3}/r4/zebra.conf | 0 .../{bfd-topo3 => bfd_topo3}/test_bfd_topo3.dot | 0 .../{bfd-topo3 => bfd_topo3}/test_bfd_topo3.jpg | Bin .../{bfd-topo3 => bfd_topo3}/test_bfd_topo3.py | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/__init__.py | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/bfdd.conf | 0 .../r1/bgp_prefixes.json | 0 .../r1/bgp_summary.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/bgpd.conf | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/peers.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/zebra.conf | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/bfdd.conf | 0 .../r2/bgp_prefixes.json | 0 .../r2/bgp_summary.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/bgpd.conf | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/peers.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/zebra.conf | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/bfdd.conf | 0 .../r3/bgp_prefixes.json | 0 .../r3/bgp_summary.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/bgpd.conf | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/peers.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/zebra.conf | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/bfdd.conf | 0 .../r4/bgp_prefixes.json | 0 .../r4/bgp_summary.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/bgpd.conf | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/peers.json | 0 .../{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/zebra.conf | 0 .../test_bfd_vrf_topo1.dot | 0 .../test_bfd_vrf_topo1.jpg | Bin .../test_bfd_vrf_topo1.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp_aggregate-address_origin.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp_aggregate-address_route-map.py | 0 .../__init__.py | 0 .../exabgp.env | 0 .../peer1/exabgp.cfg | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../test_bgp_aggregator_zero.py | 0 tests/topotests/{bgp-auth => bgp_auth}/R1/bgpd.conf | 0 .../{bgp-auth => bgp_auth}/R1/bgpd_multi_vrf.conf | 0 .../R1/bgpd_multi_vrf_prefix.conf | 0 .../{bgp-auth => bgp_auth}/R1/bgpd_prefix.conf | 0 .../{bgp-auth => bgp_auth}/R1/bgpd_vrf.conf | 0 .../{bgp-auth => bgp_auth}/R1/bgpd_vrf_prefix.conf | 0 .../topotests/{bgp-auth => bgp_auth}/R1/ospfd.conf | 0 .../{bgp-auth => bgp_auth}/R1/ospfd_multi_vrf.conf | 0 .../{bgp-auth => bgp_auth}/R1/ospfd_vrf.conf | 0 .../topotests/{bgp-auth => bgp_auth}/R1/zebra.conf | 0 tests/topotests/{bgp-auth => bgp_auth}/R2/bgpd.conf | 0 .../{bgp-auth => bgp_auth}/R2/bgpd_multi_vrf.conf | 0 .../R2/bgpd_multi_vrf_prefix.conf | 0 .../{bgp-auth => bgp_auth}/R2/bgpd_prefix.conf | 0 .../{bgp-auth => bgp_auth}/R2/bgpd_vrf.conf | 0 .../{bgp-auth => bgp_auth}/R2/bgpd_vrf_prefix.conf | 0 .../topotests/{bgp-auth => bgp_auth}/R2/ospfd.conf | 0 .../{bgp-auth => bgp_auth}/R2/ospfd_multi_vrf.conf | 0 .../{bgp-auth => bgp_auth}/R2/ospfd_vrf.conf | 0 .../topotests/{bgp-auth => bgp_auth}/R2/zebra.conf | 0 tests/topotests/{bgp-auth => bgp_auth}/R3/bgpd.conf | 0 .../{bgp-auth => bgp_auth}/R3/bgpd_multi_vrf.conf | 0 .../R3/bgpd_multi_vrf_prefix.conf | 0 .../{bgp-auth => bgp_auth}/R3/bgpd_prefix.conf | 0 .../{bgp-auth => bgp_auth}/R3/bgpd_vrf.conf | 0 .../{bgp-auth => bgp_auth}/R3/bgpd_vrf_prefix.conf | 0 .../topotests/{bgp-auth => bgp_auth}/R3/ospfd.conf | 0 .../{bgp-auth => bgp_auth}/R3/ospfd_multi_vrf.conf | 0 .../{bgp-auth => bgp_auth}/R3/ospfd_vrf.conf | 0 .../topotests/{bgp-auth => bgp_auth}/R3/zebra.conf | 0 .../{bgp-auth => bgp_auth}/test_bgp_auth.py | 0 .../__init__.py | 0 .../bgp_basic_functionality.json | 0 .../test_bgp_basic_functionality.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp_comm-list_delete.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp-community-alias.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../r3/bgpd.conf | 0 .../r3/zebra.conf | 0 .../test_bgp-default-ipv4-ipv6-unicast.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp_default-originate.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp_default-originate_route-map_match.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 ...est_bgp_default-originate_route-map_match_set.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp_default-originate_route-map_set.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../r3/bgpd.conf | 0 .../r3/zebra.conf | 0 ...test_bgp-ebgp-common-subnet-nexthop-unchanged.py | 0 .../__init__.py | 0 .../bgp-ecmp-topo1.dot | 0 .../bgp-ecmp-topo1.pdf | Bin .../{bgp-ecmp-topo1 => bgp_ecmp_topo1}/exabgp.env | 0 .../peer1/exa-receive.py | 0 .../peer1/exa-send.py | 0 .../peer1/exabgp.cfg | 0 .../peer10/exa-receive.py | 0 .../peer10/exa-send.py | 0 .../peer10/exabgp.cfg | 0 .../peer11/exa-receive.py | 0 .../peer11/exa-send.py | 0 .../peer11/exabgp.cfg | 0 .../peer12/exa-receive.py | 0 .../peer12/exa-send.py | 0 .../peer12/exabgp.cfg | 0 .../peer13/exa-receive.py | 0 .../peer13/exa-send.py | 0 .../peer13/exabgp.cfg | 0 .../peer14/exa-receive.py | 0 .../peer14/exa-send.py | 0 .../peer14/exabgp.cfg | 0 .../peer15/exa-receive.py | 0 .../peer15/exa-send.py | 0 .../peer15/exabgp.cfg | 0 .../peer16/exa-receive.py | 0 .../peer16/exa-send.py | 0 .../peer16/exabgp.cfg | 0 .../peer17/exa-receive.py | 0 .../peer17/exa-send.py | 0 .../peer17/exabgp.cfg | 0 .../peer18/exa-receive.py | 0 .../peer18/exa-send.py | 0 .../peer18/exabgp.cfg | 0 .../peer19/exa-receive.py | 0 .../peer19/exa-send.py | 0 .../peer19/exabgp.cfg | 0 .../peer2/exa-receive.py | 0 .../peer2/exa-send.py | 0 .../peer2/exabgp.cfg | 0 .../peer20/exa-receive.py | 0 .../peer20/exa-send.py | 0 .../peer20/exabgp.cfg | 0 .../peer3/exa-receive.py | 0 .../peer3/exa-send.py | 0 .../peer3/exabgp.cfg | 0 .../peer4/exa-receive.py | 0 .../peer4/exa-send.py | 0 .../peer4/exabgp.cfg | 0 .../peer5/exa-receive.py | 0 .../peer5/exa-send.py | 0 .../peer5/exabgp.cfg | 0 .../peer6/exa-receive.py | 0 .../peer6/exa-send.py | 0 .../peer6/exabgp.cfg | 0 .../peer7/exa-receive.py | 0 .../peer7/exa-send.py | 0 .../peer7/exabgp.cfg | 0 .../peer8/exa-receive.py | 0 .../peer8/exa-send.py | 0 .../peer8/exabgp.cfg | 0 .../peer9/exa-receive.py | 0 .../peer9/exa-send.py | 0 .../peer9/exabgp.cfg | 0 .../{bgp-ecmp-topo1 => bgp_ecmp_topo1}/r1/bgpd.conf | 0 .../r1/summary.txt | 0 .../r1/summary20.txt | 0 .../r1/zebra.conf | 0 .../test_bgp_ecmp_topo1.py | 0 .../ebgp_ecmp_topo2.json | 0 .../ibgp_ecmp_topo2.json | 0 .../test_ebgp_ecmp_topo2.py | 0 .../test_ibgp_ecmp_topo2.py | 0 .../evpn-mh-topo-tests.pdf | Bin .../{bgp-evpn-mh => bgp_evpn_mh}/hostd11/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd11/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd11/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd12/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd12/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd12/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd21/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd21/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd21/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd22/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd22/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/hostd22/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/spine1/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/spine1/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/spine1/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/spine2/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/spine2/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/spine2/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/test_evpn_mh.py | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm11/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm11/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm11/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm12/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm12/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm12/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm21/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm21/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm21/zebra.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm22/evpn.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm22/pim.conf | 0 .../{bgp-evpn-mh => bgp_evpn_mh}/torm22/zebra.conf | 0 .../P1/bgpd.conf | 0 .../P1/ospfd.conf | 0 .../P1/zebra.conf | 0 .../PE1/bgpd.conf | 0 .../PE1/evpn.vni.json | 0 .../PE1/ospfd.conf | 0 .../PE1/zebra.conf | 0 .../PE2/bgpd.conf | 0 .../PE2/evpn.vni.json | 0 .../PE2/ospfd.conf | 0 .../PE2/zebra.conf | 0 .../__init__.py | 0 .../host1/bgpd.conf | 0 .../host1/ospfd.conf | 0 .../host1/zebra.conf | 0 .../host2/bgpd.conf | 0 .../host2/ospfd.conf | 0 .../host2/zebra.conf | 0 .../test_bgp_evpn_vxlan.py | 0 .../__init__.py | 0 .../bgp_path_attributes.json | 0 .../test_bgp_path_attributes.py | 0 .../__init__.py | 0 .../{bgp_peer-group => bgp_peer_group}/r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../{bgp_peer-group => bgp_peer_group}/r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../{bgp_peer-group => bgp_peer_group}/r3/bgpd.conf | 0 .../r3/zebra.conf | 0 .../test_bgp_peer-group.py | 0 .../exabgp.env | 0 .../peer1/exa-receive.py | 0 .../peer1/exa_readpipe.py | 0 .../peer1/exabgp.cfg | 0 .../peer2/exa-receive.py | 0 .../peer2/exa_readpipe.py | 0 .../peer2/exabgp.cfg | 0 .../peer3/exa-receive.py | 0 .../peer3/exa_readpipe.py | 0 .../peer3/exabgp.cfg | 0 .../peer4/exa-receive.py | 0 .../peer4/exa_readpipe.py | 0 .../peer4/exabgp.cfg | 0 .../r1/bgpd.conf | 0 .../r1/multipath.json | 0 .../r1/not-multipath.json | 0 .../r1/prefix1-eBGP-confed.json | 0 .../r1/prefix1-eBGP-iBGP.json | 0 .../r1/prefix1-no-recursive.json | 0 .../r1/prefix1-recursive.json | 0 .../r1/prefix1.json | 0 .../r1/prefix3-ip-route.json | 0 .../r1/prefix3-no-recursive.json | 0 .../r1/prefix3-recursive.json | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/staticd.conf | 0 .../r2/zebra.conf | 0 .../test_bgp_peer-type_multipath-relax.py | 0 .../__init__.py | 0 .../prefix_lists.json | 0 .../test_prefix_lists.py | 0 .../bgp_route_map_topo1.json | 0 .../bgp_route_map_topo2.json | 0 .../test_route_map_topo1.py | 0 .../test_route_map_topo2.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../r3/bgpd.conf | 0 .../r3/zebra.conf | 0 .../test_bgp_sender-as-path-loop-detection.py | 0 .../__init__.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../r2/bgpd.conf | 0 .../r2/zebra.conf | 0 .../r3/bgpd.conf | 0 .../r3/zebra.conf | 0 .../test_bgp_set_local-preference_add_subtract.py | 0 .../ce1/bgpd.conf | 0 .../ce1/snmpd.conf | 0 .../ce1/zebra.conf | 0 .../ce2/bgpd.conf | 0 .../ce2/snmpd.conf | 0 .../ce2/zebra.conf | 0 .../ce3/bgpd.conf | 0 .../ce3/snmpd.conf | 0 .../ce3/zebra.conf | 0 .../ce4/bgpd.conf | 0 .../ce4/snmpd.conf | 0 .../ce4/zebra.conf | 0 .../r1/bgpd.conf | 0 .../r1/isisd.conf | 0 .../r1/snmpd.conf | 0 .../r1/zebra.conf | 0 .../r2/isisd.conf | 0 .../r2/snmpd.conf | 0 .../r2/zebra.conf | 0 .../r3/isisd.conf | 0 .../r3/snmpd.conf | 0 .../r3/zebra.conf | 0 .../r4/bgpd.conf | 0 .../r4/isisd.conf | 0 .../r4/snmpd.conf | 0 .../r4/zebra.conf | 0 .../test_bgp_snmp_mplsvpn.py | 0 .../r1/bgpd.conf | 0 .../r1/zebra.conf | 0 .../setup_vrfs | 0 .../test_bgp-vrf-route-leak-basic.py | 0 .../{eigrp-topo1 => eigrp_topo1}/r1/eigrpd.conf | 0 .../r1/show_ip_eigrp.json | 0 .../r1/show_ip_eigrp.ref | 0 .../r1/show_ip_route.json_ref | 0 .../{eigrp-topo1 => eigrp_topo1}/r1/zebra.conf | 0 .../{eigrp-topo1 => eigrp_topo1}/r2/eigrpd.conf | 0 .../r2/show_ip_eigrp.json | 0 .../r2/show_ip_eigrp.ref | 0 .../r2/show_ip_route.json_ref | 0 .../{eigrp-topo1 => eigrp_topo1}/r2/zebra.conf | 0 .../{eigrp-topo1 => eigrp_topo1}/r3/eigrpd.conf | 0 .../r3/show_ip_eigrp.json | 0 .../r3/show_ip_eigrp.ref | 0 .../r3/show_ip_route.json_ref | 0 .../{eigrp-topo1 => eigrp_topo1}/r3/zebra.conf | 0 .../test_eigrp_topo1.dot | 0 .../test_eigrp_topo1.py | 0 .../{evpn-pim-1 => evpn_pim_1}/host1/bgpd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/host1/pimd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/host1/zebra.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/host2/bgpd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/host2/pimd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/host2/zebra.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/leaf1/bgpd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/leaf1/pimd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/leaf1/zebra.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/leaf2/bgpd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/leaf2/pimd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/leaf2/zebra.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/spine/bgp.summ.json | 0 .../{evpn-pim-1 => evpn_pim_1}/spine/bgpd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/spine/join-info.json | 0 .../{evpn-pim-1 => evpn_pim_1}/spine/pimd.conf | 0 .../{evpn-pim-1 => evpn_pim_1}/spine/zebra.conf | 0 .../test_evpn_pim_topo1.py | 0 .../{example-test => example_test}/__init__.py | 0 .../{example-test => example_test}/test_example.py | 0 .../test_template.dot | 0 .../test_template.jpg | Bin .../{example-test => example_test}/test_template.py | 0 .../__init__.py | 0 .../test_topo_json_multiple_links/__init__.py | 0 .../example_topojson_multiple_links.json | 0 .../test_example_topojson_multiple_links.py | 0 .../test_topo_json_single_link/__init__.py | 0 .../example_topojson.json | 0 .../test_example_topojson.py | 0 .../test_topo_json_single_link_loopback/__init__.py | 0 .../example_topojson.json | 0 .../test_example_topojson.py | 0 .../{isis-lfa-topo1 => isis_lfa_topo1}/__init__.py | 0 .../rt1/isisd.conf | 0 .../rt1/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step10/show_ipv6_route.ref.diff | 0 .../rt1/step11/show_ipv6_route.ref.diff | 0 .../rt1/step12/show_ipv6_route.ref.diff | 0 .../rt1/step13/show_ipv6_route.ref.diff | 0 .../rt1/step2/show_ipv6_route.ref.diff | 0 .../rt1/step3/show_ipv6_route.ref.diff | 0 .../rt1/step4/show_ipv6_route.ref.diff | 0 .../rt1/step5/show_ipv6_route.ref.diff | 0 .../rt1/step6/show_ipv6_route.ref.diff | 0 .../rt1/step7/show_ipv6_route.ref.diff | 0 .../rt1/step8/show_ipv6_route.ref.diff | 0 .../rt1/step9/show_ipv6_route.ref.diff | 0 .../rt1/zebra.conf | 0 .../rt2/isisd.conf | 0 .../rt2/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/zebra.conf | 0 .../rt3/isisd.conf | 0 .../rt3/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/zebra.conf | 0 .../rt4/isisd.conf | 0 .../rt4/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/zebra.conf | 0 .../rt5/isisd.conf | 0 .../rt5/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/zebra.conf | 0 .../rt6/isisd.conf | 0 .../rt6/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/zebra.conf | 0 .../rt7/isisd.conf | 0 .../rt7/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt7/zebra.conf | 0 .../test_isis_lfa_topo1.py | 0 .../__init__.py | 0 .../rt1/isisd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step2/show_ip_route.ref | 0 .../rt1/step2/show_ipv6_route.ref | 0 .../rt1/step3/show_ip_route.ref | 0 .../rt1/step3/show_ipv6_route.ref | 0 .../rt1/step4/show_ip_route.ref | 0 .../rt1/step4/show_ipv6_route.ref | 0 .../rt1/zebra.conf | 0 .../rt2/isisd.conf | 0 .../rt2/step1/show_ip_route.ref | 0 .../rt2/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/zebra.conf | 0 .../rt3/isisd.conf | 0 .../rt3/step1/show_ip_route.ref | 0 .../rt3/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/zebra.conf | 0 .../rt4/isisd.conf | 0 .../rt4/step1/show_ip_route.ref | 0 .../rt4/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/zebra.conf | 0 .../rt5/isisd.conf | 0 .../rt5/step1/show_ip_route.ref | 0 .../rt5/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/zebra.conf | 0 .../rt6/isisd.conf | 0 .../rt6/step1/show_ip_route.ref | 0 .../rt6/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step2/show_ip_route.ref | 0 .../rt6/step2/show_ipv6_route.ref | 0 .../rt6/step3/show_ip_route.ref | 0 .../rt6/step3/show_ipv6_route.ref | 0 .../rt6/step4/show_ip_route.ref | 0 .../rt6/step4/show_ipv6_route.ref | 0 .../rt6/zebra.conf | 0 .../test_isis_lsp_bits_topo1.py | 0 .../__init__.py | 0 .../rt1/isisd.conf | 0 .../rt1/ldpd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_ipv6_route.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step10/show_ip_route.ref.diff | 0 .../rt1/step10/show_ipv6_route.ref.diff | 0 .../rt1/step2/show_ip_route.ref.diff | 0 .../rt1/step2/show_ipv6_route.ref.diff | 0 .../rt1/step3/show_ip_route.ref.diff | 0 .../rt1/step3/show_ipv6_route.ref.diff | 0 .../rt1/step4/show_ip_route.ref.diff | 0 .../rt1/step4/show_ipv6_route.ref.diff | 0 .../rt1/step5/show_ip_route.ref.diff | 0 .../rt1/step5/show_ipv6_route.ref.diff | 0 .../rt1/step6/show_ip_route.ref.diff | 0 .../rt1/step6/show_ipv6_route.ref.diff | 0 .../rt1/step7/show_ip_route.ref.diff | 0 .../rt1/step7/show_ipv6_route.ref.diff | 0 .../rt1/step8/show_ip_route.ref.diff | 0 .../rt1/step8/show_ipv6_route.ref.diff | 0 .../rt1/step9/show_ip_route.ref.diff | 0 .../rt1/step9/show_ipv6_route.ref.diff | 0 .../rt1/zebra.conf | 0 .../rt2/isisd.conf | 0 .../rt2/ldpd.conf | 0 .../rt2/zebra.conf | 0 .../rt3/isisd.conf | 0 .../rt3/ldpd.conf | 0 .../rt3/zebra.conf | 0 .../rt4/isisd.conf | 0 .../rt4/ldpd.conf | 0 .../rt4/zebra.conf | 0 .../rt5/isisd.conf | 0 .../rt5/ldpd.conf | 0 .../rt5/zebra.conf | 0 .../rt6/isisd.conf | 0 .../rt6/ldpd.conf | 0 .../rt6/zebra.conf | 0 .../rt7/isisd.conf | 0 .../rt7/ldpd.conf | 0 .../rt7/zebra.conf | 0 .../rt8/isisd.conf | 0 .../rt8/ldpd.conf | 0 .../rt8/zebra.conf | 0 .../test_isis_rlfa_topo1.py | 0 .../{isis-snmp => isis_snmp}/ce3/zebra.conf | 0 .../{isis-snmp => isis_snmp}/r1/isisd.conf | 0 .../topotests/{isis-snmp => isis_snmp}/r1/ldpd.conf | 0 .../{isis-snmp => isis_snmp}/r1/show_ip_route.ref | 0 .../r1/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-snmp => isis_snmp}/r1/snmpd.conf | 0 .../{isis-snmp => isis_snmp}/r1/zebra.conf | 0 .../{isis-snmp => isis_snmp}/r2/isisd.conf | 0 .../topotests/{isis-snmp => isis_snmp}/r2/ldpd.conf | 0 .../{isis-snmp => isis_snmp}/r2/show_ip_route.ref | 0 .../r2/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-snmp => isis_snmp}/r2/snmpd.conf | 0 .../{isis-snmp => isis_snmp}/r2/zebra.conf | 0 .../{isis-snmp => isis_snmp}/r3/isisd.conf | 0 .../topotests/{isis-snmp => isis_snmp}/r3/ldpd.conf | 0 .../{isis-snmp => isis_snmp}/r3/show_ip_route.ref | 0 .../r3/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-snmp => isis_snmp}/r3/snmpd.conf | 0 .../{isis-snmp => isis_snmp}/r3/zebra.conf | 0 .../{isis-snmp => isis_snmp}/r4/isisd.conf | 0 .../topotests/{isis-snmp => isis_snmp}/r4/ldpd.conf | 0 .../{isis-snmp => isis_snmp}/r4/show_ip_route.ref | 0 .../r4/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-snmp => isis_snmp}/r4/snmpd.conf | 0 .../{isis-snmp => isis_snmp}/r4/zebra.conf | 0 .../{isis-snmp => isis_snmp}/r5/isisd.conf | 0 .../topotests/{isis-snmp => isis_snmp}/r5/ldpd.conf | 0 .../topotests/{isis-snmp => isis_snmp}/r5/ldpdconf | 0 .../{isis-snmp => isis_snmp}/r5/show_ip_route.ref | 0 .../r5/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-snmp => isis_snmp}/r5/snmpd.conf | 0 .../{isis-snmp => isis_snmp}/r5/zebra.conf | 0 .../{isis-snmp => isis_snmp}/test_isis_snmp.dot | 0 .../{isis-snmp => isis_snmp}/test_isis_snmp.py | 0 .../dst/zebra.conf | 0 .../rt1/bgpd.conf | 0 .../rt1/isisd.conf | 0 .../rt1/pathd.conf | 0 .../rt1/step1/show_mpls_table_with_candidate.ref | 0 .../rt1/step1/show_mpls_table_without_candidate.ref | 0 .../rt1/step2/show_operational_data.ref | 0 .../step2/show_operational_data_with_candidate.ref | 0 .../show_operational_data_with_single_candidate.ref | 0 .../show_operational_data_with_two_candidates.ref | 0 .../rt1/step4/show_mpls_table.ref | 0 .../rt1/step4/show_mpls_table_add_segment.ref | 0 .../rt1/step4/show_mpls_table_change_segment.ref | 0 .../rt1/step5/show_ip_route_bgp_active_srte.ref | 0 .../rt1/step5/show_ip_route_bgp_inactive_srte.ref | 0 .../rt1/step5/show_operational_data_active.ref | 0 .../rt1/step5/show_operational_data_inactive.ref | 0 .../rt1/zebra.conf | 0 .../rt2/isisd.conf | 0 .../rt2/zebra.conf | 0 .../rt3/isisd.conf | 0 .../rt3/zebra.conf | 0 .../rt4/isisd.conf | 0 .../rt4/zebra.conf | 0 .../rt5/isisd.conf | 0 .../rt5/zebra.conf | 0 .../rt6/bgpd.conf | 0 .../rt6/isisd.conf | 0 .../rt6/pathd.conf | 0 .../rt6/step1/show_mpls_table_with_candidate.ref | 0 .../rt6/step1/show_mpls_table_without_candidate.ref | 0 .../rt6/step2/show_operational_data.ref | 0 .../step2/show_operational_data_with_candidate.ref | 0 .../show_operational_data_with_single_candidate.ref | 0 .../show_operational_data_with_two_candidates.ref | 0 .../rt6/step4/show_mpls_table.ref | 0 .../rt6/zebra.conf | 0 .../test_isis_sr_te_topo1.py | 0 .../{isis-sr-topo1 => isis_sr_topo1}/__init__.py | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt1/isisd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_ipv6_route.ref | 0 .../rt1/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step10/show_ip_route.ref | 0 .../rt1/step10/show_ipv6_route.ref | 0 .../rt1/step10/show_mpls_table.ref | 0 .../step10/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step2/show_ip_route.ref | 0 .../rt1/step2/show_ipv6_route.ref | 0 .../rt1/step2/show_mpls_table.ref | 0 .../step2/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step3/show_ip_route.ref | 0 .../rt1/step3/show_ipv6_route.ref | 0 .../rt1/step3/show_mpls_table.ref | 0 .../step3/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step4/show_ip_route.ref | 0 .../rt1/step4/show_ipv6_route.ref | 0 .../rt1/step4/show_mpls_table.ref | 0 .../step4/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step5/show_ip_route.ref | 0 .../rt1/step5/show_ipv6_route.ref | 0 .../rt1/step5/show_mpls_table.ref | 0 .../step5/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step6/show_ip_route.ref | 0 .../rt1/step6/show_ipv6_route.ref | 0 .../rt1/step6/show_mpls_table.ref | 0 .../step6/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step7/show_ip_route.ref | 0 .../rt1/step7/show_ipv6_route.ref | 0 .../rt1/step7/show_mpls_table.ref | 0 .../step7/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step8/show_ip_route.ref | 0 .../rt1/step8/show_ipv6_route.ref | 0 .../rt1/step8/show_mpls_table.ref | 0 .../step8/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step9/show_ip_route.ref | 0 .../rt1/step9/show_ipv6_route.ref | 0 .../rt1/step9/show_mpls_table.ref | 0 .../step9/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt1/zebra.conf | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt2/isisd.conf | 0 .../rt2/step1/show_ip_route.ref | 0 .../rt2/step1/show_ipv6_route.ref | 0 .../rt2/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step10/show_ip_route.ref | 0 .../rt2/step10/show_ipv6_route.ref | 0 .../rt2/step10/show_mpls_table.ref | 0 .../step10/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step2/show_ip_route.ref | 0 .../rt2/step2/show_ipv6_route.ref | 0 .../rt2/step2/show_mpls_table.ref | 0 .../step2/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step3/show_ip_route.ref | 0 .../rt2/step3/show_ipv6_route.ref | 0 .../rt2/step3/show_mpls_table.ref | 0 .../step3/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step4/show_ip_route.ref | 0 .../rt2/step4/show_ipv6_route.ref | 0 .../rt2/step4/show_mpls_table.ref | 0 .../step4/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step5/show_ip_route.ref | 0 .../rt2/step5/show_ipv6_route.ref | 0 .../rt2/step5/show_mpls_table.ref | 0 .../step5/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step6/show_ip_route.ref | 0 .../rt2/step6/show_ipv6_route.ref | 0 .../rt2/step6/show_mpls_table.ref | 0 .../step6/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step7/show_ip_route.ref | 0 .../rt2/step7/show_ipv6_route.ref | 0 .../rt2/step7/show_mpls_table.ref | 0 .../step7/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step8/show_ip_route.ref | 0 .../rt2/step8/show_ipv6_route.ref | 0 .../rt2/step8/show_mpls_table.ref | 0 .../step8/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step9/show_ip_route.ref | 0 .../rt2/step9/show_ipv6_route.ref | 0 .../rt2/step9/show_mpls_table.ref | 0 .../step9/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt2/zebra.conf | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt3/isisd.conf | 0 .../rt3/step1/show_ip_route.ref | 0 .../rt3/step1/show_ipv6_route.ref | 0 .../rt3/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step10/show_ip_route.ref | 0 .../rt3/step10/show_ipv6_route.ref | 0 .../rt3/step10/show_mpls_table.ref | 0 .../step10/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step2/show_ip_route.ref | 0 .../rt3/step2/show_ipv6_route.ref | 0 .../rt3/step2/show_mpls_table.ref | 0 .../step2/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step3/show_ip_route.ref | 0 .../rt3/step3/show_ipv6_route.ref | 0 .../rt3/step3/show_mpls_table.ref | 0 .../step3/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step4/show_ip_route.ref | 0 .../rt3/step4/show_ipv6_route.ref | 0 .../rt3/step4/show_mpls_table.ref | 0 .../step4/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step5/show_ip_route.ref | 0 .../rt3/step5/show_ipv6_route.ref | 0 .../rt3/step5/show_mpls_table.ref | 0 .../step5/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step6/show_ip_route.ref | 0 .../rt3/step6/show_ipv6_route.ref | 0 .../rt3/step6/show_mpls_table.ref | 0 .../step6/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step7/show_ip_route.ref | 0 .../rt3/step7/show_ipv6_route.ref | 0 .../rt3/step7/show_mpls_table.ref | 0 .../step7/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step8/show_ip_route.ref | 0 .../rt3/step8/show_ipv6_route.ref | 0 .../rt3/step8/show_mpls_table.ref | 0 .../step8/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step9/show_ip_route.ref | 0 .../rt3/step9/show_ipv6_route.ref | 0 .../rt3/step9/show_mpls_table.ref | 0 .../step9/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt3/zebra.conf | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt4/isisd.conf | 0 .../rt4/step1/show_ip_route.ref | 0 .../rt4/step1/show_ipv6_route.ref | 0 .../rt4/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step10/show_ip_route.ref | 0 .../rt4/step10/show_ipv6_route.ref | 0 .../rt4/step10/show_mpls_table.ref | 0 .../step10/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step2/show_ip_route.ref | 0 .../rt4/step2/show_ipv6_route.ref | 0 .../rt4/step2/show_mpls_table.ref | 0 .../step2/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step3/show_ip_route.ref | 0 .../rt4/step3/show_ipv6_route.ref | 0 .../rt4/step3/show_mpls_table.ref | 0 .../step3/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step4/show_ip_route.ref | 0 .../rt4/step4/show_ipv6_route.ref | 0 .../rt4/step4/show_mpls_table.ref | 0 .../step4/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step5/show_ip_route.ref | 0 .../rt4/step5/show_ipv6_route.ref | 0 .../rt4/step5/show_mpls_table.ref | 0 .../step5/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step6/show_ip_route.ref | 0 .../rt4/step6/show_ipv6_route.ref | 0 .../rt4/step6/show_mpls_table.ref | 0 .../step6/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step7/show_ip_route.ref | 0 .../rt4/step7/show_ipv6_route.ref | 0 .../rt4/step7/show_mpls_table.ref | 0 .../step7/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step8/show_ip_route.ref | 0 .../rt4/step8/show_ipv6_route.ref | 0 .../rt4/step8/show_mpls_table.ref | 0 .../step8/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step9/show_ip_route.ref | 0 .../rt4/step9/show_ipv6_route.ref | 0 .../rt4/step9/show_mpls_table.ref | 0 .../step9/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt4/zebra.conf | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt5/isisd.conf | 0 .../rt5/step1/show_ip_route.ref | 0 .../rt5/step1/show_ipv6_route.ref | 0 .../rt5/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step10/show_ip_route.ref | 0 .../rt5/step10/show_ipv6_route.ref | 0 .../rt5/step10/show_mpls_table.ref | 0 .../step10/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step2/show_ip_route.ref | 0 .../rt5/step2/show_ipv6_route.ref | 0 .../rt5/step2/show_mpls_table.ref | 0 .../step2/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step3/show_ip_route.ref | 0 .../rt5/step3/show_ipv6_route.ref | 0 .../rt5/step3/show_mpls_table.ref | 0 .../step3/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step4/show_ip_route.ref | 0 .../rt5/step4/show_ipv6_route.ref | 0 .../rt5/step4/show_mpls_table.ref | 0 .../step4/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step5/show_ip_route.ref | 0 .../rt5/step5/show_ipv6_route.ref | 0 .../rt5/step5/show_mpls_table.ref | 0 .../step5/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step6/show_ip_route.ref | 0 .../rt5/step6/show_ipv6_route.ref | 0 .../rt5/step6/show_mpls_table.ref | 0 .../step6/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step7/show_ip_route.ref | 0 .../rt5/step7/show_ipv6_route.ref | 0 .../rt5/step7/show_mpls_table.ref | 0 .../step7/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step8/show_ip_route.ref | 0 .../rt5/step8/show_ipv6_route.ref | 0 .../rt5/step8/show_mpls_table.ref | 0 .../step8/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step9/show_ip_route.ref | 0 .../rt5/step9/show_ipv6_route.ref | 0 .../rt5/step9/show_mpls_table.ref | 0 .../step9/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt5/zebra.conf | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt6/isisd.conf | 0 .../rt6/step1/show_ip_route.ref | 0 .../rt6/step1/show_ipv6_route.ref | 0 .../rt6/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step10/show_ip_route.ref | 0 .../rt6/step10/show_ipv6_route.ref | 0 .../rt6/step10/show_mpls_table.ref | 0 .../step10/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step2/show_ip_route.ref | 0 .../rt6/step2/show_ipv6_route.ref | 0 .../rt6/step2/show_mpls_table.ref | 0 .../step2/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step3/show_ip_route.ref | 0 .../rt6/step3/show_ipv6_route.ref | 0 .../rt6/step3/show_mpls_table.ref | 0 .../step3/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step4/show_ip_route.ref | 0 .../rt6/step4/show_ipv6_route.ref | 0 .../rt6/step4/show_mpls_table.ref | 0 .../step4/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step5/show_ip_route.ref | 0 .../rt6/step5/show_ipv6_route.ref | 0 .../rt6/step5/show_mpls_table.ref | 0 .../step5/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step6/show_ip_route.ref | 0 .../rt6/step6/show_ipv6_route.ref | 0 .../rt6/step6/show_mpls_table.ref | 0 .../step6/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step7/show_ip_route.ref | 0 .../rt6/step7/show_ipv6_route.ref | 0 .../rt6/step7/show_mpls_table.ref | 0 .../step7/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step8/show_ip_route.ref | 0 .../rt6/step8/show_ipv6_route.ref | 0 .../rt6/step8/show_mpls_table.ref | 0 .../step8/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step9/show_ip_route.ref | 0 .../rt6/step9/show_ipv6_route.ref | 0 .../rt6/step9/show_mpls_table.ref | 0 .../step9/show_yang_interface_isis_adjacencies.ref | 0 .../{isis-sr-topo1 => isis_sr_topo1}/rt6/zebra.conf | 0 .../test_isis_sr_topo1.py | 0 .../__init__.py | 0 .../rt1/isisd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_ipv6_route.ref | 0 .../rt1/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt1/step2/show_ip_route.ref.diff | 0 .../rt1/step2/show_ipv6_route.ref.diff | 0 .../rt1/step2/show_mpls_table.ref.diff | 0 .../rt1/step3/show_ip_route.ref.diff | 0 .../rt1/step3/show_ipv6_route.ref.diff | 0 .../rt1/step3/show_mpls_table.ref.diff | 0 .../rt1/step4/show_ip_route.ref.diff | 0 .../rt1/step4/show_ipv6_route.ref.diff | 0 .../rt1/step4/show_mpls_table.ref.diff | 0 .../rt1/step5/show_ip_route.ref.diff | 0 .../rt1/step5/show_ipv6_route.ref.diff | 0 .../rt1/step5/show_mpls_table.ref.diff | 0 .../rt1/step6/show_ip_route.ref.diff | 0 .../rt1/step6/show_ipv6_route.ref.diff | 0 .../rt1/step6/show_mpls_table.ref.diff | 0 .../rt1/step7/show_ip_route.ref.diff | 0 .../rt1/step7/show_ipv6_route.ref.diff | 0 .../rt1/step7/show_mpls_table.ref.diff | 0 .../rt1/step8/show_ip_route.ref.diff | 0 .../rt1/step8/show_ipv6_route.ref.diff | 0 .../rt1/step8/show_mpls_table.ref.diff | 0 .../rt1/step9/show_ip_route.ref.diff | 0 .../rt1/step9/show_ipv6_route.ref.diff | 0 .../rt1/step9/show_mpls_table.ref.diff | 0 .../rt1/zebra.conf | 0 .../rt2/isisd.conf | 0 .../rt2/step1/show_ip_route.ref | 0 .../rt2/step1/show_ipv6_route.ref | 0 .../rt2/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt2/step2/show_ip_route.ref.diff | 0 .../rt2/step2/show_ipv6_route.ref.diff | 0 .../rt2/step2/show_mpls_table.ref.diff | 0 .../rt2/step3/show_ip_route.ref.diff | 0 .../rt2/step3/show_ipv6_route.ref.diff | 0 .../rt2/step3/show_mpls_table.ref.diff | 0 .../rt2/step4/show_ip_route.ref.diff | 0 .../rt2/step4/show_ipv6_route.ref.diff | 0 .../rt2/step4/show_mpls_table.ref.diff | 0 .../rt2/step5/show_ip_route.ref.diff | 0 .../rt2/step5/show_ipv6_route.ref.diff | 0 .../rt2/step5/show_mpls_table.ref.diff | 0 .../rt2/step6/show_ip_route.ref.diff | 0 .../rt2/step6/show_ipv6_route.ref.diff | 0 .../rt2/step6/show_mpls_table.ref.diff | 0 .../rt2/step7/show_ip_route.ref.diff | 0 .../rt2/step7/show_ipv6_route.ref.diff | 0 .../rt2/step7/show_mpls_table.ref.diff | 0 .../rt2/step8/show_ip_route.ref.diff | 0 .../rt2/step8/show_ipv6_route.ref.diff | 0 .../rt2/step8/show_mpls_table.ref.diff | 0 .../rt2/step9/show_ip_route.ref.diff | 0 .../rt2/step9/show_ipv6_route.ref.diff | 0 .../rt2/step9/show_mpls_table.ref.diff | 0 .../rt2/zebra.conf | 0 .../rt3/isisd.conf | 0 .../rt3/step1/show_ip_route.ref | 0 .../rt3/step1/show_ipv6_route.ref | 0 .../rt3/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt3/step2/show_ip_route.ref.diff | 0 .../rt3/step2/show_ipv6_route.ref.diff | 0 .../rt3/step2/show_mpls_table.ref.diff | 0 .../rt3/step3/show_ip_route.ref.diff | 0 .../rt3/step3/show_ipv6_route.ref.diff | 0 .../rt3/step3/show_mpls_table.ref.diff | 0 .../rt3/step4/show_ip_route.ref.diff | 0 .../rt3/step4/show_ipv6_route.ref.diff | 0 .../rt3/step4/show_mpls_table.ref.diff | 0 .../rt3/step5/show_ip_route.ref.diff | 0 .../rt3/step5/show_ipv6_route.ref.diff | 0 .../rt3/step5/show_mpls_table.ref.diff | 0 .../rt3/step6/show_ip_route.ref.diff | 0 .../rt3/step6/show_ipv6_route.ref.diff | 0 .../rt3/step6/show_mpls_table.ref.diff | 0 .../rt3/step7/show_ip_route.ref.diff | 0 .../rt3/step7/show_ipv6_route.ref.diff | 0 .../rt3/step7/show_mpls_table.ref.diff | 0 .../rt3/step8/show_ip_route.ref.diff | 0 .../rt3/step8/show_ipv6_route.ref.diff | 0 .../rt3/step8/show_mpls_table.ref.diff | 0 .../rt3/step9/show_ip_route.ref.diff | 0 .../rt3/step9/show_ipv6_route.ref.diff | 0 .../rt3/step9/show_mpls_table.ref.diff | 0 .../rt3/zebra.conf | 0 .../rt4/isisd.conf | 0 .../rt4/step1/show_ip_route.ref | 0 .../rt4/step1/show_ipv6_route.ref | 0 .../rt4/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt4/step2/show_ip_route.ref.diff | 0 .../rt4/step2/show_ipv6_route.ref.diff | 0 .../rt4/step2/show_mpls_table.ref.diff | 0 .../rt4/step3/show_ip_route.ref.diff | 0 .../rt4/step3/show_ipv6_route.ref.diff | 0 .../rt4/step3/show_mpls_table.ref.diff | 0 .../rt4/step4/show_ip_route.ref.diff | 0 .../rt4/step4/show_ipv6_route.ref.diff | 0 .../rt4/step4/show_mpls_table.ref.diff | 0 .../rt4/step5/show_ip_route.ref.diff | 0 .../rt4/step5/show_ipv6_route.ref.diff | 0 .../rt4/step5/show_mpls_table.ref.diff | 0 .../rt4/step6/show_ip_route.ref.diff | 0 .../rt4/step6/show_ipv6_route.ref.diff | 0 .../rt4/step6/show_mpls_table.ref.diff | 0 .../rt4/step7/show_ip_route.ref.diff | 0 .../rt4/step7/show_ipv6_route.ref.diff | 0 .../rt4/step7/show_mpls_table.ref.diff | 0 .../rt4/step8/show_ip_route.ref.diff | 0 .../rt4/step8/show_ipv6_route.ref.diff | 0 .../rt4/step8/show_mpls_table.ref.diff | 0 .../rt4/step9/show_ip_route.ref.diff | 0 .../rt4/step9/show_ipv6_route.ref.diff | 0 .../rt4/step9/show_mpls_table.ref.diff | 0 .../rt4/zebra.conf | 0 .../rt5/isisd.conf | 0 .../rt5/step1/show_ip_route.ref | 0 .../rt5/step1/show_ipv6_route.ref | 0 .../rt5/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt5/step2/show_ip_route.ref.diff | 0 .../rt5/step2/show_ipv6_route.ref.diff | 0 .../rt5/step2/show_mpls_table.ref.diff | 0 .../rt5/step3/show_ip_route.ref.diff | 0 .../rt5/step3/show_ipv6_route.ref.diff | 0 .../rt5/step3/show_mpls_table.ref.diff | 0 .../rt5/step4/show_ip_route.ref.diff | 0 .../rt5/step4/show_ipv6_route.ref.diff | 0 .../rt5/step4/show_mpls_table.ref.diff | 0 .../rt5/step5/show_ip_route.ref.diff | 0 .../rt5/step5/show_ipv6_route.ref.diff | 0 .../rt5/step5/show_mpls_table.ref.diff | 0 .../rt5/step6/show_ip_route.ref.diff | 0 .../rt5/step6/show_ipv6_route.ref.diff | 0 .../rt5/step6/show_mpls_table.ref.diff | 0 .../rt5/step7/show_ip_route.ref.diff | 0 .../rt5/step7/show_ipv6_route.ref.diff | 0 .../rt5/step7/show_mpls_table.ref.diff | 0 .../rt5/step8/show_ip_route.ref.diff | 0 .../rt5/step8/show_ipv6_route.ref.diff | 0 .../rt5/step8/show_mpls_table.ref.diff | 0 .../rt5/step9/show_ip_route.ref.diff | 0 .../rt5/step9/show_ipv6_route.ref.diff | 0 .../rt5/step9/show_mpls_table.ref.diff | 0 .../rt5/zebra.conf | 0 .../rt6/isisd.conf | 0 .../rt6/step1/show_ip_route.ref | 0 .../rt6/step1/show_ipv6_route.ref | 0 .../rt6/step1/show_mpls_table.ref | 0 .../step1/show_yang_interface_isis_adjacencies.ref | 0 .../rt6/step2/show_ip_route.ref.diff | 0 .../rt6/step2/show_ipv6_route.ref.diff | 0 .../rt6/step2/show_mpls_table.ref.diff | 0 .../rt6/step3/show_ip_route.ref.diff | 0 .../rt6/step3/show_ipv6_route.ref.diff | 0 .../rt6/step3/show_mpls_table.ref.diff | 0 .../rt6/step4/show_ip_route.ref.diff | 0 .../rt6/step4/show_ipv6_route.ref.diff | 0 .../rt6/step4/show_mpls_table.ref.diff | 0 .../rt6/step5/show_ip_route.ref.diff | 0 .../rt6/step5/show_ipv6_route.ref.diff | 0 .../rt6/step5/show_mpls_table.ref.diff | 0 .../rt6/step6/show_ip_route.ref.diff | 0 .../rt6/step6/show_ipv6_route.ref.diff | 0 .../rt6/step6/show_mpls_table.ref.diff | 0 .../rt6/step7/show_ip_route.ref.diff | 0 .../rt6/step7/show_ipv6_route.ref.diff | 0 .../rt6/step7/show_mpls_table.ref.diff | 0 .../rt6/step8/show_ip_route.ref.diff | 0 .../rt6/step8/show_ipv6_route.ref.diff | 0 .../rt6/step8/show_mpls_table.ref.diff | 0 .../rt6/step9/show_ip_route.ref.diff | 0 .../rt6/step9/show_ipv6_route.ref.diff | 0 .../rt6/step9/show_mpls_table.ref.diff | 0 .../rt6/zebra.conf | 0 .../test_isis_tilfa_topo1.py | 0 .../{isis-topo1-vrf => isis_topo1}/__init__.py | 0 .../{isis-topo1 => isis_topo1}/r1/isisd.conf | 0 .../{isis-topo1 => isis_topo1}/r1/r1_route.json | 0 .../{isis-topo1 => isis_topo1}/r1/r1_route6.json | 0 .../r1/r1_route6_linux.json | 0 .../r1/r1_route_linux.json | 0 .../{isis-topo1 => isis_topo1}/r1/r1_topology.json | 0 .../{isis-topo1 => isis_topo1}/r1/zebra.conf | 0 .../{isis-topo1 => isis_topo1}/r2/isisd.conf | 0 .../{isis-topo1 => isis_topo1}/r2/r2_route.json | 0 .../{isis-topo1 => isis_topo1}/r2/r2_route6.json | 0 .../r2/r2_route6_linux.json | 0 .../r2/r2_route_linux.json | 0 .../{isis-topo1 => isis_topo1}/r2/r2_topology.json | 0 .../{isis-topo1 => isis_topo1}/r2/zebra.conf | 0 .../{isis-topo1 => isis_topo1}/r3/isisd.conf | 0 .../{isis-topo1 => isis_topo1}/r3/r3_route.json | 0 .../{isis-topo1 => isis_topo1}/r3/r3_route6.json | 0 .../r3/r3_route6_linux.json | 0 .../r3/r3_route_linux.json | 0 .../{isis-topo1 => isis_topo1}/r3/r3_topology.json | 0 .../{isis-topo1 => isis_topo1}/r3/zebra.conf | 0 .../{isis-topo1 => isis_topo1}/r4/isisd.conf | 0 .../{isis-topo1 => isis_topo1}/r4/r4_route.json | 0 .../{isis-topo1 => isis_topo1}/r4/r4_route6.json | 0 .../r4/r4_route6_linux.json | 0 .../r4/r4_route_linux.json | 0 .../{isis-topo1 => isis_topo1}/r4/r4_topology.json | 0 .../{isis-topo1 => isis_topo1}/r4/zebra.conf | 0 .../{isis-topo1 => isis_topo1}/r5/isisd.conf | 0 .../{isis-topo1 => isis_topo1}/r5/r5_route.json | 0 .../{isis-topo1 => isis_topo1}/r5/r5_route6.json | 0 .../r5/r5_route6_linux.json | 0 .../r5/r5_route_linux.json | 0 .../{isis-topo1 => isis_topo1}/r5/r5_topology.json | 0 .../{isis-topo1 => isis_topo1}/r5/zebra.conf | 0 .../{isis-topo1 => isis_topo1}/test_isis_topo1.dot | 0 .../{isis-topo1 => isis_topo1}/test_isis_topo1.jpg | Bin .../{isis-topo1 => isis_topo1}/test_isis_topo1.py | 0 .../{isis-topo1 => isis_topo1_vrf}/__init__.py | 0 .../r1/isisd.conf | 0 .../r1/r1_route.json | 0 .../r1/r1_route6.json | 0 .../r1/r1_route6_linux.json | 0 .../r1/r1_route_linux.json | 0 .../r1/r1_topology.json | 0 .../r1/zebra.conf | 0 .../r2/isisd.conf | 0 .../r2/r2_route.json | 0 .../r2/r2_route6.json | 0 .../r2/r2_route6_linux.json | 0 .../r2/r2_route_linux.json | 0 .../r2/r2_topology.json | 0 .../r2/zebra.conf | 0 .../r3/isisd.conf | 0 .../r3/r3_route.json | 0 .../r3/r3_route6.json | 0 .../r3/r3_route6_linux.json | 0 .../r3/r3_route_linux.json | 0 .../r3/r3_topology.json | 0 .../r3/zebra.conf | 0 .../r4/isisd.conf | 0 .../r4/r4_route.json | 0 .../r4/r4_route6.json | 0 .../r4/r4_route6_linux.json | 0 .../r4/r4_route_linux.json | 0 .../r4/r4_topology.json | 0 .../r4/zebra.conf | 0 .../r5/isisd.conf | 0 .../r5/r5_route.json | 0 .../r5/r5_route6.json | 0 .../r5/r5_route6_linux.json | 0 .../r5/r5_route_linux.json | 0 .../r5/r5_topology.json | 0 .../r5/zebra.conf | 0 .../test_isis_topo1_vrf.dot | 0 .../test_isis_topo1_vrf.jpg | Bin .../test_isis_topo1_vrf.py | 0 .../r1/ldpd.conf | 0 .../r1/ospfd.conf | 0 .../r1/show_ip_ospf_neighbor.json | 0 .../r1/show_ip_route.ref | 0 .../r1/show_ldp_all_binding.ref | 0 .../r1/show_ldp_binding.ref | 0 .../r1/show_ldp_discovery.ref | 0 .../r1/show_ldp_neighbor.ref | 0 .../r1/zebra.conf | 0 .../r2/ldpd.conf | 0 .../r2/ospfd.conf | 0 .../r2/show_ip_ospf_neighbor.json | 0 .../r2/show_ip_route.ref | 0 .../r2/show_ldp_all_binding.ref | 0 .../r2/show_ldp_binding.ref | 0 .../r2/show_ldp_discovery.ref | 0 .../r2/show_ldp_neighbor.ref | 0 .../r2/zebra.conf | 0 .../r3/ldpd.conf | 0 .../r3/ospfd.conf | 0 .../r3/show_ip_ospf_neighbor.json | 0 .../r3/show_ip_route.ref | 0 .../r3/show_ldp_all_binding.ref | 0 .../r3/show_ldp_binding.ref | 0 .../r3/show_ldp_discovery.ref | 0 .../r3/show_ldp_neighbor.ref | 0 .../r3/zebra.conf | 0 .../r4/ldpd.conf | 0 .../r4/ospfd.conf | 0 .../r4/show_ip_ospf_neighbor.json | 0 .../r4/show_ip_route.ref | 0 .../r4/show_ldp_all_binding.ref | 0 .../r4/show_ldp_binding.ref | 0 .../r4/show_ldp_discovery.ref | 0 .../r4/show_ldp_neighbor.ref | 0 .../r4/zebra.conf | 0 .../test_ldp_oc_acl_topo1.dot | 0 .../test_ldp_oc_acl_topo1.py | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r1/ldpd.conf | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r1/ospfd.conf | 0 .../r1/show_ip_ospf_neighbor.json | 0 .../r1/show_ip_route.ref | 0 .../r1/show_ldp_binding.ref | 0 .../r1/show_ldp_discovery.ref | 0 .../r1/show_ldp_neighbor.ref | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r1/zebra.conf | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r2/ldpd.conf | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r2/ospfd.conf | 0 .../r2/show_ip_ospf_neighbor.json | 0 .../r2/show_ip_route.ref | 0 .../r2/show_ldp_binding.ref | 0 .../r2/show_ldp_discovery.ref | 0 .../r2/show_ldp_neighbor.ref | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r2/zebra.conf | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r3/ldpd.conf | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r3/ospfd.conf | 0 .../r3/show_ip_ospf_neighbor.json | 0 .../r3/show_ip_route.ref | 0 .../r3/show_ldp_binding.ref | 0 .../r3/show_ldp_discovery.ref | 0 .../r3/show_ldp_neighbor.ref | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r3/zebra.conf | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r4/ldpd.conf | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r4/ospfd.conf | 0 .../r4/show_ip_ospf_neighbor.json | 0 .../r4/show_ip_route.ref | 0 .../r4/show_ldp_binding.ref | 0 .../r4/show_ldp_discovery.ref | 0 .../r4/show_ldp_neighbor.ref | 0 .../{ldp-oc-topo1 => ldp_oc_topo1}/r4/zebra.conf | 0 .../test_ldp_oc_topo1.dot | 0 .../test_ldp_oc_topo1.py | 0 .../topotests/{ldp-snmp => ldp_snmp}/ce1/zebra.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/ce2/zebra.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/ce3/zebra.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/r1/isisd.conf | 0 tests/topotests/{ldp-snmp => ldp_snmp}/r1/ldpd.conf | 0 .../{ldp-snmp => ldp_snmp}/r1/show_ip_route.ref | 0 .../r1/show_isis_interface_detail.ref | 0 .../show_isis_interface_detail_r1_eth1_shutdown.ref | 0 .../show_isis_interface_detail_r2_eth1_shutdown.ref | 0 .../r1/show_isis_ldp_sync.ref | 0 .../r1/show_isis_ldp_sync_r1_eth1_shutdown.ref | 0 .../r1/show_isis_ldp_sync_r2_eth1_shutdown.ref | 0 .../r1/show_l2vpn_binding.ref | 0 .../{ldp-snmp => ldp_snmp}/r1/show_l2vpn_vc.ref | 0 .../{ldp-snmp => ldp_snmp}/r1/show_ldp_binding.ref | 0 .../r1/show_ldp_discovery.ref | 0 .../{ldp-snmp => ldp_snmp}/r1/show_ldp_igp_sync.ref | 0 .../r1/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../{ldp-snmp => ldp_snmp}/r1/show_ldp_neighbor.ref | 0 .../r1/show_yang_interface_isis_adjacencies.ref | 0 .../topotests/{ldp-snmp => ldp_snmp}/r1/snmpd.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/r1/zebra.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/r2/isisd.conf | 0 tests/topotests/{ldp-snmp => ldp_snmp}/r2/ldpd.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/r2/ospfd.conf | 0 .../{ldp-snmp => ldp_snmp}/r2/show_ip_route.ref | 0 .../r2/show_isis_interface_detail.ref | 0 .../show_isis_interface_detail_r1_eth1_shutdown.ref | 0 .../show_isis_interface_detail_r2_eth1_shutdown.ref | 0 .../r2/show_isis_ldp_sync.ref | 0 .../r2/show_isis_ldp_sync_r1_eth1_shutdown.ref | 0 .../r2/show_isis_ldp_sync_r2_eth1_shutdown.ref | 0 .../r2/show_l2vpn_binding.ref | 0 .../{ldp-snmp => ldp_snmp}/r2/show_l2vpn_vc.ref | 0 .../{ldp-snmp => ldp_snmp}/r2/show_ldp_binding.ref | 0 .../r2/show_ldp_discovery.ref | 0 .../{ldp-snmp => ldp_snmp}/r2/show_ldp_igp_sync.ref | 0 .../r2/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../r2/show_ldp_igp_sync_r2_eth1_shutdown.ref | 0 .../{ldp-snmp => ldp_snmp}/r2/show_ldp_neighbor.ref | 0 .../r2/show_yang_interface_isis_adjacencies.ref | 0 .../topotests/{ldp-snmp => ldp_snmp}/r2/snmpd.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/r2/zebra.conf | 0 .../topotests/{ldp-snmp => ldp_snmp}/r3/isisd.conf | 0 tests/topotests/{ldp-snmp => ldp_snmp}/r3/ldpd.conf | 0 .../{ldp-snmp => ldp_snmp}/r3/show_ip_route.ref | 0 .../r3/show_isis_interface_detail.ref | 0 .../show_isis_interface_detail_r1_eth1_shutdown.ref | 0 .../show_isis_interface_detail_r2_eth1_shutdown.ref | 0 .../r3/show_isis_ldp_sync.ref | 0 .../r3/show_isis_ldp_sync_r1_eth1_shutdown.ref | 0 .../r3/show_isis_ldp_sync_r2_eth1_shutdown.ref | 0 .../r3/show_l2vpn_binding.ref | 0 .../{ldp-snmp => ldp_snmp}/r3/show_l2vpn_vc.ref | 0 .../{ldp-snmp => ldp_snmp}/r3/show_ldp_binding.ref | 0 .../r3/show_ldp_discovery.ref | 0 .../{ldp-snmp => ldp_snmp}/r3/show_ldp_igp_sync.ref | 0 .../r3/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../{ldp-snmp => ldp_snmp}/r3/show_ldp_neighbor.ref | 0 .../r3/show_yang_interface_isis_adjacencies.ref | 0 .../topotests/{ldp-snmp => ldp_snmp}/r3/zebra.conf | 0 .../{ldp-snmp => ldp_snmp}/test_ldp_snmp_topo1.py | 0 .../ce1/zebra.conf | 0 .../ce2/zebra.conf | 0 .../ce3/zebra.conf | 0 .../r1/isisd.conf | 0 .../r1/ldpd.conf | 0 .../r1/show_ip_route.ref | 0 .../r1/show_isis_interface_detail.ref | 0 .../show_isis_interface_detail_r1_eth1_shutdown.ref | 0 .../show_isis_interface_detail_r2_eth1_shutdown.ref | 0 .../r1/show_isis_ldp_sync.ref | 0 .../r1/show_isis_ldp_sync_r1_eth1_shutdown.ref | 0 .../r1/show_isis_ldp_sync_r2_eth1_shutdown.ref | 0 .../r1/show_l2vpn_binding.ref | 0 .../r1/show_l2vpn_vc.ref | 0 .../r1/show_ldp_binding.ref | 0 .../r1/show_ldp_discovery.ref | 0 .../r1/show_ldp_igp_sync.ref | 0 .../r1/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../r1/show_ldp_neighbor.ref | 0 .../r1/show_yang_interface_isis_adjacencies.ref | 0 .../r1/zebra.conf | 0 .../r2/isisd.conf | 0 .../r2/ldpd.conf | 0 .../r2/show_ip_route.ref | 0 .../r2/show_isis_interface_detail.ref | 0 .../show_isis_interface_detail_r1_eth1_shutdown.ref | 0 .../show_isis_interface_detail_r2_eth1_shutdown.ref | 0 .../r2/show_isis_ldp_sync.ref | 0 .../r2/show_isis_ldp_sync_r1_eth1_shutdown.ref | 0 .../r2/show_isis_ldp_sync_r2_eth1_shutdown.ref | 0 .../r2/show_l2vpn_binding.ref | 0 .../r2/show_l2vpn_vc.ref | 0 .../r2/show_ldp_binding.ref | 0 .../r2/show_ldp_discovery.ref | 0 .../r2/show_ldp_igp_sync.ref | 0 .../r2/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../r2/show_ldp_igp_sync_r2_eth1_shutdown.ref | 0 .../r2/show_ldp_neighbor.ref | 0 .../r2/show_yang_interface_isis_adjacencies.ref | 0 .../r2/zebra.conf | 0 .../r3/isisd.conf | 0 .../r3/ldpd.conf | 0 .../r3/show_ip_route.ref | 0 .../r3/show_isis_interface_detail.ref | 0 .../show_isis_interface_detail_r1_eth1_shutdown.ref | 0 .../show_isis_interface_detail_r2_eth1_shutdown.ref | 0 .../r3/show_isis_ldp_sync.ref | 0 .../r3/show_isis_ldp_sync_r1_eth1_shutdown.ref | 0 .../r3/show_isis_ldp_sync_r2_eth1_shutdown.ref | 0 .../r3/show_l2vpn_binding.ref | 0 .../r3/show_l2vpn_vc.ref | 0 .../r3/show_ldp_binding.ref | 0 .../r3/show_ldp_discovery.ref | 0 .../r3/show_ldp_igp_sync.ref | 0 .../r3/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../r3/show_ldp_neighbor.ref | 0 .../r3/show_yang_interface_isis_adjacencies.ref | 0 .../r3/zebra.conf | 0 .../test_ldp_sync_isis_topo1.dot | 0 .../test_ldp_sync_isis_topo1.py | 0 .../ce1/zebra.conf | 0 .../ce2/zebra.conf | 0 .../ce3/zebra.conf | 0 .../r1/ldpd.conf | 0 .../r1/ospf-nbrs.txt | 0 .../r1/ospfd.conf | 0 .../r1/show_ip_ospf_interface.ref | 0 .../r1/show_ip_ospf_interface_r1_eth1_shutdown.ref | 0 .../r1/show_ip_ospf_interface_r2_eth1_shutdown.ref | 0 .../r1/show_ip_ospf_neighbor.json | 0 .../r1/show_ip_route.ref | 0 .../r1/show_l2vpn_binding.ref | 0 .../r1/show_l2vpn_vc.ref | 0 .../r1/show_ldp_binding.ref | 0 .../r1/show_ldp_discovery.ref | 0 .../r1/show_ldp_igp_sync.ref | 0 .../r1/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../r1/show_ldp_neighbor.ref | 0 .../r1/show_ospf_ldp_sync.ref | 0 .../r1/show_ospf_ldp_sync_r1_eth1_shutdown.ref | 0 .../r1/show_ospf_ldp_sync_r2_eth1_shutdown.ref | 0 .../r1/zebra.conf | 0 .../r2/ldpd.conf | 0 .../r2/ospfd.conf | 0 .../r2/show_ip_ospf_interface.ref | 0 .../r2/show_ip_ospf_interface_r1_eth1_shutdown.ref | 0 .../r2/show_ip_ospf_interface_r2_eth1_shutdown.ref | 0 .../r2/show_ip_ospf_neighbor.json | 0 .../r2/show_ip_route.ref | 0 .../r2/show_l2vpn_binding.ref | 0 .../r2/show_l2vpn_vc.ref | 0 .../r2/show_ldp_binding.ref | 0 .../r2/show_ldp_discovery.ref | 0 .../r2/show_ldp_igp_sync.ref | 0 .../r2/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../r2/show_ldp_neighbor.ref | 0 .../r2/show_ospf_ldp_sync.ref | 0 .../r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref | 0 .../r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref | 0 .../r2/zebra.conf | 0 .../r3/ldpd.conf | 0 .../r3/ospfd.conf | 0 .../r3/show_ip_ospf_interface.ref | 0 .../r3/show_ip_ospf_interface_r1_eth1_shutdown.ref | 0 .../r3/show_ip_ospf_interface_r2_eth1_shutdown.ref | 0 .../r3/show_ip_ospf_neighbor.json | 0 .../r3/show_ip_route.ref | 0 .../r3/show_l2vpn_binding.ref | 0 .../r3/show_l2vpn_vc.ref | 0 .../r3/show_ldp_binding.ref | 0 .../r3/show_ldp_discovery.ref | 0 .../r3/show_ldp_igp_sync.ref | 0 .../r3/show_ldp_igp_sync_r1_eth1_shutdown.ref | 0 .../r3/show_ldp_neighbor.ref | 0 .../r3/show_ospf_ldp_sync.ref | 0 .../r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref | 0 .../r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref | 0 .../r3/zebra.conf | 0 .../test_ldp_sync_ospf_topo1.dot | 0 .../test_ldp_sync_ospf_topo1.py | 0 .../{ldp-topo1 => ldp_topo1}/r1/ip_mpls_route.ref | 0 .../topotests/{ldp-topo1 => ldp_topo1}/r1/ldpd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r1/ospfd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r1/show_ipv4_route.ref | 0 .../r1/show_mpls_ldp_binding.ref | 0 .../r1/show_mpls_ldp_discovery.ref | 0 .../r1/show_mpls_ldp_interface.ref | 0 .../r1/show_mpls_ldp_neighbor.ref | 0 .../{ldp-topo1 => ldp_topo1}/r1/show_mpls_table.ref | 0 .../{ldp-topo1 => ldp_topo1}/r1/zebra.conf | 0 .../{ldp-topo1 => ldp_topo1}/r2/ip_mpls_route.ref | 0 .../topotests/{ldp-topo1 => ldp_topo1}/r2/ldpd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r2/ospfd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r2/show_ipv4_route.ref | 0 .../r2/show_mpls_ldp_binding.ref | 0 .../r2/show_mpls_ldp_discovery.ref | 0 .../r2/show_mpls_ldp_interface.ref | 0 .../r2/show_mpls_ldp_neighbor.ref | 0 .../{ldp-topo1 => ldp_topo1}/r2/show_mpls_table.ref | 0 .../{ldp-topo1 => ldp_topo1}/r2/zebra.conf | 0 .../{ldp-topo1 => ldp_topo1}/r3/ip_mpls_route.ref | 0 .../topotests/{ldp-topo1 => ldp_topo1}/r3/ldpd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r3/ospfd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r3/show_ipv4_route.ref | 0 .../r3/show_mpls_ldp_binding.ref | 0 .../r3/show_mpls_ldp_discovery.ref | 0 .../r3/show_mpls_ldp_interface.ref | 0 .../r3/show_mpls_ldp_neighbor.ref | 0 .../{ldp-topo1 => ldp_topo1}/r3/show_mpls_table.ref | 0 .../{ldp-topo1 => ldp_topo1}/r3/zebra.conf | 0 .../{ldp-topo1 => ldp_topo1}/r4/ip_mpls_route.ref | 0 .../topotests/{ldp-topo1 => ldp_topo1}/r4/ldpd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r4/ospfd.conf | 0 .../{ldp-topo1 => ldp_topo1}/r4/show_ipv4_route.ref | 0 .../r4/show_mpls_ldp_binding.ref | 0 .../r4/show_mpls_ldp_discovery.ref | 0 .../r4/show_mpls_ldp_interface.ref | 0 .../r4/show_mpls_ldp_neighbor.ref | 0 .../{ldp-topo1 => ldp_topo1}/r4/show_mpls_table.ref | 0 .../{ldp-topo1 => ldp_topo1}/r4/zebra.conf | 0 .../{ldp-topo1 => ldp_topo1}/test_ldp_topo1.py | 0 .../{ldp-vpls-topo1 => ldp_vpls_topo1}/__init__.py | 0 .../ce1/zebra.conf | 0 .../ce2/zebra.conf | 0 .../ce3/zebra.conf | 0 .../{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/ldpd.conf | 0 .../r1/ospf-nbrs.txt | 0 .../r1/ospfd.conf | 0 .../r1/show_ip_ospf_neighbor.json | 0 .../r1/show_ip_route.ref | 0 .../r1/show_l2vpn_binding.ref | 0 .../r1/show_l2vpn_vc.ref | 0 .../r1/show_ldp_binding.ref | 0 .../r1/show_ldp_discovery.ref | 0 .../r1/show_ldp_neighbor.ref | 0 .../r1/zebra.conf | 0 .../{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/ldpd.conf | 0 .../r2/ospfd.conf | 0 .../r2/show_ip_ospf_neighbor.json | 0 .../r2/show_ip_route.ref | 0 .../r2/show_l2vpn_binding.ref | 0 .../r2/show_l2vpn_vc.ref | 0 .../r2/show_ldp_binding.ref | 0 .../r2/show_ldp_discovery.ref | 0 .../r2/show_ldp_neighbor.ref | 0 .../r2/zebra.conf | 0 .../{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/ldpd.conf | 0 .../r3/ospfd.conf | 0 .../r3/show_ip_ospf_neighbor.json | 0 .../r3/show_ip_route.ref | 0 .../r3/show_l2vpn_binding.ref | 0 .../r3/show_l2vpn_vc.ref | 0 .../r3/show_ldp_binding.ref | 0 .../r3/show_ldp_discovery.ref | 0 .../r3/show_ldp_neighbor.ref | 0 .../r3/zebra.conf | 0 .../test_ldp_vpls_topo1.dot | 0 .../test_ldp_vpls_topo1.pdf | Bin .../test_ldp_vpls_topo1.py | 0 .../mcast_pim_bsmp_01.json | 0 .../test_mcast_pim_bsmp_01.py | 0 .../mcast_pim_bsmp_02.json | 0 .../test_mcast_pim_bsmp_02.py | 0 .../multicast_pim_sm_topo1.json | 0 .../test_multicast_pim_sm_topo1.py | 0 .../multicast_pim_sm_topo2.json | 0 .../test_multicast_pim_sm_topo2.py | 0 .../multicast_pim_sm_topo3.json | 0 .../multicast_pim_sm_topo4.json | 0 .../test_multicast_pim_sm_topo3.py | 0 .../test_multicast_pim_sm_topo4.py | 0 .../__init__.py | 0 .../multicast_pim_static_rp.json | 0 .../test_multicast_pim_static_rp.py | 0 .../{nhrp-topo => nhrp_topo}/r1/nhrp4_cache.json | 0 .../{nhrp-topo => nhrp_topo}/r1/nhrp_route4.json | 0 .../{nhrp-topo => nhrp_topo}/r1/nhrpd.conf | 0 .../{nhrp-topo => nhrp_topo}/r1/zebra.conf | 0 .../{nhrp-topo => nhrp_topo}/r2/nhrp4_cache.json | 0 .../{nhrp-topo => nhrp_topo}/r2/nhrp_route4.json | 0 .../{nhrp-topo => nhrp_topo}/r2/nhrpd.conf | 0 .../{nhrp-topo => nhrp_topo}/r2/zebra.conf | 0 .../{nhrp-topo => nhrp_topo}/r3/zebra.conf | 0 .../{nhrp-topo => nhrp_topo}/test_nhrp_topo.dot | 0 .../{nhrp-topo => nhrp_topo}/test_nhrp_topo.py | 0 .../{ospf6-topo1 => ospf6_topo1}/README.md | 0 .../r1/ip_6_address.nhg.ref | 0 .../r1/ip_6_address.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r1/ospf6d.conf | 0 .../r1/show_ipv6_route.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r1/zebra.conf | 0 .../r2/ip_6_address.nhg.ref | 0 .../r2/ip_6_address.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r2/ospf6d.conf | 0 .../r2/show_ipv6_route.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r2/zebra.conf | 0 .../r3/ip_6_address.nhg.ref | 0 .../r3/ip_6_address.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r3/ospf6d.conf | 0 .../r3/show_ipv6_route.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r3/zebra.conf | 0 .../r4/ip_6_address.nhg.ref | 0 .../r4/ip_6_address.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r4/ospf6d.conf | 0 .../r4/show_ipv6_route.ref | 0 .../{ospf6-topo1 => ospf6_topo1}/r4/zebra.conf | 0 .../test_ospf6_topo1.py | 0 .../{ospf6-topo1-vrf => ospf6_topo1_vrf}/README.md | 0 .../r1/ip_6_address.nhg.ref | 0 .../r1/ip_6_address.ref | 0 .../r1/ospf6d.conf | 0 .../r1/show_ipv6_vrf_route.ref | 0 .../r1/zebra.conf | 0 .../r2/ip_6_address.ref | 0 .../r2/ospf6d.conf | 0 .../r2/show_ipv6_vrf_route.ref | 0 .../r2/zebra.conf | 0 .../r3/ip_6_address.ref | 0 .../r3/ospf6d.conf | 0 .../r3/show_ipv6_vrf_route.ref | 0 .../r3/zebra.conf | 0 .../r4/ip_6_address.ref | 0 .../r4/ospf6d.conf | 0 .../r4/show_ipv6_vrf_route.ref | 0 .../r4/zebra.conf | 0 .../test_ospf6_topo1_vrf.py | 0 .../{ospf6-topo2 => ospf6_topo2}/r1/ospf6d.conf | 0 .../{ospf6-topo2 => ospf6_topo2}/r1/zebra.conf | 0 .../{ospf6-topo2 => ospf6_topo2}/r2/ospf6d.conf | 0 .../{ospf6-topo2 => ospf6_topo2}/r2/zebra.conf | 0 .../{ospf6-topo2 => ospf6_topo2}/r3/ospf6d.conf | 0 .../{ospf6-topo2 => ospf6_topo2}/r3/zebra.conf | 0 .../test_ospf6_topo2.dot | 0 .../test_ospf6_topo2.png | Bin .../test_ospf6_topo2.py | 0 .../test_ospf_dual_stack.dot | 0 .../test_ospf_dual_stack.jpg | Bin .../test_ospf_dual_stack.json | 0 .../test_ospf_dual_stack.py | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/__init__.py | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt1/ospfd.conf | 0 .../rt1/step1/show_ip_route.ref | 0 .../rt1/step1/show_mpls_table.ref | 0 .../rt1/step10/show_ip_route.ref | 0 .../rt1/step10/show_mpls_table.ref | 0 .../rt1/step2/show_ip_route.ref | 0 .../rt1/step2/show_mpls_table.ref | 0 .../rt1/step3/show_ip_route.ref | 0 .../rt1/step3/show_mpls_table.ref | 0 .../rt1/step4/show_ip_route.ref | 0 .../rt1/step4/show_mpls_table.ref | 0 .../rt1/step5/show_ip_route.ref | 0 .../rt1/step5/show_mpls_table.ref | 0 .../rt1/step6/show_ip_route.ref | 0 .../rt1/step6/show_mpls_table.ref | 0 .../rt1/step7/show_ip_route.ref | 0 .../rt1/step7/show_mpls_table.ref | 0 .../rt1/step8/show_ip_route.ref | 0 .../rt1/step8/show_mpls_table.ref | 0 .../rt1/step9/show_ip_route.ref | 0 .../rt1/step9/show_mpls_table.ref | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt1/zebra.conf | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt2/ospfd.conf | 0 .../rt2/step1/show_ip_route.ref | 0 .../rt2/step1/show_mpls_table.ref | 0 .../rt2/step10/show_ip_route.ref | 0 .../rt2/step10/show_mpls_table.ref | 0 .../rt2/step2/show_ip_route.ref | 0 .../rt2/step2/show_mpls_table.ref | 0 .../rt2/step3/show_ip_route.ref | 0 .../rt2/step3/show_mpls_table.ref | 0 .../rt2/step4/show_ip_route.ref | 0 .../rt2/step4/show_mpls_table.ref | 0 .../rt2/step5/show_ip_route.ref | 0 .../rt2/step5/show_mpls_table.ref | 0 .../rt2/step6/show_ip_route.ref | 0 .../rt2/step6/show_mpls_table.ref | 0 .../rt2/step7/show_ip_route.ref | 0 .../rt2/step7/show_mpls_table.ref | 0 .../rt2/step8/show_ip_route.ref | 0 .../rt2/step8/show_mpls_table.ref | 0 .../rt2/step9/show_ip_route.ref | 0 .../rt2/step9/show_mpls_table.ref | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt2/zebra.conf | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt3/ospfd.conf | 0 .../rt3/step1/show_ip_route.ref | 0 .../rt3/step1/show_mpls_table.ref | 0 .../rt3/step10/show_ip_route.ref | 0 .../rt3/step10/show_mpls_table.ref | 0 .../rt3/step2/show_ip_route.ref | 0 .../rt3/step2/show_mpls_table.ref | 0 .../rt3/step3/show_ip_route.ref | 0 .../rt3/step3/show_mpls_table.ref | 0 .../rt3/step4/show_ip_route.ref | 0 .../rt3/step4/show_mpls_table.ref | 0 .../rt3/step5/show_ip_route.ref | 0 .../rt3/step5/show_mpls_table.ref | 0 .../rt3/step6/show_ip_route.ref | 0 .../rt3/step6/show_mpls_table.ref | 0 .../rt3/step7/show_ip_route.ref | 0 .../rt3/step7/show_mpls_table.ref | 0 .../rt3/step8/show_ip_route.ref | 0 .../rt3/step8/show_mpls_table.ref | 0 .../rt3/step9/show_ip_route.ref | 0 .../rt3/step9/show_mpls_table.ref | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt3/zebra.conf | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt4/ospfd.conf | 0 .../rt4/step1/show_ip_route.ref | 0 .../rt4/step1/show_mpls_table.ref | 0 .../rt4/step10/show_ip_route.ref | 0 .../rt4/step10/show_mpls_table.ref | 0 .../rt4/step2/show_ip_route.ref | 0 .../rt4/step2/show_mpls_table.ref | 0 .../rt4/step3/show_ip_route.ref | 0 .../rt4/step3/show_mpls_table.ref | 0 .../rt4/step4/show_ip_route.ref | 0 .../rt4/step4/show_mpls_table.ref | 0 .../rt4/step5/show_ip_route.ref | 0 .../rt4/step5/show_mpls_table.ref | 0 .../rt4/step6/show_ip_route.ref | 0 .../rt4/step6/show_mpls_table.ref | 0 .../rt4/step7/show_ip_route.ref | 0 .../rt4/step7/show_mpls_table.ref | 0 .../rt4/step8/show_ip_route.ref | 0 .../rt4/step8/show_mpls_table.ref | 0 .../rt4/step9/show_ip_route.ref | 0 .../rt4/step9/show_mpls_table.ref | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt4/zebra.conf | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt5/ospfd.conf | 0 .../rt5/step1/show_ip_route.ref | 0 .../rt5/step1/show_mpls_table.ref | 0 .../rt5/step10/show_ip_route.ref | 0 .../rt5/step10/show_mpls_table.ref | 0 .../rt5/step2/show_ip_route.ref | 0 .../rt5/step2/show_mpls_table.ref | 0 .../rt5/step3/show_ip_route.ref | 0 .../rt5/step3/show_mpls_table.ref | 0 .../rt5/step4/show_ip_route.ref | 0 .../rt5/step4/show_mpls_table.ref | 0 .../rt5/step5/show_ip_route.ref | 0 .../rt5/step5/show_mpls_table.ref | 0 .../rt5/step6/show_ip_route.ref | 0 .../rt5/step6/show_mpls_table.ref | 0 .../rt5/step7/show_ip_route.ref | 0 .../rt5/step7/show_mpls_table.ref | 0 .../rt5/step8/show_ip_route.ref | 0 .../rt5/step8/show_mpls_table.ref | 0 .../rt5/step9/show_ip_route.ref | 0 .../rt5/step9/show_mpls_table.ref | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt5/zebra.conf | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt6/ospfd.conf | 0 .../rt6/step1/show_ip_route.ref | 0 .../rt6/step1/show_mpls_table.ref | 0 .../rt6/step10/show_ip_route.ref | 0 .../rt6/step10/show_mpls_table.ref | 0 .../rt6/step2/show_ip_route.ref | 0 .../rt6/step2/show_mpls_table.ref | 0 .../rt6/step3/show_ip_route.ref | 0 .../rt6/step3/show_mpls_table.ref | 0 .../rt6/step4/show_ip_route.ref | 0 .../rt6/step4/show_mpls_table.ref | 0 .../rt6/step5/show_ip_route.ref | 0 .../rt6/step5/show_mpls_table.ref | 0 .../rt6/step6/show_ip_route.ref | 0 .../rt6/step6/show_mpls_table.ref | 0 .../rt6/step7/show_ip_route.ref | 0 .../rt6/step7/show_mpls_table.ref | 0 .../rt6/step8/show_ip_route.ref | 0 .../rt6/step8/show_mpls_table.ref | 0 .../rt6/step9/show_ip_route.ref | 0 .../rt6/step9/show_mpls_table.ref | 0 .../{ospf-sr-topo1 => ospf_sr_topo1}/rt6/zebra.conf | 0 .../test_ospf_sr_topo1.py | 0 .../{ospf-te-topo1 => ospf_te_topo1}/__init__.py | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r1/ospfd.conf | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r1/zebra.conf | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r2/ospfd.conf | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r2/zebra.conf | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r3/ospfd.conf | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r3/zebra.conf | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r4/ospfd.conf | 0 .../{ospf-te-topo1 => ospf_te_topo1}/r4/zebra.conf | 0 .../reference/ted_step1.json | 0 .../reference/ted_step2.json | 0 .../reference/ted_step3.json | 0 .../reference/ted_step4.json | 0 .../reference/ted_step5.json | 0 .../reference/ted_step6.json | 0 .../reference/ted_step7.json | 0 .../test_ospf_te_topo1.py | 0 .../__init__.py | 0 .../rt1/ospfd.conf | 0 .../rt1/step1/show_ip_route_initial.ref | 0 .../rt1/step2/show_ip_route_initial.ref | 0 .../rt1/step2/show_ip_route_link_protection.ref | 0 .../rt1/step3/show_ip_route_initial.ref | 0 .../rt1/step3/show_ip_route_node_protection.ref | 0 .../rt1/zebra.conf | 0 .../rt2/ospfd.conf | 0 .../rt2/zebra.conf | 0 .../rt3/ospfd.conf | 0 .../rt3/zebra.conf | 0 .../rt4/ospfd.conf | 0 .../rt4/zebra.conf | 0 .../rt5/ospfd.conf | 0 .../rt5/zebra.conf | 0 .../test_ospf_tilfa_topo1.py | 0 .../{ospf-topo1-vrf => ospf_topo1}/__init__.py | 0 .../{ospf-topo1 => ospf_topo1}/r1/ospf6d.conf | 0 .../{ospf-topo1 => ospf_topo1}/r1/ospf6route.txt | 0 .../r1/ospf6route_down.txt | 0 .../r1/ospf6route_ecmp.txt | 0 .../{ospf-topo1 => ospf_topo1}/r1/ospfd.conf | 0 .../{ospf-topo1 => ospf_topo1}/r1/ospfroute.txt | 0 .../r1/ospfroute_down.txt | 0 .../{ospf-topo1 => ospf_topo1}/r1/zebra.conf | 0 .../{ospf-topo1 => ospf_topo1}/r2/ospf6d.conf | 0 .../{ospf-topo1 => ospf_topo1}/r2/ospf6route.txt | 0 .../r2/ospf6route_down.txt | 0 .../r2/ospf6route_ecmp.txt | 0 .../{ospf-topo1 => ospf_topo1}/r2/ospfd.conf | 0 .../{ospf-topo1 => ospf_topo1}/r2/ospfroute.txt | 0 .../r2/ospfroute_down.txt | 0 .../{ospf-topo1 => ospf_topo1}/r2/zebra.conf | 0 .../{ospf-topo1 => ospf_topo1}/r3/ospf6d.conf | 0 .../{ospf-topo1 => ospf_topo1}/r3/ospf6route.txt | 0 .../r3/ospf6route_down.txt | 0 .../r3/ospf6route_ecmp.txt | 0 .../{ospf-topo1 => ospf_topo1}/r3/ospfd.conf | 0 .../{ospf-topo1 => ospf_topo1}/r3/ospfroute.txt | 0 .../r3/ospfroute_down.txt | 0 .../{ospf-topo1 => ospf_topo1}/r3/zebra.conf | 0 .../{ospf-topo1 => ospf_topo1}/r4/ospf6d.conf | 0 .../{ospf-topo1 => ospf_topo1}/r4/ospf6route.txt | 0 .../r4/ospf6route_down.txt | 0 .../r4/ospf6route_ecmp.txt | 0 .../{ospf-topo1 => ospf_topo1}/r4/ospfd.conf | 0 .../{ospf-topo1 => ospf_topo1}/r4/ospfroute.txt | 0 .../r4/ospfroute_down.txt | 0 .../{ospf-topo1 => ospf_topo1}/r4/zebra.conf | 0 .../{ospf-topo1 => ospf_topo1}/test_ospf_topo1.dot | 0 .../{ospf-topo1 => ospf_topo1}/test_ospf_topo1.jpg | Bin .../{ospf-topo1 => ospf_topo1}/test_ospf_topo1.py | 0 .../{ospf-topo1 => ospf_topo1_vrf}/__init__.py | 0 .../r1/ospfd.conf | 0 .../r1/ospfroute.txt | 0 .../r1/ospfroute_down.txt | 0 .../r1/zebra.conf | 0 .../r1/zebraroute.txt | 0 .../r1/zebraroutedown.txt | 0 .../r2/ospfd.conf | 0 .../r2/ospfroute.txt | 0 .../r2/ospfroute_down.txt | 0 .../r2/zebra.conf | 0 .../r2/zebraroute.txt | 0 .../r2/zebraroutedown.txt | 0 .../r3/ospfd.conf | 0 .../r3/ospfroute.txt | 0 .../r3/ospfroute_down.txt | 0 .../r3/zebra.conf | 0 .../r3/zebraroute.txt | 0 .../r3/zebraroutedown.txt | 0 .../test_ospf_topo1-vrf.dot | 0 .../test_ospf_topo1_vrf.jpg | Bin .../test_ospf_topo1_vrf.py | 0 .../{ospf-topo2 => ospf_topo2}/r1/ospf-route.json | 0 .../{ospf-topo2 => ospf_topo2}/r1/ospfd.conf | 0 .../{ospf-topo2 => ospf_topo2}/r1/v4_route.json | 0 .../{ospf-topo2 => ospf_topo2}/r1/zebra.conf | 0 .../{ospf-topo2 => ospf_topo2}/r2/ospf-route.json | 0 .../{ospf-topo2 => ospf_topo2}/r2/ospfd.conf | 0 .../{ospf-topo2 => ospf_topo2}/r2/v4_route.json | 0 .../{ospf-topo2 => ospf_topo2}/r2/zebra.conf | 0 .../{ospf-topo2 => ospf_topo2}/test_ospf_topo2.py | 0 .../topotests/{pbr-topo1 => pbr_topo1}/__init__.py | 0 .../{pbr-topo1 => pbr_topo1}/r1/linux-rules.json | 0 .../{pbr-topo1 => pbr_topo1}/r1/pbr-interface.json | 0 .../{pbr-topo1 => pbr_topo1}/r1/pbr-map.json | 0 .../r1/pbr-nexthop-groups.json | 0 .../topotests/{pbr-topo1 => pbr_topo1}/r1/pbrd.conf | 0 .../{pbr-topo1 => pbr_topo1}/r1/zebra.conf | 0 .../{pbr-topo1 => pbr_topo1}/test_pbr_topo1.py | 0 .../topotests/{pim-basic => pim_basic}/mcast-rx.py | 0 .../topotests/{pim-basic => pim_basic}/mcast-tx.py | 0 .../topotests/{pim-basic => pim_basic}/r1/bgpd.conf | 0 .../topotests/{pim-basic => pim_basic}/r1/pimd.conf | 0 .../{pim-basic => pim_basic}/r1/rp-info.json | 0 .../{pim-basic => pim_basic}/r1/zebra.conf | 0 .../topotests/{pim-basic => pim_basic}/r2/pimd.conf | 0 .../{pim-basic => pim_basic}/r2/zebra.conf | 0 .../topotests/{pim-basic => pim_basic}/r3/pimd.conf | 0 .../{pim-basic => pim_basic}/r3/zebra.conf | 0 .../topotests/{pim-basic => pim_basic}/rp/bgpd.conf | 0 .../topotests/{pim-basic => pim_basic}/rp/pimd.conf | 0 .../{pim-basic => pim_basic}/rp/upstream.json | 0 .../{pim-basic => pim_basic}/rp/zebra.conf | 0 .../topotests/{pim-basic => pim_basic}/test_pim.py | 0 .../__init__.py | 0 .../r1/bfdd.conf | 0 .../r1/pimd.conf | 0 .../r1/zebra.conf | 0 .../r2/bfdd.conf | 0 .../r2/pimd.conf | 0 .../r2/zebra.conf | 0 .../r3/bfdd.conf | 0 .../r3/pimd.conf | 0 .../r3/zebra.conf | 0 .../r4/bfdd.conf | 0 .../r4/pimd.conf | 0 .../r4/zebra.conf | 0 .../test_pim_basic_topo2.dot | 0 .../test_pim_basic_topo2.png | Bin .../test_pim_basic_topo2.py | 0 .../{rip-topo1 => rip_topo1}/r1/rip_status.ref | 0 .../topotests/{rip-topo1 => rip_topo1}/r1/ripd.conf | 0 .../{rip-topo1 => rip_topo1}/r1/show_ip_rip.ref | 0 .../{rip-topo1 => rip_topo1}/r1/show_ip_route.ref | 0 .../{rip-topo1 => rip_topo1}/r1/zebra.conf | 0 .../{rip-topo1 => rip_topo1}/r2/rip_status.ref | 0 .../topotests/{rip-topo1 => rip_topo1}/r2/ripd.conf | 0 .../{rip-topo1 => rip_topo1}/r2/show_ip_rip.ref | 0 .../{rip-topo1 => rip_topo1}/r2/show_ip_route.ref | 0 .../{rip-topo1 => rip_topo1}/r2/zebra.conf | 0 .../{rip-topo1 => rip_topo1}/r3/rip_status.ref | 0 .../topotests/{rip-topo1 => rip_topo1}/r3/ripd.conf | 0 .../{rip-topo1 => rip_topo1}/r3/show_ip_rip.ref | 0 .../{rip-topo1 => rip_topo1}/r3/show_ip_route.ref | 0 .../{rip-topo1 => rip_topo1}/r3/zebra.conf | 0 .../{rip-topo1 => rip_topo1}/test_rip_topo1.dot | 0 .../{rip-topo1 => rip_topo1}/test_rip_topo1.pdf | Bin .../{rip-topo1 => rip_topo1}/test_rip_topo1.py | 0 .../r1/ripng_status.ref | 0 .../{ripng-topo1 => ripng_topo1}/r1/ripngd.conf | 0 .../r1/show_ipv6_ripng.ref | 0 .../r1/show_ipv6_route.ref | 0 .../{ripng-topo1 => ripng_topo1}/r1/zebra.conf | 0 .../r2/ripng_status.ref | 0 .../{ripng-topo1 => ripng_topo1}/r2/ripngd.conf | 0 .../r2/show_ipv6_ripng.ref | 0 .../r2/show_ipv6_route.ref | 0 .../{ripng-topo1 => ripng_topo1}/r2/zebra.conf | 0 .../r3/ripng_status.ref | 0 .../{ripng-topo1 => ripng_topo1}/r3/ripngd.conf | 0 .../r3/show_ipv6_ripng.ref | 0 .../r3/show_ipv6_route.ref | 0 .../{ripng-topo1 => ripng_topo1}/r3/zebra.conf | 0 .../test_ripng_topo1.dot | 0 .../test_ripng_topo1.pdf | Bin .../test_ripng_topo1.py | 0 .../r1/installed.routes.json | 0 .../{route-scale => route_scale}/r1/no.routes.json | 0 .../{route-scale => route_scale}/r1/sharpd.conf | 0 .../{route-scale => route_scale}/r1/zebra.conf | 0 .../test_route_scale.py | 0 .../r1/bgpd.conf | 0 .../r1/isisd.conf | 0 .../r1/snmpd.conf | 0 .../r1/zebra.conf | 0 .../test_simple_snmp.py | 0 2082 files changed, 0 insertions(+), 0 deletions(-) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/babeld.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/bgpd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ip_nht.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ipv4_routes.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ipv6_nht.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ipv6_routes.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/isisd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ldpd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/nhrpd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ospf6d.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ospf6d.conf-pre-v4 (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ospfd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/pbrd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/rip_status.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ripd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ripng_status.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/ripngd.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv4-post4.1.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv4-post5.0.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv4-post6.1.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv4.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv6-post4.1.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv6.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv6_post6.1.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_bgp_ipv6_summary.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_ip_bgp_summary.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_ip_ospf_interface.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_ipv6_ospf6_interface (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_ipv6_ospf6_interface.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_isis_interface_detail.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_mpls_ldp_interface.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/show_route_map.ref (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/r1/zebra.conf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/test_all_protocol_startup.dot (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/test_all_protocol_startup.pdf (100%) rename tests/topotests/{all-protocol-startup => all_protocol_startup}/test_all_protocol_startup.py (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/__init__.py (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r1/bfdd.conf (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r1/bgp_ipv6_routes_down.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r1/bgpd.conf (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r1/ipv6_routes.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r1/peers.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r1/peers_down.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r1/zebra.conf (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r2/zebra.conf (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r3/bfdd.conf (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r3/bgp_ipv6_routes_down.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r3/bgpd.conf (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r3/ipv6_routes.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r3/peers.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r3/peers_down.json (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/r3/zebra.conf (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/test_bfd_bgp_cbit_topo3.dot (100%) rename tests/topotests/{bfd-bgp-cbit-topo3 => bfd_bgp_cbit_topo3}/test_bfd_bgp_cbit_topo3.py (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/__init__.py (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/bfdd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/isisd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step1/show_ipv6_route.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step2/show_bfd_peers.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_bfd_peers_healthy.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_bfd_peers_rt2_down.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_bfd_peers_rt3_down.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_ip_route_healthy.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_ip_route_rt2_down.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_ip_route_rt3_down.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_ipv6_route_healthy.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_ipv6_route_rt2_down.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/step3/show_ipv6_route_rt3_down.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt2/bfdd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt2/isisd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt2/step2/show_bfd_peers.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt3/bfdd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt3/isisd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt3/step2/show_bfd_peers.ref (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt4/bfdd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt4/isisd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt5/bfdd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt5/isisd.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{bfd-isis-topo1 => bfd_isis_topo1}/test_bfd_isis_topo1.py (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/__init__.py (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/bfdd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/ospf6d.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/ospfd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step1/show_ipv6_route.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step2/show_bfd_peers.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_bfd_peers_healthy.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_bfd_peers_rt2_down.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_bfd_peers_rt3_down.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_ip_route_healthy.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_ip_route_rt2_down.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_ip_route_rt3_down.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_ipv6_route_healthy.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_ipv6_route_rt2_down.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/step3/show_ipv6_route_rt3_down.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt2/bfdd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt2/ospf6d.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt2/ospfd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt2/step2/show_bfd_peers.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt3/bfdd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt3/ospf6d.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt3/ospfd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt3/step2/show_bfd_peers.ref (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt4/bfdd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt4/ospf6d.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt4/ospfd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt5/bfdd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt5/ospf6d.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt5/ospfd.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{bfd-ospf-topo1 => bfd_ospf_topo1}/test_bfd_ospf_topo1.py (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/__init__.py (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r1/bfd-peers-initial.json (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r1/bfdd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r1/zebra.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r2/bfd-peers-initial.json (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r2/bfdd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r2/bgpd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r2/zebra.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r3/bfd-peers-initial.json (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r3/bfdd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r3/bgpd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r3/isisd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r3/zebra.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r4/bfd-peers-initial.json (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r4/bfdd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r4/bgpd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r4/isisd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r4/ospf6d.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r4/zebra.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r5/bfd-peers-initial.json (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r5/bfdd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r5/ospf6d.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r5/zebra.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r6/bfd-peers-initial.json (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r6/bfdd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r6/ospfd.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/r6/zebra.conf (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/test_bfd_profiles_topo1.dot (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/test_bfd_profiles_topo1.png (100%) rename tests/topotests/{bfd-profiles-topo1 => bfd_profiles_topo1}/test_bfd_profiles_topo1.py (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/__init__.py (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r1/bfdd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r1/bgp_prefixes.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r1/bgp_summary.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r1/bgpd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r1/peers.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r1/zebra.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r2/bfdd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r2/bgp_prefixes.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r2/bgp_summary.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r2/bgpd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r2/peers.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r2/zebra.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r3/bfdd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r3/bgp_prefixes.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r3/bgp_summary.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r3/bgpd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r3/peers.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r3/zebra.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r4/bfdd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r4/bgp_prefixes.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r4/bgp_summary.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r4/bgpd.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r4/peers.json (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/r4/zebra.conf (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/test_bfd_topo1.dot (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/test_bfd_topo1.jpg (100%) rename tests/topotests/{bfd-topo1 => bfd_topo1}/test_bfd_topo1.py (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/__init__.py (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r1/bfdd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r1/bgpd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r1/ipv4_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r1/ipv6_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r1/peers.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r1/zebra.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/bfdd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/bgpd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/ipv4_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/ipv6_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/ospf6d.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/ospfd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/peers.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r2/zebra.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r3/bfdd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r3/ipv4_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r3/ipv6_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r3/ospfd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r3/peers.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r3/zebra.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r4/bfdd.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r4/ipv4_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r4/ipv6_routes.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r4/ospf6d.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r4/peers.json (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/r4/zebra.conf (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/test_bfd_topo2.dot (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/test_bfd_topo2.jpg (100%) rename tests/topotests/{bfd-topo2 => bfd_topo2}/test_bfd_topo2.py (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/__init__.py (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r1/bfd-peers.json (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r1/bfdd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r1/bgpd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r1/zebra.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r2/bfd-peers.json (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r2/bfdd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r2/bgpd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r2/zebra.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r3/bfd-peers.json (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r3/bfdd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r3/bgpd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r3/zebra.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r4/bfd-peers.json (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r4/bfdd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r4/bgpd.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/r4/zebra.conf (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/test_bfd_topo3.dot (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/test_bfd_topo3.jpg (100%) rename tests/topotests/{bfd-topo3 => bfd_topo3}/test_bfd_topo3.py (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/__init__.py (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/bfdd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/bgp_prefixes.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/bgp_summary.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/bgpd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/peers.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r1/zebra.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/bfdd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/bgp_prefixes.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/bgp_summary.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/bgpd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/peers.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r2/zebra.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/bfdd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/bgp_prefixes.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/bgp_summary.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/bgpd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/peers.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r3/zebra.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/bfdd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/bgp_prefixes.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/bgp_summary.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/bgpd.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/peers.json (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/r4/zebra.conf (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/test_bfd_vrf_topo1.dot (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/test_bfd_vrf_topo1.jpg (100%) rename tests/topotests/{bfd-vrf-topo1 => bfd_vrf_topo1}/test_bfd_vrf_topo1.py (100%) rename tests/topotests/{bgp-aggregator-zero => bgp_aggregate_address_origin}/__init__.py (100%) rename tests/topotests/{bgp_aggregate-address_origin => bgp_aggregate_address_origin}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_aggregate-address_origin => bgp_aggregate_address_origin}/r1/zebra.conf (100%) rename tests/topotests/{bgp_aggregate-address_origin => bgp_aggregate_address_origin}/r2/bgpd.conf (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_aggregate_address_origin}/r2/zebra.conf (100%) rename tests/topotests/{bgp_aggregate-address_origin => bgp_aggregate_address_origin}/test_bgp_aggregate-address_origin.py (100%) rename tests/topotests/{bgp-basic-functionality-topo1 => bgp_aggregate_address_route_map}/__init__.py (100%) rename tests/topotests/{bgp_aggregate-address_route-map => bgp_aggregate_address_route_map}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_aggregate-address_route-map => bgp_aggregate_address_route_map}/r1/zebra.conf (100%) rename tests/topotests/{bgp_aggregate-address_route-map => bgp_aggregate_address_route_map}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_aggregate-address_origin => bgp_aggregate_address_route_map}/r2/zebra.conf (100%) rename tests/topotests/{bgp_aggregate-address_route-map => bgp_aggregate_address_route_map}/test_bgp_aggregate-address_route-map.py (100%) rename tests/topotests/{bgp-community-alias => bgp_aggregator_zero}/__init__.py (100%) rename tests/topotests/{bgp-aggregator-zero => bgp_aggregator_zero}/exabgp.env (100%) rename tests/topotests/{bgp-aggregator-zero => bgp_aggregator_zero}/peer1/exabgp.cfg (100%) rename tests/topotests/{bgp-aggregator-zero => bgp_aggregator_zero}/r1/bgpd.conf (100%) rename tests/topotests/{bgp-aggregator-zero => bgp_aggregator_zero}/r1/zebra.conf (100%) rename tests/topotests/{bgp-aggregator-zero => bgp_aggregator_zero}/test_bgp_aggregator_zero.py (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/bgpd.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/bgpd_multi_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/bgpd_multi_vrf_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/bgpd_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/bgpd_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/bgpd_vrf_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/ospfd.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/ospfd_multi_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/ospfd_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R1/zebra.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/bgpd.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/bgpd_multi_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/bgpd_multi_vrf_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/bgpd_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/bgpd_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/bgpd_vrf_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/ospfd.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/ospfd_multi_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/ospfd_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R2/zebra.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/bgpd.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/bgpd_multi_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/bgpd_multi_vrf_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/bgpd_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/bgpd_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/bgpd_vrf_prefix.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/ospfd.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/ospfd_multi_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/ospfd_vrf.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/R3/zebra.conf (100%) rename tests/topotests/{bgp-auth => bgp_auth}/test_bgp_auth.py (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_basic_functionality_topo1}/__init__.py (100%) rename tests/topotests/{bgp-basic-functionality-topo1 => bgp_basic_functionality_topo1}/bgp_basic_functionality.json (100%) rename tests/topotests/{bgp-basic-functionality-topo1 => bgp_basic_functionality_topo1}/test_bgp_basic_functionality.py (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_comm_list_delete}/__init__.py (100%) rename tests/topotests/{bgp_comm-list_delete => bgp_comm_list_delete}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_comm-list_delete => bgp_comm_list_delete}/r1/zebra.conf (100%) rename tests/topotests/{bgp_comm-list_delete => bgp_comm_list_delete}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_aggregate-address_route-map => bgp_comm_list_delete}/r2/zebra.conf (100%) rename tests/topotests/{bgp_comm-list_delete => bgp_comm_list_delete}/test_bgp_comm-list_delete.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_community_alias}/__init__.py (100%) rename tests/topotests/{bgp-community-alias => bgp_community_alias}/r1/bgpd.conf (100%) rename tests/topotests/{bgp-community-alias => bgp_community_alias}/r1/zebra.conf (100%) rename tests/topotests/{bgp-community-alias => bgp_community_alias}/r2/bgpd.conf (100%) rename tests/topotests/{bgp-community-alias => bgp_community_alias}/r2/zebra.conf (100%) rename tests/topotests/{bgp-community-alias => bgp_community_alias}/test_bgp-community-alias.py (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_default_ipv4_ipv6_unicast}/__init__.py (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_default_ipv4_ipv6_unicast}/r1/bgpd.conf (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_default_ipv4_ipv6_unicast}/r1/zebra.conf (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_default_ipv4_ipv6_unicast}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_comm-list_delete => bgp_default_ipv4_ipv6_unicast}/r2/zebra.conf (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_default_ipv4_ipv6_unicast}/r3/bgpd.conf (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_default_ipv4_ipv6_unicast}/r3/zebra.conf (100%) rename tests/topotests/{bgp-default-ipv4-ipv6-unicast => bgp_default_ipv4_ipv6_unicast}/test_bgp-default-ipv4-ipv6-unicast.py (100%) rename tests/topotests/{bgp-path-attributes-topo1 => bgp_default_route}/__init__.py (100%) rename tests/topotests/{bgp_default-route => bgp_default_route}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_default-route => bgp_default_route}/r1/zebra.conf (100%) rename tests/topotests/{bgp_default-route => bgp_default_route}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_default-route => bgp_default_route}/r2/zebra.conf (100%) rename tests/topotests/{bgp_default-route => bgp_default_route}/test_bgp_default-originate.py (100%) rename tests/topotests/{bgp-prefix-list-topo1 => bgp_default_route_route_map_match}/__init__.py (100%) rename tests/topotests/{bgp_default-route_route-map_match => bgp_default_route_route_map_match}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match => bgp_default_route_route_map_match}/r1/zebra.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match => bgp_default_route_route_map_match}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match => bgp_default_route_route_map_match}/r2/zebra.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match => bgp_default_route_route_map_match}/test_bgp_default-originate_route-map_match.py (100%) rename tests/topotests/{bgp_aggregate-address_origin => bgp_default_route_route_map_match_set}/__init__.py (100%) rename tests/topotests/{bgp_default-route_route-map_match_set => bgp_default_route_route_map_match_set}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match_set => bgp_default_route_route_map_match_set}/r1/zebra.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match_set => bgp_default_route_route_map_match_set}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match_set => bgp_default_route_route_map_match_set}/r2/zebra.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match_set => bgp_default_route_route_map_match_set}/test_bgp_default-originate_route-map_match_set.py (100%) rename tests/topotests/{bgp_aggregate-address_route-map => bgp_default_route_route_map_set}/__init__.py (100%) rename tests/topotests/{bgp_default-route_route-map_set => bgp_default_route_route_map_set}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_default-route_route-map_set => bgp_default_route_route_map_set}/r1/zebra.conf (100%) rename tests/topotests/{bgp_default-route_route-map_set => bgp_default_route_route_map_set}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_default-route_route-map_set => bgp_default_route_route_map_set}/r2/zebra.conf (100%) rename tests/topotests/{bgp_default-route_route-map_set => bgp_default_route_route_map_set}/test_bgp_default-originate_route-map_set.py (100%) rename tests/topotests/{bgp_comm-list_delete => bgp_ebgp_common_subnet_nexthop_unchanged}/__init__.py (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_ebgp_common_subnet_nexthop_unchanged}/r1/bgpd.conf (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_ebgp_common_subnet_nexthop_unchanged}/r1/zebra.conf (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_ebgp_common_subnet_nexthop_unchanged}/r2/bgpd.conf (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_ebgp_common_subnet_nexthop_unchanged}/r2/zebra.conf (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_ebgp_common_subnet_nexthop_unchanged}/r3/bgpd.conf (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_ebgp_common_subnet_nexthop_unchanged}/r3/zebra.conf (100%) rename tests/topotests/{bgp-ebgp-common-subnet-nexthop-unchanged => bgp_ebgp_common_subnet_nexthop_unchanged}/test_bgp-ebgp-common-subnet-nexthop-unchanged.py (100%) rename tests/topotests/{bgp_default-route => bgp_ecmp_topo1}/__init__.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/bgp-ecmp-topo1.dot (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/bgp-ecmp-topo1.pdf (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/exabgp.env (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer1/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer1/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer1/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer10/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer10/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer10/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer11/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer11/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer11/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer12/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer12/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer12/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer13/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer13/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer13/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer14/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer14/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer14/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer15/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer15/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer15/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer16/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer16/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer16/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer17/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer17/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer17/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer18/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer18/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer18/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer19/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer19/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer19/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer2/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer2/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer2/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer20/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer20/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer20/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer3/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer3/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer3/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer4/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer4/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer4/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer5/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer5/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer5/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer6/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer6/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer6/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer7/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer7/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer7/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer8/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer8/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer8/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer9/exa-receive.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer9/exa-send.py (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/peer9/exabgp.cfg (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/r1/bgpd.conf (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/r1/summary.txt (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/r1/summary20.txt (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/r1/zebra.conf (100%) rename tests/topotests/{bgp-ecmp-topo1 => bgp_ecmp_topo1}/test_bgp_ecmp_topo1.py (100%) rename tests/topotests/{bgp-ecmp-topo2 => bgp_ecmp_topo2}/ebgp_ecmp_topo2.json (100%) rename tests/topotests/{bgp-ecmp-topo2 => bgp_ecmp_topo2}/ibgp_ecmp_topo2.json (100%) rename tests/topotests/{bgp-ecmp-topo2 => bgp_ecmp_topo2}/test_ebgp_ecmp_topo2.py (100%) rename tests/topotests/{bgp-ecmp-topo2 => bgp_ecmp_topo2}/test_ibgp_ecmp_topo2.py (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/evpn-mh-topo-tests.pdf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd11/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd11/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd11/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd12/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd12/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd12/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd21/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd21/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd21/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd22/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd22/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/hostd22/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/spine1/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/spine1/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/spine1/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/spine2/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/spine2/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/spine2/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/test_evpn_mh.py (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm11/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm11/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm11/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm12/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm12/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm12/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm21/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm21/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm21/zebra.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm22/evpn.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm22/pim.conf (100%) rename tests/topotests/{bgp-evpn-mh => bgp_evpn_mh}/torm22/zebra.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/P1/bgpd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/P1/ospfd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/P1/zebra.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE1/bgpd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE1/evpn.vni.json (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE1/ospfd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE1/zebra.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE2/bgpd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE2/evpn.vni.json (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE2/ospfd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/PE2/zebra.conf (100%) rename tests/topotests/{bgp_default-route_route-map_match => bgp_evpn_vxlan_topo1}/__init__.py (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/host1/bgpd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/host1/ospfd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/host1/zebra.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/host2/bgpd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/host2/ospfd.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/host2/zebra.conf (100%) rename tests/topotests/{bgp-evpn-vxlan_topo1 => bgp_evpn_vxlan_topo1}/test_bgp_evpn_vxlan.py (100%) rename tests/topotests/{bgp_default-route_route-map_match_set => bgp_path_attributes_topo1}/__init__.py (100%) rename tests/topotests/{bgp-path-attributes-topo1 => bgp_path_attributes_topo1}/bgp_path_attributes.json (100%) rename tests/topotests/{bgp-path-attributes-topo1 => bgp_path_attributes_topo1}/test_bgp_path_attributes.py (100%) rename tests/topotests/{bgp_default-route_route-map_set => bgp_peer_group}/__init__.py (100%) rename tests/topotests/{bgp_peer-group => bgp_peer_group}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_peer-group => bgp_peer_group}/r1/zebra.conf (100%) rename tests/topotests/{bgp_peer-group => bgp_peer_group}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_peer-group => bgp_peer_group}/r2/zebra.conf (100%) rename tests/topotests/{bgp_peer-group => bgp_peer_group}/r3/bgpd.conf (100%) rename tests/topotests/{bgp_peer-group => bgp_peer_group}/r3/zebra.conf (100%) rename tests/topotests/{bgp_peer-group => bgp_peer_group}/test_bgp_peer-group.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/exabgp.env (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer1/exa-receive.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer1/exa_readpipe.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer1/exabgp.cfg (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer2/exa-receive.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer2/exa_readpipe.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer2/exabgp.cfg (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer3/exa-receive.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer3/exa_readpipe.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer3/exabgp.cfg (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer4/exa-receive.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer4/exa_readpipe.py (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/peer4/exabgp.cfg (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/multipath.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/not-multipath.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix1-eBGP-confed.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix1-eBGP-iBGP.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix1-no-recursive.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix1-recursive.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix1.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix3-ip-route.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix3-no-recursive.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/prefix3-recursive.json (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r1/zebra.conf (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r2/staticd.conf (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/r2/zebra.conf (100%) rename tests/topotests/{bgp_peer-type_multipath-relax => bgp_peer_type_multipath_relax}/test_bgp_peer-type_multipath-relax.py (100%) rename tests/topotests/{bgp_peer-group => bgp_prefix_list_topo1}/__init__.py (100%) rename tests/topotests/{bgp-prefix-list-topo1 => bgp_prefix_list_topo1}/prefix_lists.json (100%) rename tests/topotests/{bgp-prefix-list-topo1 => bgp_prefix_list_topo1}/test_prefix_lists.py (100%) rename tests/topotests/{bgp-route-map => bgp_route_map}/bgp_route_map_topo1.json (100%) rename tests/topotests/{bgp-route-map => bgp_route_map}/bgp_route_map_topo2.json (100%) rename tests/topotests/{bgp-route-map => bgp_route_map}/test_route_map_topo1.py (100%) rename tests/topotests/{bgp-route-map => bgp_route_map}/test_route_map_topo2.py (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/__init__.py (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/r1/zebra.conf (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/r2/zebra.conf (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/r3/bgpd.conf (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/r3/zebra.conf (100%) rename tests/topotests/{bgp_sender-as-path-loop-detection => bgp_sender_as_path_loop_detection}/test_bgp_sender-as-path-loop-detection.py (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/__init__.py (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/r1/bgpd.conf (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/r1/zebra.conf (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/r2/bgpd.conf (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/r2/zebra.conf (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/r3/bgpd.conf (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/r3/zebra.conf (100%) rename tests/topotests/{bgp_set_local-preference_add_subtract => bgp_set_local_preference_add_subtract}/test_bgp_set_local-preference_add_subtract.py (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce1/bgpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce1/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce1/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce2/bgpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce2/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce2/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce3/bgpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce3/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce3/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce4/bgpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce4/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/ce4/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r1/bgpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r1/isisd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r1/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r1/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r2/isisd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r2/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r2/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r3/isisd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r3/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r3/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r4/bgpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r4/isisd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r4/snmpd.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/r4/zebra.conf (100%) rename tests/topotests/{bgp-snmp-mplsl3vpn => bgp_snmp_mplsl3vpn}/test_bgp_snmp_mplsvpn.py (100%) rename tests/topotests/{bgp-vrf-route-leak-basic => bgp_vrf_route_leak_basic}/r1/bgpd.conf (100%) rename tests/topotests/{bgp-vrf-route-leak-basic => bgp_vrf_route_leak_basic}/r1/zebra.conf (100%) rename tests/topotests/{bgp-vrf-route-leak-basic => bgp_vrf_route_leak_basic}/setup_vrfs (100%) rename tests/topotests/{bgp-vrf-route-leak-basic => bgp_vrf_route_leak_basic}/test_bgp-vrf-route-leak-basic.py (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r1/eigrpd.conf (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r1/show_ip_eigrp.json (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r1/show_ip_eigrp.ref (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r1/show_ip_route.json_ref (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r1/zebra.conf (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r2/eigrpd.conf (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r2/show_ip_eigrp.json (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r2/show_ip_eigrp.ref (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r2/show_ip_route.json_ref (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r2/zebra.conf (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r3/eigrpd.conf (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r3/show_ip_eigrp.json (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r3/show_ip_eigrp.ref (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r3/show_ip_route.json_ref (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/r3/zebra.conf (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/test_eigrp_topo1.dot (100%) rename tests/topotests/{eigrp-topo1 => eigrp_topo1}/test_eigrp_topo1.py (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/host1/bgpd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/host1/pimd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/host1/zebra.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/host2/bgpd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/host2/pimd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/host2/zebra.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/leaf1/bgpd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/leaf1/pimd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/leaf1/zebra.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/leaf2/bgpd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/leaf2/pimd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/leaf2/zebra.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/spine/bgp.summ.json (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/spine/bgpd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/spine/join-info.json (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/spine/pimd.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/spine/zebra.conf (100%) rename tests/topotests/{evpn-pim-1 => evpn_pim_1}/test_evpn_pim_topo1.py (100%) rename tests/topotests/{example-test => example_test}/__init__.py (100%) rename tests/topotests/{example-test => example_test}/test_example.py (100%) rename tests/topotests/{example-test => example_test}/test_template.dot (100%) rename tests/topotests/{example-test => example_test}/test_template.jpg (100%) rename tests/topotests/{example-test => example_test}/test_template.py (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/__init__.py (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_multiple_links/__init__.py (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_multiple_links/example_topojson_multiple_links.json (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_multiple_links/test_example_topojson_multiple_links.py (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_single_link/__init__.py (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_single_link/example_topojson.json (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_single_link/test_example_topojson.py (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_single_link_loopback/__init__.py (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_single_link_loopback/example_topojson.json (100%) rename tests/topotests/{example-topojson-test => example_topojson_test}/test_topo_json_single_link_loopback/test_example_topojson.py (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/__init__.py (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/isisd.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step10/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step11/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step12/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step13/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt2/isisd.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt2/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt2/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt3/isisd.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt3/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt3/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt4/isisd.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt4/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt4/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt5/isisd.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt5/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt5/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt6/isisd.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt6/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt6/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt6/zebra.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt7/isisd.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt7/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt7/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/rt7/zebra.conf (100%) rename tests/topotests/{isis-lfa-topo1 => isis_lfa_topo1}/test_isis_lfa_topo1.py (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/__init__.py (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/isisd.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt2/isisd.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt2/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt2/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt2/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt3/isisd.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt3/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt3/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt3/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt4/isisd.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt4/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt4/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt4/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt5/isisd.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt5/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt5/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt5/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/isisd.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/rt6/zebra.conf (100%) rename tests/topotests/{isis-lsp-bits-topo1 => isis_lsp_bits_topo1}/test_isis_lsp_bits_topo1.py (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/__init__.py (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step10/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step10/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step2/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step3/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step4/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step5/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step6/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step7/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step8/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step9/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt2/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt2/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt3/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt3/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt4/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt4/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt5/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt5/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt6/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt6/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt6/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt7/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt7/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt7/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt8/isisd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt8/ldpd.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/rt8/zebra.conf (100%) rename tests/topotests/{isis-rlfa-topo1 => isis_rlfa_topo1}/test_isis_rlfa_topo1.py (100%) rename tests/topotests/{isis-snmp => isis_snmp}/ce3/zebra.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r1/isisd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r1/ldpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r1/show_ip_route.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r1/snmpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r1/zebra.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r2/isisd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r2/ldpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r2/show_ip_route.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r2/snmpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r2/zebra.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r3/isisd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r3/ldpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r3/show_ip_route.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r3/snmpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r3/zebra.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r4/isisd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r4/ldpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r4/show_ip_route.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r4/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r4/snmpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r4/zebra.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r5/isisd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r5/ldpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r5/ldpdconf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r5/show_ip_route.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r5/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r5/snmpd.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/r5/zebra.conf (100%) rename tests/topotests/{isis-snmp => isis_snmp}/test_isis_snmp.dot (100%) rename tests/topotests/{isis-snmp => isis_snmp}/test_isis_snmp.py (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/dst/zebra.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/bgpd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/isisd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/pathd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step1/show_mpls_table_with_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step1/show_mpls_table_without_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step2/show_operational_data.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step2/show_operational_data_with_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step3/show_operational_data_with_single_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step3/show_operational_data_with_two_candidates.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step4/show_mpls_table_add_segment.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step4/show_mpls_table_change_segment.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step5/show_ip_route_bgp_active_srte.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step5/show_ip_route_bgp_inactive_srte.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step5/show_operational_data_active.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/step5/show_operational_data_inactive.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt2/isisd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt3/isisd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt4/isisd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt5/isisd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/bgpd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/isisd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/pathd.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/step1/show_mpls_table_with_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/step1/show_mpls_table_without_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/step2/show_operational_data.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/step2/show_operational_data_with_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/step3/show_operational_data_with_single_candidate.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/step3/show_operational_data_with_two_candidates.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/rt6/zebra.conf (100%) rename tests/topotests/{isis-sr-te-topo1 => isis_sr_te_topo1}/test_isis_sr_te_topo1.py (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/__init__.py (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/isisd.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step10/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step10/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step10/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step10/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step2/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step3/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step4/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step5/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step5/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step5/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step5/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step6/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step6/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step6/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step6/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step7/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step7/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step7/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step7/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step8/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step8/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step8/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step8/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step9/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step9/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step9/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/step9/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/isisd.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step10/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step10/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step10/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step10/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step2/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step3/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step4/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step5/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step5/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step5/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step5/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step6/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step6/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step6/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step6/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step7/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step7/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step7/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step7/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step8/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step8/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step8/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step8/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step9/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step9/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step9/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/step9/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/isisd.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step10/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step10/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step10/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step10/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step2/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step3/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step4/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step5/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step5/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step5/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step5/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step6/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step6/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step6/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step6/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step7/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step7/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step7/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step7/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step8/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step8/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step8/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step8/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step9/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step9/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step9/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/step9/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/isisd.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step10/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step10/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step10/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step10/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step2/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step3/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step4/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step5/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step5/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step5/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step5/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step6/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step6/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step6/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step6/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step7/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step7/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step7/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step7/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step8/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step8/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step8/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step8/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step9/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step9/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step9/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/step9/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/isisd.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step10/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step10/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step10/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step10/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step2/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step3/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step4/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step5/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step5/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step5/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step5/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step6/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step6/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step6/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step6/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step7/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step7/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step7/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step7/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step8/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step8/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step8/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step8/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step9/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step9/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step9/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/step9/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/isisd.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step10/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step10/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step10/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step10/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step2/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step2/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step2/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step3/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step3/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step3/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step4/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step4/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step4/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step4/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step5/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step5/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step5/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step5/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step6/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step6/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step6/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step6/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step7/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step7/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step7/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step7/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step8/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step8/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step8/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step8/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step9/show_ip_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step9/show_ipv6_route.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step9/show_mpls_table.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/step9/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/rt6/zebra.conf (100%) rename tests/topotests/{isis-sr-topo1 => isis_sr_topo1}/test_isis_sr_topo1.py (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/__init__.py (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/isisd.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step2/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step2/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step3/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step3/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step4/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step4/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step5/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step5/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step6/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step6/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step7/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step7/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step8/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step8/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step9/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/step9/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/isisd.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step2/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step2/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step3/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step3/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step4/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step4/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step5/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step5/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step6/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step6/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step7/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step7/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step8/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step8/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step9/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/step9/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/isisd.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step2/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step2/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step3/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step3/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step4/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step4/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step5/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step5/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step6/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step6/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step7/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step7/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step8/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step8/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step9/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/step9/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/isisd.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step2/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step2/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step3/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step3/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step4/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step4/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step5/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step5/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step6/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step6/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step7/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step7/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step8/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step8/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step9/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/step9/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/isisd.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step2/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step2/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step3/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step3/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step4/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step4/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step5/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step5/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step6/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step6/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step7/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step7/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step8/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step8/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step9/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/step9/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/isisd.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step1/show_ip_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step1/show_ipv6_route.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step1/show_mpls_table.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step2/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step2/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step2/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step3/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step3/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step3/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step4/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step4/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step4/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step5/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step5/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step5/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step6/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step6/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step6/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step7/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step7/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step7/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step8/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step8/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step8/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step9/show_ip_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step9/show_ipv6_route.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/step9/show_mpls_table.ref.diff (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/rt6/zebra.conf (100%) rename tests/topotests/{isis-tilfa-topo1 => isis_tilfa_topo1}/test_isis_tilfa_topo1.py (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1}/__init__.py (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r1/isisd.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r1/r1_route.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r1/r1_route6.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r1/r1_route6_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r1/r1_route_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r1/r1_topology.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r1/zebra.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r2/isisd.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r2/r2_route.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r2/r2_route6.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r2/r2_route6_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r2/r2_route_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r2/r2_topology.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r2/zebra.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r3/isisd.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r3/r3_route.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r3/r3_route6.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r3/r3_route6_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r3/r3_route_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r3/r3_topology.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r3/zebra.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r4/isisd.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r4/r4_route.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r4/r4_route6.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r4/r4_route6_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r4/r4_route_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r4/r4_topology.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r4/zebra.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r5/isisd.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r5/r5_route.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r5/r5_route6.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r5/r5_route6_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r5/r5_route_linux.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r5/r5_topology.json (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/r5/zebra.conf (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/test_isis_topo1.dot (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/test_isis_topo1.jpg (100%) rename tests/topotests/{isis-topo1 => isis_topo1}/test_isis_topo1.py (100%) rename tests/topotests/{isis-topo1 => isis_topo1_vrf}/__init__.py (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r1/isisd.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r1/r1_route.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r1/r1_route6.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r1/r1_route6_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r1/r1_route_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r1/r1_topology.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r1/zebra.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r2/isisd.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r2/r2_route.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r2/r2_route6.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r2/r2_route6_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r2/r2_route_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r2/r2_topology.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r2/zebra.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r3/isisd.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r3/r3_route.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r3/r3_route6.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r3/r3_route6_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r3/r3_route_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r3/r3_topology.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r3/zebra.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r4/isisd.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r4/r4_route.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r4/r4_route6.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r4/r4_route6_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r4/r4_route_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r4/r4_topology.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r4/zebra.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r5/isisd.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r5/r5_route.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r5/r5_route6.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r5/r5_route6_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r5/r5_route_linux.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r5/r5_topology.json (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/r5/zebra.conf (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/test_isis_topo1_vrf.dot (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/test_isis_topo1_vrf.jpg (100%) rename tests/topotests/{isis-topo1-vrf => isis_topo1_vrf}/test_isis_topo1_vrf.py (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/ldpd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/show_ldp_all_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/ldpd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/ospfd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/show_ldp_all_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/ldpd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/ospfd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/show_ldp_all_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/ldpd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/ospfd.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/show_ldp_all_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/r4/zebra.conf (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/test_ldp_oc_acl_topo1.dot (100%) rename tests/topotests/{ldp-oc-acl-topo1 => ldp_oc_acl_topo1}/test_ldp_oc_acl_topo1.py (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/ldpd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/ldpd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/ospfd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/ldpd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/ospfd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/ldpd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/ospfd.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/show_ip_route.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/r4/zebra.conf (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/test_ldp_oc_topo1.dot (100%) rename tests/topotests/{ldp-oc-topo1 => ldp_oc_topo1}/test_ldp_oc_topo1.py (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/ce1/zebra.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/ce2/zebra.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/ce3/zebra.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/isisd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/ldpd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_ip_route.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_isis_interface_detail.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_isis_interface_detail_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_isis_interface_detail_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_isis_ldp_sync.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/snmpd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r1/zebra.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/isisd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/ldpd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/ospfd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_ip_route.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_isis_interface_detail.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_isis_interface_detail_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_isis_interface_detail_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_isis_ldp_sync.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/snmpd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r2/zebra.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/isisd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/ldpd.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_ip_route.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_isis_interface_detail.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_isis_interface_detail_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_isis_interface_detail_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_isis_ldp_sync.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/r3/zebra.conf (100%) rename tests/topotests/{ldp-snmp => ldp_snmp}/test_ldp_snmp_topo1.py (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/ce1/zebra.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/ce2/zebra.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/ce3/zebra.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/isisd.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/ldpd.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_ip_route.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_isis_interface_detail.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_isis_interface_detail_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_isis_interface_detail_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_isis_ldp_sync.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/isisd.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/ldpd.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_ip_route.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_isis_interface_detail.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_isis_interface_detail_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_isis_interface_detail_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_isis_ldp_sync.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/isisd.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/ldpd.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_ip_route.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_isis_interface_detail.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_isis_interface_detail_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_isis_interface_detail_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_isis_ldp_sync.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/show_yang_interface_isis_adjacencies.ref (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/test_ldp_sync_isis_topo1.dot (100%) rename tests/topotests/{ldp-sync-isis-topo1 => ldp_sync_isis_topo1}/test_ldp_sync_isis_topo1.py (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/ce1/zebra.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/ce2/zebra.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/ce3/zebra.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/ldpd.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/ospf-nbrs.txt (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ip_ospf_interface.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ip_ospf_interface_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ip_ospf_interface_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ip_route.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ospf_ldp_sync.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ospf_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/show_ospf_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/ldpd.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/ospfd.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ip_ospf_interface.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ip_ospf_interface_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ip_ospf_interface_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ip_route.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ospf_ldp_sync.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/ldpd.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/ospfd.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ip_ospf_interface.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ip_ospf_interface_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ip_ospf_interface_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ip_route.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ldp_igp_sync.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ospf_ldp_sync.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/test_ldp_sync_ospf_topo1.dot (100%) rename tests/topotests/{ldp-sync-ospf-topo1 => ldp_sync_ospf_topo1}/test_ldp_sync_ospf_topo1.py (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/ip_mpls_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/ldpd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/show_ipv4_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/show_mpls_ldp_binding.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/show_mpls_ldp_discovery.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/show_mpls_ldp_interface.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/show_mpls_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/show_mpls_table.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/ip_mpls_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/ldpd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/ospfd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/show_ipv4_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/show_mpls_ldp_binding.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/show_mpls_ldp_discovery.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/show_mpls_ldp_interface.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/show_mpls_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/show_mpls_table.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/ip_mpls_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/ldpd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/ospfd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/show_ipv4_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/show_mpls_ldp_binding.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/show_mpls_ldp_discovery.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/show_mpls_ldp_interface.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/show_mpls_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/show_mpls_table.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/ip_mpls_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/ldpd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/ospfd.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/show_ipv4_route.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/show_mpls_ldp_binding.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/show_mpls_ldp_discovery.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/show_mpls_ldp_interface.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/show_mpls_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/show_mpls_table.ref (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/r4/zebra.conf (100%) rename tests/topotests/{ldp-topo1 => ldp_topo1}/test_ldp_topo1.py (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/__init__.py (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/ce1/zebra.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/ce2/zebra.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/ce3/zebra.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/ldpd.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/ospf-nbrs.txt (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/show_ip_route.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/ldpd.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/ospfd.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/show_ip_route.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/ldpd.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/ospfd.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/show_ip_ospf_neighbor.json (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/show_ip_route.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/show_l2vpn_binding.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/show_l2vpn_vc.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/show_ldp_binding.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/show_ldp_discovery.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/show_ldp_neighbor.ref (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/test_ldp_vpls_topo1.dot (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/test_ldp_vpls_topo1.pdf (100%) rename tests/topotests/{ldp-vpls-topo1 => ldp_vpls_topo1}/test_ldp_vpls_topo1.py (100%) rename tests/topotests/{multicast-pim-bsm-topo1 => multicast_pim_bsm_topo1}/mcast_pim_bsmp_01.json (100%) rename tests/topotests/{multicast-pim-bsm-topo1 => multicast_pim_bsm_topo1}/test_mcast_pim_bsmp_01.py (100%) rename tests/topotests/{multicast-pim-bsm-topo2 => multicast_pim_bsm_topo2}/mcast_pim_bsmp_02.json (100%) rename tests/topotests/{multicast-pim-bsm-topo2 => multicast_pim_bsm_topo2}/test_mcast_pim_bsmp_02.py (100%) rename tests/topotests/{multicast-pim-sm-topo1 => multicast_pim_sm_topo1}/multicast_pim_sm_topo1.json (100%) rename tests/topotests/{multicast-pim-sm-topo1 => multicast_pim_sm_topo1}/test_multicast_pim_sm_topo1.py (100%) rename tests/topotests/{multicast-pim-sm-topo2 => multicast_pim_sm_topo2}/multicast_pim_sm_topo2.json (100%) rename tests/topotests/{multicast-pim-sm-topo2 => multicast_pim_sm_topo2}/test_multicast_pim_sm_topo2.py (100%) rename tests/topotests/{multicast-pim-sm-topo3 => multicast_pim_sm_topo3}/multicast_pim_sm_topo3.json (100%) rename tests/topotests/{multicast-pim-sm-topo3 => multicast_pim_sm_topo3}/multicast_pim_sm_topo4.json (100%) rename tests/topotests/{multicast-pim-sm-topo3 => multicast_pim_sm_topo3}/test_multicast_pim_sm_topo3.py (100%) rename tests/topotests/{multicast-pim-sm-topo3 => multicast_pim_sm_topo3}/test_multicast_pim_sm_topo4.py (100%) rename tests/topotests/{multicast-pim-static-rp-topo1 => multicast_pim_static_rp_topo1}/__init__.py (100%) rename tests/topotests/{multicast-pim-static-rp-topo1 => multicast_pim_static_rp_topo1}/multicast_pim_static_rp.json (100%) rename tests/topotests/{multicast-pim-static-rp-topo1 => multicast_pim_static_rp_topo1}/test_multicast_pim_static_rp.py (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r1/nhrp4_cache.json (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r1/nhrp_route4.json (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r1/nhrpd.conf (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r1/zebra.conf (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r2/nhrp4_cache.json (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r2/nhrp_route4.json (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r2/nhrpd.conf (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r2/zebra.conf (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/r3/zebra.conf (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/test_nhrp_topo.dot (100%) rename tests/topotests/{nhrp-topo => nhrp_topo}/test_nhrp_topo.py (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/README.md (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1}/r1/ip_6_address.nhg.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r1/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r1/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r1/show_ipv6_route.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r2/ip_6_address.nhg.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r2/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r2/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r2/show_ipv6_route.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r3/ip_6_address.nhg.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r3/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r3/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r3/show_ipv6_route.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r4/ip_6_address.nhg.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r4/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r4/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r4/show_ipv6_route.ref (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/r4/zebra.conf (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1}/test_ospf6_topo1.py (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/README.md (100%) rename tests/topotests/{ospf6-topo1 => ospf6_topo1_vrf}/r1/ip_6_address.nhg.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r1/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r1/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r1/show_ipv6_vrf_route.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r1/zebra.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r2/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r2/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r2/show_ipv6_vrf_route.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r2/zebra.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r3/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r3/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r3/show_ipv6_vrf_route.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r3/zebra.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r4/ip_6_address.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r4/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r4/show_ipv6_vrf_route.ref (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/r4/zebra.conf (100%) rename tests/topotests/{ospf6-topo1-vrf => ospf6_topo1_vrf}/test_ospf6_topo1_vrf.py (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/r1/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/r1/zebra.conf (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/r2/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/r2/zebra.conf (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/r3/ospf6d.conf (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/r3/zebra.conf (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/test_ospf6_topo2.dot (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/test_ospf6_topo2.png (100%) rename tests/topotests/{ospf6-topo2 => ospf6_topo2}/test_ospf6_topo2.py (100%) rename tests/topotests/{ospf-dual-stack => ospf_dual_stack}/test_ospf_dual_stack.dot (100%) rename tests/topotests/{ospf-dual-stack => ospf_dual_stack}/test_ospf_dual_stack.jpg (100%) rename tests/topotests/{ospf-dual-stack => ospf_dual_stack}/test_ospf_dual_stack.json (100%) rename tests/topotests/{ospf-dual-stack => ospf_dual_stack}/test_ospf_dual_stack.py (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/__init__.py (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/ospfd.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step1/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step1/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step10/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step10/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step2/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step2/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step3/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step3/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step4/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step4/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step5/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step5/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step6/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step6/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step7/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step7/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step8/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step8/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step9/show_ip_route.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/step9/show_mpls_table.ref (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/rt6/zebra.conf (100%) rename tests/topotests/{ospf-sr-topo1 => ospf_sr_topo1}/test_ospf_sr_topo1.py (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/__init__.py (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r2/ospfd.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r3/ospfd.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r4/ospfd.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/r4/zebra.conf (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/reference/ted_step1.json (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/reference/ted_step2.json (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/reference/ted_step3.json (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/reference/ted_step4.json (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/reference/ted_step5.json (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/reference/ted_step6.json (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/reference/ted_step7.json (100%) rename tests/topotests/{ospf-te-topo1 => ospf_te_topo1}/test_ospf_te_topo1.py (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/__init__.py (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt1/ospfd.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt1/step1/show_ip_route_initial.ref (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt1/step2/show_ip_route_initial.ref (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt1/step2/show_ip_route_link_protection.ref (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt1/step3/show_ip_route_initial.ref (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt1/step3/show_ip_route_node_protection.ref (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt1/zebra.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt2/ospfd.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt2/zebra.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt3/ospfd.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt3/zebra.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt4/ospfd.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt4/zebra.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt5/ospfd.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/rt5/zebra.conf (100%) rename tests/topotests/{ospf-tilfa-topo1 => ospf_tilfa_topo1}/test_ospf_tilfa_topo1.py (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1}/__init__.py (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/ospf6d.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/ospf6route.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/ospf6route_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/ospf6route_ecmp.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/ospfd.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/ospfroute.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/ospfroute_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/ospf6d.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/ospf6route.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/ospf6route_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/ospf6route_ecmp.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/ospfd.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/ospfroute.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/ospfroute_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/ospf6d.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/ospf6route.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/ospf6route_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/ospf6route_ecmp.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/ospfd.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/ospfroute.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/ospfroute_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/ospf6d.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/ospf6route.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/ospf6route_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/ospf6route_ecmp.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/ospfd.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/ospfroute.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/ospfroute_down.txt (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/r4/zebra.conf (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/test_ospf_topo1.dot (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/test_ospf_topo1.jpg (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1}/test_ospf_topo1.py (100%) rename tests/topotests/{ospf-topo1 => ospf_topo1_vrf}/__init__.py (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r1/ospfd.conf (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r1/ospfroute.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r1/ospfroute_down.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r1/zebra.conf (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r1/zebraroute.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r1/zebraroutedown.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r2/ospfd.conf (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r2/ospfroute.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r2/ospfroute_down.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r2/zebra.conf (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r2/zebraroute.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r2/zebraroutedown.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r3/ospfd.conf (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r3/ospfroute.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r3/ospfroute_down.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r3/zebra.conf (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r3/zebraroute.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/r3/zebraroutedown.txt (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/test_ospf_topo1-vrf.dot (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/test_ospf_topo1_vrf.jpg (100%) rename tests/topotests/{ospf-topo1-vrf => ospf_topo1_vrf}/test_ospf_topo1_vrf.py (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r1/ospf-route.json (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r1/ospfd.conf (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r1/v4_route.json (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r1/zebra.conf (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r2/ospf-route.json (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r2/ospfd.conf (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r2/v4_route.json (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/r2/zebra.conf (100%) rename tests/topotests/{ospf-topo2 => ospf_topo2}/test_ospf_topo2.py (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/__init__.py (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/r1/linux-rules.json (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/r1/pbr-interface.json (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/r1/pbr-map.json (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/r1/pbr-nexthop-groups.json (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/r1/pbrd.conf (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/r1/zebra.conf (100%) rename tests/topotests/{pbr-topo1 => pbr_topo1}/test_pbr_topo1.py (100%) rename tests/topotests/{pim-basic => pim_basic}/mcast-rx.py (100%) rename tests/topotests/{pim-basic => pim_basic}/mcast-tx.py (100%) rename tests/topotests/{pim-basic => pim_basic}/r1/bgpd.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/r1/pimd.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/r1/rp-info.json (100%) rename tests/topotests/{pim-basic => pim_basic}/r1/zebra.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/r2/pimd.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/r2/zebra.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/r3/pimd.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/r3/zebra.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/rp/bgpd.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/rp/pimd.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/rp/upstream.json (100%) rename tests/topotests/{pim-basic => pim_basic}/rp/zebra.conf (100%) rename tests/topotests/{pim-basic => pim_basic}/test_pim.py (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/__init__.py (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r1/bfdd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r1/pimd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r1/zebra.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r2/bfdd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r2/pimd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r2/zebra.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r3/bfdd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r3/pimd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r3/zebra.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r4/bfdd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r4/pimd.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/r4/zebra.conf (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/test_pim_basic_topo2.dot (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/test_pim_basic_topo2.png (100%) rename tests/topotests/{pim-basic-topo2 => pim_basic_topo2}/test_pim_basic_topo2.py (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r1/rip_status.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r1/ripd.conf (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r1/show_ip_rip.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r1/show_ip_route.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r1/zebra.conf (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r2/rip_status.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r2/ripd.conf (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r2/show_ip_rip.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r2/show_ip_route.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r2/zebra.conf (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r3/rip_status.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r3/ripd.conf (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r3/show_ip_rip.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r3/show_ip_route.ref (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/r3/zebra.conf (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/test_rip_topo1.dot (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/test_rip_topo1.pdf (100%) rename tests/topotests/{rip-topo1 => rip_topo1}/test_rip_topo1.py (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r1/ripng_status.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r1/ripngd.conf (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r1/show_ipv6_ripng.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r1/show_ipv6_route.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r1/zebra.conf (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r2/ripng_status.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r2/ripngd.conf (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r2/show_ipv6_ripng.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r2/show_ipv6_route.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r2/zebra.conf (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r3/ripng_status.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r3/ripngd.conf (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r3/show_ipv6_ripng.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r3/show_ipv6_route.ref (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/r3/zebra.conf (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/test_ripng_topo1.dot (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/test_ripng_topo1.pdf (100%) rename tests/topotests/{ripng-topo1 => ripng_topo1}/test_ripng_topo1.py (100%) rename tests/topotests/{route-scale => route_scale}/r1/installed.routes.json (100%) rename tests/topotests/{route-scale => route_scale}/r1/no.routes.json (100%) rename tests/topotests/{route-scale => route_scale}/r1/sharpd.conf (100%) rename tests/topotests/{route-scale => route_scale}/r1/zebra.conf (100%) rename tests/topotests/{route-scale => route_scale}/test_route_scale.py (100%) rename tests/topotests/{simple-snmp-test => simple_snmp_test}/r1/bgpd.conf (100%) rename tests/topotests/{simple-snmp-test => simple_snmp_test}/r1/isisd.conf (100%) rename tests/topotests/{simple-snmp-test => simple_snmp_test}/r1/snmpd.conf (100%) rename tests/topotests/{simple-snmp-test => simple_snmp_test}/r1/zebra.conf (100%) rename tests/topotests/{simple-snmp-test => simple_snmp_test}/test_simple_snmp.py (100%) diff --git a/tests/topotests/all-protocol-startup/r1/babeld.conf b/tests/topotests/all_protocol_startup/r1/babeld.conf similarity index 100% rename from tests/topotests/all-protocol-startup/r1/babeld.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ip_nht.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ipv4_routes.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ipv6_nht.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ipv6_routes.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/nhrpd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ospf6d.conf-pre-v4 rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/pbrd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/rip_status.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ripd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ripng_status.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/ripngd.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post4.1.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post5.0.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv4-post6.1.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv4.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv6-post4.1.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv6.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_post6.1.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_ip_ospf_interface.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_ipv6_ospf6_interface rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_ipv6_ospf6_interface.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_isis_interface_detail.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_mpls_ldp_interface.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/show_route_map.ref rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/test_all_protocol_startup.dot rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/test_all_protocol_startup.pdf rename to 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 similarity index 100% rename from tests/topotests/all-protocol-startup/test_all_protocol_startup.py rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r1/ipv6_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r3/ipv6_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.dot rename to 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 similarity index 100% rename from tests/topotests/bfd-bgp-cbit-topo3/test_bfd_bgp_cbit_topo3.py rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step2/show_bfd_peers.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_healthy.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_rt2_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_bfd_peers_rt3_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_healthy.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_rt2_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_ip_route_rt3_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_healthy.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_rt2_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/step3/show_ipv6_route_rt3_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt2/step2/show_bfd_peers.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt3/step2/show_bfd_peers.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt5/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-isis-topo1/test_bfd_isis_topo1.py rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step2/show_bfd_peers.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_healthy.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_rt2_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_bfd_peers_rt3_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_healthy.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_rt2_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_ip_route_rt3_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_healthy.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_rt2_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/step3/show_ipv6_route_rt3_down.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt2/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt2/step2/show_bfd_peers.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt3/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt3/step2/show_bfd_peers.ref rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt4/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt5/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt5/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt5/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-ospf-topo1/test_bfd_ospf_topo1.py rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r1/bfd-peers-initial.json rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r4/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r4/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r5/bfd-peers-initial.json rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r5/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r5/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r6/bfd-peers-initial.json rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r6/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r6/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/r6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.png rename to 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 similarity index 100% rename from tests/topotests/bfd-profiles-topo1/test_bfd_profiles_topo1.py rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/__init__.py rename to tests/topotests/bfd_topo1/__init__.py diff --git a/tests/topotests/bfd-topo1/r1/bfdd.conf b/tests/topotests/bfd_topo1/r1/bfdd.conf similarity index 100% rename from tests/topotests/bfd-topo1/r1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r1/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r1/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r1/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r2/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r2/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r2/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r3/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r3/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r3/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r4/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r4/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r4/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r4/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/test_bfd_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/test_bfd_topo1.jpg rename to 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 similarity index 100% rename from tests/topotests/bfd-topo1/test_bfd_topo1.py rename to tests/topotests/bfd_topo1/test_bfd_topo1.py diff --git a/tests/topotests/bfd-topo2/__init__.py b/tests/topotests/bfd_topo2/__init__.py similarity index 100% rename from tests/topotests/bfd-topo2/__init__.py rename to tests/topotests/bfd_topo2/__init__.py diff --git a/tests/topotests/bfd-topo2/r1/bfdd.conf b/tests/topotests/bfd_topo2/r1/bfdd.conf similarity index 100% rename from tests/topotests/bfd-topo2/r1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r1/ipv4_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r1/ipv6_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r1/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/ipv4_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/ipv6_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r3/ipv4_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r3/ipv6_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r3/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r4/ipv4_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r4/ipv6_routes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r4/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r4/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/test_bfd_topo2.dot rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/test_bfd_topo2.jpg rename to 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 similarity index 100% rename from tests/topotests/bfd-topo2/test_bfd_topo2.py rename to tests/topotests/bfd_topo2/test_bfd_topo2.py diff --git a/tests/topotests/bfd-topo3/__init__.py b/tests/topotests/bfd_topo3/__init__.py similarity index 100% rename from tests/topotests/bfd-topo3/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r1/bfd-peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r2/bfd-peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r3/bfd-peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r4/bfd-peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r4/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/test_bfd_topo3.dot rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/test_bfd_topo3.jpg rename to 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 similarity index 100% rename from tests/topotests/bfd-topo3/test_bfd_topo3.py rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r1/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r1/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r1/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r2/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r2/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r2/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r3/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r3/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r3/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r4/bgp_prefixes.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r4/bgp_summary.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r4/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r4/peers.json rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.jpg rename to 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 similarity index 100% rename from tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py rename to 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 similarity index 100% rename from tests/topotests/bgp-aggregator-zero/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_origin/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py rename to 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 similarity index 100% rename from tests/topotests/bgp-basic-functionality-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_route-map/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_route-map/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_route-map/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_origin/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_route-map/test_bgp_aggregate-address_route-map.py rename to 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 similarity index 100% rename from tests/topotests/bgp-community-alias/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-aggregator-zero/exabgp.env rename to 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 similarity index 100% rename from tests/topotests/bgp-aggregator-zero/peer1/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-aggregator-zero/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-aggregator-zero/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-aggregator-zero/test_bgp_aggregator_zero.py rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/bgpd_multi_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/bgpd_multi_vrf_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/bgpd_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/bgpd_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/bgpd_vrf_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/ospfd_multi_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/ospfd_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/bgpd_multi_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/bgpd_multi_vrf_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/bgpd_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/bgpd_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/bgpd_vrf_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/ospfd_multi_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/ospfd_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/bgpd_multi_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/bgpd_multi_vrf_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/bgpd_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/bgpd_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/bgpd_vrf_prefix.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/ospfd_multi_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/ospfd_vrf.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/R3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-auth/test_bgp_auth.py rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-basic-functionality-topo1/bgp_basic_functionality.json rename to 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 similarity index 100% rename from tests/topotests/bgp-basic-functionality-topo1/test_bgp_basic_functionality.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_comm-list_delete/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_comm-list_delete/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_comm-list_delete/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_route-map/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_comm-list_delete/test_bgp_comm-list_delete.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-community-alias/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-community-alias/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-community-alias/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-community-alias/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-community-alias/test_bgp-community-alias.py rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_comm-list_delete/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-default-ipv4-ipv6-unicast/test_bgp-default-ipv4-ipv6-unicast.py rename to 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 similarity index 100% rename from tests/topotests/bgp-path-attributes-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route/test_bgp_default-originate.py rename to 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 similarity index 100% rename from tests/topotests/bgp-prefix-list-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match/test_bgp_default-originate_route-map_match.py rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_origin/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match_set/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match_set/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match_set/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match_set/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match_set/test_bgp_default-originate_route-map_match_set.py rename to 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 similarity index 100% rename from tests/topotests/bgp_aggregate-address_route-map/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_set/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_set/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_set/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_set/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_set/test_bgp_default-originate_route-map_set.py rename to 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 similarity index 100% rename from tests/topotests/bgp_comm-list_delete/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ebgp-common-subnet-nexthop-unchanged/test_bgp-ebgp-common-subnet-nexthop-unchanged.py rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/bgp-ecmp-topo1.dot rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/bgp-ecmp-topo1.pdf rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/exabgp.env rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer1/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer1/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer1/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer10/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer10/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer10/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer11/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer11/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer11/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer12/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer12/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer12/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer13/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer13/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer13/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer14/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer14/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer14/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer15/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer15/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer15/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer16/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer16/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer16/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer17/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer17/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer17/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer18/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer18/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer18/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer19/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer19/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer19/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer2/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer2/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer2/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer20/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer20/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer20/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer3/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer3/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer3/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer4/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer4/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer4/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer5/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer5/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer5/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer6/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer6/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer6/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer7/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer7/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer7/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer8/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer8/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer8/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer9/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer9/exa-send.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/peer9/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/r1/summary.txt rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/r1/summary20.txt rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo1/test_bgp_ecmp_topo1.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo2/ebgp_ecmp_topo2.json rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo2/ibgp_ecmp_topo2.json rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo2/test_ebgp_ecmp_topo2.py rename to 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 similarity index 100% rename from tests/topotests/bgp-ecmp-topo2/test_ibgp_ecmp_topo2.py rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/evpn-mh-topo-tests.pdf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd11/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd11/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd11/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd12/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd12/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd12/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd21/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd21/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd21/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd22/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd22/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/hostd22/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/spine1/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/spine1/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/spine1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/spine2/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/spine2/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/spine2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/test_evpn_mh.py rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm11/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm11/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm11/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm12/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm12/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm12/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm21/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm21/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm21/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm22/evpn.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm22/pim.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-mh/torm22/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/P1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/P1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/P1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE1/evpn.vni.json rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE2/evpn.vni.json rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/PE2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/host1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/host1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/host1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/host2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/host2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/host2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_match_set/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-path-attributes-topo1/bgp_path_attributes.json rename to 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 similarity index 100% rename from tests/topotests/bgp-path-attributes-topo1/test_bgp_path_attributes.py rename to 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 similarity index 100% rename from tests/topotests/bgp_default-route_route-map_set/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/test_bgp_peer-group.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/exabgp.env rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer1/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer1/exa_readpipe.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer1/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer2/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer2/exa_readpipe.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer2/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer3/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer3/exa_readpipe.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer3/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer4/exa-receive.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer4/exa_readpipe.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/peer4/exabgp.cfg rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/multipath.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/not-multipath.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-eBGP-confed.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-eBGP-iBGP.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-no-recursive.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1-recursive.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix1.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-ip-route.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-no-recursive.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/prefix3-recursive.json rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r2/staticd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-type_multipath-relax/test_bgp_peer-type_multipath-relax.py rename to 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 similarity index 100% rename from tests/topotests/bgp_peer-group/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp-prefix-list-topo1/prefix_lists.json rename to 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 similarity index 100% rename from tests/topotests/bgp-prefix-list-topo1/test_prefix_lists.py rename to 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 similarity index 100% rename from tests/topotests/bgp-route-map/bgp_route_map_topo1.json rename to 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 similarity index 100% rename from tests/topotests/bgp-route-map/bgp_route_map_topo2.json rename to 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 similarity index 100% rename from tests/topotests/bgp-route-map/test_route_map_topo1.py rename to 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 similarity index 100% rename from tests/topotests/bgp-route-map/test_route_map_topo2.py rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_sender-as-path-loop-detection/test_bgp_sender-as-path-loop-detection.py rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/__init__.py rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/r2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/r3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp_set_local-preference_add_subtract/test_bgp_set_local-preference_add_subtract.py rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce1/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce2/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce3/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce3/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce4/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce4/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/ce4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r1/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r2/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r3/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r4/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r4/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py rename to 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 similarity index 100% rename from tests/topotests/bgp-vrf-route-leak-basic/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-vrf-route-leak-basic/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/bgp-vrf-route-leak-basic/setup_vrfs rename to 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 similarity index 100% rename from tests/topotests/bgp-vrf-route-leak-basic/test_bgp-vrf-route-leak-basic.py rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r1/eigrpd.conf rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r1/show_ip_eigrp.json rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r1/show_ip_eigrp.ref rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r1/show_ip_route.json_ref rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r2/eigrpd.conf rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r2/show_ip_eigrp.json rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r2/show_ip_eigrp.ref rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r2/show_ip_route.json_ref rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r3/eigrpd.conf rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r3/show_ip_eigrp.json rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r3/show_ip_eigrp.ref rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r3/show_ip_route.json_ref rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/test_eigrp_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/eigrp-topo1/test_eigrp_topo1.py rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/host1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/host1/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/host1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/host2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/host2/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/host2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/leaf1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/leaf1/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/leaf1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/leaf2/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/leaf2/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/leaf2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/spine/bgp.summ.json rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/spine/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/spine/join-info.json rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/spine/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/spine/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py rename to 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 similarity index 100% rename from tests/topotests/example-test/__init__.py rename to tests/topotests/example_test/__init__.py diff --git a/tests/topotests/example-test/test_example.py b/tests/topotests/example_test/test_example.py similarity index 100% rename from tests/topotests/example-test/test_example.py rename to 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 similarity index 100% rename from tests/topotests/example-test/test_template.dot rename to 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 similarity index 100% rename from tests/topotests/example-test/test_template.jpg rename to 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 similarity index 100% rename from tests/topotests/example-test/test_template.py rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/__init__.py rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_multiple_links/__init__.py rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_multiple_links/example_topojson_multiple_links.json rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_multiple_links/test_example_topojson_multiple_links.py rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_single_link/__init__.py rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_single_link/example_topojson.json rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_single_link/test_example_topojson.py rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/__init__.py rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/example_topojson.json rename to 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 similarity index 100% rename from tests/topotests/example-topojson-test/test_topo_json_single_link_loopback/test_example_topojson.py rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step10/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step11/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step12/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step13/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt2/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt3/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt4/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt5/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt6/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt6/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt7/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt7/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt7/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/rt7/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lfa-topo1/test_isis_lfa_topo1.py rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/rt6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-lsp-bits-topo1/test_isis_lsp_bits_topo1.py rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step10/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step10/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step2/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step3/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step4/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step5/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step6/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step7/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step8/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step9/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt4/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt5/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt6/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt6/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt7/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt7/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt7/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt8/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt8/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/rt8/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-rlfa-topo1/test_isis_rlfa_topo1.py rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/ce3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r1/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r2/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r3/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r4/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r4/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r4/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r5/ldpd.conf rename to tests/topotests/isis_snmp/r5/ldpd.conf diff --git a/tests/topotests/isis-snmp/r5/ldpdconf b/tests/topotests/isis_snmp/r5/ldpdconf similarity index 100% rename from tests/topotests/isis-snmp/r5/ldpdconf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r5/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r5/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/r5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/test_isis_snmp.dot rename to 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 similarity index 100% rename from tests/topotests/isis-snmp/test_isis_snmp.py rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/dst/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/pathd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step1/show_mpls_table_with_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step1/show_mpls_table_without_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step2/show_operational_data.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step2/show_operational_data_with_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step3/show_operational_data_with_single_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step3/show_operational_data_with_two_candidates.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table_add_segment.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step4/show_mpls_table_change_segment.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step5/show_ip_route_bgp_active_srte.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step5/show_ip_route_bgp_inactive_srte.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step5/show_operational_data_active.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/step5/show_operational_data_inactive.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/pathd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/step1/show_mpls_table_with_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/step1/show_mpls_table_without_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/step2/show_operational_data.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/step2/show_operational_data_with_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/step3/show_operational_data_with_single_candidate.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/step3/show_operational_data_with_two_candidates.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/rt6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-te-topo1/test_isis_sr_te_topo1.py rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step10/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step5/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step6/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step7/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step8/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step9/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step10/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step5/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step6/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step7/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step8/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step9/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step10/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step5/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step6/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step7/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step8/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step9/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step10/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step5/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step6/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step7/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step8/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step9/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step10/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step5/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step6/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step7/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step8/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step9/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step10/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step5/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step6/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step7/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step8/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step9/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/rt6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step2/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step2/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step3/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step3/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step4/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step4/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step5/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step5/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step6/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step6/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step7/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step7/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step8/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step8/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step9/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/step9/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step2/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step2/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step3/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step3/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step4/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step4/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step5/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step5/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step6/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step6/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step7/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step7/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step8/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step8/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step9/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/step9/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step2/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step2/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step3/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step3/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step4/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step4/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step5/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step5/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step6/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step6/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step7/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step7/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step8/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step8/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step9/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/step9/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step2/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step2/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step3/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step3/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step4/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step4/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step5/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step5/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step6/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step6/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step7/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step7/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step8/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step8/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step9/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/step9/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step2/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step2/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step3/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step3/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step4/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step4/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step5/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step5/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step6/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step6/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step7/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step7/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step8/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step8/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step9/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/step9/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step2/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step2/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step2/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step3/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step3/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step3/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step4/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step4/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step4/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step5/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step5/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step5/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step6/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step6/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step6/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step7/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step7/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step7/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step8/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step8/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step8/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step9/show_ip_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step9/show_ipv6_route.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/step9/show_mpls_table.ref.diff rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/rt6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/__init__.py rename to tests/topotests/isis_topo1/__init__.py diff --git a/tests/topotests/isis-topo1/r1/isisd.conf b/tests/topotests/isis_topo1/r1/isisd.conf similarity index 100% rename from tests/topotests/isis-topo1/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r1/r1_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r1/r1_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r1/r1_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r1/r1_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r1/r1_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r2/r2_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r2/r2_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r2/r2_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r2/r2_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r2/r2_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r3/r3_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r3/r3_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r3/r3_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r3/r3_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r3/r3_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r4/r4_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r4/r4_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r4/r4_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r4/r4_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r4/r4_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r5/r5_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r5/r5_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r5/r5_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r5/r5_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r5/r5_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/r5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/test_isis_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/test_isis_topo1.jpg rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/test_isis_topo1.py rename to 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 similarity index 100% rename from tests/topotests/isis-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r1/r1_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r1/r1_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r1/r1_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r1/r1_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r1/r1_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r2/r2_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r2/r2_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r2/r2_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r2/r2_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r2/r2_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r3/r3_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r3/r3_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r3/r3_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r3/r3_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r3/r3_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r4/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r4/r4_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r4/r4_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r4/r4_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r4/r4_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r4/r4_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r5/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r5/r5_route.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r5/r5_route6.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r5/r5_route6_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r5/r5_route_linux.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r5/r5_topology.json rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/r5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.dot rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.jpg rename to 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 similarity index 100% rename from tests/topotests/isis-topo1-vrf/test_isis_topo1_vrf.py rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_all_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_all_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_all_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_all_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-acl-topo1/test_ldp_oc_acl_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/ldp-oc-topo1/test_ldp_oc_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/ce1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/ce2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/ce3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_isis_interface_detail.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_isis_interface_detail_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_isis_interface_detail_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_isis_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_isis_interface_detail.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_isis_interface_detail_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_isis_interface_detail_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_isis_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_isis_interface_detail.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_isis_interface_detail_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_isis_interface_detail_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_isis_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/ce1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/ce2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/ce3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_isis_interface_detail_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_isis_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_isis_interface_detail_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_isis_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_igp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_isis_interface_detail_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_isis_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/show_yang_interface_isis_adjacencies.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/ce1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/ce2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/ce3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/ospf-nbrs.txt rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_interface_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/show_ospf_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_interface_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/show_ospf_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_interface_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_igp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_igp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync_r1_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/show_ospf_ldp_sync_r2_eth1_shutdown.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/ip_mpls_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/show_ipv4_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/show_mpls_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/show_mpls_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/show_mpls_ldp_interface.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/show_mpls_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/ip_mpls_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/show_ipv4_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/show_mpls_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/show_mpls_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/show_mpls_ldp_interface.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/show_mpls_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/ip_mpls_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/show_ipv4_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/show_mpls_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/show_mpls_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/show_mpls_ldp_interface.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/show_mpls_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/ip_mpls_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/show_ipv4_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/show_mpls_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/show_mpls_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/show_mpls_ldp_interface.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/show_mpls_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-topo1/test_ldp_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/ce1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/ce2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/ce3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/ospf-nbrs.txt rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/ldpd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.json rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/show_l2vpn_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/show_l2vpn_vc.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/show_ldp_binding.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/show_ldp_discovery.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/show_ldp_neighbor.ref rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf rename to 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 similarity index 100% rename from tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-bsm-topo1/mcast_pim_bsmp_01.json rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-bsm-topo1/test_mcast_pim_bsmp_01.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-bsm-topo2/mcast_pim_bsmp_02.json rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-bsm-topo2/test_mcast_pim_bsmp_02.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo1/multicast_pim_sm_topo1.json rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo1/test_multicast_pim_sm_topo1.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo2/multicast_pim_sm_topo2.json rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo2/test_multicast_pim_sm_topo2.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo3/multicast_pim_sm_topo3.json rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo3/multicast_pim_sm_topo4.json rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo3/test_multicast_pim_sm_topo3.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-sm-topo3/test_multicast_pim_sm_topo4.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-static-rp-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-static-rp-topo1/multicast_pim_static_rp.json rename to 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 similarity index 100% rename from tests/topotests/multicast-pim-static-rp-topo1/test_multicast_pim_static_rp.py rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r1/nhrp4_cache.json rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r1/nhrp_route4.json rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r1/nhrpd.conf rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r2/nhrp4_cache.json rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r2/nhrp_route4.json rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r2/nhrpd.conf rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/test_nhrp_topo.dot rename to 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 similarity index 100% rename from tests/topotests/nhrp-topo/test_nhrp_topo.py rename to tests/topotests/nhrp_topo/test_nhrp_topo.py diff --git a/tests/topotests/ospf6-topo1/README.md b/tests/topotests/ospf6_topo1/README.md similarity index 100% rename from tests/topotests/ospf6-topo1/README.md rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r1/ip_6_address.nhg.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r1/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r1/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r2/ip_6_address.nhg.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r2/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r2/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r3/ip_6_address.nhg.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r3/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r3/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r4/ip_6_address.nhg.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r4/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r4/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r4/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/test_ospf6_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/README.md rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1/r1/ip_6_address.nhg.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r1/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r1/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r1/show_ipv6_vrf_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r2/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r2/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r2/show_ipv6_vrf_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r3/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r3/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r3/show_ipv6_vrf_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r4/ip_6_address.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r4/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r4/show_ipv6_vrf_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo1-vrf/test_ospf6_topo1_vrf.py rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/r1/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/r2/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/r3/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/test_ospf6_topo2.dot rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/test_ospf6_topo2.png rename to 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 similarity index 100% rename from tests/topotests/ospf6-topo2/test_ospf6_topo2.py rename to 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 similarity index 100% rename from tests/topotests/ospf-dual-stack/test_ospf_dual_stack.dot rename to 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 similarity index 100% rename from tests/topotests/ospf-dual-stack/test_ospf_dual_stack.jpg rename to 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 similarity index 100% rename from tests/topotests/ospf-dual-stack/test_ospf_dual_stack.json rename to 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 similarity index 100% rename from tests/topotests/ospf-dual-stack/test_ospf_dual_stack.py rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step1/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step10/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step10/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step2/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step3/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step4/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step4/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step5/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step5/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step6/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step6/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step7/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step7/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step8/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step8/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step9/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/step9/show_mpls_table.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/rt6/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-sr-topo1/test_ospf_sr_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/reference/ted_step1.json rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/reference/ted_step2.json rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/reference/ted_step3.json rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/reference/ted_step4.json rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/reference/ted_step5.json rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/reference/ted_step6.json rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/reference/ted_step7.json rename to 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 similarity index 100% rename from tests/topotests/ospf-te-topo1/test_ospf_te_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt1/step1/show_ip_route_initial.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt1/step2/show_ip_route_initial.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt1/step2/show_ip_route_link_protection.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt1/step3/show_ip_route_initial.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt1/step3/show_ip_route_node_protection.ref rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt5/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/rt5/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-tilfa-topo1/test_ospf_tilfa_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/__init__.py rename to tests/topotests/ospf_topo1/__init__.py diff --git a/tests/topotests/ospf-topo1/r1/ospf6d.conf b/tests/topotests/ospf_topo1/r1/ospf6d.conf similarity index 100% rename from tests/topotests/ospf-topo1/r1/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r1/ospf6route.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r1/ospf6route_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r1/ospf6route_ecmp.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r1/ospfroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r1/ospfroute_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/ospf6route.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/ospf6route_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/ospf6route_ecmp.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/ospfroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/ospfroute_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/ospf6route.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/ospf6route_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/ospf6route_ecmp.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/ospfroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/ospfroute_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/ospf6d.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/ospf6route.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/ospf6route_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/ospf6route_ecmp.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/ospfroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/ospfroute_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/test_ospf_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/test_ospf_topo1.jpg rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/test_ospf_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r1/ospfroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r1/ospfroute_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r1/zebraroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r1/zebraroutedown.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r2/ospfroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r2/ospfroute_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r2/zebraroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r2/zebraroutedown.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r3/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r3/ospfroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r3/ospfroute_down.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r3/zebraroute.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/r3/zebraroutedown.txt rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/test_ospf_topo1-vrf.dot rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.jpg rename to 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 similarity index 100% rename from tests/topotests/ospf-topo1-vrf/test_ospf_topo1_vrf.py rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r1/ospf-route.json rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r1/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r1/v4_route.json rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r2/ospf-route.json rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r2/ospfd.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r2/v4_route.json rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ospf-topo2/test_ospf_topo2.py rename to tests/topotests/ospf_topo2/test_ospf_topo2.py diff --git a/tests/topotests/pbr-topo1/__init__.py b/tests/topotests/pbr_topo1/__init__.py similarity index 100% rename from tests/topotests/pbr-topo1/__init__.py rename to 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 similarity index 100% rename from tests/topotests/pbr-topo1/r1/linux-rules.json rename to 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 similarity index 100% rename from tests/topotests/pbr-topo1/r1/pbr-interface.json rename to 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 similarity index 100% rename from tests/topotests/pbr-topo1/r1/pbr-map.json rename to 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 similarity index 100% rename from tests/topotests/pbr-topo1/r1/pbr-nexthop-groups.json rename to 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 similarity index 100% rename from tests/topotests/pbr-topo1/r1/pbrd.conf rename to 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 similarity index 100% rename from tests/topotests/pbr-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pbr-topo1/test_pbr_topo1.py rename to 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 similarity index 100% rename from tests/topotests/pim-basic/mcast-rx.py rename to 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 similarity index 100% rename from tests/topotests/pim-basic/mcast-tx.py rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r1/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r1/rp-info.json rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r2/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r3/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/rp/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/rp/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/rp/upstream.json rename to 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 similarity index 100% rename from tests/topotests/pim-basic/rp/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic/test_pim.py rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/__init__.py rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r1/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r1/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r2/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r2/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r3/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r3/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r4/bfdd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r4/pimd.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/r4/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/test_pim_basic_topo2.dot rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/test_pim_basic_topo2.png rename to 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 similarity index 100% rename from tests/topotests/pim-basic-topo2/test_pim_basic_topo2.py rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r1/rip_status.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r1/ripd.conf rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r1/show_ip_rip.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r1/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r2/rip_status.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r2/ripd.conf rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r2/show_ip_rip.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r2/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r3/rip_status.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r3/ripd.conf rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r3/show_ip_rip.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r3/show_ip_route.ref rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/test_rip_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/test_rip_topo1.pdf rename to 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 similarity index 100% rename from tests/topotests/rip-topo1/test_rip_topo1.py rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r1/ripng_status.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r1/ripngd.conf rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r1/show_ipv6_ripng.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r1/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r2/ripng_status.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r2/ripngd.conf rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r2/show_ipv6_ripng.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r2/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r2/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r3/ripng_status.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r3/ripngd.conf rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r3/show_ipv6_ripng.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r3/show_ipv6_route.ref rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/r3/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/test_ripng_topo1.dot rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/test_ripng_topo1.pdf rename to 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 similarity index 100% rename from tests/topotests/ripng-topo1/test_ripng_topo1.py rename to 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 similarity index 100% rename from tests/topotests/route-scale/r1/installed.routes.json rename to 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 similarity index 100% rename from tests/topotests/route-scale/r1/no.routes.json rename to 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 similarity index 100% rename from tests/topotests/route-scale/r1/sharpd.conf rename to 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 similarity index 100% rename from tests/topotests/route-scale/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/route-scale/test_route_scale.py rename to 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 similarity index 100% rename from tests/topotests/simple-snmp-test/r1/bgpd.conf rename to 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 similarity index 100% rename from tests/topotests/simple-snmp-test/r1/isisd.conf rename to 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 similarity index 100% rename from tests/topotests/simple-snmp-test/r1/snmpd.conf rename to 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 similarity index 100% rename from tests/topotests/simple-snmp-test/r1/zebra.conf rename to 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 similarity index 100% rename from tests/topotests/simple-snmp-test/test_simple_snmp.py rename to tests/topotests/simple_snmp_test/test_simple_snmp.py