14 files changed, 0 insertions, 46 deletions
diff --git a/tests/topotests/babel_topo1/r3/babeld.conf b/tests/topotests/babel_topo1/r3/babeld.conf
index bfda3622dd..e10e5aaacc 100644
--- a/tests/topotests/babel_topo1/r3/babeld.conf
+++ b/tests/topotests/babel_topo1/r3/babeld.conf
@@ -14,4 +14,3 @@ router  babel
  network r3-eth1
  redistribute ipv4 connected
  redistribute ipv4 static
- redistirbute ipv6 connected
diff --git a/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf
index ce36494604..72238ccd40 100644
--- a/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf
@@ -27,6 +27,5 @@ interface eth-rt3
 !
 router ospf
  ospf router-id 1.1.1.1
- passive interface lo
  router-info area 0.0.0.0
 !
diff --git a/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf
index a8ca564e4e..c5f4262a8f 100644
--- a/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf
@@ -25,6 +25,5 @@ interface eth-rt5
 !
 router ospf
  ospf router-id 2.2.2.2
- passive interface lo
  router-info area 0.0.0.0
 !
diff --git a/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf
index 0404994c09..e487bdd7c0 100644
--- a/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf
@@ -25,6 +25,5 @@ interface eth-rt4
 !
 router ospf
  ospf router-id 3.3.3.3
- passive interface lo
  router-info area 0.0.0.0
 !
diff --git a/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf
index 6b8ab3704f..560904e75d 100644
--- a/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf
@@ -24,6 +24,5 @@ interface eth-rt5
 !
 router ospf
  ospf router-id 4.4.4.4
- passive interface lo
  router-info area 0.0.0.0
 !
diff --git a/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf
index 043432ec3d..77f5445286 100644
--- a/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf
+++ b/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf
@@ -24,6 +24,5 @@ interface eth-rt4
 !
 router ospf
  ospf router-id 5.5.5.5
- passive interface lo
  router-info area 0.0.0.0
 !
diff --git a/tests/topotests/bgp_update_delay/r2/zebra.conf b/tests/topotests/bgp_update_delay/r2/zebra.conf
index 420f00d974..1fcedaaf72 100644
--- a/tests/topotests/bgp_update_delay/r2/zebra.conf
+++ b/tests/topotests/bgp_update_delay/r2/zebra.conf
@@ -12,9 +12,5 @@ interface r2-eth3
  ip address 192.168.252.1/30
  vrf vrf1
 !
-auto vrf1
-iface vrf1
-  vrf-table auto
-!
 ip forwarding
 !
diff --git a/tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf b/tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf
deleted file mode 100644
index 233a6473b3..0000000000
--- a/tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-interface r1-eth0
- ip router isis 1
- isis circuit-type level-1
-!
-interface lo
- ip router isis 1
- isis passive
-!
-router isis 1
- is-type level-1
- net 49.0002.0000.1994.00
- segment-routing on
- segment-routing prefix 192.0.2.1/32 index 11
-!
diff --git a/tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf b/tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf
deleted file mode 100644
index 547d10f2bc..0000000000
--- a/tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-interface r2-eth0
- ip router isis 1
- isis circuit-type level-1
-!
-interface lo
- ip router isis 1
- isis passive
-!
-router isis 1
- is-type level-1
- net 49.0002.0000.1995.00
- segment-routing on
- segment-routing prefix 192.0.2.2/32 index 22
-!
diff --git a/tests/topotests/bgp_vpnv4_noretain/test_bgp_vpnv4_noretain.py b/tests/topotests/bgp_vpnv4_noretain/test_bgp_vpnv4_noretain.py
index f665040f7f..f2865fec9e 100644
--- a/tests/topotests/bgp_vpnv4_noretain/test_bgp_vpnv4_noretain.py
+++ b/tests/topotests/bgp_vpnv4_noretain/test_bgp_vpnv4_noretain.py
@@ -120,9 +120,6 @@ def setup_module(mod):
         router.load_config(
             TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
         )
-        router.load_config(
-            TopoRouter.RD_ISIS, os.path.join(CWD, "{}/bgpd.conf".format(rname))
-        )
 
     # Initialize all routers.
     tgen.start_router()
diff --git a/tests/topotests/config_timing/r1/zebra.conf b/tests/topotests/config_timing/r1/zebra.conf
index 46fd965034..b4dc338b8d 100644
--- a/tests/topotests/config_timing/r1/zebra.conf
+++ b/tests/topotests/config_timing/r1/zebra.conf
@@ -4,10 +4,8 @@ ip prefix-list ANY permit 0.0.0.0/0 le 32
 ipv6 prefix-list ANY seq 10 permit any
 
 route-map RM-NONE4 deny 10
-exit-route-map
 
 route-map RM-NONE6 deny 10
-exit-route-map
 
 interface r1-eth0
   ip address 100.0.0.1/24
diff --git a/tests/topotests/cspf_topo1/r1/sharpd.conf b/tests/topotests/cspf_topo1/r1/sharpd.conf
index 272eac944e..465034f150 100644
--- a/tests/topotests/cspf_topo1/r1/sharpd.conf
+++ b/tests/topotests/cspf_topo1/r1/sharpd.conf
@@ -1,3 +1,2 @@
 !
-import-te
 !
diff --git a/tests/topotests/isis_snmp/r1/ldpd.conf b/tests/topotests/isis_snmp/r1/ldpd.conf
index 5b1cbfebc9..64f51fce27 100644
--- a/tests/topotests/isis_snmp/r1/ldpd.conf
+++ b/tests/topotests/isis_snmp/r1/ldpd.conf
@@ -5,7 +5,6 @@ log file ldpd.log
 ! debug mpls ldp event
 ! debug mpls ldp errors
 ! debug mpls ldp sync
-agentx
 !
 mpls ldp
  router-id 1.1.1.1
diff --git a/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf
index 8a9b4eb124..aa9438b78e 100644
--- a/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf
+++ b/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf
@@ -1,4 +1,3 @@
-:assword 1
 hostname rt1
 log file ospf6d.log
 log commands