From dd02d8926c4af2663f11b36a3a935f635259f13b Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 4 Aug 2023 12:56:11 -0400 Subject: [PATCH] tests: bgp_vpnv4_noretain test turns on isis but never uses it The test was reading in the bgp config for the isis config and clearly the test is working without this. So let's remove from the test the usage of isisd Signed-off-by: Donald Sharp --- tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf | 14 -------------- tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf | 14 -------------- .../bgp_vpnv4_noretain/test_bgp_vpnv4_noretain.py | 3 --- 3 files changed, 31 deletions(-) delete mode 100644 tests/topotests/bgp_vpnv4_noretain/r1/isisd.conf delete mode 100644 tests/topotests/bgp_vpnv4_noretain/r2/isisd.conf 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()