Skip to content

Splitting platform specific condition check to pass test_nhop_group.py test in Marvell(Innovium) #9107

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
wangxin merged 1 commit into from
Jul 25, 2023
Merged

Splitting platform specific condition check to pass test_nhop_group.py test in Marvell(Innovium) #9107

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
5 changes: 4 additions & 1 deletion tests/ipfwd/test_nhop_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ def test_nhop_group_member_count(duthost, tbinfo):
# increase CRM polling time
asic.command("crm config polling interval {}".format(polling_interval))

if is_cisco_device(duthost) or is_innovium_device(duthost):
if is_cisco_device(duthost):
# Waiting for ARP routes to be synced and programmed
time.sleep(sleep_time_sync_before)
crm_stat = get_crm_info(duthost, asic)
Expand All @@ -389,6 +389,9 @@ def test_nhop_group_member_count(duthost, tbinfo):
# Consider both available nhop_grp and nhop_grp_mem before creating nhop_groups
nhop_group_mem_count = int((nhop_group_mem_count) / default_max_nhop_paths * CISCO_NHOP_GROUP_FILL_PERCENTAGE)
nhop_group_count = min(nhop_group_mem_count, nhop_group_count)
elif is_innovium_device(duthost):
crm_stat = get_crm_info(duthost, asic)
nhop_group_count = crm_stat["available_nhop_grp"]
else:
nhop_group_count = min(max_nhop, nhop_group_limit) + extra_nhops
# initialize log analyzer
Expand Down