topotests: bgp_bmp, use unified configuration

Use unified configuration procedure. Signed-off-by: Philippe Guibert <[email protected]>
FRRouting · Nov 18, 2024 · 2ee8f99 · 2ee8f99
1 parent f68a64e
commit 2ee8f99
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 47 deletions.
diff --git a/tests/topotests/bgp_bmp/r1/bgpd.conf → tests/topotests/bgp_bmp/r1/frr.conf b/tests/topotests/bgp_bmp/r1/bgpd.conf → tests/topotests/bgp_bmp/r1/frr.conf
@@ -1,3 +1,10 @@
+interface r1-eth0
+ ip address 192.0.2.1/24
+!
+interface r1-eth1
+ ip address 192.168.0.1/24
+ ipv6 address 192:168::1/64
+!
 router bgp 65501
  bgp router-id 192.168.0.1
  bgp log-neighbor-changes

diff --git a/tests/topotests/bgp_bmp/r1/zebra.conf b/tests/topotests/bgp_bmp/r1/zebra.conf
diff --git a/tests/topotests/bgp_bmp/r1vrf/bgpd.conf → tests/topotests/bgp_bmp/r1vrf/frr.conf b/tests/topotests/bgp_bmp/r1vrf/bgpd.conf → tests/topotests/bgp_bmp/r1vrf/frr.conf
@@ -1,3 +1,10 @@
+interface r1vrf-eth0
+ ip address 192.0.2.1/24
+!
+interface r1vrf-eth1
+ ip address 192.168.0.1/24
+ ipv6 address 192:168::1/64
+!
 router bgp 65501 vrf vrf1
  bgp router-id 192.168.0.1
  bgp log-neighbor-changes
@@ -15,7 +22,6 @@ router bgp 65501 vrf vrf1
    bmp monitor ipv6 unicast loc-rib
  exit
 !
-
  address-family ipv4 unicast
   neighbor 192.168.0.2 activate
   neighbor 192.168.0.2 soft-reconfiguration inbound

diff --git a/tests/topotests/bgp_bmp/r1vrf/zebra.conf b/tests/topotests/bgp_bmp/r1vrf/zebra.conf
diff --git a/tests/topotests/bgp_bmp/r2/bgpd.conf → tests/topotests/bgp_bmp/r2/frr.conf b/tests/topotests/bgp_bmp/r2/bgpd.conf → tests/topotests/bgp_bmp/r2/frr.conf
@@ -1,3 +1,11 @@
+interface r2-eth0
+ ip address 192.168.0.2/24
+ ipv6 address 192:168::2/64
+!
+interface r2-eth1
+ ip address 172.31.0.2/24
+ ipv6 address 172:31::2/64
+!
 router bgp 65502
  bgp router-id 192.168.0.2
  bgp log-neighbor-changes

diff --git a/tests/topotests/bgp_bmp/r2/zebra.conf b/tests/topotests/bgp_bmp/r2/zebra.conf
diff --git a/tests/topotests/bgp_bmp/r2vrf/bgpd.conf → tests/topotests/bgp_bmp/r2vrf/frr.conf b/tests/topotests/bgp_bmp/r2vrf/bgpd.conf → tests/topotests/bgp_bmp/r2vrf/frr.conf
@@ -1,3 +1,11 @@
+interface r2vrf-eth0
+ ip address 192.168.0.2/24
+ ipv6 address 192:168::2/64
+!
+interface r2vrf-eth1
+ ip address 172.31.0.2/24
+ ipv6 address 172:31::2/64
+!
 router bgp 65502
  bgp router-id 192.168.0.2
  bgp log-neighbor-changes

diff --git a/tests/topotests/bgp_bmp/r2vrf/zebra.conf b/tests/topotests/bgp_bmp/r2vrf/zebra.conf
diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_1.py b/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
@@ -79,14 +79,9 @@ def setup_module(mod):
         )
 
     for rname, router in tgen.routers().items():
-        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)),
-            "-M bmp",
-        )
+        logger.info("Loading router %s" % rname)
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)),
+                               [(TopoRouter.RD_ZEBRA, None), (TopoRouter.RD_BGP, '-M bmp')])
 
     tgen.start_router()
 

diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_2.py b/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
@@ -91,14 +91,9 @@ def setup_module(mod):
         )
 
     for rname, router in tgen.routers().items():
-        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)),
-            "-M bmp",
-        )
+        logger.info("Loading router %s" % rname)
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)),
+                               [(TopoRouter.RD_ZEBRA, None), (TopoRouter.RD_BGP, '-M bmp')])
 
     tgen.start_router()