Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bgpd: Fix bgp core with a possible Intf delete (backport #17624) #17625

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 11, 2024

Although trigger unknown, based on the backtrace in one of the internal testing, we do see some delete in the Intf where we can have the peer ifp pointer null and we try to dereference it while trying to install the route leading to a crash

Skip updating the ifindex in such cases and since the nexthop is not properly updated, BGP skips sending it to zebra.

BackTrace:

0  0x00007faef05e7ebc in ?? () from /lib/x86_64-linux-gnu/libc.so.6 1  0x00007faef0598fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6 2  0x00007faef09900dc in core_handler (signo=11, siginfo=0x7ffdde8cb4b0, context=<optimized out>) at lib/sigevent.c:274 3  <signal handler called>
4  0x00005560aad4b7d8 in update_ipv6nh_for_route_install (api_nh=0x7ffdde8cbe94, is_evpn=false, best_pi=0x5560b21187d0, pi=0x5560b21187d0, ifindex=0, nexthop=0x5560b03cb0dc,
   nh_bgp=0x5560ace04df0, nh_othervrf=0) at bgpd/bgp_zebra.c:1273
5  bgp_zebra_announce_actual (dest=dest@entry=0x5560afcfa950, info=0x5560b21187d0, bgp=0x5560ace04df0) at bgpd/bgp_zebra.c:1521 6  0x00005560aad4bc85 in bgp_handle_route_announcements_to_zebra (e=<optimized out>) at bgpd/bgp_zebra.c:1896 7  0x00007faef09a1c0d in thread_call (thread=thread@entry=0x7ffdde8d7580) at lib/thread.c:2008 8  0x00007faef095a598 in frr_run (master=0x5560ac7e5190) at lib/libfrr.c:1223 9  0x00005560aac65db6 in main (argc=<optimized out>, argv=<optimized out>) at bgpd/bgp_main.c:557

(gdb) f 4
4  0x00005560aad4b7d8 in update_ipv6nh_for_route_install (api_nh=0x7ffdde8cbe94, is_evpn=false, best_pi=0x5560b21187d0, pi=0x5560b21187d0, ifindex=0, nexthop=0x5560b03cb0dc,
    nh_bgp=0x5560ace04df0, nh_othervrf=0) at bgpd/bgp_zebra.c:1273
1273	in bgpd/bgp_zebra.c
(gdb) p pi->peer->ifp
$26 = (struct interface *) 0x0

Ticket :#4203904


This is an automatic backport of pull request #17624 done by Mergify.

Although trigger unknown, based on the backtrace in one of the internal
testing, we do see some delete in the Intf where we can have the peer
ifp pointer null and we try to dereference it while trying to install
the route leading to a crash

Skip updating the ifindex in such cases and since the nexthop is not
properly updated, BGP skips sending it to zebra.

BackTrace:
0  0x00007faef05e7ebc in ?? () from /lib/x86_64-linux-gnu/libc.so.6
1  0x00007faef0598fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6
2  0x00007faef09900dc in core_handler (signo=11, siginfo=0x7ffdde8cb4b0, context=<optimized out>) at lib/sigevent.c:274
3  <signal handler called>
4  0x00005560aad4b7d8 in update_ipv6nh_for_route_install (api_nh=0x7ffdde8cbe94, is_evpn=false, best_pi=0x5560b21187d0, pi=0x5560b21187d0, ifindex=0, nexthop=0x5560b03cb0dc,
   nh_bgp=0x5560ace04df0, nh_othervrf=0) at bgpd/bgp_zebra.c:1273
5  bgp_zebra_announce_actual (dest=dest@entry=0x5560afcfa950, info=0x5560b21187d0, bgp=0x5560ace04df0) at bgpd/bgp_zebra.c:1521
6  0x00005560aad4bc85 in bgp_handle_route_announcements_to_zebra (e=<optimized out>) at bgpd/bgp_zebra.c:1896
7  0x00007faef09a1c0d in thread_call (thread=thread@entry=0x7ffdde8d7580) at lib/thread.c:2008
8  0x00007faef095a598 in frr_run (master=0x5560ac7e5190) at lib/libfrr.c:1223
9  0x00005560aac65db6 in main (argc=<optimized out>, argv=<optimized out>) at bgpd/bgp_main.c:557

(gdb) f 4
4  0x00005560aad4b7d8 in update_ipv6nh_for_route_install (api_nh=0x7ffdde8cbe94, is_evpn=false, best_pi=0x5560b21187d0, pi=0x5560b21187d0, ifindex=0, nexthop=0x5560b03cb0dc,
    nh_bgp=0x5560ace04df0, nh_othervrf=0) at bgpd/bgp_zebra.c:1273
1273	in bgpd/bgp_zebra.c
(gdb) p pi->peer->ifp
$26 = (struct interface *) 0x0

Ticket :#4203904

Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
(cherry picked from commit 9b0b928)

# Conflicts:
#	bfdd/bfd.c
#	bfdd/bfd.h
#	bfdd/bfdd_cli.c
#	bgpd/bgp_aspath.c
#	bgpd/bgp_aspath.h
#	bgpd/bgp_attr.c
#	bgpd/bgp_attr.h
#	bgpd/bgp_bfd.c
#	bgpd/bgp_bmp.c
#	bgpd/bgp_bmp.h
#	bgpd/bgp_clist.c
#	bgpd/bgp_community_alias.c
#	bgpd/bgp_community_alias.h
#	bgpd/bgp_conditional_adv.c
#	bgpd/bgp_debug.c
#	bgpd/bgp_ecommunity.c
#	bgpd/bgp_ecommunity.h
#	bgpd/bgp_evpn.c
#	bgpd/bgp_fsm.c
#	bgpd/bgp_fsm.h
#	bgpd/bgp_io.c
#	bgpd/bgp_mplsvpn.c
#	bgpd/bgp_network.c
#	bgpd/bgp_network.h
#	bgpd/bgp_nexthop.c
#	bgpd/bgp_nexthop.h
#	bgpd/bgp_nht.c
#	bgpd/bgp_packet.c
#	bgpd/bgp_packet.h
#	bgpd/bgp_route.c
#	bgpd/bgp_route.h
#	bgpd/bgp_routemap.c
#	bgpd/bgp_routemap_nb.c
#	bgpd/bgp_routemap_nb.h
#	bgpd/bgp_routemap_nb_config.c
#	bgpd/bgp_updgrp.c
#	bgpd/bgp_updgrp_adv.c
#	bgpd/bgp_vty.c
#	bgpd/bgp_zebra.c
#	bgpd/bgpd.c
#	bgpd/bgpd.h
#	bgpd/rfapi/bgp_rfapi_cfg.c
#	bgpd/rfapi/rfapi.c
#	bgpd/rfapi/rfapi_vty.c
#	bgpd/rfapi/vnc_export_bgp.c
#	configure.ac
#	debian/changelog
#	debian/control
#	debian/rules
#	doc/developer/topotests.rst
#	doc/user/about.rst
#	doc/user/bfd.rst
#	doc/user/bgp.rst
#	doc/user/evpn.rst
#	doc/user/filter.rst
#	doc/user/ospfd.rst
#	doc/user/pim.rst
#	doc/user/pimv6.rst
#	doc/user/routemap.rst
#	doc/user/vrrp.rst
#	doc/user/zebra.rst
#	docker/ubuntu-ci/Dockerfile
#	fpm/fpm.h
#	isisd/isis_circuit.c
#	isisd/isis_lsp.c
#	isisd/isis_pdu.c
#	isisd/isis_route.h
#	isisd/isis_spf.c
#	isisd/isis_tlvs.c
#	isisd/isis_vty_fabricd.c
#	isisd/isisd.c
#	ldpd/ldpe.c
#	lib/command.h
#	lib/csv.c
#	lib/defun_lex.l
#	lib/event.c
#	lib/frrevent.h
#	lib/if.c
#	lib/if.h
#	lib/libfrr.c
#	lib/libospf.h
#	lib/log.c
#	lib/memory.c
#	lib/memory.h
#	lib/netns_linux.c
#	lib/nexthop.c
#	lib/nexthop.h
#	lib/ntop.c
#	lib/ptm_lib.c
#	lib/routemap.c
#	lib/routemap.h
#	lib/routemap_cli.c
#	lib/routemap_northbound.c
#	lib/sigevent.c
#	lib/sockunion.c
#	lib/sockunion.h
#	lib/table.c
#	lib/table.h
#	lib/wheel.c
#	lib/wheel.h
#	lib/zclient.c
#	lib/zclient.h
#	lib/zlog_5424_cli.c
#	nhrpd/nhrp_vty.c
#	ospf6d/ospf6_intra.c
#	ospfd/ospf_lsa.c
#	ospfd/ospf_lsa.h
#	ospfd/ospf_opaque.c
#	ospfd/ospf_sr.c
#	ospfd/ospf_vty.c
#	pimd/pim6_cmd.c
#	pimd/pim6_cmd.h
#	pimd/pim6_mld.c
#	pimd/pim_autorp.c
#	pimd/pim_autorp.h
#	pimd/pim_bsm.c
#	pimd/pim_bsm.h
#	pimd/pim_bsr_rpdb.c
#	pimd/pim_cmd.c
#	pimd/pim_cmd_common.c
#	pimd/pim_cmd_common.h
#	pimd/pim_iface.c
#	pimd/pim_iface.h
#	pimd/pim_ifchannel.c
#	pimd/pim_igmp.c
#	pimd/pim_igmpv2.c
#	pimd/pim_igmpv3.c
#	pimd/pim_instance.c
#	pimd/pim_instance.h
#	pimd/pim_join.c
#	pimd/pim_mroute.c
#	pimd/pim_msdp.c
#	pimd/pim_msdp.h
#	pimd/pim_msdp_packet.c
#	pimd/pim_msdp_socket.c
#	pimd/pim_nb.c
#	pimd/pim_nb.h
#	pimd/pim_nb_config.c
#	pimd/pim_rp.c
#	pimd/pim_rp.h
#	pimd/pim_tib.c
#	pimd/pim_util.c
#	pimd/pim_util.h
#	pimd/pim_vty.c
#	pimd/pim_zlookup.c
#	pimd/pimd.c
#	python/makefile.py
#	python/xref2vtysh.py
#	redhat/frr.spec.in
#	ripd/ripd.c
#	sharpd/sharp_vty.c
#	staticd/static_zebra.c
#	tests/helpers/c/prng.c
#	tests/isisd/test_fuzz_isis_tlv.c
#	tests/isisd/test_fuzz_isis_tlv_tests.h.gz
#	tests/isisd/test_isis_spf.c
#	tests/lib/cli/common_cli.c
#	tests/lib/northbound/test_oper_data.c
#	tests/lib/test_frrlua.c
#	tests/lib/test_frrscript.c
#	tests/lib/test_typelist.c
#	tests/lib/test_zmq.c
#	tests/topotests/Dockerfile
#	tests/topotests/all_protocol_startup/r1/show_route_map.ref
#	tests/topotests/all_protocol_startup/test_all_protocol_startup.py
#	tests/topotests/bfd_isis_topo1/rt1/step1/show_ipv6_route.ref
#	tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_healthy.ref
#	tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
#	tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
#	tests/topotests/bfd_isis_topo1/rt1/zebra.conf
#	tests/topotests/bfd_isis_topo1/rt2/zebra.conf
#	tests/topotests/bfd_isis_topo1/rt3/zebra.conf
#	tests/topotests/bfd_isis_topo1/rt4/zebra.conf
#	tests/topotests/bfd_isis_topo1/rt5/zebra.conf
#	tests/topotests/bfd_ospf_topo1/rt1/step1/show_ipv6_route.ref
#	tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_healthy.ref
#	tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
#	tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
#	tests/topotests/bfd_ospf_topo1/rt1/zebra.conf
#	tests/topotests/bfd_ospf_topo1/rt2/zebra.conf
#	tests/topotests/bfd_ospf_topo1/rt3/zebra.conf
#	tests/topotests/bfd_ospf_topo1/rt4/zebra.conf
#	tests/topotests/bfd_ospf_topo1/rt5/zebra.conf
#	tests/topotests/bfd_profiles_topo1/r2/bgpd.conf
#	tests/topotests/bfd_profiles_topo1/r3/bgpd.conf
#	tests/topotests/bfd_profiles_topo1/r4/bgpd.conf
#	tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf
#	tests/topotests/bgp_aggregate_address_topo1/r2/bgpd.conf
#	tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
#	tests/topotests/bgp_aigp/r1/bgpd.conf
#	tests/topotests/bgp_aigp/r1/zebra.conf
#	tests/topotests/bgp_aigp/test_bgp_aigp.py
#	tests/topotests/bgp_as_override/test_bgp_as_override.py
#	tests/topotests/bgp_aspath_zero/r1/bgpd.conf
#	tests/topotests/bgp_color_extcommunities/r1/bgpd.conf
#	tests/topotests/bgp_color_extcommunities/test_bgp_color_extcommunities.py
#	tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
#	tests/topotests/bgp_evpn_rt5/r2/bgpd.conf
#	tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
#	tests/topotests/bgp_extended_link_bandwidth/r1/frr.conf
#	tests/topotests/bgp_extended_link_bandwidth/r2/frr.conf
#	tests/topotests/bgp_extended_link_bandwidth/test_bgp_extended_link_bandwidth.py
#	tests/topotests/bgp_flowspec/r1/bgpd.conf
#	tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py
#	tests/topotests/bgp_lu_topo1/R3/bgpd.conf
#	tests/topotests/bgp_lu_topo1/R3/zebra.conf
#	tests/topotests/bgp_lu_topo2/R3/bgpd.conf
#	tests/topotests/bgp_lu_topo2/R3/staticd.conf
#	tests/topotests/bgp_lu_topo2/R3/zebra.conf
#	tests/topotests/bgp_match_peer/r1/frr.conf
#	tests/topotests/bgp_match_peer/test_bgp_match_peer.py
#	tests/topotests/bgp_max_med_on_startup/r1/bgpd.conf
#	tests/topotests/bgp_max_med_on_startup/test_bgp_max_med_on_startup.py
#	tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
#	tests/topotests/bgp_nexthop_ipv6/r1/bgpd.conf
#	tests/topotests/bgp_nexthop_ipv6/r1/show_bgp_ipv6_step1.json
#	tests/topotests/bgp_nexthop_ipv6/r2/bgpd.conf
#	tests/topotests/bgp_nexthop_ipv6/r2/show_bgp_ipv6_step1.json
#	tests/topotests/bgp_nexthop_ipv6/r4/bgpd.conf
#	tests/topotests/bgp_nexthop_ipv6/r4/show_bgp_ipv6_step2.json
#	tests/topotests/bgp_nexthop_ipv6/r5/bgpd.conf
#	tests/topotests/bgp_nexthop_ipv6/r5/show_bgp_ipv6_step1.json
#	tests/topotests/bgp_nexthop_ipv6/r5/show_bgp_ipv6_step2.json
#	tests/topotests/bgp_nexthop_ipv6/r6/bgpd.conf
#	tests/topotests/bgp_nexthop_ipv6/r6/show_bgp_ipv6_step1.json
#	tests/topotests/bgp_nexthop_ipv6/rr/bgpd.conf
#	tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py
#	tests/topotests/bgp_path_attribute_discard/r1/frr.conf
#	tests/topotests/bgp_path_attribute_discard/r2/frr.conf
#	tests/topotests/bgp_peer_group/r1/frr.conf
#	tests/topotests/bgp_peer_group/test_bgp_peer-group.py
#	tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
#	tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
#	tests/topotests/bgp_prefix_sid/r1/bgpd.conf
#	tests/topotests/bgp_prefix_sid2/r1/bgpd.conf
#	tests/topotests/bgp_route_server_client/r1/bgpd.conf
#	tests/topotests/bgp_route_server_client/r2/bgpd.conf
#	tests/topotests/bgp_route_server_client/r3/bgpd.conf
#	tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py
#	tests/topotests/bgp_rpki_topo1/r2/bgpd.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
#	tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
#	tests/topotests/bgp_vpnv4_asbr/test_bgp_vpnv4_asbr.py
#	tests/topotests/bgp_vpnv4_per_nexthop_label/test_bgp_vpnv4_per_nexthop_label.py
#	tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py
#	tests/topotests/bgp_vrf_netns/r1/bgpd.conf
#	tests/topotests/conftest.py
#	tests/topotests/docker/README.md
#	tests/topotests/docker/build.sh
#	tests/topotests/docker/frr-topotests.sh
#	tests/topotests/docker/inner/compile_frr.sh
#	tests/topotests/docker/inner/entrypoint.sh
#	tests/topotests/isis_topo1/test_isis_topo1.py
#	tests/topotests/lib/bgp.py
#	tests/topotests/lib/bmp_collector/bgp/update/path_attributes.py
#	tests/topotests/lib/bmp_collector/bmp.py
#	tests/topotests/lib/pim.py
#	tests/topotests/lib/snmptest.py
#	tests/topotests/lib/topogen.py
#	tests/topotests/lib/topotest.py
#	tests/topotests/msdp_topo1/r1/pimd.conf
#	tests/topotests/msdp_topo1/test_msdp_topo1.py
#	tests/topotests/ospf_instance_redistribute/test_ospf_instance_redistribute.py
#	tests/topotests/ospf_metric_propagation/h1/frr.conf
#	tests/topotests/ospf_metric_propagation/h2/frr.conf
#	tests/topotests/ospf_metric_propagation/r1/frr.conf
#	tests/topotests/ospf_metric_propagation/r2/frr.conf
#	tests/topotests/ospf_metric_propagation/r3/frr.conf
#	tests/topotests/ospf_metric_propagation/r4/frr.conf
#	tests/topotests/ospf_metric_propagation/ra/frr.conf
#	tests/topotests/ospf_metric_propagation/rb/frr.conf
#	tests/topotests/ospf_metric_propagation/rc/frr.conf
#	tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf
#	tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf
#	tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf
#	tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf
#	tests/topotests/ospf_netns_vrf/r1/ospfd.conf
#	tests/topotests/ospf_netns_vrf/r1/zebra.conf
#	tests/topotests/ospf_netns_vrf/r2/ospfd.conf
#	tests/topotests/ospf_netns_vrf/r2/zebra.conf
#	tests/topotests/ospf_netns_vrf/r3/ospfd.conf
#	tests/topotests/ospf_netns_vrf/r3/zebra.conf
#	tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
#	tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
#	tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
#	tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
#	tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
#	tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
#	tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
#	tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
#	tests/topotests/ospf_prefix_suppression/r1/frr.conf
#	tests/topotests/ospf_prefix_suppression/r2/frr.conf
#	tests/topotests/ospf_prefix_suppression/r3/frr.conf
#	tests/topotests/ospfapi/test_ospf_clientapi.py
#	tests/topotests/pim_autorp/r1/frr.conf
#	tests/topotests/pim_autorp/r2/frr.conf
#	tests/topotests/pim_autorp/test_pim_autorp.py
#	tests/topotests/pim_basic/test_pim.py
#	tests/topotests/pim_cand_rp_bsr/r1/frr.conf
#	tests/topotests/pim_cand_rp_bsr/r2/frr.conf
#	tests/topotests/pim_cand_rp_bsr/r3/frr.conf
#	tests/topotests/pim_cand_rp_bsr/r4/frr.conf
#	tests/topotests/pim_cand_rp_bsr/r5/frr.conf
#	tests/topotests/pim_cand_rp_bsr/r6/frr.conf
#	tests/topotests/pytest.ini
#	tests/topotests/simple_snmp_test/r1/bgpd.conf
#	tests/topotests/simple_snmp_test/r1/isisd.conf
#	tests/topotests/simple_snmp_test/r1/zebra.conf
#	tests/topotests/simple_snmp_test/test_simple_snmp.py
#	tests/topotests/zebra_fec_nexthop_resolution/r1/bgpd.conf
#	tests/topotests/zebra_fec_nexthop_resolution/r2/bgpd.conf
#	tests/topotests/zebra_fec_nexthop_resolution/r3/bgpd.conf
#	tests/topotests/zebra_fec_nexthop_resolution/r4/bgpd.conf
#	tests/topotests/zebra_fec_nexthop_resolution/r5/bgpd.conf
#	tests/topotests/zebra_fec_nexthop_resolution/r7/bgpd.conf
#	tests/topotests/zebra_fec_nexthop_resolution/test_zebra_fec_nexthop_resolution.py
#	tests/topotests/zebra_rib/r1/sharp_rmap.ref
#	tests/topotests/zebra_rib/r1/static_rmap.ref
#	tests/topotests/zebra_rib/test_zebra_rib.py
#	tools/etc/frr/support_bundle_commands.conf
#	tools/frr-reload.py
#	tools/frr_babeltrace.py
#	tools/gcc-plugins/frr-format.c
#	tools/start-stop-daemon.c
#	tools/subdir.am
#	vtysh/vtysh.c
#	vtysh/vtysh_main.c
#	yang/frr-bfdd.yang
#	yang/frr-bgp-route-map.yang
#	yang/frr-pim-rp.yang
#	yang/frr-pim.yang
#	yang/frr-route-map.yang
#	zebra/connected.c
#	zebra/debug.c
#	zebra/debug.h
#	zebra/dpdk/zebra_dplane_dpdk.c
#	zebra/dplane_fpm_nl.c
#	zebra/if_netlink.c
#	zebra/interface.c
#	zebra/interface.h
#	zebra/ioctl.c
#	zebra/ipforward_proc.c
#	zebra/kernel_netlink.c
#	zebra/kernel_socket.c
#	zebra/main.c
#	zebra/redistribute.c
#	zebra/redistribute.h
#	zebra/rt_netlink.c
#	zebra/table_manager.h
#	zebra/zapi_msg.c
#	zebra/zebra_cli.c
#	zebra/zebra_dplane.c
#	zebra/zebra_dplane.h
#	zebra/zebra_evpn.c
#	zebra/zebra_evpn.h
#	zebra/zebra_l2.h
#	zebra/zebra_mpls.c
#	zebra/zebra_nb_state.c
#	zebra/zebra_netns_id.c
#	zebra/zebra_netns_notify.c
#	zebra/zebra_ns.c
#	zebra/zebra_ns.h
#	zebra/zebra_rib.c
#	zebra/zebra_rnh.c
#	zebra/zebra_routemap.c
#	zebra/zebra_routemap.h
#	zebra/zebra_router.h
#	zebra/zebra_script.c
#	zebra/zebra_srte.c
#	zebra/zebra_srv6.c
#	zebra/zebra_vrf.c
#	zebra/zebra_vty.c
#	zebra/zebra_vxlan.c
#	zebra/zebra_vxlan.h
#	zebra/zebra_vxlan_if.c
#	zebra/zserv.c
#	zebra/zserv.h
@mergify mergify bot added the conflicts label Dec 11, 2024
Copy link
Author

mergify bot commented Dec 11, 2024

Cherry-pick of 9b0b928 has failed:

On branch mergify/bp/stable/10.2/pr-17624
Your branch is up to date with 'origin/stable/10.2'.

You are currently cherry-picking commit 9b0b9282d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   doc/accords/frr-name-use
	new file:   tests/topotests/bgp_aigp/r8/bgpd.conf
	new file:   tests/topotests/bgp_aigp/r8/zebra.conf
	new file:   tests/topotests/bgp_bfd_session/__init__.py
	new file:   tests/topotests/bgp_bfd_session/r1/frr.conf
	new file:   tests/topotests/bgp_bfd_session/test_bgp_bfd_session.py
	new file:   tests/topotests/bgp_bmp/bgpbmp.py
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-update-loc-rib-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-update-loc-rib-step2.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-update-post-policy-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-update-post-policy-step2.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-update-pre-policy-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-update-pre-policy-step2.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-withdraw-loc-rib-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-withdraw-loc-rib-step2.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-withdraw-post-policy-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-withdraw-post-policy-step2.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-withdraw-pre-policy-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1/bmp-withdraw-pre-policy-step2.json
	new file:   tests/topotests/bgp_bmp/bmp1vrf/bmp-update-loc-rib-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1vrf/bmp-update-post-policy-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1vrf/bmp-update-pre-policy-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1vrf/bmp-withdraw-loc-rib-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1vrf/bmp-withdraw-post-policy-step1.json
	new file:   tests/topotests/bgp_bmp/bmp1vrf/bmp-withdraw-pre-policy-step1.json
	new file:   tests/topotests/bgp_bmp/r1/frr.conf
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv4-update-step1.json
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv4-update-step2.json
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv4-withdraw-step1.json
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv4-withdraw-step2.json
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv6-update-step1.json
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv6-update-step2.json
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv6-withdraw-step1.json
	new file:   tests/topotests/bgp_bmp/r1/show-bgp-ipv6-withdraw-step2.json
	new file:   tests/topotests/bgp_bmp/r1vrf/frr.conf
	new file:   tests/topotests/bgp_bmp/r1vrf/show-bgp-ipv4-update-step1.json
	new file:   tests/topotests/bgp_bmp/r1vrf/show-bgp-ipv4-withdraw-step1.json
	new file:   tests/topotests/bgp_bmp/r1vrf/show-bgp-ipv6-update-step1.json
	new file:   tests/topotests/bgp_bmp/r1vrf/show-bgp-ipv6-withdraw-step1.json
	new file:   tests/topotests/bgp_bmp/r2/frr.conf
	new file:   tests/topotests/bgp_bmp/r2vrf/frr.conf
	new file:   tests/topotests/bgp_bmp/test_bgp_bmp_1.py
	new file:   tests/topotests/bgp_bmp/test_bgp_bmp_2.py
	new file:   tests/topotests/bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes.json
	new file:   tests/topotests/bgp_evpn_rt5/r1/bgp_l2vpn_evpn_routes_all.json
	new file:   tests/topotests/bgp_evpn_rt5/r2/bgp_l2vpn_evpn_routes.json
	new file:   tests/topotests/bgp_extended_link_bandwidth/r3/frr.conf
	new file:   tests/topotests/bgp_extended_link_bandwidth/r4/frr.conf
	new file:   tests/topotests/bgp_invalid_nexthop/__init__.py
	new file:   tests/topotests/bgp_invalid_nexthop/exabgp.env
	new file:   tests/topotests/bgp_invalid_nexthop/peer1/exabgp.cfg
	new file:   tests/topotests/bgp_invalid_nexthop/r1/frr.conf
	new file:   tests/topotests/bgp_invalid_nexthop/test_bgp_invalid_nexthop.py
	new file:   tests/topotests/bgp_peer_group/r4/frr.conf
	new file:   tests/topotests/bgp_route_server_client/exabgp.env
	new file:   tests/topotests/bgp_route_server_client/r1/show_bgp_ipv6_step1.json
	new file:   tests/topotests/bgp_route_server_client/r1/show_bgp_ipv6_step2.json
	new file:   tests/topotests/bgp_route_server_client/r2/show_bgp_ipv6_step1.json
	new file:   tests/topotests/bgp_route_server_client/r2/show_bgp_ipv6_step2.json
	new file:   tests/topotests/bgp_route_server_client/r2/show_bgp_ipv6_summary.json
	new file:   tests/topotests/bgp_route_server_client/r3/show_bgp_ipv6_step1.json
	new file:   tests/topotests/bgp_route_server_client/r3/show_bgp_ipv6_step2.json
	new file:   tests/topotests/bgp_route_server_client/r4/bgpd.conf
	new file:   tests/topotests/bgp_route_server_client/r4/show_bgp_ipv6_step1.json
	new file:   tests/topotests/bgp_route_server_client/r4/show_bgp_ipv6_step2.json
	new file:   tests/topotests/bgp_route_server_client/r4/zebra.conf
	new file:   tests/topotests/bgp_route_server_client/r5/exabgp.cfg
	new file:   tests/topotests/bgp_set_metric_igp/__init__.py
	new file:   tests/topotests/bgp_set_metric_igp/r1/frr.conf
	new file:   tests/topotests/bgp_set_metric_igp/r2/frr.conf
	new file:   tests/topotests/bgp_set_metric_igp/r3/frr.conf
	new file:   tests/topotests/bgp_set_metric_igp/r4/frr.conf
	new file:   tests/topotests/bgp_set_metric_igp/r5/frr.conf
	new file:   tests/topotests/bgp_set_metric_igp/test_bgp_set_metric_igp.py
	new file:   tests/topotests/bgp_vpnv4_route_leak_basic/r1/frr.conf
	new file:   tests/topotests/bgp_vpnv4_route_leak_basic/setup_vrfs
	new file:   tests/topotests/bgp_vpnv4_route_leak_basic/test_bgp_vpnv4_route_leak_basic.py
	new file:   tests/topotests/high_ecmp/r1/frr.conf
	new file:   tests/topotests/high_ecmp/r2/frr.conf
	new file:   tests/topotests/high_ecmp/test_high_ecmp.py
	new file:   tests/topotests/lib/bmp_collector/bmpserver.py
	new file:   tests/topotests/ospf_instance_redistribute/r1/frr.conf
	new file:   tests/topotests/ospf_multi_instance/r1/frr.conf
	new file:   tests/topotests/ospf_multi_instance/r2/frr.conf
	new file:   tests/topotests/ospf_multi_instance/r3/frr.conf
	new file:   tests/topotests/ospf_multi_instance/test_ospf_multi_instance.py
	new file:   tests/topotests/pim_autorp/r3/frr.conf
	new file:   tests/topotests/pim_autorp/r4/frr.conf
	new file:   tests/topotests/pim_boundary_acl/r1/frr.conf
	new file:   tests/topotests/pim_boundary_acl/r2/frr.conf
	new file:   tests/topotests/pim_boundary_acl/r3/frr.conf
	new file:   tests/topotests/pim_boundary_acl/rp/frr.conf
	new file:   tests/topotests/pim_boundary_acl/test_pim_boundary_acl.py
	new file:   tests/topotests/pim_embedded_rp/__init__.py
	new file:   tests/topotests/pim_embedded_rp/r1/frr.conf
	new file:   tests/topotests/pim_embedded_rp/r2/frr.conf
	new file:   tests/topotests/pim_embedded_rp/r3/frr.conf
	new file:   tests/topotests/pim_embedded_rp/test_pim_embedded_rp.py
	new file:   tests/topotests/simple_snmp_test/r1/ospf6d.conf
	new file:   tests/topotests/simple_snmp_test/r1/ospfd.conf
	new file:   tests/topotests/simple_snmp_test/r1/ripd.conf
	new file:   tests/topotests/zebra_rib/r1/frr-import.conf
	new file:   tests/topotests/zebra_rib/r1/import_init_mrib_table.json
	new file:   tests/topotests/zebra_rib/r1/import_init_table.json
	new file:   tests/topotests/zebra_rib/r1/import_mrib_table_2.json
	new file:   tests/topotests/zebra_rib/r1/import_mrib_table_3.json
	new file:   tests/topotests/zebra_rib/r1/import_mrib_table_4.json
	new file:   tests/topotests/zebra_rib/r1/import_table_2.json
	new file:   tests/topotests/zebra_rib/r1/import_table_3.json
	new file:   tests/topotests/zebra_rib/r1/import_table_4.json
	new file:   tests/topotests/zebra_rib/test_zebra_import.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      bfdd/bfd.c
	both added:      bfdd/bfd.h
	both added:      bfdd/bfdd_cli.c
	both added:      bgpd/bgp_aspath.c
	both added:      bgpd/bgp_aspath.h
	both added:      bgpd/bgp_attr.c
	both added:      bgpd/bgp_attr.h
	both added:      bgpd/bgp_bfd.c
	both added:      bgpd/bgp_bmp.c
	both added:      bgpd/bgp_bmp.h
	both added:      bgpd/bgp_clist.c
	both added:      bgpd/bgp_community_alias.c
	both added:      bgpd/bgp_community_alias.h
	both added:      bgpd/bgp_conditional_adv.c
	both added:      bgpd/bgp_debug.c
	both added:      bgpd/bgp_ecommunity.c
	both added:      bgpd/bgp_ecommunity.h
	both added:      bgpd/bgp_evpn.c
	both added:      bgpd/bgp_fsm.c
	both added:      bgpd/bgp_fsm.h
	both added:      bgpd/bgp_io.c
	both added:      bgpd/bgp_mplsvpn.c
	both added:      bgpd/bgp_network.c
	both added:      bgpd/bgp_network.h
	both added:      bgpd/bgp_nexthop.c
	both added:      bgpd/bgp_nexthop.h
	both added:      bgpd/bgp_nht.c
	both added:      bgpd/bgp_packet.c
	both added:      bgpd/bgp_packet.h
	both added:      bgpd/bgp_route.c
	both added:      bgpd/bgp_route.h
	both added:      bgpd/bgp_routemap.c
	both added:      bgpd/bgp_routemap_nb.c
	both added:      bgpd/bgp_routemap_nb.h
	both added:      bgpd/bgp_routemap_nb_config.c
	both added:      bgpd/bgp_updgrp.c
	both added:      bgpd/bgp_updgrp_adv.c
	both added:      bgpd/bgp_vty.c
	both added:      bgpd/bgp_zebra.c
	both added:      bgpd/bgpd.c
	both added:      bgpd/bgpd.h
	both added:      bgpd/rfapi/bgp_rfapi_cfg.c
	both added:      bgpd/rfapi/rfapi.c
	both added:      bgpd/rfapi/rfapi_vty.c
	both added:      bgpd/rfapi/vnc_export_bgp.c
	both added:      configure.ac
	both added:      debian/changelog
	both added:      debian/control
	both added:      debian/rules
	both added:      doc/developer/topotests.rst
	both added:      doc/user/about.rst
	both added:      doc/user/bfd.rst
	both added:      doc/user/bgp.rst
	both added:      doc/user/evpn.rst
	both added:      doc/user/filter.rst
	both added:      doc/user/ospfd.rst
	both added:      doc/user/pim.rst
	both added:      doc/user/pimv6.rst
	both added:      doc/user/routemap.rst
	both added:      doc/user/vrrp.rst
	both added:      doc/user/zebra.rst
	both added:      docker/ubuntu-ci/Dockerfile
	both added:      fpm/fpm.h
	both added:      isisd/isis_circuit.c
	both added:      isisd/isis_lsp.c
	both added:      isisd/isis_pdu.c
	both added:      isisd/isis_route.h
	both added:      isisd/isis_spf.c
	both added:      isisd/isis_tlvs.c
	both added:      isisd/isis_vty_fabricd.c
	both added:      isisd/isisd.c
	both added:      ldpd/ldpe.c
	both added:      lib/command.h
	both added:      lib/csv.c
	both added:      lib/defun_lex.l
	both added:      lib/event.c
	both added:      lib/frrevent.h
	both added:      lib/if.c
	both added:      lib/if.h
	both added:      lib/libfrr.c
	both added:      lib/libospf.h
	both added:      lib/log.c
	both added:      lib/memory.c
	both added:      lib/memory.h
	both added:      lib/netns_linux.c
	both added:      lib/nexthop.c
	both added:      lib/nexthop.h
	both added:      lib/ntop.c
	both added:      lib/ptm_lib.c
	both added:      lib/routemap.c
	both added:      lib/routemap.h
	both added:      lib/routemap_cli.c
	both added:      lib/routemap_northbound.c
	both added:      lib/sigevent.c
	both added:      lib/sockunion.c
	both added:      lib/sockunion.h
	both added:      lib/table.c
	both added:      lib/table.h
	both added:      lib/wheel.c
	both added:      lib/wheel.h
	both added:      lib/zclient.c
	both added:      lib/zclient.h
	both added:      lib/zlog_5424_cli.c
	both added:      nhrpd/nhrp_vty.c
	both added:      ospf6d/ospf6_intra.c
	both added:      ospfd/ospf_lsa.c
	both added:      ospfd/ospf_lsa.h
	both added:      ospfd/ospf_opaque.c
	both added:      ospfd/ospf_sr.c
	both added:      ospfd/ospf_vty.c
	both added:      pimd/pim6_cmd.c
	both added:      pimd/pim6_cmd.h
	both added:      pimd/pim6_mld.c
	both added:      pimd/pim_autorp.c
	both added:      pimd/pim_autorp.h
	both added:      pimd/pim_bsm.c
	both added:      pimd/pim_bsm.h
	both added:      pimd/pim_bsr_rpdb.c
	both added:      pimd/pim_cmd.c
	both added:      pimd/pim_cmd_common.c
	both added:      pimd/pim_cmd_common.h
	both added:      pimd/pim_iface.c
	both added:      pimd/pim_iface.h
	both added:      pimd/pim_ifchannel.c
	both added:      pimd/pim_igmp.c
	both added:      pimd/pim_igmpv2.c
	both added:      pimd/pim_igmpv3.c
	both added:      pimd/pim_instance.c
	both added:      pimd/pim_instance.h
	both added:      pimd/pim_join.c
	both added:      pimd/pim_mroute.c
	both added:      pimd/pim_msdp.c
	both added:      pimd/pim_msdp.h
	both added:      pimd/pim_msdp_packet.c
	both added:      pimd/pim_msdp_socket.c
	both added:      pimd/pim_nb.c
	both added:      pimd/pim_nb.h
	both added:      pimd/pim_nb_config.c
	both added:      pimd/pim_rp.c
	both added:      pimd/pim_rp.h
	both added:      pimd/pim_tib.c
	both added:      pimd/pim_util.c
	both added:      pimd/pim_util.h
	both added:      pimd/pim_vty.c
	both added:      pimd/pim_zlookup.c
	both added:      pimd/pimd.c
	both added:      python/makefile.py
	both added:      python/xref2vtysh.py
	both added:      redhat/frr.spec.in
	both added:      ripd/ripd.c
	both added:      sharpd/sharp_vty.c
	both added:      staticd/static_zebra.c
	both added:      tests/helpers/c/prng.c
	both added:      tests/isisd/test_fuzz_isis_tlv.c
	both added:      tests/isisd/test_fuzz_isis_tlv_tests.h.gz
	both added:      tests/isisd/test_isis_spf.c
	both added:      tests/lib/cli/common_cli.c
	both added:      tests/lib/northbound/test_oper_data.c
	both added:      tests/lib/test_frrlua.c
	both added:      tests/lib/test_frrscript.c
	both added:      tests/lib/test_typelist.c
	both added:      tests/lib/test_zmq.c
	both added:      tests/topotests/Dockerfile
	both added:      tests/topotests/all_protocol_startup/r1/show_route_map.ref
	both added:      tests/topotests/all_protocol_startup/test_all_protocol_startup.py
	both added:      tests/topotests/bfd_isis_topo1/rt1/step1/show_ipv6_route.ref
	both added:      tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_healthy.ref
	both added:      tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
	both added:      tests/topotests/bfd_isis_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
	both added:      tests/topotests/bfd_isis_topo1/rt1/zebra.conf
	both added:      tests/topotests/bfd_isis_topo1/rt2/zebra.conf
	both added:      tests/topotests/bfd_isis_topo1/rt3/zebra.conf
	both added:      tests/topotests/bfd_isis_topo1/rt4/zebra.conf
	both added:      tests/topotests/bfd_isis_topo1/rt5/zebra.conf
	both added:      tests/topotests/bfd_ospf_topo1/rt1/step1/show_ipv6_route.ref
	both added:      tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_healthy.ref
	both added:      tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt2_down.ref
	both added:      tests/topotests/bfd_ospf_topo1/rt1/step3/show_ipv6_route_rt3_down.ref
	both added:      tests/topotests/bfd_ospf_topo1/rt1/zebra.conf
	both added:      tests/topotests/bfd_ospf_topo1/rt2/zebra.conf
	both added:      tests/topotests/bfd_ospf_topo1/rt3/zebra.conf
	both added:      tests/topotests/bfd_ospf_topo1/rt4/zebra.conf
	both added:      tests/topotests/bfd_ospf_topo1/rt5/zebra.conf
	both added:      tests/topotests/bfd_profiles_topo1/r2/bgpd.conf
	both added:      tests/topotests/bfd_profiles_topo1/r3/bgpd.conf
	both added:      tests/topotests/bfd_profiles_topo1/r4/bgpd.conf
	both added:      tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf
	both added:      tests/topotests/bgp_aggregate_address_topo1/r2/bgpd.conf
	both added:      tests/topotests/bgp_aggregator_zero/r1/bgpd.conf
	both added:      tests/topotests/bgp_aigp/r1/bgpd.conf
	both added:      tests/topotests/bgp_aigp/r1/zebra.conf
	both added:      tests/topotests/bgp_aigp/test_bgp_aigp.py
	both added:      tests/topotests/bgp_as_override/test_bgp_as_override.py
	both added:      tests/topotests/bgp_aspath_zero/r1/bgpd.conf
	both added:      tests/topotests/bgp_color_extcommunities/r1/bgpd.conf
	both added:      tests/topotests/bgp_color_extcommunities/test_bgp_color_extcommunities.py
	both added:      tests/topotests/bgp_ecmp_topo1/r1/bgpd.conf
	both added:      tests/topotests/bgp_evpn_rt5/r2/bgpd.conf
	both added:      tests/topotests/bgp_evpn_rt5/test_bgp_evpn.py
	both added:      tests/topotests/bgp_extended_link_bandwidth/r1/frr.conf
	both added:      tests/topotests/bgp_extended_link_bandwidth/r2/frr.conf
	both added:      tests/topotests/bgp_extended_link_bandwidth/test_bgp_extended_link_bandwidth.py
	both added:      tests/topotests/bgp_flowspec/r1/bgpd.conf
	both added:      tests/topotests/bgp_ipv4_over_ipv6/test_rfc5549_ebgp_unnumbered_nbr.py
	both added:      tests/topotests/bgp_lu_topo1/R3/bgpd.conf
	both added:      tests/topotests/bgp_lu_topo1/R3/zebra.conf
	both added:      tests/topotests/bgp_lu_topo2/R3/bgpd.conf
	both added:      tests/topotests/bgp_lu_topo2/R3/staticd.conf
	both added:      tests/topotests/bgp_lu_topo2/R3/zebra.conf
	both added:      tests/topotests/bgp_match_peer/r1/frr.conf
	both added:      tests/topotests/bgp_match_peer/test_bgp_match_peer.py
	both added:      tests/topotests/bgp_max_med_on_startup/r1/bgpd.conf
	both added:      tests/topotests/bgp_max_med_on_startup/test_bgp_max_med_on_startup.py
	both added:      tests/topotests/bgp_multiview_topo1/r1/bgpd.conf
	both added:      tests/topotests/bgp_nexthop_ipv6/r1/bgpd.conf
	both added:      tests/topotests/bgp_nexthop_ipv6/r1/show_bgp_ipv6_step1.json
	both added:      tests/topotests/bgp_nexthop_ipv6/r2/bgpd.conf
	both added:      tests/topotests/bgp_nexthop_ipv6/r2/show_bgp_ipv6_step1.json
	both added:      tests/topotests/bgp_nexthop_ipv6/r4/bgpd.conf
	both added:      tests/topotests/bgp_nexthop_ipv6/r4/show_bgp_ipv6_step2.json
	both added:      tests/topotests/bgp_nexthop_ipv6/r5/bgpd.conf
	both added:      tests/topotests/bgp_nexthop_ipv6/r5/show_bgp_ipv6_step1.json
	both added:      tests/topotests/bgp_nexthop_ipv6/r5/show_bgp_ipv6_step2.json
	both added:      tests/topotests/bgp_nexthop_ipv6/r6/bgpd.conf
	both added:      tests/topotests/bgp_nexthop_ipv6/r6/show_bgp_ipv6_step1.json
	both added:      tests/topotests/bgp_nexthop_ipv6/rr/bgpd.conf
	both added:      tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py
	both added:      tests/topotests/bgp_path_attribute_discard/r1/frr.conf
	both added:      tests/topotests/bgp_path_attribute_discard/r2/frr.conf
	both added:      tests/topotests/bgp_peer_group/r1/frr.conf
	both added:      tests/topotests/bgp_peer_group/test_bgp_peer-group.py
	both added:      tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
	both added:      tests/topotests/bgp_peer_type_multipath_relax/r2/bgpd.conf
	both added:      tests/topotests/bgp_prefix_sid/r1/bgpd.conf
	both added:      tests/topotests/bgp_prefix_sid2/r1/bgpd.conf
	both added:      tests/topotests/bgp_route_server_client/r1/bgpd.conf
	both added:      tests/topotests/bgp_route_server_client/r2/bgpd.conf
	both added:      tests/topotests/bgp_route_server_client/r3/bgpd.conf
	both added:      tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py
	both added:      tests/topotests/bgp_rpki_topo1/r2/bgpd.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
	both added:      tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
	both added:      tests/topotests/bgp_vpnv4_asbr/test_bgp_vpnv4_asbr.py
	both added:      tests/topotests/bgp_vpnv4_per_nexthop_label/test_bgp_vpnv4_per_nexthop_label.py
	both added:      tests/topotests/bgp_vpnv6_per_nexthop_label/test_bgp_vpnv6_per_nexthop_label.py
	both added:      tests/topotests/bgp_vrf_netns/r1/bgpd.conf
	both added:      tests/topotests/conftest.py
	both added:      tests/topotests/docker/README.md
	both added:      tests/topotests/docker/build.sh
	both added:      tests/topotests/docker/frr-topotests.sh
	both added:      tests/topotests/docker/inner/compile_frr.sh
	both added:      tests/topotests/docker/inner/entrypoint.sh
	both added:      tests/topotests/isis_topo1/test_isis_topo1.py
	both added:      tests/topotests/lib/bgp.py
	both added:      tests/topotests/lib/bmp_collector/bgp/update/path_attributes.py
	both added:      tests/topotests/lib/bmp_collector/bmp.py
	both added:      tests/topotests/lib/pim.py
	both added:      tests/topotests/lib/snmptest.py
	both added:      tests/topotests/lib/topogen.py
	both added:      tests/topotests/lib/topotest.py
	both added:      tests/topotests/msdp_topo1/r1/pimd.conf
	both added:      tests/topotests/msdp_topo1/test_msdp_topo1.py
	both added:      tests/topotests/ospf_instance_redistribute/test_ospf_instance_redistribute.py
	both added:      tests/topotests/ospf_metric_propagation/h1/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/h2/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/r1/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/r2/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/r3/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/r4/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/ra/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/rb/frr.conf
	both added:      tests/topotests/ospf_metric_propagation/rc/frr.conf
	both added:      tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf
	both added:      tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf
	both added:      tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf
	both added:      tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf
	both added:      tests/topotests/ospf_netns_vrf/r1/ospfd.conf
	both added:      tests/topotests/ospf_netns_vrf/r1/zebra.conf
	both added:      tests/topotests/ospf_netns_vrf/r2/ospfd.conf
	both added:      tests/topotests/ospf_netns_vrf/r2/zebra.conf
	both added:      tests/topotests/ospf_netns_vrf/r3/ospfd.conf
	both added:      tests/topotests/ospf_netns_vrf/r3/zebra.conf
	both added:      tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
	both added:      tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
	both added:      tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
	both added:      tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
	both added:      tests/topotests/ospf_p2mp/r3/frr-p2mp-non-broadcast.conf
	both added:      tests/topotests/ospf_p2mp/r3/frr-p2mp.conf
	both added:      tests/topotests/ospf_p2mp/r4/frr-p2mp-non-broadcast.conf
	both added:      tests/topotests/ospf_p2mp/r4/frr-p2mp.conf
	both added:      tests/topotests/ospf_prefix_suppression/r1/frr.conf
	both added:      tests/topotests/ospf_prefix_suppression/r2/frr.conf
	both added:      tests/topotests/ospf_prefix_suppression/r3/frr.conf
	both added:      tests/topotests/ospfapi/test_ospf_clientapi.py
	both added:      tests/topotests/pim_autorp/r1/frr.conf
	both added:      tests/topotests/pim_autorp/r2/frr.conf
	both added:      tests/topotests/pim_autorp/test_pim_autorp.py
	both added:      tests/topotests/pim_basic/test_pim.py
	both added:      tests/topotests/pim_cand_rp_bsr/r1/frr.conf
	both added:      tests/topotests/pim_cand_rp_bsr/r2/frr.conf
	both added:      tests/topotests/pim_cand_rp_bsr/r3/frr.conf
	both added:      tests/topotests/pim_cand_rp_bsr/r4/frr.conf
	both added:      tests/topotests/pim_cand_rp_bsr/r5/frr.conf
	both added:      tests/topotests/pim_cand_rp_bsr/r6/frr.conf
	both added:      tests/topotests/pytest.ini
	both added:      tests/topotests/simple_snmp_test/r1/bgpd.conf
	both added:      tests/topotests/simple_snmp_test/r1/isisd.conf
	both added:      tests/topotests/simple_snmp_test/r1/zebra.conf
	both added:      tests/topotests/simple_snmp_test/test_simple_snmp.py
	both added:      tests/topotests/zebra_fec_nexthop_resolution/r1/bgpd.conf
	both added:      tests/topotests/zebra_fec_nexthop_resolution/r2/bgpd.conf
	both added:      tests/topotests/zebra_fec_nexthop_resolution/r3/bgpd.conf
	both added:      tests/topotests/zebra_fec_nexthop_resolution/r4/bgpd.conf
	both added:      tests/topotests/zebra_fec_nexthop_resolution/r5/bgpd.conf
	both added:      tests/topotests/zebra_fec_nexthop_resolution/r7/bgpd.conf
	both added:      tests/topotests/zebra_fec_nexthop_resolution/test_zebra_fec_nexthop_resolution.py
	both added:      tests/topotests/zebra_rib/r1/sharp_rmap.ref
	both added:      tests/topotests/zebra_rib/r1/static_rmap.ref
	both added:      tests/topotests/zebra_rib/test_zebra_rib.py
	both added:      tools/etc/frr/support_bundle_commands.conf
	both added:      tools/frr-reload.py
	both added:      tools/frr_babeltrace.py
	both added:      tools/gcc-plugins/frr-format.c
	both added:      tools/start-stop-daemon.c
	both added:      tools/subdir.am
	both added:      vtysh/vtysh.c
	both added:      vtysh/vtysh_main.c
	both added:      yang/frr-bfdd.yang
	both added:      yang/frr-bgp-route-map.yang
	both added:      yang/frr-pim-rp.yang
	both added:      yang/frr-pim.yang
	both added:      yang/frr-route-map.yang
	both added:      zebra/connected.c
	both added:      zebra/debug.c
	both added:      zebra/debug.h
	both added:      zebra/dpdk/zebra_dplane_dpdk.c
	both added:      zebra/dplane_fpm_nl.c
	both added:      zebra/if_netlink.c
	both added:      zebra/interface.c
	both added:      zebra/interface.h
	both added:      zebra/ioctl.c
	both added:      zebra/ipforward_proc.c
	both added:      zebra/kernel_netlink.c
	both added:      zebra/kernel_socket.c
	both added:      zebra/main.c
	both added:      zebra/redistribute.c
	both added:      zebra/redistribute.h
	both added:      zebra/rt_netlink.c
	both added:      zebra/table_manager.h
	both added:      zebra/zapi_msg.c
	both added:      zebra/zebra_cli.c
	both added:      zebra/zebra_dplane.c
	both added:      zebra/zebra_dplane.h
	both added:      zebra/zebra_evpn.c
	both added:      zebra/zebra_evpn.h
	both added:      zebra/zebra_l2.h
	both added:      zebra/zebra_mpls.c
	both added:      zebra/zebra_nb_state.c
	both added:      zebra/zebra_netns_id.c
	both added:      zebra/zebra_netns_notify.c
	both added:      zebra/zebra_ns.c
	both added:      zebra/zebra_ns.h
	both added:      zebra/zebra_rib.c
	both added:      zebra/zebra_rnh.c
	both added:      zebra/zebra_routemap.c
	both added:      zebra/zebra_routemap.h
	both added:      zebra/zebra_router.h
	both added:      zebra/zebra_script.c
	both added:      zebra/zebra_srte.c
	both added:      zebra/zebra_srv6.c
	both added:      zebra/zebra_vrf.c
	both added:      zebra/zebra_vty.c
	both added:      zebra/zebra_vxlan.c
	both added:      zebra/zebra_vxlan.h
	both added:      zebra/zebra_vxlan_if.c
	both added:      zebra/zserv.c
	both added:      zebra/zserv.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ton31337
Copy link
Member

Replaced by #17630.

@ton31337 ton31337 closed this Dec 11, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.2/pr-17624 branch December 11, 2024 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants