Skip to content

Fix IPv6-only topology support in generic_patch BGP convergence check #23241

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
yxieca merged 1 commit into from
Mar 26, 2026
+11 −6
Merged

Fix IPv6-only topology support in generic_patch BGP convergence check #23241

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
17 changes: 11 additions & 6 deletions tests/configlet/util/generic_patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,17 @@ def generic_patch_add_t0(duthost, skip_load=False, hack_apply=False):
# Wait for BGP sessions to establish BEFORE DB comparison.
# After adding T0 config, BGP needs to converge and populate app-db route entries.
# Comparing DBs before BGP convergence causes spurious mismatches in app-db.
assert wait_until(DB_COMP_WAIT_TIME, 20, 0, is_bgp_session_established,
duthost, tor_data["ip"]["remote"]), \
"BGP IPv4 session for {} not established before DB comparison".format(tor_data["ip"]["remote"])
assert wait_until(DB_COMP_WAIT_TIME, 20, 0, is_bgp_session_established,
duthost, tor_data["ipv6"]["remote"].lower()), \
"BGP IPv6 session for {} not established before DB comparison".format(tor_data["ipv6"]["remote"].lower())
v4_remote = tor_data.get("ip", {}).get("remote")
v6_remote = tor_data.get("ipv6", {}).get("remote")
if v4_remote:
assert wait_until(DB_COMP_WAIT_TIME, 20, 0, is_bgp_session_established,
duthost, v4_remote), \
"BGP IPv4 session for {} not established before DB comparison".format(v4_remote)
if v6_remote:
assert wait_until(DB_COMP_WAIT_TIME, 20, 0, is_bgp_session_established,
duthost, v6_remote.lower()), \
"BGP IPv6 session for {} not established before DB comparison".format(v6_remote.lower())
assert v4_remote or v6_remote, "No BGP neighbors detected for convergence check"

assert wait_until(DB_COMP_WAIT_TIME, 20, 0, db_comp, duthost, patch_add_t0_dir,
orig_db_dir, "generic_patch_add_t0"), \
Expand Down
Loading