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

[pmon daemon regression test] Correct the log messages with right daemon name and fix term_and_start_status failure #3922

Merged
merged 8 commits into from
Aug 19, 2021
+49 −146
Merged

[pmon daemon regression test] Correct the log messages with right daemon name and fix term_and_start_status failure #3922

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eab7b47
Fix wrong daemon names for platform daemon regression test
sujinmkang Jul 30, 2021
7c6b588
Restart the daemon if the autorestart is set to false in case of
sujinmkang Jul 30, 2021
1e3b74f
Fix based on the autorestart enabled with buildimage PR #8326
sujinmkang Aug 4, 2021
fab9aa1
The pcied db fix is in other PR.
sujinmkang Aug 6, 2021
e2ff20c
Fix test_pmon_pcied/ledd_term_and_start_status failure
sujinmkang Aug 11, 2021
01e359e
disable only pmon auto restart
sujinmkang Aug 17, 2021
5087487
remove the disable_and_enable_autorestart_containers
sujinmkang Aug 17, 2021
352f0cb
review comments
sujinmkang Aug 18, 2021
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
27 changes: 14 additions & 13 deletions tests/platform_tests/daemon/test_fancontrol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ def test_pmon_fancontrol_running_status(duthosts, rand_one_dut_hostname):
daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
logger.info("{} daemon is {} with pid {}".format(daemon_name, daemon_status, daemon_pid))
pytest_assert(daemon_status == expected_running_status,
"Pcied expected running status is {} but is {}".format(expected_running_status, daemon_status))
"{} expected running status is {} but is {}".format(daemon_name, expected_running_status, daemon_status))
pytest_assert(daemon_pid != -1,
"Pcied expected pid is a positive integer but is {}".format(daemon_pid))
"{} expected pid is a positive integer but is {}".format(daemon_name, daemon_pid))


def test_pmon_fancontrol_stop_and_start_status(check_daemon_status, duthosts, rand_one_dut_hostname):
Expand All @@ -124,18 +124,18 @@ def test_pmon_fancontrol_stop_and_start_status(check_daemon_status, duthosts, ra

daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(daemon_status == expected_stopped_status,
"Pcied expected stopped status is {} but is {}".format(expected_stopped_status, daemon_status))
"{} expected stopped status is {} but is {}".format(daemon_name, expected_stopped_status, daemon_status))
pytest_assert(daemon_pid == -1,
"Pcied expected pid is -1 but is {}".format(daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, daemon_pid))

duthost.start_pmon_daemon(daemon_name)
time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is a positive number not {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))

Expand All @@ -153,18 +153,18 @@ def test_pmon_fancontrol_term_and_start_status(check_daemon_status, duthosts, ra

daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(daemon_status == expected_exited_status,
"Pcied expected terminated status is {} but is {}".format(expected_exited_status, daemon_status))
"{} expected terminated status is {} but is {}".format(daemon_name, expected_exited_status, daemon_status))
pytest_assert(daemon_pid == -1,
"Pcied expected pid is -1 but is {}".format(daemon_pid))
"{} expected pid is a positive number not {}".format(daemon_name, daemon_pid))

duthost.start_pmon_daemon(daemon_name)
time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))

Expand All @@ -182,14 +182,15 @@ def test_pmon_fancontrol_kill_and_start_status(check_daemon_status, duthosts, ra
daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
logger.info("{} daemon got killed unexpectedly and it is {} with pid {}".format(daemon_name, daemon_status, daemon_pid))
pytest_assert(daemon_status != expected_running_status,
"Pcied unexpected killed status is not {}".format(daemon_status))
"{} unexpected killed status is not {}".format(daemon_name, daemon_status))

time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)

pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is a positive number not {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))
27 changes: 14 additions & 13 deletions tests/platform_tests/daemon/test_ledd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ def test_pmon_ledd_running_status(duthosts, rand_one_dut_hostname):
daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
logger.info("{} daemon is {} with pid {}".format(daemon_name, daemon_status, daemon_pid))
pytest_assert(daemon_status == expected_running_status,
"Pcied expected running status is {} but is {}".format(expected_running_status, daemon_status))
"{} expected running status is {} but is {}".format(daemon_name, expected_running_status, daemon_status))
pytest_assert(daemon_pid != -1,
"Pcied expected pid is a positive integer but is {}".format(daemon_pid))
"{} expected pid is a positive integer but is {}".format(daemon_name, daemon_pid))


def test_pmon_ledd_stop_and_start_status(check_daemon_status, duthosts, rand_one_dut_hostname):
Expand All @@ -124,18 +124,18 @@ def test_pmon_ledd_stop_and_start_status(check_daemon_status, duthosts, rand_one

daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(daemon_status == expected_stopped_status,
"Pcied expected stopped status is {} but is {}".format(expected_stopped_status, daemon_status))
"{} expected stopped status is {} but is {}".format(daemon_name, expected_stopped_status, daemon_status))
pytest_assert(daemon_pid == -1,
"Pcied expected pid is -1 but is {}".format(daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, daemon_pid))

duthost.start_pmon_daemon(daemon_name)
time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is a positive integer but is {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))

Expand All @@ -153,18 +153,18 @@ def test_pmon_ledd_term_and_start_status(check_daemon_status, duthosts, rand_one

daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(daemon_status == expected_exited_status,
"Pcied expected terminated status is {} but is {}".format(expected_exited_status, daemon_status))
"{} expected terminated status is {} but is {}".format(daemon_name, expected_exited_status, daemon_status))
pytest_assert(daemon_pid == -1,
"Pcied expected pid is -1 but is {}".format(daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, daemon_pid))

duthost.start_pmon_daemon(daemon_name)
time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is a positive integer but is {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))

Expand All @@ -182,14 +182,15 @@ def test_pmon_ledd_kill_and_start_status(check_daemon_status, duthosts, rand_one
daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
logger.info("{} daemon got killed unexpectedly and it is {} with pid {}".format(daemon_name, daemon_status, daemon_pid))
pytest_assert(daemon_status != expected_running_status,
"Pcied unexpected killed status is not {}".format(daemon_status))
"{} unexpected killed status is not {}".format(daemon_name, daemon_status))

time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)

pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is a positive integer but is {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))
35 changes: 18 additions & 17 deletions tests/platform_tests/daemon/test_pcied.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
SIG_TERM = "-15"
SIG_KILL = "-9"

pcie_devices_status_tbl_key = "PCIE_DEVICES|status"
pcie_devices_status_tbl_key = "PCIE_DEVICES"
pcie_devices_status_tbl_key_m = "PCIE_DEVICES|status"
status_field = "status"
expected_pcied_devices_status = "PASSED"

Expand Down Expand Up @@ -110,14 +111,14 @@ def test_pmon_pcied_running_status(duthosts, rand_one_dut_hostname):
daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
logger.info("{} daemon is {} with pid {}".format(daemon_name, daemon_status, daemon_pid))
pytest_assert(daemon_status == expected_running_status,
"Pcied expected running status is {} but is {}".format(expected_running_status, daemon_status))
"{} expected running status is {} but is {}".format(daemon_name, expected_running_status, daemon_status))
pytest_assert(daemon_pid != -1,
"Pcied expected pid is a positive integer but is {}".format(daemon_pid))
"{} expected pid is a positive integer but is {}".format(daemon_name, daemon_pid))

daemon_db_value = duthost.get_pmon_daemon_db_value(pcie_devices_status_tbl_key, status_field)
pytest_assert(daemon_db_value == expected_pcied_devices_status,
"Expected {} {} is {} but is {}".format(pcie_devices_status_tbl_key, status_field, expected_pcied_devices_status, daemon_db_value))

daemon_db_value_m = duthost.get_pmon_daemon_db_value(pcie_devices_status_tbl_key_m, status_field)
if daemon_db_value != expected_pcied_devices_status and daemon_db_value_m != expected_pcied_devices_status:
logger.error("{} expected db value is not set".format(daemon_name))
sujinmkang marked this conversation as resolved.
Show resolved Hide resolved


def test_pmon_pcied_stop_and_start_status(check_daemon_status, duthosts, rand_one_dut_hostname):
Expand All @@ -133,18 +134,18 @@ def test_pmon_pcied_stop_and_start_status(check_daemon_status, duthosts, rand_on

daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(daemon_status == expected_stopped_status,
"Pcied expected stopped status is {} but is {}".format(expected_stopped_status, daemon_status))
"{} expected stopped status is {} but is {}".format(daemon_name, expected_stopped_status, daemon_status))
pytest_assert(daemon_pid == -1,
"Pcied expected pid is -1 but is {}".format(daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, daemon_pid))

duthost.start_pmon_daemon(daemon_name)
time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))

Expand All @@ -162,18 +163,18 @@ def test_pmon_pcied_term_and_start_status(check_daemon_status, duthosts, rand_on

daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(daemon_status == expected_exited_status,
"Pcied expected terminated status is {} but is {}".format(expected_exited_status, daemon_status))
"{} expected terminated status is {} but is {}".format(daemon_name, expected_exited_status, daemon_status))
pytest_assert(daemon_pid == -1,
"Pcied expected pid is -1 but is {}".format(daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, daemon_pid))

duthost.start_pmon_daemon(daemon_name)
time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))

Expand All @@ -191,14 +192,14 @@ def test_pmon_pcied_kill_and_start_status(check_daemon_status, duthosts, rand_on
daemon_status, daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
logger.info("{} daemon got killed unexpectedly and it is {} with pid {}".format(daemon_name, daemon_status, daemon_pid))
pytest_assert(daemon_status != expected_running_status,
"Pcied unexpected killed status is not {}".format(daemon_status))
"{} unexpected killed status is not {}".format(daemon_name, daemon_status))

time.sleep(10)

post_daemon_status, post_daemon_pid = duthost.get_pmon_daemon_status(daemon_name)
pytest_assert(post_daemon_status == expected_running_status,
"Pcied expected restarted status is {} but is {}".format(expected_running_status, post_daemon_status))
"{} expected restarted status is {} but is {}".format(daemon_name, expected_running_status, post_daemon_status))
pytest_assert(post_daemon_pid != -1,
"Pcied expected pid is -1 but is {}".format(post_daemon_pid))
"{} expected pid is -1 but is {}".format(daemon_name, post_daemon_pid))
pytest_assert(post_daemon_pid > pre_daemon_pid,
"Restarted {} pid should be bigger than {} but it is {}".format(daemon_name, pre_daemon_pid, post_daemon_pid))