Skip to content

Revert "[action] [PR:24524] [ipfwd] Increase timeout for high-scale platforms (#25201)" #1329

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
lizhijianrd merged 1 commit into from
Jul 23, 2026
Merged

Revert "[action] [PR:24524] [ipfwd] Increase timeout for high-scale platforms (#25201)" #1329

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
12 changes: 1 addition & 11 deletions tests/ipfwd/test_nhop_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,6 @@ def validate_asic_route(duthost, route, exist=True):
return exist is False


def is_high_scale_platform(duthost) -> bool:
interfaces_status = duthost.sonichost.get_interfaces_status()
number_of_interfaces = len(interfaces_status.keys())
return number_of_interfaces >= 128


def test_nhop_group_member_count(duthost, tbinfo, loganalyzer):
"""
Test next hop group resource count. Steps:
Expand Down Expand Up @@ -371,10 +365,6 @@ def test_nhop_group_member_count(duthost, tbinfo, loganalyzer):
default_max_nhop_paths = 8
polling_interval = 10
sleep_time = 120
elif is_high_scale_platform(duthost):
default_max_nhop_paths = 32
polling_interval = 10
sleep_time = 380
else:
default_max_nhop_paths = 32
polling_interval = 10
Expand Down Expand Up @@ -458,7 +448,7 @@ def test_nhop_group_member_count(duthost, tbinfo, loganalyzer):

# verify the test used up all the NHOP group resources
# skip this check on Mellanox as ASIC resources are shared
if is_cisco_device(duthost) or is_high_scale_platform(duthost):
if is_cisco_device(duthost) or "7060X6" in duthost.sonichost.get_facts()['platform'].upper():
pytest_assert(
crm_after["available_nhop_grp"] + nhop_group_count == crm_before["available_nhop_grp"],
"Unused NHOP group resource:{}, used:{}, nhop_group_count:{}, Unused NHOP group resource before:{}".format(
Expand Down