proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-24 17:52:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14955 from FRRouting/mergify/bp/stable/9.1/pr-14922

Browse Source 
staticd: fix changing to source auto in bfd monitor  (backport #14922)
This commit is contained in:
Donatas Abraitis 2023-12-06 22:11:44 +02:00 committed by GitHub
commit f9d62446c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staticd/static_nb_config.c
View File

@ -18,6 +18,7 @@
#include "static_vrf.h"
#include "static_routes.h"
#include "static_nb.h"
#include "static_zebra.h"
static int static_path_list_create(struct nb_cb_create_args *args)
@ -960,6 +961,17 @@ int route_next_hop_bfd_source_destroy(struct nb_cb_destroy_args *args)
sn = nb_running_get_entry(args->dnode, NULL, true);
static_next_hop_bfd_auto_source(sn);
/* NHT information are needed by BFD to automatically find the source
*
* Force zebra to resend the information to BFD by unregistering and
* registering again NHT. The (...)/frr-nexthops/nexthop northbound
* apply_finish function will trigger a call to static_install_nexthop()
* that does a call to static_zebra_nht_register(nh, true);
* static_zebra_nht_register(sn, false);
*/
static_zebra_nht_register(sn, false);
return NB_OK;
}

111
tests/topotests/bfd_topo3/test_bfd_topo3.py
View File

@ -65,6 +65,41 @@ def setup_module(mod):
tgen.start_router()
def expect_static_bfd_output(router, filename):
"Load JSON file and compare with 'show bfd peer json'"
tgen = get_topogen()
logger.info("waiting BFD configuration on router {}".format(router))
bfd_config = json.loads(open("{}/{}/{}.json".format(CWD, router, filename)).read())
test_func = partial(
topotest.router_json_cmp,
tgen.gears[router],
"show bfd static route json",
bfd_config,
)
_, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
assertmsg = '"{}" BFD static route status failure'.format(router)
assert result is None, assertmsg
def expect_route_missing(router, iptype, route):
"Wait until route is present on RIB for protocol."
tgen = get_topogen()
logger.info("waiting route {} to disapear in {}".format(route, router))
test_func = partial(
topotest.router_json_cmp,
tgen.gears[router],
"show {} route json".format(iptype),
{route: None},
)
rv, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
assertmsg = '"{}" convergence failure'.format(router)
assert result is None, assertmsg
def test_wait_bgp_convergence():
"Wait for BGP to converge"
tgen = get_topogen()
@ -166,7 +201,7 @@ def test_wait_bfd_convergence():
expect_bfd_configuration("r6")
def test_static_route_monitoring():
def test_static_route_monitoring_convergence():
"Test static route monitoring output."
tgen = get_topogen()
if tgen.routers_have_failure():
@ -174,31 +209,47 @@ def test_static_route_monitoring():
logger.info("test BFD static route status")
def expect_static_bfd_output(router, filename):
"Load JSON file and compare with 'show bfd peer json'"
logger.info("waiting BFD configuration on router {}".format(router))
bfd_config = json.loads(
open("{}/{}/{}.json".format(CWD, router, filename)).read()
)
test_func = partial(
topotest.router_json_cmp,
tgen.gears[router],
"show bfd static route json",
bfd_config,
)
_, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
assertmsg = '"{}" BFD static route status failure'.format(router)
assert result is None, assertmsg
expect_static_bfd_output("r3", "bfd-static")
expect_static_bfd_output("r6", "bfd-static")
logger.info("Setting r4 link down ...")
tgen.gears["r4"].link_enable("r4-eth0", False)
def test_static_route_monitoring_wrong_source():
"Test that static monitoring fails if setting a wrong source."
expect_static_bfd_output("r3", "bfd-static-down")
expect_static_bfd_output("r6", "bfd-static-down")
tgen = get_topogen()
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
logger.info("test route wrong ")
tgen.gears["r3"].vtysh_cmd(
"""
configure
ipv6 route 2001:db8:5::/64 2001:db8:4::3 bfd multi-hop source 2001:db8:4::2 profile slow-tx
"""
)
expect_route_missing("r3", "ipv6", "2001:db8:5::/64")
def test_static_route_monitoring_unset_source():
"Test that static monitoring fails if setting a wrong source."
tgen = get_topogen()
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
logger.info("test route wrong ")
tgen.gears["r3"].vtysh_cmd(
"""
configure
ipv6 route 2001:db8:5::/64 2001:db8:4::3 bfd multi-hop profile slow-tx
"""
)
expect_static_bfd_output("r3", "bfd-static")
expect_static_bfd_output("r6", "bfd-static")
def test_expect_static_rib_removal():
@ -208,18 +259,12 @@ def test_expect_static_rib_removal():
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
def expect_route_missing(router, iptype, route):
"Wait until route is present on RIB for protocol."
logger.info("waiting route {} to disapear in {}".format(route, router))
test_func = partial(
topotest.router_json_cmp,
tgen.gears[router],
"show {} route json".format(iptype),
{route: None},
)
rv, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
assertmsg = '"{}" convergence failure'.format(router)
assert result is None, assertmsg
logger.info("Setting r4 link down ...")
tgen.gears["r4"].link_enable("r4-eth0", False)
expect_static_bfd_output("r3", "bfd-static-down")
expect_static_bfd_output("r6", "bfd-static-down")
expect_route_missing("r1", "ip", "10.254.254.5/32")
expect_route_missing("r2", "ip", "10.254.254.5/32")