Skip to content

[action] [PR:18733] [CRM AVAILABLE] To enhance the crm tests for TD3 and Cisco devices #18761

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
mssonicbld merged 1 commit into from
Jun 4, 2025
Merged

[action] [PR:18733] [CRM AVAILABLE] To enhance the crm tests for TD3 and Cisco devices #18761

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions tests/crm/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@ def get_crm_resources(resources_dict):
}
return True if resources_dict else False

# Wait up to 90 seconds, checking every 5 seconds
wait_until(90, 5, 0, get_crm_resources, resources)
# Wait up to 360 seconds, checking every 5 seconds
wait_until(360, 5, 0, get_crm_resources, resources)
if not resources:
pytest.fail("CRM counters are not ready after multiple retries.")

Expand Down
7 changes: 5 additions & 2 deletions tests/crm/test_crm_available.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
'nokia-m0-7215': 126,
'nokia-7215-a1': 126,
'nokia-7215': 126,
'arista-7050cx3-32s-c28s4': 255,
'Arista-7050CX3-32S-C32': 255,
'arista-7050cx3-32s-s128': 255,
}

DEFAULT_NEXTHOP_THRESHOLD = 256
Expand All @@ -29,8 +32,8 @@ def test_crm_next_hop_group(duthosts, enum_rand_one_per_hwsku_frontend_hostname,
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]

hwsku = duthost.facts["hwsku"].lower()

nexthop_group_threshold = SKU_NEXTHOP_THRESHOLDS.get(hwsku, DEFAULT_NEXTHOP_THRESHOLD)
lower_sku_nexthop_thresholds = {k.lower(): v for k, v in SKU_NEXTHOP_THRESHOLDS.items()}
nexthop_group_threshold = lower_sku_nexthop_thresholds.get(hwsku, DEFAULT_NEXTHOP_THRESHOLD)

resource_name = "nexthop_group"
if resource_name in crm_resources:
Expand Down
Loading