proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 15:33:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13704 from donaldsharp/flowspec_support_bundle

Browse Source
This commit is contained in:
David Lamparter 2023-06-12 18:47:55 +02:00 committed by GitHub
commit b8396c9cb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_network.c
View File

@ -810,8 +810,9 @@ int bgp_getsockname(struct peer *peer)
&peer->nexthop, peer)) { &peer->nexthop, peer)) {
flog_err( flog_err(
EC_BGP_NH_UPD, EC_BGP_NH_UPD,
"%s: nexthop_set failed, resetting connection - intf %s", "%s: nexthop_set failed, local: %pSUp remote: %pSUp update_if: %s resetting connection - intf %s",
peer->host, peer->host, peer->su_local, peer->su_remote,
peer->update_if ? peer->update_if : "(None)",
peer->nexthop.ifp ? peer->nexthop.ifp->name peer->nexthop.ifp ? peer->nexthop.ifp->name
: "(Unknown)"); : "(Unknown)");
return -1; return -1;

6
tests/topotests/bgp_flowspec/test_bgp_flowspec_topo.py
View File

@ -51,6 +51,7 @@ sys.path.append(os.path.join(CWD, "../"))
from lib import topotest from lib import topotest
from lib.topogen import Topogen, TopoRouter, get_topogen from lib.topogen import Topogen, TopoRouter, get_topogen
from lib.topolog import logger from lib.topolog import logger
from lib.common_config import generate_support_bundle
# Required to instantiate the topology builder class. # Required to instantiate the topology builder class.
@ -139,7 +140,9 @@ def test_bgp_convergence():
) )
_, res = topotest.run_and_expect(test_func, None, count=90, wait=0.5) _, res = topotest.run_and_expect(test_func, None, count=90, wait=0.5)
assertmsg = "BGP router network did not converge" assertmsg = "BGP router network did not converge"
assert res is None, assertmsg if res is not None:
generate_support_bundle()
assert res is None, assertmsg
def test_bgp_flowspec(): def test_bgp_flowspec():
@ -183,7 +186,6 @@ def test_bgp_flowspec():
if __name__ == "__main__": if __name__ == "__main__":
args = ["-s"] + sys.argv[1:] args = ["-s"] + sys.argv[1:]
ret = pytest.main(args) ret = pytest.main(args)