From 2cdacb3fa891391bae70c4d8a1a1e7bf4551f271 Mon Sep 17 00:00:00 2001 From: Aleksandr Khromykh Date: Thu, 20 Jul 2023 16:51:03 +0200 Subject: [PATCH] tests: Bluetooth: Mesh: add cfg mesh with mbedtls PSA to bsim CI Commit adds configuration for mesh with mbedtls PSA to CI BabbleSim tests as well as emulation of the Internal Trustable Storage(ITS) based on Zephyr's settings to run in parallel environment. Signed-off-by: Aleksandr Khromykh --- modules/mbedtls/configs/config-tls-generic.h | 13 ++ subsys/bluetooth/mesh/adv.h | 2 +- tests/bsim/bluetooth/mesh/CMakeLists.txt | 13 ++ tests/bsim/bluetooth/mesh/compile.sh | 7 + tests/bsim/bluetooth/mesh/overlay_psa.conf | 2 + .../bluetooth/mesh/src/distribute_keyid.c | 10 - .../bluetooth/mesh/src/distribute_keyid.h | 17 -- tests/bsim/bluetooth/mesh/src/mesh_test.c | 2 - tests/bsim/bluetooth/mesh/src/psa_its_emul.c | 209 ++++++++++++++++++ .../tests_scripts/access/access_cancel.sh | 5 + .../tests_scripts/access/access_ext_sub.sh | 5 + .../access/access_ext_sub_cap.sh | 4 + .../tests_scripts/access/access_period.sh | 5 + .../tests_scripts/access/access_transmit.sh | 5 + .../tests_scripts/advertiser/proxy_mixin.sh | 4 + .../tests_scripts/advertiser/random_order.sh | 4 + .../tests_scripts/advertiser/reverse_order.sh | 4 + .../tests_scripts/advertiser/send_order.sh | 4 + .../tests_scripts/advertiser/tx_cb_multi.sh | 4 + .../tests_scripts/advertiser/tx_cb_single.sh | 4 + .../tests_scripts/beacon/beacon_interval.sh | 6 + .../mesh/tests_scripts/beacon/invalid.sh | 6 + .../mesh/tests_scripts/beacon/iv_update.sh | 6 + .../mesh/tests_scripts/beacon/key_refresh.sh | 6 + .../mesh/tests_scripts/beacon/kr_old_key.sh | 6 + .../tests_scripts/beacon/multiple_netkeys.sh | 6 + .../blob_mdls/blob_cli_broadcast.sh | 21 -- .../blob_mdls/blob_cli_broadcast_basic.sh | 12 + .../blob_mdls/blob_cli_broadcast_trans.sh | 12 + .../blob_mdls/blob_cli_broadcast_unicast.sh | 12 + .../blob_cli_broadcast_unicast_seq.sh | 12 + .../tests_scripts/blob_mdls/blob_cli_caps.sh | 25 --- .../blob_mdls/blob_cli_caps_all_rsp.sh | 15 ++ .../blob_mdls/blob_cli_caps_cancelled.sh | 15 ++ .../blob_mdls/blob_cli_caps_no_rsp.sh | 15 ++ .../blob_mdls/blob_cli_caps_partial_rsp.sh | 15 ++ .../blob_mdls/blob_cli_friend.sh | 10 + .../blob_mdls/blob_cli_no_rsp_block.sh | 18 ++ ..._cli_no_rsp.sh => blob_cli_no_rsp_xfer.sh} | 13 +- .../blob_mdls/blob_cli_persistent_transfer.sh | 9 + .../blob_cli_persistent_transfer_pull.sh | 7 + .../blob_mdls/blob_cli_trans_complete_pull.sh | 7 + .../blob_mdls/blob_cli_trans_complete_push.sh | 6 + .../blob_mdls/blob_cli_trans_resume_pull.sh | 8 +- .../blob_mdls/blob_cli_trans_resume_push.sh | 4 + .../blob_mdls/blob_srv_persistence.sh | 32 +++ .../dfu/dfu_cli_all_targets_lost_on_apply.sh | 9 + .../dfu_cli_all_targets_lost_on_caps_get.sh | 9 + .../dfu_cli_all_targets_lost_on_metadata.sh | 9 + .../dfu_cli_all_targets_lost_on_update_get.sh | 9 + .../dfu/dfu_cli_all_targets_lost_on_verify.sh | 9 + .../dfu/dfu_cli_persistent_transfer.sh | 11 + .../tests_scripts/dfu/dfu_dist_self_update.sh | 4 + .../dfu/dfu_dist_self_update_mult_targets.sh | 5 + .../mesh/tests_scripts/dfu/dfu_mixed.sh | 5 + .../mesh/tests_scripts/dfu/dfu_mixed_fail.sh | 6 + .../mesh/tests_scripts/dfu/dfu_slot.sh | 10 + .../tests_scripts/dfu/dfu_srv_persistence.sh | 39 ++++ .../tests_scripts/friendship/establish.sh | 6 + .../friendship/establish_multi.sh | 10 + .../tests_scripts/friendship/lpn_disable.sh | 6 + .../tests_scripts/friendship/lpn_loopback.sh | 6 + .../friendship/lpn_terminate_cb.sh | 6 + .../mesh/tests_scripts/friendship/msg_frnd.sh | 6 + .../tests_scripts/friendship/msg_group.sh | 7 + .../mesh/tests_scripts/friendship/msg_mesh.sh | 7 + .../friendship/msg_mesh_low_lat.sh | 7 + .../friendship/msg_va_collision.sh | 6 + .../mesh/tests_scripts/friendship/overflow.sh | 6 + .../mesh/tests_scripts/friendship/poll.sh | 6 + .../tests_scripts/friendship/re-establish.sh | 6 + .../tests_scripts/heartbeat/sub_cb_api_all.sh | 7 + .../heartbeat/sub_cb_api_unicast.sh | 7 + .../tests_scripts/iv_index/iv_deferring.sh | 4 + .../tests_scripts/iv_index/iv_recovery.sh | 4 + .../mesh/tests_scripts/iv_index/iv_update.sh | 4 + .../large_comp_data/get_comp_data_max_sdu.sh | 5 + .../large_comp_data/get_comp_data_split.sh | 5 + .../large_comp_data/get_metadata_max_sdu.sh | 5 + .../large_comp_data/get_metadata_split.sh | 5 + .../op_agg/full_status_msg_list.sh | 5 + .../mesh/tests_scripts/persistence/access.sh | 29 +++ .../mesh/tests_scripts/persistence/cfg.sh | 16 ++ .../tests_scripts/persistence/provisioning.sh | 8 + .../persistence/reprovisioning.sh | 10 + .../priv_beacon/priv_beacon_adv.sh | 4 + .../priv_beacon/priv_beacon_interleave.sh | 4 + .../priv_beacon/priv_beacon_invalid.sh | 4 + .../priv_beacon/priv_beacon_ivu.sh | 7 + .../priv_beacon_ivu_long_interval.sh | 7 + .../priv_beacon/priv_beacon_kr.sh | 7 + .../priv_beacon_kr_long_interval.sh | 7 + .../provision/ivu_flag_one_duration.sh | 4 + .../provision/ivu_flag_zero_duration.sh | 4 + .../tests_scripts/provision/pb_adv_multi.sh | 8 + .../tests_scripts/provision/pb_adv_no_oob.sh | 6 + .../provision/pb_adv_oob_auth_ib_pk.sh | 5 + .../pb_adv_oob_auth_ignore_oob_pk.sh | 5 + .../provision/pb_adv_oob_auth_oob_pk.sh | 5 + .../provision/pb_adv_reprovision.sh | 6 + .../provision/pb_remote_nppi_robustness.sh | 7 + .../provision/pb_remote_parallel.sh | 8 + .../provision/pb_remote_pst_ncrp.sh | 25 +++ .../provision/pb_remote_reprovision.sh | 7 + .../provision/pb_remote_timeout.sh | 7 + .../replay_cache/replay_attack.sh | 12 + .../tests_scripts/replay_cache/rpl_frag.sh | 8 + .../sar/sar_cfg_persistent_storage.sh | 5 + .../tests_scripts/sar/slow_transfer_test.sh | 5 + .../mesh/tests_scripts/sar/stress_test.sh | 5 + .../tests_scripts/scanner/invalid_ad_type.sh | 6 + .../scanner/wrong_packet_length.sh | 6 + .../mesh/tests_scripts/transport/fixed.sh | 4 + .../mesh/tests_scripts/transport/group.sh | 4 + .../mesh/tests_scripts/transport/loopback.sh | 4 + .../tests_scripts/transport/loopback_group.sh | 4 + .../transport/loopback_group_low_lat.sh | 4 + .../mesh/tests_scripts/transport/seg_block.sh | 4 + .../tests_scripts/transport/seg_concurrent.sh | 4 + .../mesh/tests_scripts/transport/seg_fail.sh | 4 + .../mesh/tests_scripts/transport/seg_ivu.sh | 4 + .../mesh/tests_scripts/transport/unicast.sh | 4 + .../transport/unicast_low_lat.sh | 4 + .../tests_scripts/transport/unknown_app.sh | 4 + .../mesh/tests_scripts/transport/va.sh | 4 + .../tests_scripts/transport/va_collision.sh | 4 + tests/bsim/compile.source | 5 +- 127 files changed, 1111 insertions(+), 85 deletions(-) create mode 100644 tests/bsim/bluetooth/mesh/overlay_psa.conf delete mode 100644 tests/bsim/bluetooth/mesh/src/distribute_keyid.h create mode 100644 tests/bsim/bluetooth/mesh/src/psa_its_emul.c delete mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh delete mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh create mode 100755 tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh rename tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/{blob_cli_no_rsp.sh => blob_cli_no_rsp_xfer.sh} (71%) diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h index 0c6d418c476..9d8ab757843 100644 --- a/modules/mbedtls/configs/config-tls-generic.h +++ b/modules/mbedtls/configs/config-tls-generic.h @@ -481,6 +481,19 @@ #include CONFIG_MBEDTLS_USER_CONFIG_FILE #endif +#if !defined(CONFIG_MBEDTLS_PSA_CRYPTO_C) +/* When PSA API is used the checking header is included over the chain: + * |-psa/crypto.h + * |-psa/crypto_platform.h + * |-mbedtls/build_info.h + * |-mbedtls/check_config.h + * If include this header here then PSA API will be in semiconfigured state + * without considering dependencies from mbedtls/config_psa.h. + * mbedtls/config_psa.h should be included right after config-tls-generic.h before checking. + * Formally, all settings are correct but mbedtls library cannot be built. + * The behavior was introduced after adding mbedTLS 3.4.0 + */ #include "mbedtls/check_config.h" +#endif #endif /* MBEDTLS_CONFIG_H */ diff --git a/subsys/bluetooth/mesh/adv.h b/subsys/bluetooth/mesh/adv.h index eec6ae2fd74..0e7c5fe8ca0 100644 --- a/subsys/bluetooth/mesh/adv.h +++ b/subsys/bluetooth/mesh/adv.h @@ -14,7 +14,7 @@ #define BT_MESH_ADV_SCAN_UNIT(_ms) ((_ms) * 8 / 5) -#if defined(CONFIG_BT_EXT_ADV) +#if defined(CONFIG_BT_EXT_ADV) && !defined(CONFIG_BT_LL_SW_SPLIT) #define BT_MESH_SCAN_INTERVAL_MS 3000 #define BT_MESH_SCAN_WINDOW_MS 3000 #else diff --git a/tests/bsim/bluetooth/mesh/CMakeLists.txt b/tests/bsim/bluetooth/mesh/CMakeLists.txt index f389e75a74e..749e8d7acf4 100644 --- a/tests/bsim/bluetooth/mesh/CMakeLists.txt +++ b/tests/bsim/bluetooth/mesh/CMakeLists.txt @@ -37,6 +37,7 @@ if(CONFIG_SETTINGS) if(CONFIG_BT_MESH_USES_MBEDTLS_PSA) target_sources(app PRIVATE src/distribute_keyid.c + src/psa_its_emul.c ) endif() @@ -82,3 +83,15 @@ zephyr_include_directories( ${BSIM_COMPONENTS_PATH}/libUtilv1/src/ ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/ ) + +# The mbedTLS PSA ITS is not thread safe. +# The issue: https://github.com/zephyrproject-rtos/zephyr/issues/59362 +# Also, it isn't possible to use "native" ITS implementation since +# mbedTLS includes headers that do not exist. +# This linker option allows linking custom ITS implementation instead of +# precompiled objects from the mbedTLS library to run it in parallel. +if(CONFIG_BT_MESH_USES_MBEDTLS_PSA) + zephyr_ld_options( + ${LINKERFLAGPREFIX},--allow-multiple-definition + ) +endif() diff --git a/tests/bsim/bluetooth/mesh/compile.sh b/tests/bsim/bluetooth/mesh/compile.sh index 0c3e106170a..de9b4bd6af0 100755 --- a/tests/bsim/bluetooth/mesh/compile.sh +++ b/tests/bsim/bluetooth/mesh/compile.sh @@ -28,5 +28,12 @@ app=tests/bsim/bluetooth/mesh \ conf_file=prj_mesh1d1.conf conf_overlay=overlay_gatt.conf compile app=tests/bsim/bluetooth/mesh \ conf_file=prj_mesh1d1.conf conf_overlay=overlay_low_lat.conf compile +app=tests/bsim/bluetooth/mesh conf_file=prj_mesh1d1.conf conf_overlay=overlay_psa.conf compile +app=tests/bsim/bluetooth/mesh \ + conf_file=prj_mesh1d1.conf conf_overlay="overlay_pst.conf;overlay_psa.conf" compile +app=tests/bsim/bluetooth/mesh \ + conf_file=prj_mesh1d1.conf conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile +app=tests/bsim/bluetooth/mesh \ + conf_file=prj_mesh1d1.conf conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile wait_for_background_jobs diff --git a/tests/bsim/bluetooth/mesh/overlay_psa.conf b/tests/bsim/bluetooth/mesh/overlay_psa.conf new file mode 100644 index 00000000000..ba81c1e0213 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/overlay_psa.conf @@ -0,0 +1,2 @@ +# Enable mbedTLS PSA as a crypto backend +CONFIG_BT_MESH_USES_MBEDTLS_PSA=y diff --git a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c b/tests/bsim/bluetooth/mesh/src/distribute_keyid.c index 3f1001734ac..8bfb0f6ced1 100644 --- a/tests/bsim/bluetooth/mesh/src/distribute_keyid.c +++ b/tests/bsim/bluetooth/mesh/src/distribute_keyid.c @@ -70,13 +70,3 @@ void bt_mesh_user_keyid_assign(psa_key_id_t key_id) LOG_WRN("key id %d is out of the reserved id range", key_id); } } - -void stored_keys_clear(void) -{ - struct bt_mesh_key key; - - for (int i = 0; i < BT_MESH_KEY_ID_RANGE_SIZE; i++) { - key.key = BT_MESH_TEST_PSA_KEY_ID_USER_MIN + i; - bt_mesh_key_destroy(&key); - } -} diff --git a/tests/bsim/bluetooth/mesh/src/distribute_keyid.h b/tests/bsim/bluetooth/mesh/src/distribute_keyid.h deleted file mode 100644 index b78c6cb7480..00000000000 --- a/tests/bsim/bluetooth/mesh/src/distribute_keyid.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2023 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#ifndef TESTS_BSIM_BLUETOOTH_MESH_SRC_DISTRIBUTE_KEYID_H_ -#define TESTS_BSIM_BLUETOOTH_MESH_SRC_DISTRIBUTE_KEYID_H_ - -#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA -void stored_keys_clear(void); -#else -static inline void stored_keys_clear(void) -{} -#endif - -#endif /* TESTS_BSIM_BLUETOOTH_MESH_SRC_DISTRIBUTE_KEYID_H_ */ diff --git a/tests/bsim/bluetooth/mesh/src/mesh_test.c b/tests/bsim/bluetooth/mesh/src/mesh_test.c index cbbc7ac28a7..f9c1e2e58d4 100644 --- a/tests/bsim/bluetooth/mesh/src/mesh_test.c +++ b/tests/bsim/bluetooth/mesh/src/mesh_test.c @@ -7,7 +7,6 @@ #include "argparse.h" #include #include "settings_test_backend.h" -#include "distribute_keyid.h" #include "mesh/crypto.h" #define LOG_MODULE_NAME mesh_test @@ -557,7 +556,6 @@ void bt_mesh_test_host_files_remove(void) #if defined(CONFIG_SETTINGS) /* crypto library initialization to be able to remove stored keys. */ bt_mesh_crypto_init(); - stored_keys_clear(); settings_test_backend_clear(); #endif } diff --git a/tests/bsim/bluetooth/mesh/src/psa_its_emul.c b/tests/bsim/bluetooth/mesh/src/psa_its_emul.c new file mode 100644 index 00000000000..92af388ebd4 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/src/psa_its_emul.c @@ -0,0 +1,209 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * PSA ITS emulator over settings. + */ + +#include + +#include +#include <../library/psa_crypto_its.h> + +#define LOG_MODULE_NAME pts_its_emu + +#include +#include "mesh/net.h" +#include "mesh/settings.h" + +LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF); + +/* The value of 52 bytes was measured practically in the mbedTLS psa security storage. */ +#define MAX_ITEM_LENGTH 52 +#define MAX_ITEM_NUMBER MBEDTLS_PSA_KEY_SLOT_COUNT + +typedef struct { + uint32_t size; + psa_storage_create_flags_t flags; + uint8_t data[MAX_ITEM_LENGTH]; +} psa_its_pst_item_t; + +typedef struct { + psa_storage_uid_t uid; + psa_its_pst_item_t pst_item; +} psa_its_item_t; + +static psa_its_item_t item[MAX_ITEM_NUMBER]; + +static psa_its_item_t *get_item_by_uid(psa_storage_uid_t uid) +{ + for (int i = 0; i < MAX_ITEM_NUMBER; i++) { + if (uid == item[i].uid) { + return &item[i]; + } + } + + return NULL; +} + +static int itsemul_set(const char *name, size_t len_rd, settings_read_cb read_cb, void *cb_arg) +{ + ssize_t len; + uint64_t uid; + psa_its_item_t *p_item; + + LOG_DBG("read out uid: %s", name); + + if (!name) { + LOG_ERR("Insufficient number of arguments"); + return -ENOENT; + } + + uid = strtoull(name, NULL, 10); + if (uid == ULLONG_MAX) { + LOG_ERR("Invalid format for uid"); + return -EINVAL; + } + + p_item = get_item_by_uid(uid); + if (p_item == NULL) { + p_item = get_item_by_uid(0ull); + } + + if (p_item == NULL) { + LOG_ERR("Insufficient sources for %llu", uid); + return -EINVAL; + } + + p_item->uid = uid; + + len = read_cb(cb_arg, &p_item->pst_item, len_rd); + if (len < 0) { + LOG_ERR("Failed to read value (err %zd)", len); + return -EINVAL; + } + + LOG_HEXDUMP_DBG(&p_item->pst_item, len, "pst_item:"); + + if (len != len_rd) { + LOG_ERR("Unexpected length (%zd != %zu)", len, len_rd); + return -EINVAL; + } + + return 0; +} + +BT_MESH_SETTINGS_DEFINE(psa_its_emu, "itsemul", itsemul_set); + +psa_status_t psa_its_get_info(psa_storage_uid_t uid, struct psa_storage_info_t *p_info) +{ + psa_its_item_t *p_item; + + LOG_DBG("get info uid: %llu", uid); + + p_item = get_item_by_uid(uid); + if (p_item == NULL) { + return PSA_ERROR_DOES_NOT_EXIST; + } + + p_info->flags = p_item->pst_item.flags; + p_info->size = p_item->pst_item.size; + + LOG_DBG("flags: %lu, size: %lu", p_info->flags, p_info->size); + + return PSA_SUCCESS; +} + +psa_status_t psa_its_get(psa_storage_uid_t uid, uint32_t data_offset, uint32_t data_length, + void *p_data, size_t *p_data_length) +{ + psa_its_item_t *p_item; + psa_its_pst_item_t *p_pst_item; + + LOG_DBG("get uid: %llu", uid); + + p_item = get_item_by_uid(uid); + if (p_item == NULL) { + return PSA_ERROR_DOES_NOT_EXIST; + } + + p_pst_item = &p_item->pst_item; + + if (data_offset > p_pst_item->size) { + return PSA_ERROR_DATA_CORRUPT; + } + + *p_data_length = MIN(p_pst_item->size - data_offset, data_length); + memcpy(p_data, p_pst_item->data + data_offset, *p_data_length); + + return PSA_SUCCESS; +} + +psa_status_t psa_its_set(psa_storage_uid_t uid, uint32_t data_length, const void *p_data, + psa_storage_create_flags_t create_flags) +{ + char path[40]; + psa_its_item_t *p_item; + psa_its_pst_item_t *p_pst_item; + psa_status_t status = PSA_SUCCESS; + + LOG_DBG("Set uid: %llu, len: %lu", uid, data_length); + + if (data_length > MAX_ITEM_LENGTH) { + LOG_ERR("Too long item data: %lu > " STRINGIFY(MAX_ITEM_LENGTH), data_length); + } + + p_item = get_item_by_uid(uid); + if (p_item == NULL) { + p_item = get_item_by_uid(0ull); + } + + if (p_item == NULL) { + return PSA_ERROR_STORAGE_FAILURE; + } + + snprintk(path, sizeof(path), "bt/mesh/itsemul/%llu", uid); + + p_item->uid = uid; + p_pst_item = &p_item->pst_item; + p_pst_item->size = data_length; + p_pst_item->flags = create_flags; + memcpy(p_pst_item->data, p_data, data_length); + + if (settings_save_one(path, p_pst_item, sizeof(psa_its_pst_item_t))) { + LOG_ERR("Failed to store its item: %s", path); + status = PSA_ERROR_STORAGE_FAILURE; + } else { + LOG_DBG("Stored its item: %s", path); + } + + return status; +} + +psa_status_t psa_its_remove(psa_storage_uid_t uid) +{ + char path[40]; + psa_status_t status = PSA_SUCCESS; + psa_its_item_t *p_item; + + LOG_DBG("remove uid: %llu", uid); + + p_item = get_item_by_uid(uid); + if (p_item == NULL) { + return status; + } + memset(p_item, 0, sizeof(psa_its_item_t)); + + snprintk(path, sizeof(path), "bt/mesh/itsemul/%llu", uid); + + if (settings_delete(path)) { + LOG_ERR("Failed to remove its item: %s", path); + status = PSA_ERROR_STORAGE_FAILURE; + } else { + LOG_DBG("Removed its item: %s", path); + } + + return status; +} diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh index 9b2e5bf3f9a..6a56a084c60 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh @@ -10,3 +10,8 @@ RunTest mesh_access_publication_cancel \ conf=prj_mesh1d1_conf RunTest mesh_access_publication_cancel_1d1 \ access_tx_cancel access_rx_cancel + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_access_publication_cancel_psa \ + access_tx_cancel access_rx_cancel diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh index c05df1745db..862291b4c76 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh @@ -10,3 +10,8 @@ RunTest mesh_access_extended_model_subs \ conf=prj_mesh1d1_conf RunTest mesh_access_extended_model_subs_1d1 \ access_tx_ext_model access_sub_ext_model + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_access_extended_model_subs_psa \ + access_tx_ext_model access_sub_ext_model diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh index 4f52a419fbf..2a4f9ccc247 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh @@ -8,3 +8,7 @@ RunTest mesh_access_extended_model_subs_cap access_sub_capacity_ext_model conf=prj_mesh1d1_conf RunTest mesh_access_extended_model_subs_cap_1d1 access_sub_capacity_ext_model + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_access_extended_model_subs_cap_psa access_sub_capacity_ext_model diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh index 15e26a0095a..d2bb07c6de7 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh @@ -10,3 +10,8 @@ RunTest mesh_access_per_pub \ conf=prj_mesh1d1_conf RunTest mesh_access_per_pub_1d1 \ access_tx_period access_rx_period + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_access_per_pub_psa \ + access_tx_period access_rx_period diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh index a3d7803648f..c2f4a27ddbd 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh @@ -10,3 +10,8 @@ RunTest mesh_access_pub_retr \ conf=prj_mesh1d1_conf RunTest mesh_access_pub_retr_1d1 \ access_tx_transmit access_rx_transmit + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_access_pub_retr_psa \ + access_tx_period access_rx_period diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh index a0240274c0c..86255277277 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh @@ -24,3 +24,7 @@ RunTest mesh_adv_proxy_mixin adv_tx_proxy_mixin adv_rx_proxy_mixin conf=prj_mesh1d1_conf overlay=overlay_gatt_conf RunTest mesh_adv_proxy_mixin_1d1 adv_tx_proxy_mixin adv_rx_proxy_mixin + +conf=prj_mesh1d1_conf +overlay="overlay_gatt_conf_overlay_psa_conf" +RunTest mesh_adv_proxy_mixin_psa adv_tx_proxy_mixin adv_rx_proxy_mixin diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh index 7cf6e2ff491..8cfe0f9366a 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh @@ -9,3 +9,7 @@ RunTest mesh_adv_random_order adv_tx_random_order adv_rx_random_order conf=prj_mesh1d1_conf RunTest mesh_adv_random_order_1d1 adv_tx_random_order adv_rx_random_order + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_adv_random_order_psa adv_tx_random_order adv_rx_random_order diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh index f335a3e7311..96b30394f12 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh @@ -9,3 +9,7 @@ RunTest mesh_adv_reverse_order adv_tx_reverse_order adv_rx_receive_order conf=prj_mesh1d1_conf RunTest mesh_adv_reverse_order_1d1 adv_tx_reverse_order adv_rx_receive_order + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_adv_reverse_order_psa adv_tx_reverse_order adv_rx_receive_order diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh index 29db6c9b2ab..e208bf54579 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh @@ -9,3 +9,7 @@ RunTest mesh_adv_send_order adv_tx_send_order adv_rx_receive_order conf=prj_mesh1d1_conf RunTest mesh_adv_send_order_1d1 adv_tx_send_order adv_rx_receive_order + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_adv_send_order_psa adv_tx_send_order adv_rx_receive_order diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh index d5df191742a..28827c872f8 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh @@ -9,3 +9,7 @@ RunTest mesh_adv_tx_cb_multi adv_tx_cb_multi conf=prj_mesh1d1_conf RunTest mesh_adv_tx_cb_multi_1d1 adv_tx_cb_multi + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_adv_tx_cb_multi_psa adv_tx_cb_multi diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh index 21f73a6d2d7..edf4ba0996b 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh @@ -9,3 +9,7 @@ RunTest mesh_adv_tx_cb_single adv_tx_cb_single adv_rx_xmit conf=prj_mesh1d1_conf RunTest mesh_adv_tx_cb_single_1d1 adv_tx_cb_single adv_rx_xmit + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_adv_tx_cb_single_psa adv_tx_cb_single adv_rx_xmit diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh index c99b01e2d6b..ec70eb2f02c 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh @@ -26,3 +26,9 @@ conf=prj_mesh1d1_conf RunTest mesh_beacon_interval_1d1 \ beacon_tx_secure_beacon_interval \ beacon_rx_secure_beacon_interval + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_beacon_interval_psa \ + beacon_tx_secure_beacon_interval \ + beacon_rx_secure_beacon_interval diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh index 3cf7991a6dd..ccce8c3a1f5 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_beacon_invalid_1d1 \ beacon_tx_invalid \ beacon_rx_invalid + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_beacon_invalid_psa \ + beacon_tx_invalid \ + beacon_rx_invalid diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh index 617059ea0b4..64225fd9cf5 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_beacon_on_iv_update_1d1 \ beacon_tx_on_iv_update \ beacon_rx_on_iv_update + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_beacon_on_iv_update_psa \ + beacon_tx_on_iv_update \ + beacon_rx_on_iv_update diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh index b63a77ce3c6..00f82704718 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_beacon_on_key_refresh_1d1 \ beacon_tx_on_key_refresh \ beacon_rx_on_key_refresh + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_beacon_on_key_refresh_psa \ + beacon_tx_on_key_refresh \ + beacon_rx_on_key_refresh diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh index 3a8935906b1..3d6b151a068 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_beacon_kr_old_key_1d1 \ beacon_tx_kr_old_key \ beacon_rx_kr_old_key + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_beacon_kr_old_key_psa \ + beacon_tx_kr_old_key \ + beacon_rx_kr_old_key diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh index dc3b5b15cb2..677e4227669 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_beacon_multiple_netkeys_1d1 \ beacon_tx_multiple_netkeys \ beacon_rx_multiple_netkeys + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_beacon_multiple_netkeys_psa \ + beacon_tx_multiple_netkeys \ + beacon_rx_multiple_netkeys diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh deleted file mode 100755 index 451580ca84c..00000000000 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2022 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh - -conf=prj_mesh1d1_conf -RunTest blob_broadcast_basic \ - blob_cli_broadcast_basic - -conf=prj_mesh1d1_conf -RunTest blob_broadcast_trans \ - blob_cli_broadcast_trans - -conf=prj_mesh1d1_conf -RunTest blob_broadcast_unicast_seq \ - blob_cli_broadcast_unicast_seq - -conf=prj_mesh1d1_conf -RunTest blob_broadcast_unicast \ - blob_cli_broadcast_unicast diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh new file mode 100755 index 00000000000..6f1ec61ad27 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +conf=prj_mesh1d1_conf +RunTest blob_broadcast_basic blob_cli_broadcast_basic + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_broadcast_basic_psa blob_cli_broadcast_basic diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh new file mode 100755 index 00000000000..d5d0f60d1ce --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +conf=prj_mesh1d1_conf +RunTest blob_broadcast_trans blob_cli_broadcast_trans + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_broadcast_trans_psa blob_cli_broadcast_trans diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh new file mode 100755 index 00000000000..ee86ce33cfa --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +conf=prj_mesh1d1_conf +RunTest blob_broadcast_unicast blob_cli_broadcast_unicast + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_broadcast_unicast_psa blob_cli_broadcast_unicast diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh new file mode 100755 index 00000000000..c356122145c --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +conf=prj_mesh1d1_conf +RunTest blob_broadcast_unicast_seq blob_cli_broadcast_unicast_seq + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_broadcast_unicast_seq_psa blob_cli_broadcast_unicast_seq diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh deleted file mode 100755 index 07937bc71d9..00000000000 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2022 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh - -# The test instance sequence must stay as it is due to addressing scheme -conf=prj_mesh1d1_conf -RunTest blob_caps_all_rsp \ - blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard - -# The test instance sequence must stay as it is due to addressing scheme -conf=prj_mesh1d1_conf -RunTest blob_caps_partial_rsp \ - blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp - -# The test instance sequence must stay as it is due to addressing scheme -conf=prj_mesh1d1_conf -RunTest blob_caps_no_rsp \ - blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp - -# The test instance seqence must stay as it is due to addressing scheme -conf=prj_mesh1d1_conf -RunTest blob_caps_cancelled \ - blob_cli_caps_cancelled blob_srv_caps_standard diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh new file mode 100755 index 00000000000..bc2aa351987 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +# The test instance sequence must stay as it is due to addressing scheme +conf=prj_mesh1d1_conf +RunTest blob_caps_all_rsp \ + blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_caps_all_rsp_psa \ + blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh new file mode 100755 index 00000000000..3e1bd343a70 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +# The test instance seqence must stay as it is due to addressing scheme +conf=prj_mesh1d1_conf +RunTest blob_caps_cancelled \ + blob_cli_caps_cancelled blob_srv_caps_standard + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_caps_cancelled_psa \ + blob_cli_caps_cancelled blob_srv_caps_standard diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh new file mode 100755 index 00000000000..e53864f8be4 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +# The test instance sequence must stay as it is due to addressing scheme +conf=prj_mesh1d1_conf +RunTest blob_caps_no_rsp \ + blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_caps_no_rsp_psa \ + blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh new file mode 100755 index 00000000000..9a1675bd279 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +# The test instance sequence must stay as it is due to addressing scheme +conf=prj_mesh1d1_conf +RunTest blob_caps_partial_rsp \ + blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_caps_partial_rsp_psa \ + blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh index be5e51d32c0..1c2bde7a109 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh @@ -15,3 +15,13 @@ RunTest blob_transfer_lpn \ blob_srv_lpn_pull \ blob_srv_lpn_pull \ blob_srv_lpn_pull + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_transfer_lpn_psa \ + blob_cli_friend_pull \ + blob_srv_lpn_pull \ + blob_srv_lpn_pull \ + blob_srv_lpn_pull \ + blob_srv_lpn_pull \ + blob_srv_lpn_pull diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh new file mode 100755 index 00000000000..73728d1f141 --- /dev/null +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# Copyright 2023 Nordic Semiconductor +# SPDX-License-Identifier: Apache-2.0 + +source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh + +conf=prj_mesh1d1_conf +RunTest blob_no_rsp_block_get \ + blob_cli_fail_on_no_rsp \ + blob_srv_fail_on_block_get \ + blob_srv_fail_on_block_get -- -argstest msg-fail-type=0 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_no_rsp_block_get_psa \ + blob_cli_fail_on_no_rsp \ + blob_srv_fail_on_block_get \ + blob_srv_fail_on_block_get -- -argstest msg-fail-type=0 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh similarity index 71% rename from tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh rename to tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh index f849cc64b4e..4137deba007 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh @@ -4,14 +4,15 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh -conf=prj_mesh1d1_conf -RunTest blob_no_rsp_block_get \ - blob_cli_fail_on_no_rsp \ - blob_srv_fail_on_block_get \ - blob_srv_fail_on_block_get -- -argstest msg-fail-type=0 - conf=prj_mesh1d1_conf RunTest blob_no_rsp_xfer_get \ blob_cli_fail_on_no_rsp \ blob_srv_fail_on_xfer_get \ blob_srv_fail_on_xfer_get -- -argstest msg-fail-type=1 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_no_rsp_xfer_get_psa \ + blob_cli_fail_on_no_rsp \ + blob_srv_fail_on_xfer_get \ + blob_srv_fail_on_xfer_get -- -argstest msg-fail-type=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh index 5801182664e..e5bb421af14 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh @@ -12,3 +12,12 @@ RunTest blob_fail \ blob_srv_fail_on_block_get \ blob_srv_fail_on_xfer_get \ blob_srv_fail_on_nothing + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_fail_psa \ + blob_cli_fail_on_persistency \ + blob_srv_fail_on_block_start\ + blob_srv_fail_on_block_get \ + blob_srv_fail_on_xfer_get \ + blob_srv_fail_on_nothing diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh index 92adfd69959..8ead73c4ec7 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh @@ -10,3 +10,10 @@ RunTest blob_pst_pull \ blob_cli_trans_persistency_pull \ blob_srv_trans_persistency_pull \ blob_srv_trans_persistency_pull + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_pst_pull_psa \ + blob_cli_trans_persistency_pull \ + blob_srv_trans_persistency_pull \ + blob_srv_trans_persistency_pull diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh index 7d926d1e4c1..fdb1a8020e1 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh @@ -10,3 +10,10 @@ RunTest blob_success_pull blob_cli_trans_complete \ blob_srv_trans_complete blob_srv_trans_complete \ blob_srv_trans_complete blob_srv_trans_complete \ -- -argstest use-pull-mode=1 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_success_pull_psa blob_cli_trans_complete \ + blob_srv_trans_complete blob_srv_trans_complete \ + blob_srv_trans_complete blob_srv_trans_complete \ + -- -argstest use-pull-mode=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh index e2323f45824..5345eab11e8 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh @@ -9,3 +9,9 @@ conf=prj_mesh1d1_conf RunTest blob_success_push blob_cli_trans_complete \ blob_srv_trans_complete blob_srv_trans_complete \ blob_srv_trans_complete blob_srv_trans_complete + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_success_push_psa blob_cli_trans_complete \ + blob_srv_trans_complete blob_srv_trans_complete \ + blob_srv_trans_complete blob_srv_trans_complete diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh index 1df0cd4328e..5b05446694b 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh @@ -6,4 +6,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh # Test that BLOB Client can resume a suspended BLOB Transfer in Pull mode conf=prj_mesh1d1_conf -RunTest blob_resume_pull blob_cli_trans_resume blob_srv_trans_resume -- -argstest use-pull-mode=1 +RunTest blob_resume_pull \ + blob_cli_trans_resume blob_srv_trans_resume -- -argstest use-pull-mode=1 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_resume_pull_psa \ + blob_cli_trans_resume blob_srv_trans_resume -- -argstest use-pull-mode=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh index 8de3af64a79..01150c8b0eb 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh @@ -7,3 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh # Test that BLOB Client can resume a suspended BLOB Transfer in Push mode conf=prj_mesh1d1_conf RunTest blob_resume_push blob_cli_trans_resume blob_srv_trans_resume + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest blob_resume_push_psa blob_cli_trans_resume blob_srv_trans_resume diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh index 90bbfeabe6c..241a6bd2d10 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh @@ -39,3 +39,35 @@ conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest blob_recover_phase blob_cli_stop blob_srv_stop -- -argstest \ recover=1 expected-phase=4 + +# The same test but with PSA crypto +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \ + recover=0 expected-phase=1 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \ + recover=1 expected-phase=2 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \ + recover=1 expected-phase=3 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \ + recover=1 expected-phase=4 + +# Test reaching suspended state and continuation after reboot on new procedure. +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \ + recover=0 expected-phase=5 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \ + recover=1 expected-phase=4 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh index e2286aba323..f612119bdee 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh @@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_apply \ dfu_target_fail_on_apply \ dfu_target_fail_on_apply \ -- -argstest targets=3 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_all_tgts_lost_on_apply_psa \ + dfu_cli_all_targets_lost_on_apply \ + dfu_target_fail_on_apply \ + dfu_target_fail_on_apply \ + dfu_target_fail_on_apply \ + -- -argstest targets=3 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh index 02498ab303a..36dcf8f24ae 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh @@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_caps_get \ dfu_target_fail_on_caps_get \ dfu_target_fail_on_caps_get \ -- -argstest targets=3 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_all_tgts_lost_on_caps_get_psa \ + dfu_cli_all_targets_lost_on_caps_get \ + dfu_target_fail_on_caps_get \ + dfu_target_fail_on_caps_get \ + dfu_target_fail_on_caps_get \ + -- -argstest targets=3 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh index 8aa9640abc4..eacb921a214 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh @@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_metadata \ dfu_target_fail_on_metadata \ dfu_target_fail_on_metadata \ -- -argstest targets=3 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_all_tgts_lost_on_metadata_psa \ + dfu_cli_all_targets_lost_on_metadata \ + dfu_target_fail_on_metadata \ + dfu_target_fail_on_metadata \ + dfu_target_fail_on_metadata \ + -- -argstest targets=3 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh index 80ea00191a1..f6c53482834 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh @@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_update_get \ dfu_target_fail_on_update_get \ dfu_target_fail_on_update_get \ -- -argstest targets=3 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_all_tgts_lost_on_update_get_psa \ + dfu_cli_all_targets_lost_on_update_get \ + dfu_target_fail_on_update_get \ + dfu_target_fail_on_update_get \ + dfu_target_fail_on_update_get \ + -- -argstest targets=3 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh index 618f10aa7c6..929ab93b81e 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh @@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_verify \ dfu_target_fail_on_verify \ dfu_target_fail_on_verify \ -- -argstest targets=3 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_all_tgts_lost_on_verify_psa \ + dfu_cli_all_targets_lost_on_verify \ + dfu_target_fail_on_verify \ + dfu_target_fail_on_verify \ + dfu_target_fail_on_verify \ + -- -argstest targets=3 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh index e21298bace8..bcc98df48b5 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh @@ -15,3 +15,14 @@ RunTest dfu_persistency \ dfu_target_fail_on_verify \ dfu_target_fail_on_apply \ dfu_target_fail_on_nothing + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_persistency_psa \ + dfu_cli_fail_on_persistency \ + dfu_target_fail_on_metadata \ + dfu_target_fail_on_caps_get \ + dfu_target_fail_on_update_get \ + dfu_target_fail_on_verify \ + dfu_target_fail_on_apply \ + dfu_target_fail_on_nothing diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh index c53714ef661..64f33013e74 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh @@ -7,3 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest dfu_self_update dfu_dist_dfu_self_update -- -argstest targets=1 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_self_update_psa dfu_dist_dfu_self_update -- -argstest targets=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh index f9421b2c004..af7acb10723 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh @@ -8,3 +8,8 @@ conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest dfu_self_update_no_change \ dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_self_update_no_change_psa \ + dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh index 246c73d45ef..bcac2cbba5b 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh @@ -9,3 +9,8 @@ conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest dfu_mixed dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \ dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_mixed_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \ + dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh index c6fe9aa68e4..c5f67e2521e 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh @@ -10,3 +10,9 @@ overlay=overlay_pst_conf RunTest dfu_mixed_fail dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \ dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \ fail-confirm=1 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_mixed_fail_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \ + dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \ + fail-confirm=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh index 506a49838ef..63beed915e6 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh @@ -20,3 +20,13 @@ RunTest dfu_slot dfu_dist_dfu_slot_create_recover RunTest dfu_slot dfu_dist_dfu_slot_delete_all RunTest dfu_slot dfu_dist_dfu_slot_check_delete_all + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_slot_psa dfu_dist_dfu_slot_create + +RunTest dfu_slot_psa dfu_dist_dfu_slot_create_recover + +RunTest dfu_slot_psa dfu_dist_dfu_slot_delete_all + +RunTest dfu_slot_psa dfu_dist_dfu_slot_check_delete_all diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh index 72982bec50f..119261ce1c5 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh @@ -50,3 +50,42 @@ conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest dfu_dist_recover_phase dfu_cli_stop dfu_target_dfu_stop -- -argstest \ recover=1 expected-phase=6 + +# The same test but with PSA crypto +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \ + recover=0 expected-phase=2 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \ + recover=1 expected-phase=3 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \ + recover=1 expected-phase=4 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \ + recover=1 expected-phase=6 + +# Use phase `BT_MESH_DFU_PHASE_APPLY_SUCCESS` as marker to bring whole procedure to an end +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \ + recover=1 expected-phase=8 + +# To test recovery from Verify Fail begin new distribution that will end there, +# reboot devices and continue to Applying. +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \ + recover=0 expected-phase=5 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \ + recover=1 expected-phase=6 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh index 77d9ba276da..b89ad3af2c7 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh @@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf RunTest mesh_friendship_est_1d1 \ friendship_friend_est \ friendship_lpn_est + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_est_psa \ + friendship_friend_est \ + friendship_lpn_est diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh index 0241e667c7b..725ddae596e 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh @@ -22,3 +22,13 @@ RunTest mesh_friendship_est_multi_1d1 \ friendship_lpn_est \ friendship_lpn_est \ friendship_lpn_est + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_est_multi_psa \ + friendship_friend_est_multi \ + friendship_lpn_est \ + friendship_lpn_est \ + friendship_lpn_est \ + friendship_lpn_est \ + friendship_lpn_est diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh index 2b1c5fd6395..be22829d615 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh @@ -20,3 +20,9 @@ conf=prj_mesh1d1_conf RunTest mesh_lpn_disable_check_1d1 \ friendship_friend_no_est \ friendship_lpn_disable + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_lpn_disable_check_psa \ + friendship_friend_no_est \ + friendship_lpn_disable diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh index 4eed9149f32..676b6b81ccc 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh @@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf RunTest mesh_friendship_lpn_loopback_1d1 \ friendship_lpn_loopback \ friendship_friend_est + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_lpn_loopback_psa \ + friendship_lpn_loopback \ + friendship_friend_est diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh index a98d6a7f143..75163076af4 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh @@ -18,3 +18,9 @@ conf=prj_mesh1d1_conf RunTest mesh_lpn_terminate_cb_check_1d1 \ friendship_friend_est \ friendship_lpn_term_cb_check + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_lpn_terminate_cb_check_psa \ + friendship_friend_est \ + friendship_lpn_term_cb_check diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh index 1cc636cf7be..94d6224da5b 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh @@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf RunTest mesh_friendship_msg_frnd_1d1 \ friendship_friend_msg \ friendship_lpn_msg_frnd + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_msg_frnd_psa \ + friendship_friend_msg \ + friendship_lpn_msg_frnd diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh index 849345467e8..6e7287b00ff 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh @@ -15,3 +15,10 @@ RunTest mesh_friendship_msg_group_1d1 \ friendship_lpn_group \ friendship_other_group \ friendship_friend_group + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_msg_group_psa \ + friendship_lpn_group \ + friendship_other_group \ + friendship_friend_group diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh index 0276d8e046a..072e427d72a 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh @@ -15,3 +15,10 @@ RunTest mesh_friendship_msg_mesh_1d1 \ friendship_lpn_msg_mesh \ friendship_other_msg \ friendship_friend_est + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_msg_mesh_psa \ + friendship_lpn_msg_mesh \ + friendship_other_msg \ + friendship_friend_est diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh index 5d4c61a5ddd..d659281e4e9 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh @@ -17,3 +17,10 @@ RunTest mesh_friendship_msg_mesh_low_lat_1d1 \ friendship_lpn_msg_mesh \ friendship_other_msg \ friendship_friend_est + +conf=prj_mesh1d1_conf +overlay="overlay_low_lat_conf_overlay_psa_conf" +RunTest mesh_friendship_msg_mesh_low_lat_psa \ + friendship_lpn_msg_mesh \ + friendship_other_msg \ + friendship_friend_est diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh index a1f0d186323..360095d2e5f 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh @@ -28,3 +28,9 @@ conf=prj_mesh1d1_conf RunTest mesh_friendship_msg_va_collision_1d1 \ friendship_lpn_va_collision \ friendship_friend_va_collision + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_msg_va_collision_psa \ + friendship_lpn_va_collision \ + friendship_friend_va_collision diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh index 78027ebf49f..d717be60292 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh @@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf RunTest mesh_friendship_overflow_1d1 \ friendship_friend_overflow \ friendship_lpn_overflow + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_overflow_psa \ + friendship_friend_overflow \ + friendship_lpn_overflow diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh index b91a5db9659..90e744a7001 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh @@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf RunTest mesh_friendship_poll_1d1 \ friendship_friend_est \ friendship_lpn_poll + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_poll_psa \ + friendship_friend_est \ + friendship_lpn_poll diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh index e0e35ef573d..10abb4413ea 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh @@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf RunTest mesh_friendship_re_est_1d1 \ friendship_friend_est \ friendship_lpn_re_est + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_friendship_re_est_psa \ + friendship_friend_est \ + friendship_lpn_re_est diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh index 0e621188afd..eef25d08cf2 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh @@ -15,3 +15,10 @@ RunTest mesh_heartbeat_sub_cb_api_all_1d1 \ heartbeat_publish_all \ heartbeat_publish_all \ heartbeat_subscribe_all + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_heartbeat_sub_cb_api_all_psa \ + heartbeat_publish_all \ + heartbeat_publish_all \ + heartbeat_subscribe_all diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh index b08114b4d43..fc0660e5676 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh @@ -15,3 +15,10 @@ RunTest mesh_heartbeat_sub_cb_api_unicast_1d1 \ heartbeat_publish_unicast \ heartbeat_publish_unicast \ heartbeat_subscribe_unicast + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_heartbeat_sub_cb_api_unicast_psa \ + heartbeat_publish_unicast \ + heartbeat_publish_unicast \ + heartbeat_subscribe_unicast diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh index 5d206ab9631..cdf39dac438 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh @@ -9,3 +9,7 @@ RunTest mesh_ivi_deferring ivi_ivu_deferring conf=prj_mesh1d1_conf RunTest mesh_ivi_deferring_1d1 ivi_ivu_deferring + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_ivi_deferring_psa ivi_ivu_deferring diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh index bd4121583da..39514bf39e6 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh @@ -9,3 +9,7 @@ RunTest mesh_ivi_recovery ivi_ivu_recovery conf=prj_mesh1d1_conf RunTest mesh_ivi_recovery_1d1 ivi_ivu_recovery + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_ivi_recovery_psa ivi_ivu_recovery diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh index 931888479b9..ee2b6b20000 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh @@ -9,3 +9,7 @@ RunTest mesh_ivi_update ivi_ivu_normal conf=prj_mesh1d1_conf RunTest mesh_ivi_update_1d1 ivi_ivu_normal + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_ivi_update_psa ivi_ivu_normal diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh index a5b55e5ef6d..99f05637653 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh @@ -17,3 +17,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf RunTest mesh_lcd_test_max_access_payload \ lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_lcd_test_max_access_payload_psa \ + lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh index 8c938d1047f..45d2c103246 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh @@ -22,3 +22,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf RunTest mesh_lcd_test_split_comp_data \ lcd_cli_split_comp_data_request lcd_srv_comp_data_status_respond + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_lcd_test_split_comp_data_psa \ + lcd_cli_split_comp_data_request lcd_srv_comp_data_status_respond diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh index 3b6e90cfd9c..83cc788844f 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh @@ -18,3 +18,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf RunTest mesh_lcd_test_max_metadata_access_payload \ lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_lcd_test_max_metadata_access_payload_psa \ + lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh index 9e8dfc1457c..622b4ce5dba 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh @@ -21,3 +21,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf RunTest mesh_lcd_test_split_metadata \ lcd_cli_split_metadata_request lcd_srv_metadata_status_respond + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_lcd_test_split_metadata_psa \ + lcd_cli_split_metadata_request lcd_srv_metadata_status_respond diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh index ac1f92f1244..fb60110ad7b 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh @@ -25,3 +25,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf RunTest mesh_op_agg_test_max_access_payload \ op_agg_cli_max_len_sequence_msg_send op_agg_srv_max_len_status_msg_send + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_op_agg_test_max_access_payload_psa \ + op_agg_cli_max_len_sequence_msg_send op_agg_srv_max_len_status_msg_send diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh index a3860a35367..54c115c0673 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/access.sh @@ -59,3 +59,32 @@ conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest mesh_pst_access_data_check_1d1 persistence_access_data_load --\ -argstest access-cfg=not-configured + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_access_data_check_psa persistence_access_data_save + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_access_data_check_psa persistence_access_data_load --\ + -argstest access-cfg=configured + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_access_data_check_psa persistence_access_sub_overwrite --\ + -argstest access-cfg=configured + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_access_data_check_psa persistence_access_data_load --\ + -argstest access-cfg=new-subs + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_access_data_check_psa persistence_access_data_remove --\ + -argstest access-cfg=new-subs + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_access_data_check_psa persistence_access_data_load --\ + -argstest access-cfg=not-configured diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh index 641c4c086d7..4368700d5b9 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh @@ -35,3 +35,19 @@ RunTest mesh_pst_cfg_check_1d1 persistence_cfg_save -- -argstest stack-cfg=1 conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest mesh_pst_cfg_check_1d1 persistence_cfg_load -- -argstest stack-cfg=1 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_cfg_check_psa persistence_cfg_save -- -argstest stack-cfg=0 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_cfg_check_psa persistence_cfg_load -- -argstest stack-cfg=0 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_cfg_check_psa persistence_cfg_save -- -argstest stack-cfg=1 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_cfg_check_psa persistence_cfg_load -- -argstest stack-cfg=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh index 4ee4e2367cb..277adff0b55 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh @@ -23,3 +23,11 @@ RunTest mesh_pst_prov_data_check_1d1 persistence_provisioning_data_save conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest mesh_pst_prov_data_check_1d1 persistence_provisioning_data_load + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_prov_data_check_psa persistence_provisioning_data_save + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_prov_data_check_psa persistence_provisioning_data_load diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh index 2e294cc2926..3ecf7e90fe5 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh @@ -27,3 +27,13 @@ conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest mesh_pst_repr_1d1 persistence_reprovisioning_device \ persistence_reprovisioning_provisioner + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_repr_psa persistence_reprovisioning_device \ + persistence_reprovisioning_provisioner -- -argstest clear-settings=1 + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_pst_repr_psa persistence_reprovisioning_device \ + persistence_reprovisioning_provisioner diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh index 19248d144cd..48724dd7fbd 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh @@ -8,3 +8,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh # Test Random value changes for different Random intervals (10s, 0 - on every beacon, 30s). conf=prj_mesh1d1_conf RunTest mesh_priv_beacon_adv beacon_rx_priv_adv beacon_tx_priv_adv + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_priv_beacon_adv_psa beacon_rx_priv_adv beacon_tx_priv_adv diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh index 6137f604405..6d574a72c73 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh @@ -17,3 +17,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh # - PRB is enabled, SNB is disabled. Third PRB is advertised conf=prj_mesh1d1_conf RunTest mesh_priv_beacon_interleave beacon_rx_priv_interleave beacon_tx_priv_interleave + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_priv_beacon_interleave_psa beacon_rx_priv_interleave beacon_tx_priv_interleave diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh index 0fe934e6e67..b1983284a51 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh @@ -7,3 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh # Test if Private Beacons with invalid data do not affect device conf=prj_mesh1d1_conf RunTest mesh_priv_beacon_invalid beacon_rx_priv_invalid beacon_tx_priv_invalid + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_priv_beacon_invalid_psa beacon_rx_priv_invalid beacon_tx_priv_invalid diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh index 12eacdb5963..bb9a591fcb0 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh @@ -10,3 +10,10 @@ RunTest mesh_priv_beacon_on_iv_update \ beacon_rx_on_iv_update \ beacon_tx_priv_on_iv_update \ -- -argstest rand-int=1 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_priv_beacon_on_iv_update_psa \ + beacon_rx_on_iv_update \ + beacon_tx_priv_on_iv_update \ + -- -argstest rand-int=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh index ff6742f27db..ad0d11dbc96 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh @@ -12,3 +12,10 @@ RunTest mesh_priv_beacon_on_iv_update_long_interval \ beacon_rx_on_iv_update \ beacon_tx_priv_on_iv_update \ -- -argstest rand-int=3 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_priv_beacon_on_iv_update_long_interval_psa \ + beacon_rx_on_iv_update \ + beacon_tx_priv_on_iv_update \ + -- -argstest rand-int=3 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh index 4be5009a127..eaf6338684f 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh @@ -10,3 +10,10 @@ RunTest mesh_priv_beacon_on_key_refresh \ beacon_rx_on_key_refresh \ beacon_tx_priv_on_key_refresh \ -- -argstest rand-int=1 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_priv_beacon_on_key_refresh_psa \ + beacon_rx_on_key_refresh \ + beacon_tx_priv_on_key_refresh \ + -- -argstest rand-int=1 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh index 7b2c0f34223..cc5722e4432 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh @@ -12,3 +12,10 @@ RunTest mesh_priv_beacon_on_key_refresh_long_interval \ beacon_rx_on_key_refresh \ beacon_tx_priv_on_key_refresh \ -- -argstest rand-int=3 + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_priv_beacon_on_key_refresh_long_interval_psa \ + beacon_rx_on_key_refresh \ + beacon_tx_priv_on_key_refresh \ + -- -argstest rand-int=3 diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh index 1fd78fd21b6..168c2620212 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh @@ -8,3 +8,7 @@ RunTest mesh_prov_iv_update_one_duration prov_provisioner_iv_update_flag_one conf=prj_mesh1d1_conf RunTest mesh_prov_iv_update_one_duration_1d1 prov_provisioner_iv_update_flag_one + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_iv_update_one_duration_psa prov_provisioner_iv_update_flag_one diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh index b9f10d09ce6..07165b31c1d 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh @@ -8,3 +8,7 @@ RunTest mesh_prov_iv_update_zero_duration prov_provisioner_iv_update_flag_zero conf=prj_mesh1d1_conf RunTest mesh_prov_iv_update_zero_duration_1d1 prov_provisioner_iv_update_flag_zero + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_iv_update_zero_duration_psa prov_provisioner_iv_update_flag_zero diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh index fc504016b1a..7d8dfbe6388 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh @@ -19,3 +19,11 @@ RunTest mesh_prov_pb_adv_multi_1d1 \ prov_device_pb_adv_no_oob \ prov_device_pb_adv_no_oob \ prov_device_pb_adv_no_oob + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_adv_multi_psa \ + prov_provisioner_pb_adv_multi \ + prov_device_pb_adv_no_oob \ + prov_device_pb_adv_no_oob \ + prov_device_pb_adv_no_oob diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh index 893f9dfb589..bfcb8540ae1 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_prov_pb_adv_on_oob_1d1 \ prov_device_pb_adv_no_oob \ prov_provisioner_pb_adv_no_oob + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_adv_on_oob_psa \ + prov_device_pb_adv_no_oob \ + prov_provisioner_pb_adv_no_oob diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh index 1d66b6615d0..22d197a0adc 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh @@ -11,3 +11,8 @@ RunTest mesh_prov_pb_adv_oob_auth \ conf=prj_mesh1d1_conf RunTest mesh_prov_pb_adv_oob_auth_1d1 \ prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_adv_oob_auth_psa \ + prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh index 782794281ba..5459997e547 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh @@ -12,3 +12,8 @@ RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk \ conf=prj_mesh1d1_conf RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_1d1 \ prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_psa \ + prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh index 2dcae7fb9ee..b8ab3a5d899 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh @@ -11,3 +11,8 @@ RunTest mesh_prov_pb_adv_oob_public_key \ conf=prj_mesh1d1_conf RunTest mesh_prov_pb_adv_oob_public_key_1d1 \ prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_adv_oob_public_key_psa \ + prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh index 193bd34a28c..9c70514a093 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_prov_pb_adv_repr_1d1 \ prov_device_pb_adv_reprovision \ prov_provisioner_pb_adv_reprovision + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_adv_repr_psa \ + prov_device_pb_adv_reprovision \ + prov_provisioner_pb_adv_reprovision diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh index 52ca990fd97..d707fdb6d6c 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_nppi_robustness.sh @@ -18,3 +18,10 @@ RunTest mesh_prov_pb_remote_nppi_robustness \ prov_provisioner_pb_remote_client_nppi_robustness \ prov_device_pb_remote_server_unproved \ prov_device_pb_remote_server_nppi_robustness + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_remote_nppi_robustness_psa \ + prov_provisioner_pb_remote_client_nppi_robustness \ + prov_device_pb_remote_server_unproved \ + prov_device_pb_remote_server_nppi_robustness diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh index aec30c65f10..2c3394381cd 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_parallel.sh @@ -17,3 +17,11 @@ RunTest mesh_prov_pb_remote_parallel \ prov_device_pb_remote_server_unproved \ prov_device_pb_adv_no_oob \ prov_device_pb_adv_no_oob + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_remote_parallel_psa \ + prov_provisioner_pb_remote_client_parallel \ + prov_device_pb_remote_server_unproved \ + prov_device_pb_adv_no_oob \ + prov_device_pb_adv_no_oob diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh index 9f73a6ed4e9..f8669cbc43c 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_pst_ncrp.sh @@ -51,3 +51,28 @@ RunTest mesh_prov_pst_pb_remote_ncrp \ prov_provisioner_pb_remote_client_ncrp_second_time \ prov_device_pb_remote_server_proved \ prov_device_pb_remote_server_ncrp_second_time + +# The same test but with PSA crypto +# Step 1 +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_prov_pst_pb_remote_ncrp_psa \ + prov_provisioner_pb_remote_client_ncrp_provision \ + prov_device_pb_remote_server_unproved \ + prov_device_pb_remote_server_ncrp_prepare + +# Step 2 +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_prov_pst_pb_remote_ncrp_psa \ + prov_provisioner_pb_remote_client_ncrp \ + prov_device_pb_remote_server_proved \ + prov_device_pb_remote_server_ncrp + +# Step 3 +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_prov_pst_pb_remote_ncrp_psa \ + prov_provisioner_pb_remote_client_ncrp_second_time \ + prov_device_pb_remote_server_proved \ + prov_device_pb_remote_server_ncrp_second_time diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh index c4f1d8a167f..a49cbcd7ca9 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_reprovision.sh @@ -17,3 +17,10 @@ RunTest mesh_prov_pb_remote_reprovision \ prov_provisioner_pb_remote_client_reprovision \ prov_device_pb_remote_server_unproved \ prov_device_pb_adv_reprovision + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_remote_reprovision_psa \ + prov_provisioner_pb_remote_client_reprovision \ + prov_device_pb_remote_server_unproved \ + prov_device_pb_adv_reprovision diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh index d765f2531ee..8ef61c2666b 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_remote_timeout.sh @@ -29,3 +29,10 @@ RunTest mesh_prov_pb_remote_provisioning_timeout \ prov_provisioner_pb_remote_client_provision_timeout \ prov_device_pb_remote_server_unproved_unresponsive \ prov_device_unresponsive + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_prov_pb_remote_provisioning_timeout_psa \ + prov_provisioner_pb_remote_client_provision_timeout \ + prov_device_pb_remote_server_unproved_unresponsive \ + prov_device_unresponsive diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh index 2ca843e4b3a..190e9e422b9 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/replay_attack.sh @@ -25,3 +25,15 @@ overlay=overlay_pst_conf RunTest mesh_replay_attack_1d1 \ rpc_tx_power_replay_attack \ rpc_rx_power_replay_attack + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_replay_attack_psa \ + rpc_tx_immediate_replay_attack \ + rpc_rx_immediate_replay_attack + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_replay_attack_psa \ + rpc_tx_power_replay_attack \ + rpc_rx_power_replay_attack diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh index 3618e8ac778..95731027607 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/replay_cache/rpl_frag.sh @@ -25,3 +25,11 @@ RunTest mesh_replay_fragmentation_1d1 rpc_rx_rpl_frag rpc_tx_rpl_frag conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest mesh_replay_fragmentation_1d1 rpc_rx_reboot_after_defrag + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_replay_fragmentation_psa rpc_rx_rpl_frag rpc_tx_rpl_frag + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest mesh_replay_fragmentation_psa rpc_rx_reboot_after_defrag diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh index c908672bdb9..dbe8685d370 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/sar/sar_cfg_persistent_storage.sh @@ -12,3 +12,8 @@ conf=prj_mesh1d1_conf overlay=overlay_pst_conf RunTest sar_persistence sar_srv_cfg_store RunTest sar_persistence sar_srv_cfg_restore + +conf=prj_mesh1d1_conf +overlay="overlay_pst_conf_overlay_psa_conf" +RunTest sar_persistence_psa sar_srv_cfg_store +RunTest sar_persistence_psa sar_srv_cfg_restore diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh index 47ee7205455..a022c23c3f4 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/sar/slow_transfer_test.sh @@ -17,3 +17,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf RunTest sar_slow_test \ sar_cli_max_len_sdu_slow_send sar_srv_max_len_sdu_slow_receive + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest sar_slow_test_psa \ + sar_cli_max_len_sdu_slow_send sar_srv_max_len_sdu_slow_receive diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh b/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh index 685661777ed..89707adf031 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/sar/stress_test.sh @@ -16,3 +16,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh conf=prj_mesh1d1_conf RunTest sar_test \ sar_cli_max_len_sdu_send sar_srv_max_len_sdu_receive + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest sar_test_psa \ + sar_cli_max_len_sdu_send sar_srv_max_len_sdu_receive diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh index 6f88c9d8261..9199ac69da8 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/invalid_ad_type.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_scanner_invalid_ad_type_1d1 \ scanner_tx_invalid_ad_type \ scanner_rx_invalid_packet + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_scanner_invalid_ad_type_psa \ + scanner_tx_invalid_ad_type \ + scanner_rx_invalid_packet diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh index 1bcf8b73f12..8f0919058ed 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/scanner/wrong_packet_length.sh @@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf RunTest mesh_scanner_wrong_packet_length_1d1 \ scanner_tx_wrong_packet_length \ scanner_rx_invalid_packet + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_scanner_wrong_packet_length_psa \ + scanner_tx_wrong_packet_length \ + scanner_rx_invalid_packet diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh index daabb1bc49b..d4b86d2f98a 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/fixed.sh @@ -17,3 +17,7 @@ RunTest mesh_transport_fixed transport_tx_fixed transport_rx_fixed conf=prj_mesh1d1_conf RunTest mesh_transport_fixed_1d1 transport_tx_fixed transport_rx_fixed + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_fixed_1d1 transport_tx_fixed transport_rx_fixed diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh index d407eaaa5c7..d85d7cf8604 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/group.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_group transport_tx_group transport_rx_group conf=prj_mesh1d1_conf RunTest mesh_transport_group_1d1 transport_tx_group transport_rx_group + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_group_psa transport_tx_group transport_rx_group diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh index 3ea550574e6..9cc1fb33041 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback.sh @@ -8,3 +8,7 @@ RunTest transport_loopback transport_tx_loopback transport_rx_none conf=prj_mesh1d1_conf RunTest transport_loopback_1d1 transport_tx_loopback transport_rx_none + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest transport_loopback_psa transport_tx_loopback transport_rx_none diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh index 270139d83ea..3be2bb24367 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_loopback_group transport_tx_loopback_group transport_rx_g conf=prj_mesh1d1_conf RunTest mesh_transport_loopback_group_1d1 transport_tx_loopback_group transport_rx_group + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_loopback_group_psa transport_tx_loopback_group transport_rx_group diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh index 777470fed71..63829e012a5 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/loopback_group_low_lat.sh @@ -10,3 +10,7 @@ RunTest mesh_transport_loopback_group_low_lat transport_tx_loopback_group transp conf=prj_mesh1d1_conf overlay=overlay_low_lat_conf RunTest mesh_transport_loopback_group_low_lat_1d1 transport_tx_loopback_group transport_rx_group + +conf=prj_mesh1d1_conf +overlay="overlay_low_lat_conf_overlay_psa_conf" +RunTest mesh_transport_loopback_group_low_lat_psa transport_tx_loopback_group transport_rx_group diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh index 7db73841720..21a56f37478 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_block.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_seg_block transport_tx_seg_block transport_rx_seg_block conf=prj_mesh1d1_conf RunTest mesh_transport_seg_block_1d1 transport_tx_seg_block transport_rx_seg_block + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_seg_block_psa transport_tx_seg_block transport_rx_seg_block diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh index 81b1e571b17..40ba38aae12 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_concurrent.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_seg_concurrent transport_tx_seg_concurrent transport_rx_s conf=prj_mesh1d1_conf RunTest mesh_transport_seg_concurrent_1d1 transport_tx_seg_concurrent transport_rx_seg_concurrent + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_seg_concurrent_psa transport_tx_seg_concurrent transport_rx_seg_concurrent diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh index 8a1816b1ec5..ca650ede1f4 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_fail.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_seg_fail transport_tx_seg_fail conf=prj_mesh1d1_conf RunTest mesh_transport_seg_fail_1d1 transport_tx_seg_fail + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_seg_fail_psa transport_tx_seg_fail diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh index 0fe822d40cf..9268e42029e 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/seg_ivu.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_seg_ivu transport_tx_seg_ivu transport_rx_seg_ivu conf=prj_mesh1d1_conf RunTest mesh_transport_seg_ivu_1d1 transport_tx_seg_ivu transport_rx_seg_ivu + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_seg_ivu_psa transport_tx_seg_ivu transport_rx_seg_ivu diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh index 4f7c33d81a8..a107a86146c 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_unicast transport_tx_unicast transport_rx_unicast conf=prj_mesh1d1_conf RunTest mesh_transport_unicast_1d1 transport_tx_unicast transport_rx_unicast + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_unicast_psa transport_tx_unicast transport_rx_unicast diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh index ab61e1df2f1..cbfc8ea5ce7 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unicast_low_lat.sh @@ -10,3 +10,7 @@ RunTest mesh_transport_unicast_low_lat transport_tx_unicast transport_rx_unicast conf=prj_mesh1d1_conf overlay=overlay_low_lat_conf RunTest mesh_transport_unicast_low_lat_1d1 transport_tx_unicast transport_rx_unicast + +conf=prj_mesh1d1_conf +overlay="overlay_low_lat_conf_overlay_psa_conf" +RunTest mesh_transport_unicast_low_lat_psa transport_tx_unicast transport_rx_unicast diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh index 03ff31e290a..2a1b2741b60 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/unknown_app.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_unknown_app transport_tx_unknown_app transport_rx_none conf=prj_mesh1d1_conf RunTest mesh_transport_unknown_app_1d1 transport_tx_unknown_app transport_rx_none + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_unknown_app_psa transport_tx_unknown_app transport_rx_none diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh index 6dd9e3ba85a..698bd164485 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va.sh @@ -8,3 +8,7 @@ RunTest mesh_transport_va transport_tx_va transport_rx_va conf=prj_mesh1d1_conf RunTest mesh_transport_va_1d1 transport_tx_va transport_rx_va + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_va_psa transport_tx_va transport_rx_va diff --git a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh index 9259b02f5ff..631c43790ef 100755 --- a/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh +++ b/tests/bsim/bluetooth/mesh/tests_scripts/transport/va_collision.sh @@ -9,3 +9,7 @@ RunTest mesh_transport_va_collision transport_tx_va_collision transport_rx_va_co conf=prj_mesh1d1_conf RunTest mesh_transport_va_collision_1d1 transport_tx_va_collision transport_rx_va_collision + +conf=prj_mesh1d1_conf +overlay=overlay_psa_conf +RunTest mesh_transport_va_collision_psa transport_tx_va_collision transport_rx_va_collision diff --git a/tests/bsim/compile.source b/tests/bsim/compile.source index 22ff8eebf37..603585d15eb 100644 --- a/tests/bsim/compile.source +++ b/tests/bsim/compile.source @@ -22,7 +22,8 @@ function _compile(){ local cc_flags="${cc_flags:-"-Werror"}" if [ "${conf_overlay}" ]; then - local exe_basename="${exe_name:-bs_${BOARD}_${app}_${conf_file}_${conf_overlay}}" + overlays="${conf_overlay//;/_}" + local exe_basename="${exe_name:-bs_${BOARD}_${app}_${conf_file}_${overlays}}" else local exe_basename="${exe_name:-bs_${BOARD}_${app}_${conf_file}}" fi @@ -43,7 +44,7 @@ function _compile(){ if [ $conf_file != "prj.conf" ]; then local cmake_cmd+=( -DCONF_FILE=${conf_file}) fi - local cmake_cmd+=( -DOVERLAY_CONFIG=${conf_overlay} \ + local cmake_cmd+=( -DOVERLAY_CONFIG="${conf_overlay}" \ ${modules_arg} \ ${cmake_args} -DCMAKE_C_FLAGS=\"${cc_flags}\" ${app_root}/${app})