Update DMTF Refish use case checker test suite
Changes:
- Add logic to print errors in test suite
- Update the directory where log is collected
- Fix typo for IPMI suite
Resolves openbmc/openbmc-test-automation#2177
Change-Id: Ice7bb4a7b154529e904a501802ef22cf583963ed
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/ipmi/test_ipmi_cipher.robot b/ipmi/test_ipmi_cipher.robot
index ce07f44..6f1eb7d 100644
--- a/ipmi/test_ipmi_cipher.robot
+++ b/ipmi/test_ipmi_cipher.robot
@@ -41,7 +41,7 @@
Verify Supported Cipher Via Getciphers
- [Documentation] Verify supported chipers via IPMI getciphers command.
+ [Documentation] Verify supported ciphers via IPMI getciphers command.
[Tags] Verify_Supported_Cipher_Via_Getciphers
# Example output from 'Channel Getciphers IPMI':
diff --git a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
index bbe3f81..6dd0522 100644
--- a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
+++ b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
@@ -2,10 +2,11 @@
Documentation Test BMC using https://github.com/DMTF/Redfish-Usecase-Checkers
... DMTF tool.
-Library OperatingSystem
-Library ../../lib/state.py
+Resource ../../lib/resource.robot
Resource ../../lib/dmtf_tools_utils.robot
Resource ../../lib/openbmc_ffdc.robot
+Library OperatingSystem
+Library ../../lib/state.py
Test Setup Test Setup Execution
Test Teardown Test Teardown Execution
@@ -19,11 +20,11 @@
${command_account} ${DEFAULT_PYTHON} ${rsv_dir_path}${/}account_management/account_management.py
... -r ${OPENBMC_HOST} -u ${OPENBMC_USERNAME}
-... -p ${OPENBMC_PASSWORD} -S Always -d ${EXECDIR}${/}logs${/}
+... -p ${OPENBMC_PASSWORD} -S Always -d ${EXECDIR}${/}account-logs${/}
${command_power_control} ${DEFAULT_PYTHON} ${rsv_dir_path}${/}power_control/power_control.py
... -r ${OPENBMC_HOST} -u ${OPENBMC_USERNAME}
-... -p ${OPENBMC_PASSWORD} -S Always
+... -p ${OPENBMC_PASSWORD} -S Always -d ${EXECDIR}${/}power-logs${/}
${power_on_timeout} 15 mins
${power_off_timeout} 15 mins
@@ -37,10 +38,10 @@
${output}= Run DMTF Tool ${rsv_dir_path} ${command_account} check_error=1
- ${output}= Shell Cmd cat ${EXECDIR}${/}logs${/}results.json
+ ${output}= Shell Cmd cat ${EXECDIR}${/}account-logs${/}results.json
Log ${output}
- ${json}= OperatingSystem.Get File ${EXECDIR}${/}logs${/}results.json
+ ${json}= OperatingSystem.Get File ${EXECDIR}${/}account-logs${/}results.json
${object}= Evaluate json.loads('''${json}''') json
@@ -83,6 +84,31 @@
DMTF Power
[Documentation] Power the BMC machine on via DMTF tools.
- Print Timen Doing "DMTF Power".
+ ${output}= Run DMTF Tool ${rsv_dir_path} ${command_power_control} check_error=1
+ Log ${output}
- Run DMTF Tool ${rsv_dir_path} ${command_power_control}
+ ${json}= OperatingSystem.Get File ${EXECDIR}${/}power-logs${/}results.json
+
+ ${object}= Evaluate json.loads('''${json}''') json
+
+ ${result_list}= Set Variable ${object["TestResults"]}
+ Log To Console result: ${result_list}
+
+ @{failed_tc_list}= Create List
+ @{error_messages}= Create List
+
+ FOR ${result} IN @{result_list}
+ ${rc}= evaluate 'ErrorMessages'=='${result}'
+ ${num}= Run Keyword If ${rc} == False Set Variable ${result_list["${result}"]["fail"]}
+ Run Keyword If ${num} != None and ${num} > 0 Append To List ${failed_tc_list} ${result}
+ Run Keyword If ${rc} == True Set Variable
+ ... Append To List ${error_messages} ${result_list["ErrorMessages"]}
+ END
+
+ Log Many ErrorMessages: @{error_messages}
+ Log To Console ErrorMessages:
+ FOR ${msg} IN @{error_messages}
+ Log To Console ${msg}
+ END
+
+ Should Be Empty ${error_messages} DMTF Power keyword failed.