topotests: add unified configuration

Replace the various per-daemon config files with a unique frr.conf
configuration file.

Signed-off-by: Philippe Guibert <[email protected]>

tests/topotests/bgp_bmp/test_bgp_bmp_1.py

@@ -78,7 +78,7 @@ def setup_module(mod):
             "tcpdump -nni r1-eth0 -s 0 -w {} &".format(pcap_file), stdout=None
         )
 
-    for rname, router in tgen.routers().items():
+    for _, (rname, router) in enumerate(tgen.routers().items(), 1):
         logger.info("Loading router %s" % rname)
         router.load_frr_config(
             os.path.join(CWD, "{}/frr.conf".format(rname)),

tests/topotests/bgp_evpn_rt5/r1/bgpd.conf → tests/topotests/bgp_evpn_rt5/r1/frr.conf

@@ -1,6 +1,27 @@
+log stdout
+
+hostname r1
+password zebra
+
+! debug zebra vxlan
+! debug zebra kernel
+! debug zebra dplane
+! debug zebra rib
 ! debug bgp neighbor-events
 ! debug bgp updates
 ! debug bgp zebra
+log stdout
+vrf r1-vrf-101
+ vni 101
+ exit-vrf
+!
+interface r1-eth0
+ ip address 192.168.100.21/24
+!
+interface loop101 vrf r1-vrf-101
+ ip address 192.168.102.21/32
+ ipv6 address fd00::1/128
+!
 router bgp 65000
  bgp router-id 192.168.100.21
  bgp log-neighbor-changes
@@ -40,3 +61,5 @@ exit
 route-map rmap_r1 permit 1
  match evpn vni 101
 exit
+
+

tests/topotests/bgp_evpn_rt5/r2/bgpd.conf → tests/topotests/bgp_evpn_rt5/r2/frr.conf

@@ -1,6 +1,24 @@
+log stdout
+
+hostname r2
+password zebra
+
+! debug zebra vxlan
 ! debug bgp neighbor-events
 ! debug bgp updates
 ! debug bgp zebra
+
+vrf r2-vrf-101
+ vni 101
+ exit-vrf
+!
+interface loop101 vrf r2-vrf-101
+ ip address 192.168.101.41/32
+ ipv6 address fd00::2/128
+!
+interface r2-eth0
+ ip address 192.168.100.41/24
+!
 router bgp 65000
  bgp router-id 192.168.100.41
  bgp log-neighbor-changes
@@ -47,3 +65,4 @@ exit
 route-map rmap6 deny 2
  match ipv6 address acl6_2
 exit
+

tests/topotests/bgp_evpn_rt5/r3/bgpd.conf → tests/topotests/bgp_evpn_rt5/r3/frr.conf

@@ -1,6 +1,17 @@
 ! debug bgp neighbor-events
 ! debug bgp updates
 ! debug bgp zebra
+vrf r3-vrf-102
+ vni 102
+ exit-vrf
+!
+interface r3-eth0
+ ip address 192.168.100.61/24
+!
+interface loop102 vrf r3-vrf-102
+ ip address 192.168.102.61/32
+ ipv6 address fd00:6::1/128
+!
 router bgp 65500
  bgp router-id 192.168.100.61
  bgp log-neighbor-changes
@@ -29,3 +40,5 @@ router bgp 65000 vrf r3-vrf-102
   advertise ipv6 unicast
  exit-address-family
  !
+
+

tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py

@@ -159,21 +159,17 @@ def setup_module(mod):
     tgen.net["r1"].cmd_raises("ip -n r1-vrf-101 link set bridge-101 up")
     tgen.net["r1"].cmd_raises("ip -n r1-vrf-101 link set vxlan-101 up")
 
-    for rname, router in router_list.items():
+    for rname, router in tgen.routers().items():
+        logger.info("Loading router %s" % rname)
         if rname == "r1":
-            router.load_config(TopoRouter.RD_MGMTD, None, "--vrfwnetns")
-            router.load_config(
-                TopoRouter.RD_ZEBRA,
-                os.path.join(CWD, "{}/zebra.conf".format(rname)),
-                "--vrfwnetns",
+            router.load_frr_config(
+                os.path.join(CWD, "{}/frr.conf".format(rname)),
+                [(TopoRouter.RD_MGMTD, "--vrfwnetns"), (TopoRouter.RD_ZEBRA, "--vrfwnetns"), (TopoRouter.RD_BGP, None)],
             )
         else:
-            router.load_config(
-                TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
+            router.load_frr_config(
+                os.path.join(CWD, "{}/frr.conf".format(rname))
             )
-        router.load_config(
-            TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
-        )
 
     # Initialize all routers.
     tgen.start_router()