tests: Use frr.conf for bgp_dynamic_capabily tests

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

diff --git a/tests/topotests/bgp_dynamic_capability/r1/bgpd.conf b/tests/topotests/bgp_dynamic_capability/r1/bgpd.conf
deleted file mode 100644 (file)
index 3d2c611..0000000
--- a/tests/topotests/bgp_dynamic_capability/r1/bgpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-!debug bgp neighbor
-!
-router bgp 65001
- no bgp ebgp-requires-policy
- bgp graceful-restart
- bgp long-lived stale-time 10
- neighbor 192.168.1.2 remote-as external
- neighbor 192.168.1.2 timers 1 3
- neighbor 192.168.1.2 timers connect 1
- neighbor 192.168.1.2 capability dynamic
-!

diff --git a/tests/topotests/bgp_dynamic_capability/r1/frr.conf b/tests/topotests/bgp_dynamic_capability/r1/frr.conf
new file mode 100644 (file)
index 0000000..50280a9
--- /dev/null
+++ b/tests/topotests/bgp_dynamic_capability/r1/frr.conf
@@ -0,0 +1,15 @@
+!
+!debug bgp neighbor
+!
+int r1-eth0
+ ip address 192.168.1.1/24
+!
+router bgp 65001
+ no bgp ebgp-requires-policy
+ bgp graceful-restart
+ bgp long-lived stale-time 10
+ neighbor 192.168.1.2 remote-as external
+ neighbor 192.168.1.2 timers 1 3
+ neighbor 192.168.1.2 timers connect 1
+ neighbor 192.168.1.2 capability dynamic
+!

diff --git a/tests/topotests/bgp_dynamic_capability/r1/zebra.conf b/tests/topotests/bgp_dynamic_capability/r1/zebra.conf
deleted file mode 100644 (file)
index b29940f..0000000
--- a/tests/topotests/bgp_dynamic_capability/r1/zebra.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-!
-int r1-eth0
- ip address 192.168.1.1/24
-!

diff --git a/tests/topotests/bgp_dynamic_capability/r2/bgpd.conf b/tests/topotests/bgp_dynamic_capability/r2/bgpd.conf
deleted file mode 100644 (file)
index 46f0b21..0000000
--- a/tests/topotests/bgp_dynamic_capability/r2/bgpd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-!
-!debug bgp neighbor
-!
-router bgp 65002
- bgp graceful-restart
- bgp long-lived stale-time 20
- no bgp ebgp-requires-policy
- neighbor 192.168.1.1 remote-as external
- neighbor 192.168.1.1 timers 1 3
- neighbor 192.168.1.1 timers connect 1
- neighbor 192.168.1.1 capability dynamic
-!

diff --git a/tests/topotests/bgp_dynamic_capability/r2/frr.conf b/tests/topotests/bgp_dynamic_capability/r2/frr.conf
new file mode 100644 (file)
index 0000000..2bef917
--- /dev/null
+++ b/tests/topotests/bgp_dynamic_capability/r2/frr.conf
@@ -0,0 +1,15 @@
+!
+!debug bgp neighbor
+!
+int r2-eth0
+ ip address 192.168.1.2/24
+!
+router bgp 65002
+ bgp graceful-restart
+ bgp long-lived stale-time 20
+ no bgp ebgp-requires-policy
+ neighbor 192.168.1.1 remote-as external
+ neighbor 192.168.1.1 timers 1 3
+ neighbor 192.168.1.1 timers connect 1
+ neighbor 192.168.1.1 capability dynamic
+!

diff --git a/tests/topotests/bgp_dynamic_capability/r2/zebra.conf b/tests/topotests/bgp_dynamic_capability/r2/zebra.conf
deleted file mode 100644 (file)
index cffe827..0000000
--- a/tests/topotests/bgp_dynamic_capability/r2/zebra.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-!
-int r2-eth0
- ip address 192.168.1.2/24
-!

diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
index 846a68ea27b970a8325c0e231a67d005205cb7a7..c6c5bb17f27793b08707a2bfc292b9dbcdf4a3fc 100644 (file)
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
@@ -38,13 +38,8 @@ def setup_module(mod):
 
     router_list = tgen.routers()
 
-    for i, (rname, router) in enumerate(router_list.items(), 1):
-        router.load_config(
-            TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
-        )
-        router.load_config(
-            TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
-        )
+    for _, (rname, router) in enumerate(router_list.items(), 1):
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)))
 
     tgen.start_router()
 

diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
index 9f37440566d81241f80f4b857e5081192b963fa1..9d14388d562415934e236c3a1265e6602ee0bb5c 100644 (file)
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
@@ -36,13 +36,8 @@ def setup_module(mod):
 
     router_list = tgen.routers()
 
-    for i, (rname, router) in enumerate(router_list.items(), 1):
-        router.load_config(
-            TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
-        )
-        router.load_config(
-            TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
-        )
+    for _, (rname, router) in enumerate(router_list.items(), 1):
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)))
 
     tgen.start_router()
 

diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
index eb81ffeb696244bc9a57b0bce3e8e0cba3a61eb1..6e2fa5144314d5b27b17a503389d7c09daf082fe 100644 (file)
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
@@ -36,13 +36,8 @@ def setup_module(mod):
 
     router_list = tgen.routers()
 
-    for i, (rname, router) in enumerate(router_list.items(), 1):
-        router.load_config(
-            TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
-        )
-        router.load_config(
-            TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
-        )
+    for _, (rname, router) in enumerate(router_list.items(), 1):
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)))
 
     tgen.start_router()