From 076ea9bcd496c74b6351310def1b208991ad2c37 Mon Sep 17 00:00:00 2001 From: Zhijian Li Date: Thu, 23 Jul 2026 12:43:07 +0000 Subject: [PATCH] Revert "[action] [PR:24524] [ipfwd] Increase timeout for high-scale platforms (#25201)" This reverts commit 01616a877e3c1e999ace3007e038a38ea3ce33af. --- tests/ipfwd/test_nhop_group.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/ipfwd/test_nhop_group.py b/tests/ipfwd/test_nhop_group.py index 564290cf40..5bdc30ad20 100644 --- a/tests/ipfwd/test_nhop_group.py +++ b/tests/ipfwd/test_nhop_group.py @@ -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: @@ -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 @@ -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(