diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-10-11 12:10:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 12:10:43 +0300 |
| commit | 346e7d61d64c2247d7766a9efdac55a4e4dc3452 (patch) | |
| tree | 8d7cf7bc415d478e095ca0be4b2c6a50e276e171 | |
| parent | 005a4210c06c2c17806009c341529dce09e14897 (diff) | |
| parent | b1f45089f7e60f2e986922c54fa386ba67dacc81 (diff) | |
Merge pull request #9786 from FRRouting/mergify/bp/dev/8.1/pr-9774
bgpd: fix crash when using "show bgp vrf all" (backport #9774)
| -rw-r--r-- | bgpd/bgpd.c | 3 | ||||
| -rw-r--r-- | tests/topotests/all_protocol_startup/test_all_protocol_startup.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 925af80cb7..57083440b1 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -7883,8 +7883,7 @@ struct peer *peer_lookup_in_view(struct vty *vty, struct bgp *bgp, json_no, JSON_C_TO_STRING_PRETTY)); json_object_free(json_no); } else - vty_out(vty, "No such neighbor in %s\n", - bgp->name_pretty); + vty_out(vty, "No such neighbor in this view/vrf\n"); return NULL; } diff --git a/tests/topotests/all_protocol_startup/test_all_protocol_startup.py b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py index 1b99fcea1f..ddb7f4e16e 100644 --- a/tests/topotests/all_protocol_startup/test_all_protocol_startup.py +++ b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py @@ -966,7 +966,7 @@ def test_bgp_summary(): r"(192.168.7.(1|2)0|fc00:0:0:8::2000).+Active.+", "", expected ) elif "10.0.0.1" in arguments: - expected = "No such neighbor in VRF default" + expected = "No such neighbor in this view/vrf" if "terse" in arguments: expected = re.sub(r"BGP table version .+", "", expected) |