Revert "topotests: isis-lfa add a switchover test after BFD down"

This reverts commit c8d2816ee5245ac2a13cbb36299f2f0c23f226e3.

diff --git a/tests/topotests/isis_lfa_topo1/rt1/bfdd.conf b/tests/topotests/isis_lfa_topo1/rt1/bfdd.conf
deleted file mode 100644 (file)
index 86cf68d..0000000
--- a/tests/topotests/isis_lfa_topo1/rt1/bfdd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-hostname rt1
-!
-bfd
- peer 2001:db8:1000::2 multihop local-address 2001:db8:1000::1
- !
-!

diff --git a/tests/topotests/isis_lfa_topo1/rt2/bfdd.conf b/tests/topotests/isis_lfa_topo1/rt2/bfdd.conf
deleted file mode 100644 (file)
index 40357a4..0000000
--- a/tests/topotests/isis_lfa_topo1/rt2/bfdd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-hostname rt2
-!
-bfd
- peer 2001:db8:1000::1 multihop local-address 2001:db8:1000::2
- !
-!

diff --git a/tests/topotests/isis_lfa_topo1/test_isis_lfa_topo1.py b/tests/topotests/isis_lfa_topo1/test_isis_lfa_topo1.py
index 1d6d870a4ed096c7216b5457ec7112ac057890d3..f5bdf48e4f80febd8900bf46ff7df2fdeabe568a 100755 (executable)
--- a/tests/topotests/isis_lfa_topo1/test_isis_lfa_topo1.py
+++ b/tests/topotests/isis_lfa_topo1/test_isis_lfa_topo1.py
@@ -175,9 +175,6 @@ def setup_module(mod):
         router.load_config(
             TopoRouter.RD_ISIS, os.path.join(CWD, "{}/isisd.conf".format(rname))
         )
-        router.load_config(
-            TopoRouter.RD_BFD, os.path.join(CWD, "/dev/null".format(rname))
-        )
 
     tgen.start_router()
 
@@ -905,109 +902,6 @@ def test_rib_ipv6_step22():
         )
 
 
-#
-# Step 23
-#
-# Action(s):
-# - Setting spf-delay-ietf init-delay of 15s
-#
-# Expected changes:
-# - No routing table change
-# - At the end of test, SPF reacts to a failure in 15s
-#
-def test_rib_ipv6_step23():
-    logger.info("Test (step 23): verify IPv6 RIB")
-    tgen = get_topogen()
-
-    # Skip if previous fatal error condition is raised
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    logger.info("Setup BFD on rt1 and rt2")
-    for rname in ["rt1", "rt2"]:
-        conf_file = os.path.join(CWD, "{}/bfdd.conf".format(rname))
-        tgen.net[rname].cmd("vtysh -f {}".format(conf_file))
-
-    rname = "rt1"
-    expect = '[{"multihop":true,"peer":"2001:db8:1000::2","local":"2001:db8:1000::1","status":"up"}]'
-    router_compare_json_output(rname, "show bfd peers json", expect)
-
-    logger.info("Set ISIS BFD")
-    tgen.net["rt1"].cmd('vtysh -c "conf t" -c "int eth-rt2" -c "isis bfd"')
-    tgen.net["rt2"].cmd('vtysh -c "conf t" -c "int eth-rt1" -c "isis bfd"')
-
-    router_compare_json_output(
-        rname,
-        "show ipv6 route isis json",
-        outputs[rname][14]["show_ipv6_route.ref"],
-    )
-
-
-#
-# Step 24
-#
-# Action(s):
-# - shut the eth-rt2 interface on rt1
-#
-# Expected changes:
-# - Route switchover of routes via eth-rt2
-#
-def test_rib_ipv6_step24():
-    logger.info("Test (step 24): verify IPv6 RIB")
-    tgen = get_topogen()
-
-    # Skip if previous fatal error condition is raised
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    logger.info("Shut the interface to rt2 from the switch side and check fast-reroute")
-    tgen.net.cmd_raises("ip link set %s down" % tgen.net["s1"].intfs[0])
-
-    rname = "rt1"
-    expect = '[{"multihop":true,"peer":"2001:db8:1000::2","local":"2001:db8:1000::1","status":"down"}]'
-    router_compare_json_output(
-        rname,
-        "show bfd peers json",
-        expect,
-        count=20,
-        wait=0.05,
-    )
-
-    router_compare_json_output(
-        rname,
-        "show ipv6 route isis json",
-        outputs[rname][15]["show_ipv6_route.ref"],
-        count=2,
-        wait=0.05,
-    )
-
-
-#
-# Step 25
-#
-# Action(s): wait for the convergence and SPF computation on rt1
-#
-# Expected changes:
-# - convergence of IPv6 RIB
-#
-def test_rib_ipv6_step25():
-    logger.info("Test (step 25): verify IPv6 RIB")
-    tgen = get_topogen()
-
-    # Skip if previous fatal error condition is raised
-    if tgen.routers_have_failure():
-        pytest.skip(tgen.errors)
-
-    logger.info("Check SPF convergence")
-
-    for rname in ["rt1"]:
-        router_compare_json_output(
-            rname,
-            "show ipv6 route isis json",
-            outputs[rname][16]["show_ipv6_route.ref"],
-        )
-
-
 # Memory leak test template
 def test_memory_leak():
     "Run the memory leak test and report results."