Common error log keywords moved to logging_utils.robot.
Resolves openbmc/openbmc-test-automation#1301
Change-Id: Ib5e6aea12505c87dee5fc044ae492160025e751d
Signed-off-by: Sivas SRR <sivas.srr@in.ibm.com>
diff --git a/extended/test_error_log.robot b/extended/test_error_log.robot
index 5779805..6b8d37d 100644
--- a/extended/test_error_log.robot
+++ b/extended/test_error_log.robot
@@ -7,6 +7,7 @@
Resource ../lib/state_manager.robot
Resource ../lib/ipmi_client.robot
Resource ../lib/boot_utils.robot
+Resource ../lib/logging_utils.robot
Test Setup Test Setup Execution
Test Teardown Test Teardown Execution
diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot b/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
index 05e5fe6..c04d21e 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
+++ b/gui/obmc_gui/test/gui_header/test_obmc_gui_server_health.robot
@@ -9,6 +9,7 @@
Resource ../../../../lib/state_manager.robot
Resource ../../../../lib/openbmc_ffdc_methods.robot
Resource ../../../../lib/dump_utils.robot
+Resource ../../../../lib/logging_utils.robot
Suite Setup Launch Browser And Login OpenBMC GUI
Suite Teardown Logout And Close Browser
diff --git a/lib/logging_utils.robot b/lib/logging_utils.robot
index 7d168e7..13aa603 100644
--- a/lib/logging_utils.robot
+++ b/lib/logging_utils.robot
@@ -61,3 +61,106 @@
${empty_dict}= Create Dictionary
Return From Keyword If '${status}' == 'FAIL' ${empty_dict}
[Return] ${error_logs}
+
+
+Get IPMI SEL Setting
+ [Documentation] Returns status for given IPMI SEL setting.
+ [Arguments] ${setting}
+ # Description of argument(s):
+ # setting SEL setting which needs to be read(e.g. "Last Add Time").
+
+ ${resp}= Run IPMI Standard Command sel info
+
+ ${setting_line}= Get Lines Containing String ${resp} ${setting}
+ ... case-insensitive
+ ${setting_status}= Fetch From Right ${setting_line} :${SPACE}
+
+ [Return] ${setting_status}
+
+
+Verify Watchdog Errorlog Content
+ [Documentation] Verify watchdog errorlog content.
+ # Example:
+ # "/xyz/openbmc_project/logging/entry/1":
+ # {
+ # "AdditionalData": [],
+ # "Id": 1,
+ # "Message": "org.open_power.Host.Boot.Error.WatchdogTimedOut",
+ # "Resolved": 0,
+ # "Severity": "xyz.openbmc_project.Logging.Entry.Level.Error",
+ # "Timestamp": 1492715244828,
+ # "associations": []
+ # },
+
+ ${elog_entry}= Get URL List ${BMC_LOGGING_ENTRY}
+ ${elog}= Read Properties ${elog_entry[0]}
+ Should Be Equal As Strings
+ ... ${elog["Message"]} org.open_power.Host.Boot.Error.WatchdogTimedOut
+ Should Be Equal As Strings
+ ... ${elog["Severity"]} xyz.openbmc_project.Logging.Entry.Level.Error
+
+
+Logging Test Binary Exist
+ [Documentation] Verify existence of prerequisite logging-test.
+ Open Connection And Log In
+ ${out} ${stderr}= Execute Command
+ ... which /tmp/tarball/bin/logging-test return_stderr=True
+ Should Be Empty ${stderr}
+ Should Contain ${out} logging-test
+
+Clear Existing Error Logs
+ [Documentation] If error log isn't empty, reboot the BMC to clear the log.
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}${1}
+ Return From Keyword If ${resp.status_code} == ${HTTP_NOT_FOUND}
+ Initiate BMC Reboot
+ Wait Until Keyword Succeeds 10 min 10 sec
+ ... Is BMC Ready
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}${1}
+ Should Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
+
+Create Test Error Log
+ [Documentation] Generate test error log.
+ # Test error log entry example:
+ # "/xyz/openbmc_project/logging/entry/1": {
+ # "AdditionalData": [
+ # "STRING=FOO"
+ # ],
+ # "Id": 1,
+ # "Message": "example.xyz.openbmc_project.Example.Elog.AutoTestSimple",
+ # "Severity": "xyz.openbmc_project.Logging.Entry.Level.Error",
+ # "Timestamp": 1487743963328,
+ # "associations": []
+ # }
+
+ Execute Command On BMC /tmp/tarball/bin/logging-test -c AutoTestSimple
+
+Count Error Entries
+ [Documentation] Count Error entries.
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}
+ Should Be Equal As Strings ${resp.status_code} ${HTTP_OK}
+ ${jsondata}= To JSON ${resp.content}
+ ${count}= Get Length ${jsondata["data"]}
+ [Return] ${count}
+
+Verify Test Error Log
+ [Documentation] Verify test error log entries.
+ ${elog_entry}= Get URL List ${BMC_LOGGING_ENTRY}
+ ${entry_id}= Read Attribute ${elog_entry[0]} Message
+ Should Be Equal ${entry_id}
+ ... example.xyz.openbmc_project.Example.Elog.AutoTestSimple
+ ${entry_id}= Read Attribute ${elog_entry[0]} Severity
+ Should Be Equal ${entry_id}
+ ... xyz.openbmc_project.Logging.Entry.Level.Error
+
+Delete Error Logs And Verify
+ [Documentation] Delete all error logs and verify.
+ Delete All Error Logs
+ ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list quiet=${1}
+ Should Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
+
+
+Install Tarball
+ [Documentation] Install tarball on BMC.
+ Run Keyword If '${DEBUG_TARBALL_PATH}' == '${EMPTY}' Return From Keyword
+ BMC Execute Command rm -rf /tmp/tarball
+ Install Debug Tarball On BMC ${DEBUG_TARBALL_PATH}
diff --git a/lib/utils.robot b/lib/utils.robot
index 91729e2..f77f057 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -1492,108 +1492,6 @@
BMC Execute Command ${cmd}
-Get IPMI SEL Setting
- [Documentation] Returns status for given IPMI SEL setting.
- [Arguments] ${setting}
- # Description of argument(s):
- # setting SEL setting which needs to be read(e.g. "Last Add Time").
-
- ${resp}= Run IPMI Standard Command sel info
-
- ${setting_line}= Get Lines Containing String ${resp} ${setting}
- ... case-insensitive
- ${setting_status}= Fetch From Right ${setting_line} :${SPACE}
-
- [Return] ${setting_status}
-
-
-Verify Watchdog Errorlog Content
- [Documentation] Verify watchdog errorlog content.
- # Example:
- # "/xyz/openbmc_project/logging/entry/1":
- # {
- # "AdditionalData": [],
- # "Id": 1,
- # "Message": "org.open_power.Host.Boot.Error.WatchdogTimedOut",
- # "Resolved": 0,
- # "Severity": "xyz.openbmc_project.Logging.Entry.Level.Error",
- # "Timestamp": 1492715244828,
- # "associations": []
- # },
-
- ${elog_entry}= Get URL List ${BMC_LOGGING_ENTRY}
- ${elog}= Read Properties ${elog_entry[0]}
- Should Be Equal As Strings
- ... ${elog["Message"]} org.open_power.Host.Boot.Error.WatchdogTimedOut
- Should Be Equal As Strings
- ... ${elog["Severity"]} xyz.openbmc_project.Logging.Entry.Level.Error
-
-
-Logging Test Binary Exist
- [Documentation] Verify existence of prerequisite logging-test.
- Open Connection And Log In
- ${out} ${stderr}= Execute Command
- ... which /tmp/tarball/bin/logging-test return_stderr=True
- Should Be Empty ${stderr}
- Should Contain ${out} logging-test
-
-Clear Existing Error Logs
- [Documentation] If error log isn't empty, reboot the BMC to clear the log.
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}${1}
- Return From Keyword If ${resp.status_code} == ${HTTP_NOT_FOUND}
- Initiate BMC Reboot
- Wait Until Keyword Succeeds 10 min 10 sec
- ... Is BMC Ready
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}${1}
- Should Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
-
-Create Test Error Log
- [Documentation] Generate test error log.
- # Test error log entry example:
- # "/xyz/openbmc_project/logging/entry/1": {
- # "AdditionalData": [
- # "STRING=FOO"
- # ],
- # "Id": 1,
- # "Message": "example.xyz.openbmc_project.Example.Elog.AutoTestSimple",
- # "Severity": "xyz.openbmc_project.Logging.Entry.Level.Error",
- # "Timestamp": 1487743963328,
- # "associations": []
- # }
-
- Execute Command On BMC /tmp/tarball/bin/logging-test -c AutoTestSimple
-
-Count Error Entries
- [Documentation] Count Error entries.
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}
- Should Be Equal As Strings ${resp.status_code} ${HTTP_OK}
- ${jsondata}= To JSON ${resp.content}
- ${count}= Get Length ${jsondata["data"]}
- [Return] ${count}
-
-Verify Test Error Log
- [Documentation] Verify test error log entries.
- ${elog_entry}= Get URL List ${BMC_LOGGING_ENTRY}
- ${entry_id}= Read Attribute ${elog_entry[0]} Message
- Should Be Equal ${entry_id}
- ... example.xyz.openbmc_project.Example.Elog.AutoTestSimple
- ${entry_id}= Read Attribute ${elog_entry[0]} Severity
- Should Be Equal ${entry_id}
- ... xyz.openbmc_project.Logging.Entry.Level.Error
-
-Delete Error Logs And Verify
- [Documentation] Delete all error logs and verify.
- Delete All Error Logs
- ${resp}= OpenBMC Get Request ${BMC_LOGGING_ENTRY}/list quiet=${1}
- Should Be Equal As Strings ${resp.status_code} ${HTTP_NOT_FOUND}
-
-
-Install Tarball
- [Documentation] Install tarball on BMC.
- Run Keyword If '${DEBUG_TARBALL_PATH}' == '${EMPTY}' Return From Keyword
- BMC Execute Command rm -rf /tmp/tarball
- Install Debug Tarball On BMC ${DEBUG_TARBALL_PATH}
-
Verify Identify LED State
[Documentation] Verify the identify LED state