Skip to content

Add static route ASIC DB check for test_nhop_group test #14475

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
bingwang-ms merged 1 commit into from
Nov 6, 2024
Merged

Add static route ASIC DB check for test_nhop_group test #14475

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
18 changes: 16 additions & 2 deletions tests/ipfwd/test_nhop_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,17 @@ def build_pkt(dest_mac, ip_addr, ttl, flow_count):
return pkt, exp_packet


def validate_asic_route(duthost, route, exist=True):
logger.info(f"Checking ip route: {route}")
asic_info = duthost.shell(f'redis-cli -n 1 keys "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY:*{route}*"',
Copy link
Copy Markdown
Collaborator

@bingwang-ms bingwang-ms Oct 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need * here?

Copy link
Copy Markdown
Contributor Author

@echuawu echuawu Nov 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bingwang-ms , it's based on the test result.
image

module_ignore_errors=True)["stdout"]
if route in asic_info:
logger.info(f"Matched ASIC route: {asic_info}")
return exist is True
else:
return exist is False


def test_nhop_group_member_count(duthost, tbinfo, loganalyzer):
"""
Test next hop group resource count. Steps:
Expand Down Expand Up @@ -534,8 +545,9 @@ def built_and_send_tcp_ip_packet():
nhop.add_ip_route(ip_prefix, ips)

nhop.program_routes()
# wait for routes to be synced and programmed
time.sleep(15)

pytest_assert(wait_until(60, 5, 0, validate_asic_route, duthost, ip_prefix),
f"Static route: {ip_prefix} is failed to be programmed!")

ptfadapter.dataplane.flush()

Expand Down Expand Up @@ -565,6 +577,8 @@ def built_and_send_tcp_ip_packet():
asic.start_service("bgp")
time.sleep(15)
nhop.delete_routes()
pytest_assert(wait_until(60, 5, 0, validate_asic_route, duthost, ip_prefix, False),
f"Static route: {ip_prefix} is failed to be removed!")
arplist.clean_up()

th_asic_flow_map = {0: 'c0:ff:ee:00:00:12', 1: 'c0:ff:ee:00:00:10',
Expand Down