michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Drop explicit support for Bluetooth Mesh 1.0.1

Browse source 
Bluetooth Mesh Protocol 1.1 is backward compatible with Bluetooth Mesh
Profile 1.0.1, therefore the stack can still be qualified for 1.0.1 if
needed. But explicit support for both versions requires additional
maintenance efforts and doubles the CI time. To make the stack
qualifiable for 1.0.1, the one needs to remove Private Beacons reception
and compile out SHA256 algorithm support.

What is changed:
- Removed `CONFIG_BT_MESH_V1d1` option.
- Removed `transport_legacy.c` which was using 1.0.1 implementation. The
  new transport layer has new SaR logic that should still be possible to
  qualify for 1.0.1.
- Removed the legacy transport Kconfig options. They are superseded by
  the new transport Kconfig options.
- Tester app: `overlay-mesh-v1d1.conf` is merged into
  `overlay-mesh.conf`.
- Removed BabbleSim tests for 1.0.1.
- Updated documentation.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2023-11-29 13:28:08 +01:00 • committed by Carles Cufí
commit 981c79b7ce
173 changed files with 112 additions and 2635 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/connectivity/bluetooth/api/mesh.rst
View file

@ -5,10 +5,7 @@ Bluetooth Mesh Profile
The Bluetooth Mesh profile adds secure wireless multi-hop communication for
Bluetooth Low Energy. This module implements the
`Bluetooth Mesh Profile Specification v1.0.1 <https://www.bluetooth.com/specifications/specs/mesh-profile-1-0-1/>`_.
Implementation of the `Bluetooth Mesh Protocol Specification v1.1 <https://www.bluetooth.com/specifications/specs/mesh-protocol/>`_
is in experimental state.
`Bluetooth Mesh Protocol Specification v1.1 <https://www.bluetooth.com/specifications/specs/mesh-protocol/>`_.
Read more about Bluetooth Mesh on the
`Bluetooth SIG Website <https://www.bluetooth.com/bluetooth-resources/?tags=mesh>`_.

9
doc/connectivity/bluetooth/api/mesh/access.rst
View file

@ -168,15 +168,6 @@ needs to be stored.
Composition Data
================
.. note::
The implementation of the Bluetooth Mesh Protocol Specification version 1.1
is currently in an experimental state. For Bluetooth Mesh Profile Specification
version 1.0.1, only Composition Data Page 0 is supported. Users that are developing
for Bluetooth Mesh Profile Specification version 1.0.1 may therefore disregard all
parts of the following section mentioning the :ref:`bluetooth_mesh_lcd_srv`
model and Composition Data Pages 1, 2, 128, 129 and 130.
The Composition Data provides information about a mesh device.
A device's Composition Data holds information about the elements on the
device, the models that it supports, and other features. The Composition

56
doc/connectivity/bluetooth/api/mesh/sar_cfg.rst
View file

@ -43,36 +43,8 @@ Keep this in mind when defining the size of the buffers.
SAR does not impose extra overhead on the access layer payload per segment.
Intervals, timers and retransmission counters
*********************************************
The current stable stack implementation allows you to configure the following SAR behavior.
When sending a segmented message to a unicast address, the unacknowledged segments are repeated
the :kconfig:option:`CONFIG_BT_MESH_TX_SEG_RETRANS_COUNT` number of times before the transmission
is considered as failed. The same option configures a number of retransmissions to a group or
virtual address, but the transmission always succeedes after retransmitting all segments the
configured number of times.
The timeout between each retransmission to a unicast address is configured by the Kconfig option
:kconfig:option:`CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST`. The timeout between each
retransmission to a group or a virtual address is configured by the Kconfig option
:kconfig:option:`CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_GROUP`.
The time before sending a Segment Acknowledgment message is controlled by the Kconfig options
:kconfig:option:`CONFIG_BT_MESH_SEG_ACK_BASE_TIMEOUT`,
:kconfig:option:`CONFIG_BT_MESH_SEG_ACK_PER_HOP_TIMEOUT` and
:kconfig:option:`CONFIG_BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT`, and is defined as:
.. math::
\begin{aligned}
\max(&\mathtt{CONFIG\_BT\_MESH\_SEG\_ACK\_BASE\_TIMEOUT} \\
&+ \text{TTL} \times \mathtt{CONFIG\_BT\_MESH\_SEG\_ACK\_PER\_HOP\_TIMEOUT} \\
&+ \text{number of un-acked segments} \times \mathtt{CONFIG\_BT\_MESH\_SEG\_ACK\_PER\_SEGMENT\_TIMEOUT} , 400)
\end{aligned}
Segmentation and reassembly (SAR) Configuration models
======================================================
******************************************************
With Bluetooth Mesh Protocol Specification version 1.1, it became possible to configure SAR
behavior, such as intervals, timers and retransmission counters, over a mesh network using SAR
@ -139,7 +111,7 @@ of the `SAR Acknowledgment Retransmissions Count`_ state.
.. _bt_mesh_sar_cfg_states:
SAR states
==========
**********
There are two states defined related to segmentation and reassembly:
@ -168,7 +140,7 @@ the following states:
* SAR Receiver Segment Interval Step
SAR Segment Interval Step
-------------------------
=========================
SAR Segment Interval Step state holds a value that controls the interval between transmissions of
segments of a segmented message. The interval is measured in milliseconds.
@ -182,7 +154,7 @@ value. Segment transmission interval is then calculated using the following form
SAR Unicast Retransmissions Count
---------------------------------
=================================
SAR Unicast Retransmissions Count holds a value that defines the maximum number of retransmissions
of a segmented message to a unicast destination. Use the
@ -190,7 +162,7 @@ of a segmented message to a unicast destination. Use the
value for this state.
SAR Unicast Retransmissions Without Progress Count
--------------------------------------------------
==================================================
This state holds a value that defines the maximum number of retransmissions of a segmented message
to a unicast address that will be sent if no acknowledgment was received during the timeout, or if
@ -199,7 +171,7 @@ an acknowledgment with already confirmed segments was received. Use the Kconfig
of retransmissions.
SAR Unicast Retransmissions Interval Step
-----------------------------------------
=========================================
The value of this state controls the interval step used for delaying the retransmissions of
unacknowledged segments of a segmented message to a unicast address. The interval step is measured
@ -214,7 +186,7 @@ default value. This value is then used to calculate the interval step using the
SAR Unicast Retransmissions Interval Increment
----------------------------------------------
==============================================
SAR Unicast Retransmissions Interval Increment holds a value that controls the interval increment
used for delaying the retransmissions of unacknowledged segments of a segmented message to a unicast
@ -230,7 +202,7 @@ formula:
SAR Multicast Retransmissions Count
-----------------------------------
===================================
The state holds a value that controls the total number of retransmissions of a segmented message to
a multicast address. Use the Kconfig option
@ -238,7 +210,7 @@ a multicast address. Use the Kconfig option
retransmissions.
SAR Multicast Retransmissions Interval Step
-------------------------------------------
===========================================
This state holds a value that controls the interval between retransmissions of all segments in a
segmented message to a multicast address. The interval is measured in milliseconds.
@ -252,7 +224,7 @@ default value that is used to calculate the interval using the following formula
SAR Discard Timeout
-------------------
===================
The value of this state defines the time in seconds that the lower transport layer waits after
receiving segments of a segmented message before discarding that segmented message. Use the Kconfig
@ -265,7 +237,7 @@ timeout will be calculated using the following formula:
SAR Acknowledgment Delay Increment
----------------------------------
==================================
This state holds a value that controls the delay increment of an interval used for delaying the
transmission of an acknowledgment message after receiving a new segment. The increment is measured
@ -276,7 +248,7 @@ value. The increment value is calculated to be
:math:`\verb|CONFIG_BT_MESH_SAR_RX_ACK_DELAY_INC| + 1.5`.
SAR Segments Threshold
----------------------
======================
SAR Segments Threshold state holds a value that defines a threshold in number of segments of a
segmented message for acknowledgment retransmissions. Use the Kconfig option
@ -287,7 +259,7 @@ additionally retransmit every acknowledgment message the number of times given b
:kconfig:option:`CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT`.
SAR Acknowledgment Retransmissions Count
----------------------------------------
========================================
The SAR Acknowledgment Retransmissions Count state controls the number of retransmissions of Segment
Acknowledgment messages sent by the lower transport layer. It gives the total number of
@ -300,7 +272,7 @@ value for this state. The maximum number of transmissions of a Segment Acknowle
:math:`\verb|CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT| + 1`.
SAR Receiver Segment Interval Step
----------------------------------
==================================
The SAR Receiver Segment Interval Step defines the segments reception interval step used for
delaying the transmission of an acknowledgment message after receiving a new segment. The interval

19
doc/releases/migration-guide-3.6.rst
View file

@ -302,6 +302,25 @@ Bluetooth
* Deprecated :kconfig:option:`CONFIG_BT_MESH_PROV_DEVICE`. This option is
replaced by new option :kconfig:option:`CONFIG_BT_MESH_PROVISIONEE` to
be aligned with Mesh Protocol Specification v1.1, section 5.4. (:github:`64252`)
* Removed the ``CONFIG_BT_MESH_V1d1`` Kconfig option.
* Removed the ``CONFIG_BT_MESH_TX_SEG_RETRANS_COUNT``,
``CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST``,
``CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_GROUP``, ``CONFIG_BT_MESH_SEG_ACK_BASE_TIMEOUT``,
``CONFIG_BT_MESH_SEG_ACK_PER_HOP_TIMEOUT``, ``BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT``
Kconfig options. They are superseded by the
:kconfig:option:`CONFIG_BT_MESH_SAR_TX_SEG_INT_STEP`,
:kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_COUNT`,
:kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_WITHOUT_PROG_COUNT`,
:kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_INT_STEP`,
:kconfig:option:`CONFIG_BT_MESH_SAR_TX_UNICAST_RETRANS_INT_INC`,
:kconfig:option:`CONFIG_BT_MESH_SAR_TX_MULTICAST_RETRANS_COUNT`,
:kconfig:option:`CONFIG_BT_MESH_SAR_TX_MULTICAST_RETRANS_INT`,
:kconfig:option:`CONFIG_BT_MESH_SAR_RX_SEG_THRESHOLD`,
:kconfig:option:`CONFIG_BT_MESH_SAR_RX_ACK_DELAY_INC`,
:kconfig:option:`CONFIG_BT_MESH_SAR_RX_SEG_INT_STEP`,
:kconfig:option:`CONFIG_BT_MESH_SAR_RX_DISCARD_TIMEOUT`,
:kconfig:option:`CONFIG_BT_MESH_SAR_RX_ACK_RETRANS_COUNT` Kconfig options.
LoRaWAN
=======

1
doc/releases/release-notes-3.6.rst
View file

@ -58,6 +58,7 @@ Bluetooth
the transmitted responses on the Access layer.
The functionality is enabled by the :kconfig:option:`CONFIG_BT_MESH_ACCESS_DELAYABLE_MSG`
Kconfig option.
* The Bluetooth Mesh Protocol 1.1 is now supported by default.
* Controller

4
include/zephyr/bluetooth/mesh/main.h
View file

@ -783,7 +783,6 @@ struct bt_mesh_snb {
uint64_t auth_val;
};
#if defined(CONFIG_BT_MESH_V1d1)
struct bt_mesh_prb {
/** Random */
uint8_t random[13];
@ -797,7 +796,6 @@ struct bt_mesh_prb {
/** Authentication tag */
uint64_t auth_tag;
};
#endif
/** Beacon callback functions. */
struct bt_mesh_beacon_cb {
@ -810,7 +808,6 @@ struct bt_mesh_beacon_cb {
*/
void (*snb_received)(const struct bt_mesh_snb *snb);
#if defined(CONFIG_BT_MESH_V1d1)
/** @brief Private Beacon received.
*
* This callback notifies the application that Private Beacon
@ -819,7 +816,6 @@ struct bt_mesh_beacon_cb {
* @param prb Structure describing received Private Beacon
*/
void (*priv_received)(const struct bt_mesh_prb *prb);
#endif
};
/**

7
subsys/bluetooth/mesh/CMakeLists.txt
View file

@ -18,14 +18,9 @@ zephyr_library_sources_ifdef(CONFIG_BT_MESH
cfg_srv.c
health_srv.c
va.c
transport.c
)
if (CONFIG_BT_MESH_V1d1)
zephyr_library_sources(transport.c)
else()
zephyr_library_sources(transport_legacy.c)
endif()
zephyr_library_sources_ifdef(CONFIG_BT_MESH_ADV_LEGACY adv_legacy.c)
zephyr_library_sources_ifdef(CONFIG_BT_MESH_ADV_EXT adv_ext.c)

62
subsys/bluetooth/mesh/Kconfig
View file

@ -512,56 +512,6 @@ config BT_MESH_TX_SEG_MAX
which leaves 56 bytes for application layer data using a
4-byte MIC and 52 bytes using an 8-byte MIC.
if !BT_MESH_V1d1
config BT_MESH_TX_SEG_RETRANS_COUNT
int "Transport message segment retransmit attempts"
default 4
range 1 8
help
Maximum number of transport message segment retransmit attempts
for outgoing segment message.
config BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST
int "Transport message segment retransmit interval for unicast messages"
default 400
range 200 500
help
Maximum time of retransmit segment message to unicast address.
config BT_MESH_TX_SEG_RETRANS_TIMEOUT_GROUP
int "Transport message segment retransmit interval for group messages"
default 50
range 20 200
help
Maximum time of retransmit segment message to group address.
config BT_MESH_SEG_ACK_BASE_TIMEOUT
int "SegAck transmission base timeout"
default 150
range 150 400
help
Defines a base timeout for the acknowledgment timer used to delay
transmission of the Segmented Acknowledgment message.
config BT_MESH_SEG_ACK_PER_HOP_TIMEOUT
int "SegAck transmission timeout per hop"
default 50
range 50 250
help
Defines an additional per-hop timeout for the acknowledgment timer
used to delay transmission of the Segmented Acknowledgment message.
config BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT
int "SegAck transmission timeout per segment not yet received"
default 0
range 0 100
help
Defines an additional timeout for the acknowledgment timer for every
segment not yet received.
endif # !BT_MESH_V1d1
endmenu # Transport SAR configuration
config BT_MESH_DEFAULT_TTL
@ -1112,21 +1062,13 @@ config BT_MESH_FRIEND_ADV_LATENCY
endif # BT_MESH_FRIEND
menuconfig BT_MESH_V1d1
bool "Bluetooth Mesh v1.1 support"
help
This option enables Bluetooth Mesh v1.1 support. Bluetooth Mesh v1.1
is backward compatible with v1.0.1.
config BT_MESH_ECDH_P256_CMAC_AES128_AES_CCM
bool "Support CMAC AES128 for OOB authentication" if BT_MESH_V1d1
bool "Support CMAC AES128 for OOB authentication"
depends on BT_MESH_PROV
default y
help
Enable this option to support CMAC AES128 for OOB authentication.
if BT_MESH_V1d1
config BT_MESH_ECDH_P256_HMAC_SHA256_AES_CCM
bool "Support HMAC SHA256 for OOB authentication"
depends on BT_MESH_PROV
@ -1696,8 +1638,6 @@ config BT_MESH_SAR_RX_ACK_RETRANS_COUNT
endmenu
endif # BT_MESH_V1d1
menu "Capabilities"
config BT_MESH_SUBNET_COUNT

3
subsys/bluetooth/mesh/access.c
View file

@ -2380,7 +2380,6 @@ size_t bt_mesh_comp_page_size(uint8_t page)
int bt_mesh_comp_store(void)
{
#if IS_ENABLED(CONFIG_BT_MESH_V1d1)
NET_BUF_SIMPLE_DEFINE(buf, CONFIG_BT_MESH_COMP_PST_BUF_SIZE);
int err;
@ -2410,7 +2409,7 @@ int bt_mesh_comp_store(void)
LOG_DBG("Stored CDP%d", comp_data_pages[i].page);
}
#endif
return 0;
}

6
subsys/bluetooth/mesh/beacon.c
View file

@ -528,7 +528,6 @@ static bool secure_beacon_authenticate(struct bt_mesh_subnet *sub, void *cb_data
return false;
}
#if defined(CONFIG_BT_MESH_V1d1)
static bool priv_beacon_decrypt(struct bt_mesh_subnet *sub, void *cb_data)
{
struct beacon_params *params = cb_data;
@ -567,7 +566,6 @@ static bool priv_beacon_decrypt(struct bt_mesh_subnet *sub, void *cb_data)
return false;
}
#endif
static void net_beacon_register(struct bt_mesh_beacon *beacon, bool priv)
{
@ -658,7 +656,6 @@ static void secure_beacon_recv(struct net_buf_simple *buf)
net_beacon_resolve(&params, secure_beacon_authenticate);
}
#if defined(CONFIG_BT_MESH_V1d1)
static void private_beacon_recv(struct net_buf_simple *buf)
{
struct beacon_params params;
@ -675,7 +672,6 @@ static void private_beacon_recv(struct net_buf_simple *buf)
net_beacon_resolve(&params, priv_beacon_decrypt);
}
#endif
void bt_mesh_beacon_recv(struct net_buf_simple *buf)
{
@ -699,9 +695,7 @@ void bt_mesh_beacon_recv(struct net_buf_simple *buf)
secure_beacon_recv(buf);
break;
case BEACON_TYPE_PRIVATE:
#if defined(CONFIG_BT_MESH_V1d1)
private_beacon_recv(buf);
#endif
break;
default:
LOG_WRN("Unknown beacon type 0x%02x", type);

5
subsys/bluetooth/mesh/net.c
View file

@ -35,10 +35,7 @@
#include "prov.h"
#include "cfg.h"
#include "statistic.h"
#ifdef CONFIG_BT_MESH_V1d1
#include "sar_cfg_internal.h"
#endif
#define LOG_LEVEL CONFIG_BT_MESH_NET_LOG_LEVEL
#include <zephyr/logging/log.h>
@ -84,10 +81,8 @@ static uint16_t msg_cache_next;
/* Singleton network context (the implementation only supports one) */
struct bt_mesh_net bt_mesh = {
.local_queue = SYS_SLIST_STATIC_INIT(&bt_mesh.local_queue),
#ifdef CONFIG_BT_MESH_V1d1
.sar_tx = BT_MESH_SAR_TX_INIT,
.sar_rx = BT_MESH_SAR_RX_INIT,
#endif
#if defined(CONFIG_BT_MESH_PRIV_BEACONS)
.priv_beacon_int = 0x3c,

2
subsys/bluetooth/mesh/subnet.h
View file

@ -76,9 +76,7 @@ struct bt_mesh_subnet {
struct bt_mesh_key identity; /* IdentityKey */
#endif
struct bt_mesh_key beacon; /* BeaconKey */
#if defined(CONFIG_BT_MESH_V1d1)
struct bt_mesh_key priv_beacon; /* PrivateBeaconKey */
#endif
} keys[2];
#if defined(CONFIG_BT_MESH_PROXY_SOLICITATION)
bool sol_tx;

1656
subsys/bluetooth/mesh/transport_legacy.c
View file

File diff suppressed because it is too large Load diff

1
tests/bluetooth/mesh/blob_io_flash/prj.conf
View file

@ -15,7 +15,6 @@ CONFIG_BT_NO_DRIVER=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_V1d1=y
CONFIG_BT_MESH_BLOB_SRV=y
CONFIG_BT_MESH_BLOB_CLI=y
CONFIG_BT_MESH_BLOB_IO_FLASH=y

1
tests/bluetooth/mesh_shell/proxy_solicitation.conf
View file

@ -1,4 +1,3 @@
CONFIG_BT_MESH_V1d1=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_MESH_PROXY_CLIENT=y
CONFIG_BT_MESH_PROXY_SOLICITATION=y

30
tests/bluetooth/tester/overlay-mesh-v1d1.conf
View file

@ -1,30 +0,0 @@
CONFIG_ENTROPY_GENERATOR=y
CONFIG_BT_MESH_V1d1=y
CONFIG_BT_MESH_OP_AGG_CLI=y
CONFIG_BT_MESH_OP_AGG_SRV=y
# PTS requires more key slots.
# First one is implicitly taken by Device Key.
CONFIG_BT_MESH_MODEL_KEY_COUNT=3
CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
CONFIG_BT_MESH_SAR_CFG_SRV=y
CONFIG_BT_MESH_SAR_CFG_CLI=y
CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
CONFIG_BT_MESH_RPR_SRV=y
CONFIG_BT_MESH_RPR_CLI=y
CONFIG_BT_MESH_RPR_AD_TYPES_MAX=2
CONFIG_BT_MESH_BLOB_CLI=y
CONFIG_BT_MESH_DFU_CLI=y
CONFIG_BT_MESH_BLOB_SRV=y
CONFIG_BT_MESH_DFU_SRV=y
CONFIG_BT_MESH_DFD_SRV=y
CONFIG_BT_MESH_DFU_SLOT_CNT=2
CONFIG_BT_MESH_PRIV_BEACONS=y
CONFIG_BT_MESH_PRIV_BEACON_SRV=y
CONFIG_BT_MESH_PRIV_BEACON_CLI=y
CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
CONFIG_BT_MESH_MODEL_EXTENSIONS=y
CONFIG_BT_MESH_COMP_PAGE_1=y
CONFIG_BT_MESH_COMP_PAGE_2=y
CONFIG_SETTINGS=y

29
tests/bluetooth/tester/overlay-mesh.conf
View file

@ -1,3 +1,5 @@
CONFIG_ENTROPY_GENERATOR=y
CONFIG_BT_MESH=y
CONFIG_BT_MESH_RELAY=y
CONFIG_BT_MESH_PB_ADV=y
@ -23,3 +25,30 @@ CONFIG_BT_MESH_CDB_NODE_COUNT=3
CONFIG_BT_MESH_PROV_OOB_PUBLIC_KEY=y
CONFIG_BT_MESH_MSG_CACHE_SIZE=10
CONFIG_BT_MESH_PROXY_CLIENT=y
CONFIG_BT_MESH_OP_AGG_CLI=y
CONFIG_BT_MESH_OP_AGG_SRV=y
# PTS requires more key slots.
# First one is implicitly taken by Device Key.
CONFIG_BT_MESH_MODEL_KEY_COUNT=3
CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
CONFIG_BT_MESH_SAR_CFG_SRV=y
CONFIG_BT_MESH_SAR_CFG_CLI=y
CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
CONFIG_BT_MESH_RPR_SRV=y
CONFIG_BT_MESH_RPR_CLI=y
CONFIG_BT_MESH_RPR_AD_TYPES_MAX=2
CONFIG_BT_MESH_BLOB_CLI=y
CONFIG_BT_MESH_DFU_CLI=y
CONFIG_BT_MESH_BLOB_SRV=y
CONFIG_BT_MESH_DFU_SRV=y
CONFIG_BT_MESH_DFD_SRV=y
CONFIG_BT_MESH_DFU_SLOT_CNT=2
CONFIG_BT_MESH_PRIV_BEACONS=y
CONFIG_BT_MESH_PRIV_BEACON_SRV=y
CONFIG_BT_MESH_PRIV_BEACON_CLI=y
CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
CONFIG_BT_MESH_MODEL_EXTENSIONS=y
CONFIG_BT_MESH_COMP_PAGE_1=y
CONFIG_BT_MESH_COMP_PAGE_2=y
CONFIG_SETTINGS=y

10
tests/bluetooth/tester/testcase.yaml
View file

@ -28,13 +28,3 @@ tests:
extra_args: OVERLAY_CONFIG="overlay-mesh.conf"
tags: bluetooth
harness: bluetooth
bluetooth.general.tester_mesh_v1d1:
build_only: true
platform_allow:
- qemu_x86
- native_posix
- native_sim
- nrf52840dk_nrf52840
extra_args: OVERLAY_CONFIG="overlay-mesh.conf;overlay-mesh-v1d1.conf"
tags: bluetooth
harness: bluetooth

42
tests/bsim/bluetooth/mesh/CMakeLists.txt
View file

@ -10,30 +10,20 @@ target_sources(app PRIVATE
src/mesh_test.c
src/friendship_common.c
src/gatt_common.c
src/dfu_blob_common.c
)
if(CONFIG_BT_MESH_V1d1)
target_sources(app PRIVATE
src/dfu_blob_common.c
)
endif()
if(CONFIG_SETTINGS)
target_sources(app PRIVATE
src/test_persistence.c
src/test_replay_cache.c
src/test_provision.c
)
if(CONFIG_BT_MESH_V1d1)
target_sources(app PRIVATE
src/test_dfu.c
src/test_blob.c
src/test_sar.c
src/test_lcd.c
)
endif()
src/test_dfu.c
src/test_blob.c
src/test_sar.c
src/test_lcd.c
)
if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
target_sources(app PRIVATE
@ -47,13 +37,8 @@ elseif(CONFIG_BT_MESH_GATT_PROXY)
target_sources(app PRIVATE
src/test_advertiser.c
src/test_suspend.c
)
if(CONFIG_BT_MESH_V1d1)
target_sources(app PRIVATE
src/test_beacon.c
)
endif()
)
elseif(CONFIG_BT_CTLR_LOW_LAT)
@ -76,17 +61,12 @@ else()
src/test_iv_index.c
src/test_advertiser.c
src/test_suspend.c
src/test_blob.c
src/test_op_agg.c
src/test_sar.c
src/test_cdp1.c
)
if(CONFIG_BT_MESH_V1d1)
target_sources(app PRIVATE
src/test_blob.c
src/test_op_agg.c
src/test_sar.c
src/test_cdp1.c
)
endif()
endif()
zephyr_include_directories(

23
tests/bsim/bluetooth/mesh/compile.sh
View file

@ -18,24 +18,13 @@ mkdir -p ${WORK_DIR}
source ${ZEPHYR_BASE}/tests/bsim/compile.source
app=tests/bsim/bluetooth/mesh compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_pst.conf compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt.conf compile
app=tests/bsim/bluetooth/mesh conf_file=prj_mesh1d1.conf compile
app=tests/bsim/bluetooth/mesh \
conf_file=prj_mesh1d1.conf conf_overlay=overlay_pst.conf compile
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
app=tests/bsim/bluetooth/mesh \
conf_file=prj_mesh1d1.conf conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
app=tests/bsim/bluetooth/mesh conf_overlay=overlay_psa.conf compile
app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
app=tests/bsim/bluetooth/mesh conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
wait_for_background_jobs

3
tests/bsim/bluetooth/mesh/overlay_pst.conf
View file

@ -18,7 +18,4 @@ CONFIG_BT_MESH_SUBNET_COUNT=2
CONFIG_BT_MESH_SEQ_STORE_RATE=1
CONFIG_BT_MESH_RPL_STORE_TIMEOUT=1
CONFIG_BT_MESH_STORE_TIMEOUT=1
CONFIG_BT_MESH_TX_SEG_RETRANS_COUNT=1
CONFIG_BT_MESH_TX_SEG_RETRANS_TIMEOUT_UNICAST=200
CONFIG_BT_MESH_SEG_ACK_BASE_TIMEOUT=400
CONFIG_BT_MESH_COMP_PST_BUF_SIZE=600

28
tests/bsim/bluetooth/mesh/prj.conf
View file

@ -19,11 +19,12 @@ CONFIG_BT_CTLR_PRIVACY=n
CONFIG_BT_MESH=y
CONFIG_BT_MESH_LOG_LEVEL_DBG=y
CONFIG_BT_MESH_RELAY=y
CONFIG_BT_MESH_ADV_BUF_COUNT=32
CONFIG_BT_MESH_ADV_BUF_COUNT=64
CONFIG_BT_MESH_TX_SEG_MAX=32
CONFIG_BT_MESH_RX_SEG_MAX=32
CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
CONFIG_BT_MESH_RX_SEG_MSG_COUNT=10
CONFIG_BT_MESH_SEG_BUFS=100
CONFIG_BT_MESH_CFG_CLI=y
CONFIG_BT_MESH_MODEL_GROUP_COUNT=3
CONFIG_BT_MESH_LOW_POWER=y
@ -43,4 +44,29 @@ CONFIG_BT_MESH_CDB_NODE_COUNT=4
CONFIG_BT_MESH_PROV_OOB_PUBLIC_KEY=y
CONFIG_BT_MESH_MODEL_EXTENSIONS=y
CONFIG_BT_MESH_SUBNET_COUNT=5
CONFIG_BT_MESH_SAR_CFG_CLI=y
CONFIG_BT_MESH_SAR_CFG_SRV=y
CONFIG_BT_MESH_BLOB_SRV=y
CONFIG_BT_MESH_BLOB_CLI=y
CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MIN=256
CONFIG_BT_MESH_RPR_CLI=y
CONFIG_BT_MESH_RPR_SRV=y
CONFIG_BT_MESH_OP_AGG_CLI=y
CONFIG_BT_MESH_OP_AGG_SRV=y
CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
CONFIG_BT_MESH_DFU_SRV=y
CONFIG_BT_MESH_DFU_CLI=y
CONFIG_BT_MESH_DFD_SRV=y
CONFIG_BT_MESH_DFD_SRV_OOB_UPLOAD=y
CONFIG_BT_MESH_DFU_SLOT_CNT=4
CONFIG_BT_MESH_PRIV_BEACON_SRV=y
CONFIG_BT_MESH_PRIV_BEACON_CLI=y
CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
CONFIG_BT_MESH_OD_PRIV_PROXY_CLI=y
CONFIG_BT_MESH_COMP_PAGE_1=y
CONFIG_BT_MESH_COMP_PAGE_2=y
CONFIG_BT_TESTING=y
# Needed for RPR tests due to huge amount of retransmitted messages
CONFIG_BT_MESH_MSG_CACHE_SIZE=64

73
tests/bsim/bluetooth/mesh/prj_mesh1d1.conf
View file

@ -1,73 +0,0 @@
CONFIG_LOG_MODE_IMMEDIATE=y
CONFIG_ASSERT=y
CONFIG_SYS_CLOCK_TICKS_PER_SEC=32768
# Bluetooth configuration
CONFIG_BT=y
CONFIG_LOG=y
CONFIG_BT_PRIVACY=n
CONFIG_BT_COMPANY_ID=0x0059
CONFIG_BT_DEVICE_NAME="Mesh test"
CONFIG_BT_OBSERVER=y
CONFIG_BT_BROADCASTER=y
# Disable unused Bluetooth features
CONFIG_BT_CTLR_DUP_FILTER_LEN=0
CONFIG_BT_CTLR_PRIVACY=n
# Bluetooth Mesh configuration
CONFIG_BT_MESH=y
CONFIG_BT_MESH_V1d1=y
CONFIG_BT_MESH_LOG_LEVEL_DBG=y
CONFIG_BT_MESH_RELAY=y
CONFIG_BT_MESH_ADV_BUF_COUNT=64
CONFIG_BT_MESH_TX_SEG_MAX=32
CONFIG_BT_MESH_RX_SEG_MAX=32
CONFIG_BT_MESH_TX_SEG_MSG_COUNT=10
CONFIG_BT_MESH_RX_SEG_MSG_COUNT=10
CONFIG_BT_MESH_SEG_BUFS=100
CONFIG_BT_MESH_CFG_CLI=y
CONFIG_BT_MESH_MODEL_GROUP_COUNT=3
CONFIG_BT_MESH_LOW_POWER=y
CONFIG_BT_MESH_LPN_AUTO=n
CONFIG_BT_MESH_FRIEND=y
CONFIG_BT_MESH_FRIEND_ENABLED=n
CONFIG_BT_MESH_FRIEND_LPN_COUNT=5
CONFIG_BT_MESH_APP_KEY_COUNT=2
CONFIG_BT_MESH_MODEL_KEY_COUNT=2
CONFIG_BT_MESH_LABEL_COUNT=3
CONFIG_BT_MESH_IV_UPDATE_TEST=y
CONFIG_BT_MESH_PB_ADV=y
CONFIG_BT_MESH_PROVISIONER=y
CONFIG_BT_MESH_PROVISIONEE=y
CONFIG_BT_MESH_CDB=y
CONFIG_BT_MESH_CDB_NODE_COUNT=4
CONFIG_BT_MESH_PROV_OOB_PUBLIC_KEY=y
CONFIG_BT_MESH_MODEL_EXTENSIONS=y
CONFIG_BT_MESH_SUBNET_COUNT=5
CONFIG_BT_MESH_SAR_CFG_CLI=y
CONFIG_BT_MESH_SAR_CFG_SRV=y
CONFIG_BT_MESH_BLOB_SRV=y
CONFIG_BT_MESH_BLOB_CLI=y
CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MIN=256
CONFIG_BT_MESH_RPR_CLI=y
CONFIG_BT_MESH_RPR_SRV=y
CONFIG_BT_MESH_OP_AGG_CLI=y
CONFIG_BT_MESH_OP_AGG_SRV=y
CONFIG_BT_MESH_LARGE_COMP_DATA_CLI=y
CONFIG_BT_MESH_LARGE_COMP_DATA_SRV=y
CONFIG_BT_MESH_DFU_SRV=y
CONFIG_BT_MESH_DFU_CLI=y
CONFIG_BT_MESH_DFD_SRV=y
CONFIG_BT_MESH_DFD_SRV_OOB_UPLOAD=y
CONFIG_BT_MESH_DFU_SLOT_CNT=4
CONFIG_BT_MESH_PRIV_BEACON_SRV=y
CONFIG_BT_MESH_PRIV_BEACON_CLI=y
CONFIG_BT_MESH_OD_PRIV_PROXY_SRV=y
CONFIG_BT_MESH_OD_PRIV_PROXY_CLI=y
CONFIG_BT_MESH_COMP_PAGE_1=y
CONFIG_BT_MESH_COMP_PAGE_2=y
CONFIG_BT_TESTING=y
# Needed for RPR tests due to huge amount of retransmitted messages
CONFIG_BT_MESH_MSG_CACHE_SIZE=64

13
tests/bsim/bluetooth/mesh/src/main.c
View file

@ -11,19 +11,14 @@
extern struct bst_test_list *test_persistence_install(struct bst_test_list *tests);
extern struct bst_test_list *test_rpc_install(struct bst_test_list *tests);
extern struct bst_test_list *test_provision_pst_install(struct bst_test_list *tests);
#if defined(CONFIG_BT_MESH_V1d1)
extern struct bst_test_list *test_dfu_install(struct bst_test_list *test);
extern struct bst_test_list *test_blob_pst_install(struct bst_test_list *test);
extern struct bst_test_list *test_lcd_install(struct bst_test_list *test);
extern struct bst_test_list *test_sar_pst_install(struct bst_test_list *test);
#endif /* defined(CONFIG_BT_MESH_V1d1) */
#elif defined(CONFIG_BT_MESH_GATT_PROXY)
extern struct bst_test_list *test_adv_install(struct bst_test_list *test);
extern struct bst_test_list *test_suspend_install(struct bst_test_list *test);
#if defined(CONFIG_BT_MESH_V1d1)
extern struct bst_test_list *test_beacon_install(struct bst_test_list *tests);
#endif /* defined(CONFIG_BT_MESH_V1d1) */
#elif defined(CONFIG_BT_CTLR_LOW_LAT)
extern struct bst_test_list *test_transport_install(struct bst_test_list *tests);
extern struct bst_test_list *test_friendship_install(struct bst_test_list *tests);
@ -39,31 +34,25 @@ extern struct bst_test_list *test_access_install(struct bst_test_list *test);
extern struct bst_test_list *test_ivi_install(struct bst_test_list *test);
extern struct bst_test_list *test_adv_install(struct bst_test_list *test);
extern struct bst_test_list *test_suspend_install(struct bst_test_list *test);
#if defined(CONFIG_BT_MESH_V1d1)
extern struct bst_test_list *test_blob_install(struct bst_test_list *test);
extern struct bst_test_list *test_op_agg_install(struct bst_test_list *test);
extern struct bst_test_list *test_sar_install(struct bst_test_list *test);
extern struct bst_test_list *test_cdp1_install(struct bst_test_list *test);
#endif /* defined(CONFIG_BT_MESH_V1d1) */
#endif
bst_test_install_t test_installers[] = {
#if defined(CONFIG_SETTINGS)
test_persistence_install,
test_rpc_install,
#if defined(CONFIG_BT_MESH_V1d1)
test_provision_pst_install,
test_dfu_install,
test_blob_pst_install,
test_lcd_install,
test_sar_pst_install,
#endif /* defined(CONFIG_BT_MESH_V1d1) */
#elif defined(CONFIG_BT_MESH_GATT_PROXY)
test_adv_install,
test_suspend_install,
#if defined(CONFIG_BT_MESH_V1d1)
test_beacon_install,
#endif /* defined(CONFIG_BT_MESH_V1d1) */
#elif defined(CONFIG_BT_CTLR_LOW_LAT)
test_transport_install,
test_friendship_install,
@ -79,12 +68,10 @@ bst_test_install_t test_installers[] = {
test_ivi_install,
test_adv_install,
test_suspend_install,
#if defined(CONFIG_BT_MESH_V1d1)
test_blob_install,
test_op_agg_install,
test_sar_install,
test_cdp1_install,
#endif /* defined(CONFIG_BT_MESH_V1d1) */
#endif
NULL
};

17
tests/bsim/bluetooth/mesh/src/test_beacon.c
View file

@ -27,9 +27,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
#define BEACON_INTERVAL 10 /*seconds*/
#define BEACON_TYPE_SECURE 0x01
#if CONFIG_BT_MESH_V1d1
#define BEACON_TYPE_PRIVATE 0x02
#endif
static uint8_t test_net_key_2[16] = { 0xca, 0x11, 0xab, 0x1e };
static struct {
@ -71,7 +69,6 @@ BT_MESH_BEACON_CB_DEFINE(snb) = {
/* Setting for scanner defining what beacon is expected next, SNB as default */
static uint8_t expected_beacon = BEACON_TYPE_SECURE;
#if CONFIG_BT_MESH_V1d1
static struct bt_mesh_cfg_cli cfg_cli;
static struct bt_mesh_priv_beacon_cli priv_beacon_cli;
@ -99,7 +96,6 @@ static uint8_t last_random[13];
static bt_addr_le_t last_beacon_adv_addr;
static struct bt_mesh_key priv_beacon_key;
#endif /* CONFIG_BT_MESH_V1d1 */
static int random_interval;
@ -330,13 +326,11 @@ static struct k_sem observer_sem;
static struct {
uint8_t flags;
uint32_t iv_index;
#if CONFIG_BT_MESH_V1d1
uint8_t random[13];
uint64_t pp_hash;
uint64_t pp_random;
uint64_t net_id;
bt_addr_le_t adv_addr;
#endif
bool (*process_cb)(const uint8_t *net_id, void *ctx);
void *user_ctx;
} beacon;
@ -364,7 +358,6 @@ static void beacon_scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_ty
net_id = net_buf_simple_pull_mem(buf, 8);
beacon.iv_index = net_buf_simple_pull_be32(buf);
}
#if CONFIG_BT_MESH_V1d1
else if (expected_beacon == BEACON_TYPE_PRIVATE) {
uint8_t private_beacon_data[5];
@ -377,7 +370,7 @@ static void beacon_scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_ty
beacon.flags = private_beacon_data[0];
beacon.iv_index = sys_get_be32(&private_beacon_data[1]);
}
#endif
if (!beacon.process_cb || beacon.process_cb(net_id, beacon.user_ctx)) {
k_sem_give(&observer_sem);
}
@ -1060,8 +1053,6 @@ static void test_tx_beacon_cache(void)
PASS();
}
#if CONFIG_BT_MESH_V1d1
typedef void (*priv_beacon_cb)(const struct bt_mesh_prb *prb);
static priv_beacon_cb priv_beacon_cb_ptr;
@ -2196,8 +2187,6 @@ static void test_rx_priv_gatt_proxy(void)
#endif
#endif /* CONFIG_BT_MESH_V1d1 */
#define TEST_CASE(role, name, description) \
{ \
.test_id = "beacon_" #role "_" #name, \
@ -2216,7 +2205,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(tx, multiple_netkeys, "Beacon: multiple Net Keys"),
TEST_CASE(tx, secure_beacon_interval, "Beacon: send secure beacons"),
TEST_CASE(tx, beacon_cache, "Beacon: advertise duplicate SNBs"),
#if CONFIG_BT_MESH_V1d1
TEST_CASE(tx, priv_on_iv_update, "Private Beacon: send on IV update"),
TEST_CASE(tx, priv_on_key_refresh, "Private Beacon: send on Key Refresh"),
TEST_CASE(tx, priv_adv, "Private Beacon: advertise Private Beacons"),
@ -2230,7 +2218,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(tx, priv_gatt_proxy, "Private Proxy: Send Private Beacons over GATT"),
TEST_CASE(tx, proxy_adv_multi_subnet_coex, "Proxy Adv: Multi subnet coex proxy adv"),
TEST_CASE(tx, proxy_adv_solicit_trigger, "Proxy Adv: Trigger Solicitation"),
#endif
#endif
TEST_CASE(rx, on_iv_update, "Beacon: receive with IV update flag"),
@ -2240,7 +2227,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(rx, multiple_netkeys, "Beacon: multiple Net Keys"),
TEST_CASE(rx, secure_beacon_interval, "Beacon: receive and send secure beacons"),
TEST_CASE(rx, beacon_cache, "Beacon: receive duplicate SNBs"),
#if CONFIG_BT_MESH_V1d1
TEST_CASE(rx, priv_adv, "Private Beacon: verify random regeneration"),
TEST_CASE(rx, priv_invalid, "Private Beacon: receive invalid beacons"),
TEST_CASE(rx, priv_interleave, "Private Beacon: interleaved with SNB"),
@ -2251,7 +2237,6 @@ static const struct bst_test_instance test_beacon[] = {
TEST_CASE(rx, priv_multi_net_id, "Private Proxy: scan for multiple Net ID"),
TEST_CASE(rx, priv_gatt_proxy, "Private Proxy: Receive Private Beacons over GATT"),
TEST_CASE(rx, proxy_adv_multi_subnet_coex, "Proxy Adv: Multi subnet coex proxy adv"),
#endif
#endif
BSTEST_END_MARKER
};

4
tests/bsim/bluetooth/mesh/src/test_provision.c
View file

@ -52,11 +52,9 @@ enum test_flags {
static uint8_t static_key1[] = {0x6E, 0x6F, 0x72, 0x64, 0x69, 0x63, 0x5F,
0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x5F, 0x31};
static uint8_t static_key2[] = {0x6E, 0x6F, 0x72, 0x64, 0x69, 0x63, 0x5F};
#if IS_ENABLED(CONFIG_BT_MESH_V1d1)
static uint8_t static_key3[] = {0x45, 0x6E, 0x68, 0x61, 0x6E, 0x63, 0x65, 0x64, 0x20, 0x70, 0x72,
0x6F, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x69, 0x6E, 0x67, 0x20,
0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x20, 0x4F, 0x4F, 0x42};
#endif
static uint8_t private_key_be[32];
static uint8_t public_key_be[64];
@ -72,9 +70,7 @@ static struct oob_auth_test_vector_s {
{NULL, 0, 0, 0, 0, 0},
{static_key1, sizeof(static_key1), 0, 0, 0, 0},
{static_key2, sizeof(static_key2), 0, 0, 0, 0},
#if IS_ENABLED(CONFIG_BT_MESH_V1d1)
{static_key3, sizeof(static_key3), 0, 0, 0, 0},
#endif
{NULL, 0, 3, BT_MESH_BLINK, 0, 0},
{NULL, 0, 5, BT_MESH_BEEP, 0, 0},
{NULL, 0, 6, BT_MESH_VIBRATE, 0, 0},

4
tests/bsim/bluetooth/mesh/src/test_replay_cache.c
View file

@ -78,7 +78,6 @@ static void rx_ended(uint8_t *data, size_t len)
static void tx_sar_conf(void)
{
#ifdef CONFIG_BT_MESH_V1d1
/* Reconfigure SAR Transmitter state so that the transport layer doesn't
* retransmit.
*/
@ -97,12 +96,10 @@ static void tx_sar_conf(void)
#else
bt_mesh.sar_tx = tx_set;
#endif
#endif
}
static void rx_sar_conf(void)
{
#ifdef CONFIG_BT_MESH_V1d1
/* Reconfigure SAR Receiver state so that the transport layer does
* generate Segmented Acks as rarely as possible.
*/
@ -119,7 +116,6 @@ static void rx_sar_conf(void)
#else
bt_mesh.sar_rx = rx_set;
#endif
#endif
}
static void test_tx_immediate_replay_attack(void)

2
tests/bsim/bluetooth/mesh/src/test_transport.c
View file

@ -94,7 +94,6 @@ static void async_send_end(int err, void *data)
static void rx_sar_conf(void)
{
#ifdef CONFIG_BT_MESH_V1d1
/* Reconfigure SAR Receiver state so that the transport layer does
* generate Segmented Acks as rarely as possible.
*/
@ -111,7 +110,6 @@ static void rx_sar_conf(void)
#else
bt_mesh.sar_rx = rx_set;
#endif
#endif
}
static const struct bt_mesh_send_cb async_send_cb = {

5
tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh
View file

@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_publication_cancel \
access_tx_cancel access_rx_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

5
tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh
View file

@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_extended_model_subs \
access_tx_ext_model access_sub_ext_model
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

4
tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub_cap.sh
View file

@ -6,9 +6,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
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

5
tests/bsim/bluetooth/mesh/tests_scripts/access/access_period.sh
View file

@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_per_pub \
access_tx_period access_rx_period
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

5
tests/bsim/bluetooth/mesh/tests_scripts/access/access_period_delayable.sh
View file

@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_pub_period_delayable_retr \
access_tx_period_delayable access_rx_period_delayable
conf=prj_mesh1d1_conf
RunTest mesh_access_pub_period_delayable_retr_1d1 \
access_tx_period_delayable access_rx_period_delayable
conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_pub_period_delayable_retr_psa \
access_tx_period_delayable access_rx_period_delayable

5
tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit.sh
View file

@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_pub_retr \
access_tx_transmit access_rx_transmit
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

5
tests/bsim/bluetooth/mesh/tests_scripts/access/access_transmit_delayable.sh
View file

@ -7,11 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
RunTest mesh_access_pub_transmit_delayable_retr \
access_tx_transmit_delayable access_rx_transmit_delayable
conf=prj_mesh1d1_conf
RunTest mesh_access_pub_transmit_delayable_retr_1d1 \
access_tx_transmit_delayable access_rx_transmit_delayable
conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_access_pub_transmit_delayable_retr_psa \
access_tx_transmit_delayable access_rx_transmit_delayable

5
tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh
View file

@ -21,10 +21,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
overlay=overlay_gatt_conf
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

4
tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test buffer management by filling buffers and sending them in random order.
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

4
tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test buffer management by filling all the buffer and sending them in reversed order.
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

4
tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test buffer management by filling all the buffer and sending them all in order.
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

4
tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test tx callbacks sequence for multiple advs
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

4
tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test tx callbacks parameters and xmit sequence for single adv
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

6
tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_cache.sh
View file

@ -15,12 +15,6 @@ RunTest mesh_beacon_cache \
beacon_tx_beacon_cache \
beacon_rx_beacon_cache
conf=prj_mesh1d1_conf
RunTest mesh_beacon_cache \
beacon_tx_beacon_cache \
beacon_rx_beacon_cache
conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_beacon_cache \
beacon_tx_beacon_cache \

6
tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh
View file

@ -22,12 +22,6 @@ RunTest mesh_beacon_interval \
beacon_tx_secure_beacon_interval \
beacon_rx_secure_beacon_interval
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh
View file

@ -8,12 +8,6 @@ RunTest mesh_beacon_invalid \
beacon_tx_invalid \
beacon_rx_invalid
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh
View file

@ -8,12 +8,6 @@ RunTest mesh_beacon_on_iv_update \
beacon_tx_on_iv_update \
beacon_rx_on_iv_update
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh
View file

@ -8,12 +8,6 @@ RunTest mesh_beacon_on_key_refresh \
beacon_tx_on_key_refresh \
beacon_rx_on_key_refresh
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh
View file

@ -8,12 +8,6 @@ RunTest mesh_beacon_kr_old_key \
beacon_tx_kr_old_key \
beacon_rx_kr_old_key
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh
View file

@ -8,12 +8,6 @@ RunTest mesh_beacon_multiple_netkeys \
beacon_tx_multiple_netkeys \
beacon_rx_multiple_netkeys
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_basic.sh
View file

@ -4,9 +4,7 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_trans.sh
View file

@ -4,9 +4,7 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh
View file

@ -4,9 +4,7 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast_seq.sh
View file

@ -4,9 +4,7 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh
View file

@ -5,11 +5,9 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh
View file

@ -5,11 +5,9 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh
View file

@ -5,11 +5,9 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh
View file

@ -5,11 +5,9 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh
View file

@ -7,7 +7,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Establish multiple different friendships concurrently. Perform BLOB transfer with BLOB Client
# on friend node and BLOB Server on LPNs.
# Note: The number of LPNs must match CONFIG_BT_MESH_FRIEND_LPN_COUNT.
conf=prj_mesh1d1_conf
RunTest blob_transfer_lpn \
blob_cli_friend_pull \
blob_srv_lpn_pull \
@ -16,7 +15,6 @@ RunTest blob_transfer_lpn \
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh
View file

@ -4,13 +4,11 @@
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh
View file

@ -4,13 +4,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh
View file

@ -5,7 +5,6 @@
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_fail \
blob_cli_fail_on_persistency \
blob_srv_fail_on_block_start\
@ -13,7 +12,6 @@ RunTest blob_fail \
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh
View file

@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Client continues BLOB Transfer after one target timed out while sending chunks.
conf=prj_mesh1d1_conf
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh
View file

@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Transfer completes successfully in Pull mode
conf=prj_mesh1d1_conf
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_push.sh
View file

@ -5,12 +5,10 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that BLOB Transfer completes successfully in Push mode
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_pull.sh
View file

@ -5,11 +5,9 @@
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
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

2
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_resume_push.sh
View file

@ -5,9 +5,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

12
tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_srv_persistence.sh
View file

@ -10,65 +10,53 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Tests with -flash_rm clean up stored settings after them
# to run tests with -flash_erase correctly.
# Test cases are designed to be run using single target.
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=1
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=2
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=3
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
# Test reaching suspended state and continuation after reboot on new procedure.
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=5
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash blob_recover_phase \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4
# The same test but with PSA crypto
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=1
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=2
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop blob_srv_stop -- -argstest expected-phase=3
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest 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"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_erase blob_srv_stop -flash_erase -- -argstest expected-phase=5
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash blob_recover_phase_psa \
blob_cli_stop -flash_rm blob_srv_stop -flash_rm -- -argstest expected-phase=4

2
tests/bsim/bluetooth/mesh/tests_scripts/comp_data/cdp1_encode_decode.sh
View file

@ -13,11 +13,9 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# 0. Provisioning and setup.
# 1. Configuration client requests the node's CDP1.
# 2. The received CDP1 is compared to a hardcoded version.
conf=prj_mesh1d1_conf
RunTest mesh_cdp1_test \
cdp1_node_data_comparison
conf=prj_mesh1d1_conf
overlay=overlay_psa_conf
RunTest mesh_cdp1_test_psa \
cdp1_node_data_comparison

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh
View file

@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_apply \
dfu_cli_all_targets_lost_on_apply \
@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh
View file

@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# and `ended` callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_caps_get \
dfu_cli_all_targets_lost_on_caps_get \
@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh
View file

@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_metadata \
dfu_cli_all_targets_lost_on_metadata \
@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh
View file

@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Firmware Update Get message and `ended` callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_update_get \
dfu_cli_all_targets_lost_on_update_get \
@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh
View file

@ -8,7 +8,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# callback is called when all targets are lost at this step.
# The test instance sequence must stay as it is due to addressing scheme
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_all_tgts_lost_on_verify \
dfu_cli_all_targets_lost_on_verify \
@ -17,7 +16,6 @@ RunTest dfu_all_tgts_lost_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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh
View file

@ -5,7 +5,6 @@
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
overlay=overlay_pst_conf
RunTest dfu_persistency \
dfu_cli_fail_on_persistency \
@ -16,7 +15,6 @@ RunTest dfu_persistency \
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh
View file

@ -4,10 +4,8 @@
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

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh
View file

@ -4,12 +4,10 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
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

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh
View file

@ -5,12 +5,10 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test DFU with all variants of firmware effect
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

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh
View file

@ -5,13 +5,11 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test that confirm step fails with all variants of firmware effect
conf=prj_mesh1d1_conf
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 \

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh
View file

@ -11,7 +11,6 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# and verifies they do not exist.
# - Fourth test is rebooted device that verifies if removing all slots also removed them
# from storage.
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_slot dfu_dist_dfu_slot_create -flash_erase
@ -21,7 +20,6 @@ RunTestFlash dfu_slot dfu_dist_dfu_slot_delete_all
RunTestFlash dfu_slot dfu_dist_dfu_slot_check_delete_all -flash_rm
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_slot_psa dfu_dist_dfu_slot_create -flash_erase

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_idempotency.sh
View file

@ -5,10 +5,8 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test DFU Slot API. This test tests that the APIs are idempotent.
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_slot_idempotency dfu_dist_dfu_slot_idempotency
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_slot_idempotency_psa dfu_dist_dfu_slot_idempotency

2
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot_reservation.sh
View file

@ -5,10 +5,8 @@
source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# Test DFU Slot API. This test tests slot reservation APIs.
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest dfu_slot_reservation dfu_dist_dfu_slot_reservation
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest dfu_slot_reservation_psa dfu_dist_dfu_slot_reservation

14
tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh
View file

@ -13,32 +13,27 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# image index were loaded correctly.
# Test cases are designed to be run using single target. `dfu_cli_stop` test case in recovery part
# plays dummy role, and is there to keep order of settings files being loaded.
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=2
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=3
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop dfu_target_dfu_stop \
-- -argstest recover=1 expected-phase=4
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
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
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
@ -46,45 +41,38 @@ RunTestFlash dfu_dist_recover_phase \
# 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
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=5
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTestFlash dfu_dist_recover_phase \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
-- -argstest recover=1 expected-phase=6
# The same test but with PSA crypto
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=2
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash 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"
RunTestFlash 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"
RunTestFlash 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"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \
@ -92,13 +80,11 @@ RunTestFlash dfu_dist_recover_phase_psa \
# 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"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_erase dfu_target_dfu_stop -flash_erase \
-- -argstest recover=0 expected-phase=5
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTestFlash dfu_dist_recover_phase_psa \
dfu_cli_stop -flash_rm dfu_target_dfu_stop -flash_rm \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh
View file

@ -9,12 +9,6 @@ RunTest mesh_friendship_est \
friendship_friend_est \
friendship_lpn_est
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 \

10
tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh
View file

@ -14,16 +14,6 @@ RunTest mesh_friendship_est_multi \
friendship_lpn_est \
friendship_lpn_est
conf=prj_mesh1d1_conf
RunTest mesh_friendship_est_multi_1d1 \
friendship_friend_est_multi \
friendship_lpn_est \
friendship_lpn_est \
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh
View file

@ -16,12 +16,6 @@ RunTest mesh_lpn_disable_check \
friendship_friend_no_est \
friendship_lpn_disable
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh
View file

@ -9,12 +9,6 @@ RunTest mesh_friendship_lpn_loopback \
friendship_lpn_loopback \
friendship_friend_est
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh
View file

@ -14,12 +14,6 @@ RunTest mesh_lpn_terminate_cb_check \
friendship_friend_est \
friendship_lpn_term_cb_check
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh
View file

@ -9,12 +9,6 @@ RunTest mesh_friendship_msg_frnd \
friendship_friend_msg \
friendship_lpn_msg_frnd
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 \

7
tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh
View file

@ -10,13 +10,6 @@ RunTest mesh_friendship_msg_group \
friendship_other_group \
friendship_friend_group
conf=prj_mesh1d1_conf
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 \

7
tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh
View file

@ -10,13 +10,6 @@ RunTest mesh_friendship_msg_mesh \
friendship_other_msg \
friendship_friend_est
conf=prj_mesh1d1_conf
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 \

8
tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh
View file

@ -11,14 +11,6 @@ RunTest mesh_friendship_msg_mesh_low_lat \
friendship_other_msg \
friendship_friend_est
conf=prj_mesh1d1_conf
overlay=overlay_low_lat_conf
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh
View file

@ -24,12 +24,6 @@ RunTest mesh_friendship_msg_va_collision \
friendship_lpn_va_collision \
friendship_friend_va_collision
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh
View file

@ -9,12 +9,6 @@ RunTest mesh_friendship_overflow \
friendship_friend_overflow \
friendship_lpn_overflow
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh
View file

@ -9,12 +9,6 @@ RunTest mesh_friendship_poll \
friendship_friend_est \
friendship_lpn_poll
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 \

6
tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh
View file

@ -9,12 +9,6 @@ RunTest mesh_friendship_re_est \
friendship_friend_est \
friendship_lpn_re_est
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 \

7
tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh
View file

@ -10,13 +10,6 @@ RunTest mesh_heartbeat_sub_cb_api_all \
heartbeat_publish_all \
heartbeat_subscribe_all
conf=prj_mesh1d1_conf
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 \

7
tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh
View file

@ -10,13 +10,6 @@ RunTest mesh_heartbeat_sub_cb_api_unicast \
heartbeat_publish_unicast \
heartbeat_subscribe_unicast
conf=prj_mesh1d1_conf
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 \

4
tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test deferring of the IV index update procedure
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

4
tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test IV index recovery procedure
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

4
tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_update.sh
View file

@ -7,9 +7,5 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# test IV index update procedure
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

2
tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp0_data_split.sh
View file

@ -19,12 +19,10 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
# comp data with correspending bytes in local comp data.
# 6. Client merges the two samples and checks that the collected data is
# correctly merged, continuous, and matches its local comp data.
conf=prj_mesh1d1_conf
overlay=overlay_pst_conf
RunTest mesh_lcd_test_comp0_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=0
conf=prj_mesh1d1_conf
overlay="overlay_pst_conf_overlay_psa_conf"
RunTest mesh_lcd_test_comp0_data_split \
lcd_srv_comp_data_status_respond lcd_cli_split_comp_data_request -- -argstest page=0

Some files were not shown because too many files have changed in this diff Show more