Fix for RAS test fail
Resolves openbmc/openbmc-test-automation#1018
Change-Id: I30a9cf0422026ba23361fe497132299f9d66871a
Signed-off-by: Sridevi Ramesh <sridevra@in.ibm.com>
diff --git a/extended/test_host_ras.robot b/extended/test_host_ras.robot
index 1a2b11d..c002c63 100755
--- a/extended/test_host_ras.robot
+++ b/extended/test_host_ras.robot
@@ -75,28 +75,6 @@
Inject Unrecoverable Error Through Host
... ${value[0]} ${value[1]} 1 ${value[2]} ${err_log_path}
-# Nest accelerator NXDMAENGFIR related error injection.
-
-Verify Recoverable Callout Handling For NXDMAENG With Threshold 1
- [Documentation] Verify recoverable callout handling for NXDMAENG with
- ... threshold 1.
- [Tags] Verify_Recoverable_Callout_Handling_For_NXDMAENG_With_Threshold_1
-
- ${value}= Get From Dictionary ${ERROR_INJECT_DICT} NX_RECV1
- ${err_log_path}= Catenate ${RAS_LOG_DIR_PATH}nxfir_th1
- Inject Recoverable Error With Threshold Limit Through Host
- ... ${value[0]} ${value[1]} 1 ${value[2]} ${err_log_path}
-
-
-Verify Recoverable Callout Handling For NXDMAENG With Threshold 32
- [Documentation] Verify recoverable callout handling for NXDMAENG with
- ... threshold 32.
- [Tags] Verify_Recoverable_Callout_Handling_For_NXDMAENG_With_Threshold_32
-
- ${value}= Get From Dictionary ${ERROR_INJECT_DICT} NX_RECV32
- ${err_log_path}= Catenate ${RAS_LOG_DIR_PATH}nxfir_th32
- Inject Recoverable Error With Threshold Limit Through Host
- ... ${value[0]} ${value[1]} 32 ${value[2]} ${err_log_path}
# CAPP accelerator (CXAFIR) related error injection.
@@ -144,6 +122,38 @@
Inject Recoverable Error With Threshold Limit Through Host
... ${value[0]} ${value[1]} 32 ${value[2]} ${err_log_path}
+# Nest accelerator NXDMAENGFIR related error injection.
+
+Verify Recoverable Callout Handling For NXDMAENG With Threshold 1
+ [Documentation] Verify recoverable callout handling for NXDMAENG with
+ ... threshold 1.
+ [Tags] Verify_Recoverable_Callout_Handling_For_NXDMAENG_With_Threshold_1
+
+ ${value}= Get From Dictionary ${ERROR_INJECT_DICT} NX_RECV1
+ ${err_log_path}= Catenate ${RAS_LOG_DIR_PATH}nxfir_th1
+ Inject Recoverable Error With Threshold Limit Through Host
+ ... ${value[0]} ${value[1]} 1 ${value[2]} ${err_log_path}
+
+
+Verify Recoverable Callout Handling For NXDMAENG With Threshold 32
+ [Documentation] Verify recoverable callout handling for NXDMAENG with
+ ... threshold 32.
+ [Tags] Verify_Recoverable_Callout_Handling_For_NXDMAENG_With_Threshold_32
+
+ ${value}= Get From Dictionary ${ERROR_INJECT_DICT} NX_RECV32
+ ${err_log_path}= Catenate ${RAS_LOG_DIR_PATH}nxfir_th32
+ Inject Recoverable Error With Threshold Limit Through Host
+ ... ${value[0]} ${value[1]} 32 ${value[2]} ${err_log_path}
+
+Verify Unrecoverable Callout Handling For NXDMAENG
+ [Documentation] Verify unrecoverable callout handling for NXDMAENG.
+ [Tags] Verify_Unrecoverable_Callout_Handling_For_NXDMAENG
+
+ ${value}= Get From Dictionary ${ERROR_INJECT_DICT} NX_UE
+ ${err_log_path}= Catenate ${RAS_LOG_DIR_PATH}nxfir_ue
+ Inject Unrecoverable Error Through Host
+ ... ${value[0]} ${value[1]} 1 ${value[2]} ${err_log_path}
+
*** Keywords ***
Inject Error Through HOST
@@ -171,9 +181,9 @@
:FOR ${i} IN RANGE ${threshold_limit}
\ Run Keyword Putscom Through OS ${proc_id} ${fri} ${chip_address}
# Adding delay after each error injection.
- \ Sleep 3s
+ \ Sleep 10s
# Adding delay to get error log after error injection.
- Sleep 20s
+ Sleep 120s
Verify And Clear Gard Records On HOST
[Documentation] Verify And Clear gard records on HOST.
@@ -196,7 +206,7 @@
Collect eSEL Log ${log_prefix}
${error_log_file_path}= Catenate ${log_prefix}esel.txt
${rc} ${output} = Run and Return RC and Output
- ... grep ${signature_desc} ${error_log_file_path}
+ ... grep -i ${signature_desc} ${error_log_file_path}
Should Not Be Empty ${output}
Inject Recoverable Error With Threshold Limit Through Host
@@ -264,7 +274,7 @@
# Boot to OS.
- REST Power On
+ REST Power On quiet=${1}
RAS Suite Setup
[Documentation] Create RAS log directory to store all RAS test logs.
@@ -280,7 +290,7 @@
... boots after test suite run.
# Boot to OS.
- REST Power On
+ REST Power On quiet=${1}
Delete Error Logs
Login To OS Host
Gard Operations On OS clear all
diff --git a/lib/ras/variables.py b/lib/ras/variables.py
index 65cf5ec..cf5f100 100644
--- a/lib/ras/variables.py
+++ b/lib/ras/variables.py
@@ -9,18 +9,18 @@
DES_MCS_RECV1 = "'mcs.n0p0c0.*MCFIR[^0].*mc internal recoverable'"
-DES_MCS_UE = "'mcs.n0p0c0.*MCFIR[^1].*mc internal non recovervable'"
+DES_MCS_UE = "'mcs.n0p0c0.*MCFIR[^1].*mc internal non recovervabl'"
-
-DES_NX_RECV1 = "'pu.n0p0.*NXDMAENGFIR[^5].*Channel 0 842 engine ECC'"
+DES_NX_RECV1 = "'pu.n0p0.*NXDMAENGFIR[^13].*Channel 4 GZIP ECC PE'"
DES_NX_RECV32 = "'pu.n0p0.*NXDMAENGFIR[^4].*Channel 0 842 engine ECC'"
+DES_NX_UE = "'pu.n0p0.*NXDMAENGFIR[^5].*Channel 0 842 engine ECC'"
DES_OBUS_RECV32 = "'ob.n0p0c0.*OB_LFIR[^0].*CFIR internal parity error'"
DES_CXA_RECV5 = "'capp.n0p0c0.*CXAFIR[^34].*CXA CE on data received'"
DES_CXA_RECV32 = "'capp.n0p0c0.*CXAFIR[^2].*CXA CE on Master array'"
-DES_NPU0_RECV32 = "'pu.n0p0.*NPU0FIR[^0].*NTL array CE'"
+DES_NPU0_RECV32 = "'pu.n0p0.*NPU0FIR[^13].*CQ CTL/SM ASBE Array single'"
# The following is an error injection dictionary with each entry consisting of:
# - field_name: Targettype_threshold_limit .
@@ -36,11 +36,12 @@
'MCACALIFIR_UE': ['07010900', '0020000000000000', DES_MCA_UE],
'MCS_RECV1': ['05010800', '8000000000000000', DES_MCS_RECV1],
'MCS_UE': ['05010800', '4000000000000000', DES_MCS_UE],
- 'NX_RECV1': ['02011100','0400000000000000', DES_NX_RECV1],
+ 'NX_RECV1': ['02011100','0004000000000000', DES_NX_RECV1],
+ 'NX_UE': ['02011100','0400000000000000', DES_NX_UE],
'NX_RECV32': ['02011100', '0800000000000000', DES_NX_RECV32],
'CXA_RECV5': ['02010800', '0000000020000000', DES_CXA_RECV5],
'CXA_RECV32': ['02010800', '2000000000000000', DES_CXA_RECV32],
'OBUS_RECV32': ['0904000a', '8000000000000000', DES_OBUS_RECV32],
- 'NPU0_RECV32': ['05011400', '8000000000000000', DES_NPU0_RECV32]
+ 'NPU0_RECV32': ['05013C00', '0004000000000000', DES_NPU0_RECV32]
}
diff --git a/test_lists/skip_test_witherspoon b/test_lists/skip_test_witherspoon
index 5e70014..417188f 100644
--- a/test_lists/skip_test_witherspoon
+++ b/test_lists/skip_test_witherspoon
@@ -31,3 +31,6 @@
-e Verify_Channel_Checkstop_Through_OS_With_Auto_Reboot
# https://github.com/openbmc/openbmc-test-automation/issues/1021
-e Escale_System_On_And_PL_Disabled
+# https://w3.rchland.ibm.com/projects/bestquest/?defect=SW397623
+-e Verify_Recoverable_Callout_Handling_For_CXA_With_Threshold_5
+-e Verify_Recoverable_Callout_Handling_For_CXA_With_Threshold_32