From 1c1de4687884408c3872b37198269bfe534a66cf Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Sat, 27 Apr 2024 23:00:36 +0300 Subject: [PATCH] tests: Use a single frr.conf for bgp_gr_restart_retain_routes Signed-off-by: Donatas Abraitis --- .../r1/{bgpd.conf => frr.conf} | 7 +++++++ tests/topotests/bgp_gr_restart_retain_routes/r1/zebra.conf | 7 ------- .../r2/{bgpd.conf => frr.conf} | 7 +++++++ tests/topotests/bgp_gr_restart_retain_routes/r2/zebra.conf | 5 ----- 4 files changed, 14 insertions(+), 12 deletions(-) rename tests/topotests/bgp_gr_restart_retain_routes/r1/{bgpd.conf => frr.conf} (75%) delete mode 100644 tests/topotests/bgp_gr_restart_retain_routes/r1/zebra.conf rename tests/topotests/bgp_gr_restart_retain_routes/r2/{bgpd.conf => frr.conf} (64%) delete mode 100644 tests/topotests/bgp_gr_restart_retain_routes/r2/zebra.conf diff --git a/tests/topotests/bgp_gr_restart_retain_routes/r1/bgpd.conf b/tests/topotests/bgp_gr_restart_retain_routes/r1/frr.conf similarity index 75% rename from tests/topotests/bgp_gr_restart_retain_routes/r1/bgpd.conf rename to tests/topotests/bgp_gr_restart_retain_routes/r1/frr.conf index 50d1583873..3d4d3a8ee5 100644 --- a/tests/topotests/bgp_gr_restart_retain_routes/r1/bgpd.conf +++ b/tests/topotests/bgp_gr_restart_retain_routes/r1/frr.conf @@ -1,3 +1,10 @@ +! +interface lo + ip address 172.16.255.1/32 +! +interface r1-eth0 + ip address 192.168.255.1/24 +! router bgp 65001 no bgp ebgp-requires-policy bgp graceful-restart diff --git a/tests/topotests/bgp_gr_restart_retain_routes/r1/zebra.conf b/tests/topotests/bgp_gr_restart_retain_routes/r1/zebra.conf deleted file mode 100644 index e65bfb2c3a..0000000000 --- a/tests/topotests/bgp_gr_restart_retain_routes/r1/zebra.conf +++ /dev/null @@ -1,7 +0,0 @@ -! -interface lo - ip address 172.16.255.1/32 -! -interface r1-eth0 - ip address 192.168.255.1/24 -! diff --git a/tests/topotests/bgp_gr_restart_retain_routes/r2/bgpd.conf b/tests/topotests/bgp_gr_restart_retain_routes/r2/frr.conf similarity index 64% rename from tests/topotests/bgp_gr_restart_retain_routes/r2/bgpd.conf rename to tests/topotests/bgp_gr_restart_retain_routes/r2/frr.conf index 97418ca9a0..22c6f37839 100644 --- a/tests/topotests/bgp_gr_restart_retain_routes/r2/bgpd.conf +++ b/tests/topotests/bgp_gr_restart_retain_routes/r2/frr.conf @@ -1,3 +1,10 @@ +no zebra nexthop kernel enable +debug bgp graceful-restart +debug bgp neighbor +! +interface r2-eth0 + ip address 192.168.255.2/24 +! router bgp 65002 no bgp ebgp-requires-policy bgp graceful-restart diff --git a/tests/topotests/bgp_gr_restart_retain_routes/r2/zebra.conf b/tests/topotests/bgp_gr_restart_retain_routes/r2/zebra.conf deleted file mode 100644 index 758d797ad6..0000000000 --- a/tests/topotests/bgp_gr_restart_retain_routes/r2/zebra.conf +++ /dev/null @@ -1,5 +0,0 @@ -no zebra nexthop kernel enable -! -interface r2-eth0 - ip address 192.168.255.2/24 -!