Updated BMC Execute Command in the "syslib" and "tests" folders
- Replace Uses of "Execute Command On BMC" with
"BMC Execute Command" in the syslib and test folders.
Change-Id: I39fcf474f88310e0a022890f20c36823bf535355
Signed-off-by: Joy Onyerikwu <onyekachukwu.joy.onyerikwu@ibm.com>
diff --git a/syslib/utils_os.robot b/syslib/utils_os.robot
index 6555008..d7061d6 100755
--- a/syslib/utils_os.robot
+++ b/syslib/utils_os.robot
@@ -130,12 +130,13 @@
${cur_datetime}= Get Current Date result_format=%Y%m%d%H%M%S%f
File Exist On OS /tmp/htxerr
- ${htx_err}= Execute Command On BMC cat /tmp/htxerr
+ ${htx_err} ${std_err} ${rc}= OS Execute Command cat /tmp/htxerr
Write Log Data To File
... ${htx_err} ${htx_log_dir_path}/${OS_HOST}${cur_datetime}.htxerr
File Exist On OS /tmp/htxstats
- ${htx_stats}= Execute Command On BMC cat /tmp/htxstats
+ ${htx_stats} ${std_err} ${rc}= OS Execute Command
+ ... cat /tmp/htxstats
Write Log Data To File
... ${htx_stats} ${htx_log_dir_path}/${OS_HOST}_${cur_datetime}.htxstats
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index 677bbc8..eb463a8 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -47,10 +47,8 @@
[Documentation] Parse the journal log and check for failures.
[Tags] Check_For_Application_Failures
- Open Connection And Log In
-
- ${journal_log}= Execute Command On BMC
- ... journalctl --no-pager | egrep '${ERROR_REGEX}'
+ ${journal_log} ${stderr} ${rc}= BMC Execute Command
+ ... journalctl --no-pager | egrep '${ERROR_REGEX}' ignore_err=1
Should Be Empty ${journal_log}
diff --git a/tests/test_reset_reload.robot b/tests/test_reset_reload.robot
index 5fa8e72..abc7827 100644
--- a/tests/test_reset_reload.robot
+++ b/tests/test_reset_reload.robot
@@ -60,7 +60,7 @@
Check Reset Reload Status
[Documentation] Returns reset reload status based on file presence.
- ${rr_status}= Execute Command On BMC
+ ${rr_status} ${stderr} ${rc}= BMC Execute Command
... test -e /run/openbmc/chassis@0-on && echo "Yes" || echo "No"
[Return] ${rr_status}
diff --git a/tests/test_service_restart_policy.robot b/tests/test_service_restart_policy.robot
index 764a7cf..48d4623 100644
--- a/tests/test_service_restart_policy.robot
+++ b/tests/test_service_restart_policy.robot
@@ -46,7 +46,7 @@
Should Be Equal active ${ActiveState}
... msg=Logging Service not in active state.
- Execute Command On BMC kill -9 ${MainPID}
+ BMC Execute Command kill -9 ${MainPID}
Sleep 10s reason=Wait for service to restart.
${MainPID}= Get Service Attribute MainPID ${LOG_SERVICE}
@@ -76,5 +76,5 @@
# servicename Qualified service name
${cmd}= Set Variable
... systemctl -p ${option} show ${servicename} | cut -d = -f2
- ${attr}= Execute Command On BMC ${cmd}
+ ${attr} ${stderr} ${rc}= BMC Execute Command ${cmd}
[Return] ${attr}
diff --git a/tests/test_software_manager.robot b/tests/test_software_manager.robot
index 8351584..e13d9dd 100755
--- a/tests/test_software_manager.robot
+++ b/tests/test_software_manager.robot
@@ -274,7 +274,7 @@
Open Connection And Log In
${cmd}= Set Variable grep ^VERSION_ID= /etc/os-release | cut -f 2 -d '='
- ${output}= Execute Command On BMC ${cmd}
+ ${output} ${stderr} ${rc}= BMC Execute Command ${cmd}
Should Be Equal As Strings ${version} ${output[1:-1]}