Skip to content

fix default route for t0-isolated topo #22565

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

Merged
StormLiangMS merged 1 commit into from
Mar 13, 2026
Merged

fix default route for t0-isolated topo #22565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions ansible/library/announce_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,11 @@ def fib_t0(topo, ptf_ip, no_default_route=False, action="announce", upstream_nei
last_suffix = 0
for index, vm_name in enumerate(sorted(vms.keys())):
router_type = "leaf"
tor_default_route = False
if 'tor' in topo['configuration'][vm_name]['properties']:
router_type = 'tor'
if "PT" in vm_name:
tor_default_route = True
port, port6 = get_change_routes_ports(vm_name, topo)
aggregate_prefixes = topo['configuration'][vm_name].get("aggregate_routes", AGGREGATE_ROUTES_DEFAULT_VALUE)
aggregate_routes = [(prefix, nhipv4 if "." in prefix else nhipv6, "") for prefix in aggregate_prefixes]
Expand All @@ -583,7 +586,8 @@ def fib_t0(topo, ptf_ip, no_default_route=False, action="announce", upstream_nei
spine_asn, leaf_asn_start, tor_asn_start,
nhipv4, nhipv4, tor_subnet_size, max_tor_subnet_number, "t0",
router_type=router_type,
no_default_route=no_default_route, offset=current_routes_offset)
no_default_route=no_default_route, offset=current_routes_offset,
tor_default_route=tor_default_route)
if aggregate_routes_v4:
filterout_subnet_ipv4(aggregate_routes, routes_v4)
routes_v4.extend(aggregate_routes_v4)
Expand All @@ -597,7 +601,8 @@ def fib_t0(topo, ptf_ip, no_default_route=False, action="announce", upstream_nei
router_type=router_type,
no_default_route=no_default_route,
ipv6_address_pattern=ipv6_address_pattern,
offset=current_routes_offset)
offset=current_routes_offset,
tor_default_route=tor_default_route)
if aggregate_routes_v6:
filterout_subnet_ipv6(aggregate_routes, routes_v6)
routes_v6.extend(aggregate_routes_v6)
Expand Down
4 changes: 3 additions & 1 deletion tests/route/test_default_route.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ def get_upstream_neigh(tb, device_neigh_metadata, af, nexthops):
for neigh_name, neigh_cfg in list(topo_cfg_facts.items()):
if not is_in_neighbor(neigh_types, neigh_name):
continue
if "PT0" in neigh_name and "tor" in neigh_cfg.get('properties', []):
if 't0-isolated' in tb['topo']['name'] and "PT" not in neigh_name:
# For t0-isolated topology, PT0 default routes will be preferred over T1 neighbors,
# so only consider PT neighbors for default route verification
continue
interfaces = neigh_cfg.get('interfaces', {})
ipv4_addr = None
Expand Down
Loading