tests: Use a single frr.conf for bgp_gr_restart_retain_routes

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/tests/topotests/bgp_gr_restart_retain_routes/r1/bgpd.conf b/tests/topotests/bgp_gr_restart_retain_routes/r1/bgpd.conf
deleted file mode 100644 (file)
index 50d1583..0000000
--- a/tests/topotests/bgp_gr_restart_retain_routes/r1/bgpd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-router bgp 65001
- no bgp ebgp-requires-policy
- bgp graceful-restart
- bgp graceful-restart preserve-fw-state
- neighbor 192.168.255.2 remote-as external
- neighbor 192.168.255.2 timers 1 3
- neighbor 192.168.255.2 timers connect 1
- address-family ipv4
-  redistribute connected
- exit-address-family
-!

diff --git a/tests/topotests/bgp_gr_restart_retain_routes/r1/frr.conf b/tests/topotests/bgp_gr_restart_retain_routes/r1/frr.conf
new file mode 100644 (file)
index 0000000..3d4d3a8
--- /dev/null
+++ b/tests/topotests/bgp_gr_restart_retain_routes/r1/frr.conf
@@ -0,0 +1,18 @@
+!
+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
+ bgp graceful-restart preserve-fw-state
+ neighbor 192.168.255.2 remote-as external
+ neighbor 192.168.255.2 timers 1 3
+ neighbor 192.168.255.2 timers connect 1
+ address-family ipv4
+  redistribute connected
+ exit-address-family
+!

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 (file)
index e65bfb2..0000000
--- 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/bgpd.conf
deleted file mode 100644 (file)
index 97418ca..0000000
--- a/tests/topotests/bgp_gr_restart_retain_routes/r2/bgpd.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-router bgp 65002
- no bgp ebgp-requires-policy
- bgp graceful-restart
- bgp graceful-restart preserve-fw-state
- neighbor 192.168.255.1 remote-as external
- neighbor 192.168.255.1 timers 1 3
- neighbor 192.168.255.1 timers connect 1
-!

diff --git a/tests/topotests/bgp_gr_restart_retain_routes/r2/frr.conf b/tests/topotests/bgp_gr_restart_retain_routes/r2/frr.conf
new file mode 100644 (file)
index 0000000..22c6f37
--- /dev/null
+++ b/tests/topotests/bgp_gr_restart_retain_routes/r2/frr.conf
@@ -0,0 +1,15 @@
+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
+ bgp graceful-restart preserve-fw-state
+ neighbor 192.168.255.1 remote-as external
+ neighbor 192.168.255.1 timers 1 3
+ neighbor 192.168.255.1 timers connect 1
+!

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 (file)
index 758d797..0000000
--- 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
-!