lava_helper_configs.py: Add PSA API tests for MPS2 platforms

Storage, Attest testsuites are enabled, for fvp_mps2_an521_bl2 and
tfm_mps2_sse_200 pltaforms. Crypto testsuite is added, but not enabled
(commented out) as it currently has failing testcases.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I2aab8dc146622e6f8449763d7878ae2b2cf0651c
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 94ee3ec..53125ce 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -47,6 +47,35 @@
     return cfg
 
 
+# LAVA test-monitor definition for PSA API testsuites, testcases identified
+# by "UT" value in output (testcase identifier).
+monitors_psaapitest_by_ut = [
+    {
+        'name': 'psa_api_suite',
+        'start': 'Running..',
+        'end': 'Entering standby..',
+        'pattern': r" UT: +(?P<test_case_id>[A-Za-z0-9_]+)\r?\n"
+                   r".+?"
+                   r"TEST RESULT: (?P<result>(PASSED|FAILED|SKIPPED))",
+        'fixup': {"pass": "PASSED", "fail": "FAILED", "skip": "SKIPPED"},
+    },
+]
+
+# LAVA test-monitor definition for PSA API testsuites, testcases identified
+# by description in output (for when UT is not set to unique identifier).
+monitors_psaapitest_by_desc = [
+    {
+        'name': 'psa_api_suite',
+        'start': 'Running..',
+        'end': 'Entering standby..',
+        'pattern': r" DESCRIPTION: +(?P<test_case_id>.+?) \\|"
+                   r".+?"
+                   r"TEST RESULT: (?P<result>(PASSED|FAILED|SKIPPED))",
+        'fixup': {"pass": "PASSED", "fail": "FAILED", "skip": "SKIPPED"},
+    },
+]
+
+
 # MPS2 with BL2 bootloader
 # IMAGE0ADDRESS: 0x10000000
 # IMAGE0FILE: \Software\bl2.bin  ; BL2 bootloader
@@ -552,6 +581,31 @@
                 }  # Monitors
             ]
         },  # CoreIPCTfmLevel3
+
+#        'PsaApiTest_Crypto': {
+#            "binaries": {
+#                "firmware": "tfm_s_ns_signed.bin",
+#                "bootloader": "bl2.bin"
+#            },
+#            "monitors": monitors_psaapitest_by_ut,
+#        }, # PsaApiTest_Crypto
+
+        'PsaApiTest_STORAGE': {
+            "binaries": {
+                "firmware": "tfm_s_ns_signed.bin",
+                "bootloader": "bl2.bin"
+            },
+            "monitors": monitors_psaapitest_by_desc,
+        }, # PsaApiTest_Storage
+
+        'PsaApiTest_Attest': {
+            "binaries": {
+                "firmware": "tfm_s_ns_signed.bin",
+                "bootloader": "bl2.bin"
+            },
+            "monitors": monitors_psaapitest_by_ut,
+        }, # PsaApiTest_Attest
+
     }  # Tests
 }
 
@@ -1059,6 +1113,31 @@
                 }  # Monitors
             ]
         },  # CoreIPCTfmLevel3
+
+#        'PsaApiTest_Crypto': {
+#            "binaries": {
+#                "firmware": "bl2.axf",
+#                "bootloader": "tfm_s_ns_signed.bin"
+#            },
+#            "monitors": monitors_psaapitest_by_ut,
+#        }, # PsaApiTest_Crypto
+
+        'PsaApiTest_STORAGE': {
+            "binaries": {
+                "firmware": "bl2.axf",
+                "bootloader": "tfm_s_ns_signed.bin"
+            },
+            "monitors": monitors_psaapitest_by_desc,
+        }, # PsaApiTest_Storage
+
+        'PsaApiTest_Attest': {
+            "binaries": {
+                "firmware": "bl2.axf",
+                "bootloader": "tfm_s_ns_signed.bin"
+            },
+            "monitors": monitors_psaapitest_by_ut,
+        }, # PsaApiTest_Attest
+
     }  # Tests
 }