diff options
| -rw-r--r-- | bgpd/bgp_bfd.c | 6 | ||||
| -rwxr-xr-x | tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py | 16 |
2 files changed, 4 insertions, 18 deletions
diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c index a200589bd3..1be7eff560 100644 --- a/bgpd/bgp_bfd.c +++ b/bgpd/bgp_bfd.c @@ -207,15 +207,9 @@ static void bgp_bfd_update_peer(struct peer *peer) */ void bgp_bfd_reset_peer(struct peer *peer) { - struct bfd_info *bfd_info; - if (!peer->bfd_info) return; - bfd_info = (struct bfd_info *)peer->bfd_info; - /* if status is not down, reset bfd */ - if (bfd_info->status != BFD_STATUS_DOWN) - bgp_bfd_peer_sendmsg(peer, ZEBRA_BFD_DEST_DEREGISTER); bgp_bfd_peer_sendmsg(peer, ZEBRA_BFD_DEST_REGISTER); } diff --git a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py b/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py index eb4f0d4a83..b1f755ad06 100755 --- a/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py +++ b/tests/topotests/bfd-vrf-topo1/test_bfd_vrf_topo1.py @@ -129,14 +129,6 @@ def setup_module(mod): # Initialize all routers. tgen.start_router() - # Verify that we are using the proper version and that the BFD - # daemon exists. - for router in router_list.values(): - # Check for Version - if router.has_version("<", "5.1"): - tgen.set_error("Unsupported FRR version") - break - def teardown_module(_mod): "Teardown the pytest environment" @@ -176,7 +168,7 @@ def test_bfd_connection(): test_func = partial( topotest.router_json_cmp, router, "show bfd peers json", expected ) - _, result = topotest.run_and_expect(test_func, None, count=8, wait=0.5) + _, result = topotest.run_and_expect(test_func, None, count=16, wait=1) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert result is None, assertmsg @@ -220,7 +212,7 @@ def test_bgp_fast_convergence(): "show ip bgp vrf {}-cust1 json".format(router.name), expected, ) - _, res = topotest.run_and_expect(test_func, None, count=40, wait=0.5) + _, res = topotest.run_and_expect(test_func, None, count=40, wait=1) assertmsg = "{}: bgp did not converge".format(router.name) assert res is None, assertmsg @@ -262,7 +254,7 @@ def test_bfd_fast_convergence(): test_func = partial( topotest.router_json_cmp, router, "show bfd peers json", expected ) - _, res = topotest.run_and_expect(test_func, None, count=20, wait=0.5) + _, res = topotest.run_and_expect(test_func, None, count=40, wait=1) assertmsg = '"{}" JSON output mismatches'.format(router.name) assert res is None, assertmsg @@ -295,7 +287,7 @@ def test_bgp_fast_reconvergence(): "show ip bgp vrf {}-cust1 json".format(router.name), expected, ) - _, res = topotest.run_and_expect(test_func, None, count=3, wait=1) + _, res = topotest.run_and_expect(test_func, None, count=16, wait=1) assertmsg = "{}: bgp did not converge".format(router.name) assert res is None, assertmsg |