-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #17410 from opensourcerouting/fix/bgpd_ebgp_multih…
…op_set_unset BGP BFD session things
- Loading branch information
Showing
6 changed files
with
170 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| ! | ||
| interface r1-eth0 | ||
| ip address 10.0.0.1/24 | ||
| ! | ||
| router bgp 65000 | ||
| neighbor 192.168.1.2 remote-as auto | ||
| neighbor 192.168.1.2 bfd | ||
| neighbor 192.168.1.2 ebgp-multihop 10 | ||
| neighbor 192.168.1.2 update-source 10.0.0.1 | ||
| neighbor 192.168.1.3 remote-as auto | ||
| neighbor 192.168.1.3 bfd | ||
| neighbor 192.168.1.3 ebgp-multihop 20 | ||
| neighbor 192.168.1.3 update-source r1-eth0 | ||
| exit |
108 changes: 108 additions & 0 deletions
108
tests/topotests/bgp_bfd_session/test_bgp_bfd_session.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| #!/usr/bin/env python | ||
| # SPDX-License-Identifier: ISC | ||
|
|
||
| # | ||
| # Copyright (c) 2024 by | ||
| # Donatas Abraitis <[email protected]> | ||
| # | ||
|
|
||
| import os | ||
| import sys | ||
| import json | ||
| import pytest | ||
| import functools | ||
|
|
||
| CWD = os.path.dirname(os.path.realpath(__file__)) | ||
| sys.path.append(os.path.join(CWD, "../")) | ||
|
|
||
| # pylint: disable=C0413 | ||
| from lib import topotest | ||
| from lib.topogen import Topogen, get_topogen, TopoRouter | ||
| from lib.common_config import step | ||
|
|
||
| pytestmark = [pytest.mark.bgpd] | ||
|
|
||
|
|
||
| def build_topo(tgen): | ||
| r1 = tgen.add_router("r1") | ||
|
|
||
| switch = tgen.add_switch("s1") | ||
| switch.add_link(r1) | ||
|
|
||
|
|
||
| def setup_module(mod): | ||
| tgen = Topogen(build_topo, mod.__name__) | ||
| tgen.start_topology() | ||
|
|
||
| for _, (rname, router) in enumerate(tgen.routers().items(), 1): | ||
| router.load_frr_config( | ||
| os.path.join(CWD, "{}/frr.conf".format(rname)), | ||
| [ | ||
| (TopoRouter.RD_ZEBRA, None), | ||
| (TopoRouter.RD_MGMTD, None), | ||
| (TopoRouter.RD_BFD, None), | ||
| (TopoRouter.RD_BGP, None), | ||
| ], | ||
| ) | ||
|
|
||
| tgen.start_router() | ||
|
|
||
|
|
||
| def teardown_module(mod): | ||
| tgen = get_topogen() | ||
| tgen.stop_topology() | ||
|
|
||
|
|
||
| def test_bgp_bfd_session(): | ||
| tgen = get_topogen() | ||
|
|
||
| if tgen.routers_have_failure(): | ||
| pytest.skip(tgen.errors) | ||
|
|
||
| r1 = tgen.gears["r1"] | ||
|
|
||
| def _bfd_session(): | ||
| output = json.loads(r1.vtysh_cmd("show bfd peers json")) | ||
| expected = [ | ||
| { | ||
| "multihop": True, | ||
| "peer": "192.168.1.2", | ||
| "local": "10.0.0.1", | ||
| "vrf": "default", | ||
| "minimum-ttl": 246, | ||
| "status": "down", | ||
| "diagnostic": "ok", | ||
| "remote-diagnostic": "ok", | ||
| "type": "dynamic", | ||
| }, | ||
| { | ||
| "multihop": True, | ||
| "peer": "192.168.1.3", | ||
| "local": "10.0.0.1", | ||
| "vrf": "default", | ||
| "minimum-ttl": 236, | ||
| "status": "down", | ||
| "diagnostic": "ok", | ||
| "remote-diagnostic": "ok", | ||
| "type": "dynamic", | ||
| } | ||
| ] | ||
| return topotest.json_cmp(output, expected) | ||
|
|
||
| test_func = functools.partial(_bfd_session) | ||
| _, result = topotest.run_and_expect(test_func, None, count=30, wait=1) | ||
| assert result is None, "Can't see BFD session created" | ||
|
|
||
|
|
||
| def test_memory_leak(): | ||
| "Run the memory leak test and report results." | ||
| tgen = get_topogen() | ||
| if not tgen.is_memleak_enabled(): | ||
| pytest.skip("Memory leak test/report is disabled") | ||
|
|
||
| tgen.report_memory_leaks() | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| args = ["-s"] + sys.argv[1:] | ||
| sys.exit(pytest.main(args)) |