diff options
| author | Philippe Guibert <philippe.guibert@6wind.com> | 2024-12-19 17:28:21 +0100 |
|---|---|---|
| committer | Philippe Guibert <philippe.guibert@6wind.com> | 2025-01-21 13:48:36 +0100 |
| commit | d84b93f2872daeb1605ed09bbd9fb6fbbfa9b760 (patch) | |
| tree | 5531425b8c161d2c0d9b0d7d4f344ebbf9e97439 /tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py | |
| parent | topotests: bgp_evpn_rt5, configure route_distinguisher (diff) | |
| download | frr-d84b93f2872daeb1605ed09bbd9fb6fbbfa9b760.tar.xz frr-d84b93f2872daeb1605ed09bbd9fb6fbbfa9b760.zip | |
topotests: add unified configuration
Replace the various per-daemon config files with a unique frr.conf
configuration file.
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Diffstat (limited to 'tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py')
| -rw-r--r-- | tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py b/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py index 8570f4f8a..2b8355af0 100644 --- a/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py +++ b/tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py @@ -159,19 +159,13 @@ 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.use_netns_vrf() - 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))) else: - 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)) - ) + router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname))) # Initialize all routers. tgen.start_router() |