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.

Sign up for GitHub

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: Release SID on router deletion (backport #17913) #18022

Closed
wants to merge 2 commits into from
Closed

bgpd: Release SID on router deletion (backport #17913) #18022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57676a2
bgpd: Release SID on router deletion
Sokolmish Jan 29, 2025
5c5f458
topotests: Router deletion in SRv6 sid reachability
Sokolmish Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions bgpd/bgpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3878,19 +3878,46 @@ int bgp_delete(struct bgp *bgp)
safi_t safi;
int i;
struct graceful_restart_info *gr_info;
<<<<<<< HEAD
=======
uint32_t b_ann_cnt = 0, b_l2_cnt = 0, b_l3_cnt = 0;
uint32_t a_ann_cnt = 0, a_l2_cnt = 0, a_l3_cnt = 0;
struct bgp *bgp_to_proc = NULL;
struct bgp *bgp_to_proc_next = NULL;
struct bgp *bgp_default = bgp_get_default();
>>>>>>> f3680ab41 (bgpd: Release SID on router deletion)

assert(bgp);

bgp_soft_reconfig_table_task_cancel(bgp, NULL, NULL);

/* make sure we withdraw any exported routes */
vpn_leak_prechange(BGP_VPN_POLICY_DIR_TOVPN, AFI_IP, bgp_get_default(),
bgp);
vpn_leak_prechange(BGP_VPN_POLICY_DIR_TOVPN, AFI_IP6, bgp_get_default(),
bgp);
vpn_leak_prechange(BGP_VPN_POLICY_DIR_TOVPN, AFI_IP, bgp_default, bgp);
vpn_leak_prechange(BGP_VPN_POLICY_DIR_TOVPN, AFI_IP6, bgp_default, bgp);

bgp_vpn_leak_unimport(bgp);

<<<<<<< HEAD
=======
/*
* Release SRv6 SIDs, like it's done in `vpn_leak_postchange()`
* and bgp_sid_vpn_export_cmd/af_sid_vpn_export_cmd commands.
*/
bgp->tovpn_sid_index = 0;
UNSET_FLAG(bgp->vrf_flags, BGP_VRF_TOVPN_SID_AUTO);
delete_vrf_tovpn_sid_per_vrf(bgp_default, bgp);
for (afi = AFI_IP; afi < AFI_MAX; afi++) {
bgp->vpn_policy[afi].tovpn_sid_index = 0;
UNSET_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_SID_AUTO);
delete_vrf_tovpn_sid_per_af(bgp_default, bgp, afi);

vpn_leak_zebra_vrf_sid_withdraw(bgp, afi);
}

bgp_vpn_release_label(bgp, AFI_IP, true);
bgp_vpn_release_label(bgp, AFI_IP6, true);

>>>>>>> f3680ab41 (bgpd: Release SID on router deletion)
hook_call(bgp_inst_delete, bgp);

FOREACH_AFI_SAFI (afi, safi)
Expand Down
194 changes: 194 additions & 0 deletions tests/topotests/bgp_srv6_sid_reachability/test_bgp_srv6_sid_reachability.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
#!/usr/bin/env python
# SPDX-License-Identifier: ISC

#
# Part of NetDEF Topology Tests
#
# Copyright (c) 2023 by 6WIND
#

import os
import sys
import pytest

CWD = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(CWD, "../"))

# pylint: disable=C0413
# Import topogen and topotest helpers
from lib.topogen import Topogen, TopoRouter, get_topogen
from lib.common_config import required_linux_kernel_version
from lib.checkping import check_ping

pytestmark = [pytest.mark.bgpd, pytest.mark.staticd]


def build_topo(tgen):
tgen.add_router("r1")
tgen.add_router("r2")
tgen.add_router("r3")

tgen.add_router("c11")
tgen.add_router("c12")
tgen.add_router("c21")
tgen.add_router("c22")
tgen.add_router("c31")
tgen.add_router("c32")

tgen.add_link(tgen.gears["r1"], tgen.gears["r2"], "eth0", "eth0")
tgen.add_link(tgen.gears["r1"], tgen.gears["r3"], "eth1", "eth0")
tgen.add_link(tgen.gears["r1"], tgen.gears["c11"], "eth2", "eth0")
tgen.add_link(tgen.gears["r1"], tgen.gears["c12"], "eth3", "eth0")
tgen.add_link(tgen.gears["r2"], tgen.gears["c21"], "eth1", "eth0")
tgen.add_link(tgen.gears["r2"], tgen.gears["c22"], "eth2", "eth0")
tgen.add_link(tgen.gears["r3"], tgen.gears["c31"], "eth1", "eth0")
tgen.add_link(tgen.gears["r3"], tgen.gears["c32"], "eth2", "eth0")


def setup_module(mod):
result = required_linux_kernel_version("5.15")
if result is not True:
pytest.skip("Kernel requirements are not met")

tgen = Topogen(build_topo, mod.__name__)
tgen.start_topology()

for rname, router in tgen.routers().items():
router.load_config(
TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
)
router.load_config(
TopoRouter.RD_STATIC, os.path.join(CWD, "{}/staticd.conf".format(rname))
)
router.load_config(
TopoRouter.RD_BGP, os.path.join(CWD, "{}/bgpd.conf".format(rname))
)

tgen.gears["r1"].run("sysctl net.vrf.strict_mode=1")
tgen.gears["r1"].run("ip link add vrf10 type vrf table 10")
tgen.gears["r1"].run("ip link set vrf10 up")
tgen.gears["r1"].run("ip link add vrf20 type vrf table 20")
tgen.gears["r1"].run("ip link set vrf20 up")
tgen.gears["r1"].run("ip link set eth2 master vrf10")
tgen.gears["r1"].run("ip link set eth3 master vrf20")

tgen.gears["r2"].run("sysctl net.vrf.strict_mode=1")
tgen.gears["r2"].run("ip link add vrf10 type vrf table 10")
tgen.gears["r2"].run("ip link set vrf10 up")
tgen.gears["r2"].run("ip link add vrf20 type vrf table 20")
tgen.gears["r2"].run("ip link set vrf20 up")
tgen.gears["r2"].run("ip link set eth1 master vrf10")
tgen.gears["r2"].run("ip link set eth2 master vrf20")

tgen.gears["r3"].run("sysctl net.vrf.strict_mode=1")
tgen.gears["r3"].run("ip link add vrf10 type vrf table 10")
tgen.gears["r3"].run("ip link set vrf10 up")
tgen.gears["r3"].run("ip link add vrf20 type vrf table 20")
tgen.gears["r3"].run("ip link set vrf20 up")
tgen.gears["r3"].run("ip link set eth1 master vrf10")
tgen.gears["r3"].run("ip link set eth2 master vrf20")

tgen.start_router()


def teardown_module(mod):
tgen = get_topogen()
tgen.stop_topology()


def test_ping():
tgen = get_topogen()

check_ping("c11", "192.168.2.1", True, 120, 1)
check_ping("c11", "192.168.3.1", True, 10, 1)
check_ping("c12", "192.168.2.1", True, 10, 1)
check_ping("c12", "192.168.3.1", True, 10, 1)
check_ping("c21", "192.168.3.1", True, 10, 1)
check_ping("c22", "192.168.3.1", True, 10, 1)


def test_sid_unreachable_nht():
get_topogen().gears["r1"].vtysh_cmd(
"""
configure terminal
no ipv6 route 2001:db8:2:2::/64 2001:db8:12::2
"""
)
check_ping("c11", "192.168.2.1", False, 10, 1)


def test_sid_reachable_again_nht():
get_topogen().gears["r1"].vtysh_cmd(
"""
configure terminal
ipv6 route 2001:db8:2:2::/64 2001:db8:12::2
"""
)
check_ping("c11", "192.168.2.1", True, 10, 1)


def test_sid_unreachable_bgp_update():
get_topogen().gears["r2"].vtysh_cmd(
"""
configure terminal
router bgp 65002
no segment-routing srv6
exit
router bgp 65002 vrf vrf10
address-family ipv4 unicast
no sid vpn export 1
"""
)
check_ping("c11", "192.168.2.1", False, 10, 1)


def test_sid_reachable_again_bgp_update():
get_topogen().gears["r2"].vtysh_cmd(
"""
configure terminal
router bgp 65002
segment-routing srv6
locator default
exit
exit
router bgp 65002 vrf vrf10
address-family ipv4 unicast
sid vpn export 1
"""
)
check_ping("c11", "192.168.2.1", True, 10, 1)


def test_sid_unreachable_no_router():
get_topogen().gears["r2"].vtysh_cmd(
"""
configure terminal
no router bgp 65002 vrf vrf10
"""
)
check_ping("c11", "192.168.2.1", False, 10, 1)


def test_sid_reachable_again_no_router():
get_topogen().gears["r2"].vtysh_cmd(
"""
configure terminal
router bgp 65002 vrf vrf10
bgp router-id 192.0.2.2
!
address-family ipv4 unicast
redistribute connected
sid vpn export 1
rd vpn export 65002:10
rt vpn both 0:10
import vpn
export vpn
exit-address-family
"""
)
check_ping("c11", "192.168.2.1", True, 10, 1)


if __name__ == "__main__":
args = ["-s"] + sys.argv[1:]
sys.exit(pytest.main(args))
Loading