Skip to content

[202012] Fix crm test failures due to bad cherry-pick #7305

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
neethajohn merged 1 commit into from
Jan 20, 2023
Merged

[202012] Fix crm test failures due to bad cherry-pick #7305

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: 0 additions & 18 deletions tests/crm/test_crm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,24 +620,6 @@ def test_crm_nexthop(duthosts, enum_rand_one_per_hwsku_frontend_hostname, enum_f
"\"crm_stats_ipv{}_nexthop_used\" counter was not decremented or "
"\"crm_stats_ipv{}_nexthop_available\" counter was not incremented".format(ip_ver, ip_ver))

# Get new "crm_stats_ipv[4/6]_nexthop" used and available counter value
new_crm_stats_nexthop_used, new_crm_stats_nexthop_available = get_crm_stats(get_nexthop_stats, duthost)

# Verify "crm_stats_ipv[4/6]_nexthop_used" counter was incremented
if not (new_crm_stats_nexthop_used - crm_stats_nexthop_used >= 1):
RESTORE_CMDS["test_crm_nexthop"].append(nexthop_del_cmd)
pytest_assert(crm_stats_checker,
"\"crm_stats_ipv{}_nexthop_used\" counter was not incremented or "
"\"crm_stats_ipv{}_nexthop_available\" counter was not decremented".format(ip_ver, ip_ver))
# Remove nexthop
asichost.shell(nexthop_del_cmd)

crm_stats_checker = wait_until(30, 5, 0, check_crm_stats, get_nexthop_stats, duthost, crm_stats_nexthop_used,
crm_stats_nexthop_available)
pytest_assert(crm_stats_checker,
"\"crm_stats_ipv{}_nexthop_used\" counter was not decremented or "
"\"crm_stats_ipv{}_nexthop_available\" counter was not incremented".format(ip_ver, ip_ver))

# Get new "crm_stats_ipv[4/6]_nexthop" used and available counter value
new_crm_stats_nexthop_used, new_crm_stats_nexthop_available = get_crm_stats(get_nexthop_stats, duthost)
used_percent = get_used_percent(new_crm_stats_nexthop_used, new_crm_stats_nexthop_available)
Expand Down