Skip to content

[orchagent]: Recreate custom BFD monitor for reused nexthop #4808

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

Open
zjswhhh wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −6
Open

[orchagent]: Recreate custom BFD monitor for reused nexthop #4808

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
bb8d8d9
[orchagent]: Recreate custom BFD monitor for reused nexthop
zjswhhh Jul 31, 2026
ba01503
Merge branch 'master' of https://github.com/sonic-net/sonic-swss into…
zjswhhh Aug 6, 2026
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
22 changes: 16 additions & 6 deletions orchagent/vnetorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,14 +1170,24 @@ bool VNetRouteOrch::selectNextHopGroup(const string& vnet,
nexthops_selected = nhg_custom;
return true;
}
else if (!hasNextHopGroup(vnet, nexthops_primary))
else
{
SWSS_LOG_INFO("Creating next hop group %s", nexthops_primary.to_string().c_str());
setEndpointMonitor(vnet, monitors, nexthops_primary, monitoring, rx_monitor_timer, tx_monitor_timer, ipPrefix);
if (!createNextHopGroup(vnet, nexthops_primary, vrf_obj, monitoring))
bool next_hop_group_exists = hasNextHopGroup(vnet, nexthops_primary);
bool route_exists = syncd_tunnel_routes_[vnet].find(ipPrefix) != syncd_tunnel_routes_[vnet].end();

if (!next_hop_group_exists || !route_exists)
{
delEndpointMonitor(vnet, nexthops_primary, ipPrefix);
return false;
setEndpointMonitor(vnet, monitors, nexthops_primary, monitoring, rx_monitor_timer, tx_monitor_timer, ipPrefix);
}

if (!next_hop_group_exists)
{
SWSS_LOG_INFO("Creating next hop group %s", nexthops_primary.to_string().c_str());
if (!createNextHopGroup(vnet, nexthops_primary, vrf_obj, monitoring))
{
delEndpointMonitor(vnet, nexthops_primary, ipPrefix);
return false;
}
}
}
nexthops_selected = nexthops_primary;
Expand Down
13 changes: 13 additions & 0 deletions tests/test_vnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3347,6 +3347,19 @@ def test_vnet_orch_34(self, dvs, testlog):
self.add_neighbor("Ethernet4", "9.1.0.1", "00:01:02:03:04:05")

vnet_obj.fetch_exist_entries(dvs)

# Recreating a local-only route must also recreate its custom BFD session,
# even though the directly connected next hop is reused.
create_vnet_routes(dvs, "100.100.1.1/32", vnet_name, '9.1.0.1', ep_monitor='9.1.0.1', primary='9.1.0.1', monitoring='custom_bfd', adv_prefix='100.100.1.1/32', check_directly_connected=True, rx_monitor_timer=100, tx_monitor_timer=100)
check_bfd_session(dvs, ['9.1.0.1'])
delete_vnet_routes(dvs, "100.100.1.1/32", vnet_name)
check_del_bfd_session(dvs, ['9.1.0.1'])

create_vnet_routes(dvs, "100.100.1.1/32", vnet_name, '9.1.0.1', ep_monitor='9.1.0.1', primary='9.1.0.1', monitoring='custom_bfd', adv_prefix='100.100.1.1/32', check_directly_connected=True, rx_monitor_timer=100, tx_monitor_timer=100)
check_bfd_session(dvs, ['9.1.0.1'])
delete_vnet_routes(dvs, "100.100.1.1/32", vnet_name)
check_del_bfd_session(dvs, ['9.1.0.1'])

create_vnet_routes(dvs, "100.100.1.1/32", vnet_name, '9.1.0.1,9.1.0.2', ep_monitor='9.1.0.1,9.1.0.2', primary ='9.1.0.1', monitoring='custom_bfd', adv_prefix='100.100.1.1/32', check_directly_connected=True, rx_monitor_timer=100, tx_monitor_timer=100)

# default monitor status is down, route should not be programmed in this status
Expand Down
Loading