Skip to content

[lldp] Fix LLDP_ENTRY_TABLE key comparison for dualtor topology #23193

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 24, 2026
Merged

[lldp] Fix LLDP_ENTRY_TABLE key comparison for dualtor topology #23193

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
15 changes: 11 additions & 4 deletions tests/lldp/test_lldp_syncd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ def get_lldpctl_output(duthost):
def get_show_lldp_table_output(duthost):
lines = duthost.shell("show lldp table")["stdout"].split("\n")[3:-2]
interface_list = [line.split()[0] for line in lines]
return interface_list
# Deduplicate: in dualtor topology, uplink ports may have multiple
# LLDP neighbors (T1 switch + fanout), causing duplicate interface entries
return list(dict.fromkeys(interface_list))


def get_lldp_data(duthost, db_instance):
Expand All @@ -123,7 +125,7 @@ def check_lldp_table_keys(duthost, db_instance):
# Check if LLDP_ENTRY_TABLE keys match show lldp table output
lldp_entry_keys = get_lldp_entry_keys(db_instance)
show_lldp_table_int_list = get_show_lldp_table_output(duthost)
return sorted(lldp_entry_keys) == sorted(show_lldp_table_int_list)
return set(lldp_entry_keys) == set(show_lldp_table_int_list)


def _shutdown_startup_interface(duthost, interface, asic_str=""):
Expand Down Expand Up @@ -192,9 +194,14 @@ def assert_lldp_interfaces(
"""
Assert that LLDP_ENTRY_TABLE keys match show lldp table output and lldpctl output
"""
db_set = set(lldp_entry_keys)
cli_set = set(show_lldp_table_int_list)
pytest_assert(
sorted(lldp_entry_keys) == sorted(show_lldp_table_int_list),
"LLDP_ENTRY_TABLE keys do not match 'show lldp table' output",
db_set == cli_set,
"LLDP_ENTRY_TABLE keys do not match 'show lldp table' output. "
"In DB but not in CLI: {}. In CLI but not in DB: {}".format(
db_set - cli_set, cli_set - db_set
),
)

# Verify LLDP_ENTRY_TABLE keys match lldpctl interface indexes
Expand Down
Loading