Skip to content
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

[system_health] Add support for check_system_health_info both old and new format #7681

Merged
merged 1 commit into from
Mar 8, 2023
Merged

[system_health] Add support for check_system_health_info both old and new format #7681

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
15 changes: 13 additions & 2 deletions tests/system_health/test_system_health.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,11 @@ def test_service_checker_with_process_exit(duthosts, enum_rand_one_per_hwsku_hos
# use wait_until to check if SYSTEM_HEALTH_INFO has expected content
# avoid waiting for too long or DEFAULT_INTERVAL is not long enough to refresh db
category = '{}:{}'.format(container, critical_process)
expected_value = "Process '{}' in container '{}' is not running".format(critical_process, container)
result = wait_until(WAIT_TIMEOUT, 10, 2, check_system_health_info, duthost, category, expected_value)
expected_values = ["Process '{}' in container '{}' is not running".format(critical_process, container),
"'{}' is not running".format(critical_process)]
result = wait_until(WAIT_TIMEOUT, 10, 2, check_system_health_info_any_of, duthost, category,
expected_values)

assert result == True, '{} is not recorded'.format(critical_process)
summary = redis_get_field_value(duthost, STATE_DB, HEALTH_TABLE_NAME, 'summary')
assert summary == SUMMARY_NOT_OK, 'Expect summary {}, got {}'.format(SUMMARY_NOT_OK, summary)
Expand Down Expand Up @@ -365,6 +368,14 @@ def redis_get_system_health_info(duthost, db_id, key):
output = duthost.shell(cmd)['stdout'].strip()
return output

def check_system_health_info_any_of(duthost, category, expected_values):
value = redis_get_field_value(duthost, STATE_DB, HEALTH_TABLE_NAME, category)
for expected_value in expected_values:
if value == expected_value:
return True

return False

def check_system_health_info(duthost, category, expected_value):
value = redis_get_field_value(duthost, STATE_DB, HEALTH_TABLE_NAME, category)
return value == expected_value
Expand Down