Skip to content

Commit

Permalink
zephyr: mesh: apply TCRL-2024 changes for MBT and DFU profiles
Browse files Browse the repository at this point in the history 
- With TCRL-2024-1 profiles MBT and DFU changed to MBTM and DFUM
respectively. Updating the test case names and profile names.
- TSPX_Reception_Counter and TSPX_Server_Timeout removed and separate
TSPX_Client_Timeout_Base and TSPX_Server_Timeout_Base added for client
and server.
- Adding missing DFUM tests to zephyr iut_config.
- Adjust the CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MIN/MAX according to MBTM
test cases.
- Increase the CONFIG_BT_MESH_SETTINGS_WORKQ_STACK_SIZE to 1200 instead
of default 800.

Signed-off-by: m-alperen-sener <[email protected]>
  • Loading branch information
@m-alperen-sener
m-alperen-sener committed Jul 11, 2024
1 parent 0a03958 commit 66fcc00
Show file tree
Hide file tree
Showing 6 changed files with 262 additions and 254 deletions.
281 changes: 144 additions & 137 deletions autopts/bot/iut_config/zephyr.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
'CONFIG_FLASH_MAP': 'y',
'CONFIG_NVS': 'y',
'CONFIG_SETTINGS_NVS': 'y',
'CONFIG_BT_MESH_SETTINGS_WORKQ_STACK_SIZE': '1200'
},
"test_cases": [
'MESH/SR/RPR/PDU/BV-02-C',
Expand All @@ -197,114 +198,117 @@
'CONFIG_FLASH_PAGE_LAYOUT': 'y',
'CONFIG_FLASH_MAP': 'y',
'CONFIG_NVS': 'y',
'CONFIG_BT_MESH_SETTINGS_WORKQ_STACK_SIZE': '1200',
'CONFIG_BT_MESH_DFD_SRV': 'y',
'CONFIG_BT_MESH_DFU_SRV': 'y',
'CONFIG_BT_MESH_DFD_SRV_OOB_UPLOAD': 'y',
'CONFIG_BT_MESH_BLOB_SIZE_MAX': '5000',
'CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MIN': '1024',
'CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MAX': '1024'
'CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MIN': '256',
'CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MAX': '256'
},
"test_cases": [
'DFU/CL/FU/BV-01-C',
'DFU/CL/FU/BV-02-C',
'DFU/CL/FU/BV-03-C',
'DFU/SR/FD/BV-01-C',
'DFU/SR/FD/BV-02-C',
'DFU/SR/FD/BV-03-C',
'DFU/SR/FD/BV-04-C',
'DFU/SR/FD/BV-05-C',
'DFU/SR/FD/BV-06-C',
'DFU/SR/FD/BV-07-C',
'DFU/SR/FD/BV-08-C',
'DFU/SR/FD/BV-09-C',
'DFU/SR/FD/BV-10-C',
'DFU/SR/FD/BV-11-C',
'DFU/SR/FD/BV-12-C',
'DFU/SR/FD/BV-13-C',
'DFU/SR/FD/BV-14-C',
'DFU/SR/FD/BV-15-C',
'DFU/SR/FD/BV-16-C',
'DFU/SR/FD/BV-17-C',
'DFU/SR/FD/BV-18-C',
'DFU/SR/FD/BV-19-C',
'DFU/SR/FD/BV-20-C',
'DFU/SR/FD/BV-21-C',
'DFU/SR/FD/BV-22-C',
'DFU/SR/FD/BV-23-C',
'DFU/SR/FD/BV-24-C',
'DFU/SR/FD/BV-25-C',
'DFU/SR/FD/BV-26-C',
'DFU/SR/FD/BV-27-C',
'DFU/SR/FD/BV-28-C',
'DFU/SR/FD/BV-29-C',
'DFU/SR/FD/BV-30-C',
'DFU/SR/FD/BV-31-C',
'DFU/SR/FD/BV-32-C',
'DFU/SR/FD/BV-33-C',
'DFU/SR/FD/BV-34-C',
'DFU/SR/FD/BV-59-C',
'DFU/SR/FD/BV-50-C',
'DFU/SR/FD/BV-35-C',
'DFU/SR/FD/BV-36-C',
'DFU/SR/FD/BV-37-C',
'DFU/SR/FD/BV-38-C',
'DFU/SR/FD/BV-39-C',
'DFU/SR/FD/BV-40-C',
'DFU/SR/FD/BV-41-C',
'DFU/SR/FD/BV-51-C',
'DFU/SR/FD/BV-42-C',
'DFU/SR/FD/BV-43-C',
'DFU/SR/FD/BV-44-C',
'DFU/SR/FD/BV-45-C',
'DFU/SR/FD/BV-46-C',
'DFU/SR/FD/BV-49-C',
'DFU/SR/FD/BV-52-C',
'DFU/SR/FD/BV-53-C',
'DFU/SR/FD/BV-54-C',
'DFU/SR/FD/BV-55-C',
'DFU/SR/FD/BV-56-C',
'DFU/SR/FD/BV-57-C',
'DFU/SR/FD/BV-58-C',
'MBT/SR/BT/BV-01-C',
'MBT/SR/BT/BV-02-C',
'MBT/SR/BT/BV-03-C',
'MBT/SR/BT/BV-04-C',
'MBT/SR/BT/BV-05-C',
'MBT/SR/BT/BV-06-C',
'MBT/SR/BT/BV-07-C',
'MBT/SR/BT/BV-08-C',
'MBT/SR/BT/BV-09-C',
'MBT/SR/BT/BV-10-C',
'MBT/SR/BT/BV-11-C',
'MBT/SR/BT/BV-12-C',
'MBT/SR/BT/BV-13-C',
'MBT/SR/BT/BV-14-C',
'MBT/SR/BT/BV-15-C',
'MBT/SR/BT/BV-16-C',
'MBT/SR/BT/BV-17-C',
'MBT/SR/BT/BV-18-C',
'MBT/SR/BT/BV-19-C',
'MBT/SR/BT/BV-20-C',
'MBT/SR/BT/BV-21-C',
'MBT/SR/BT/BV-22-C',
'MBT/SR/BT/BV-23-C',
'MBT/SR/BT/BV-24-C',
'MBT/SR/BT/BV-25-C',
'MBT/SR/BT/BV-26-C',
'MBT/SR/BT/BV-27-C',
'MBT/SR/BT/BV-28-C',
'MBT/SR/BT/BV-29-C',
'MBT/SR/BT/BV-30-C',
'MBT/SR/BT/BV-31-C',
'MBT/SR/BT/BV-32-C',
'MBT/SR/BT/BV-33-C',
'MBT/SR/BT/BV-34-C',
'MBT/SR/BT/BV-35-C',
'MBT/SR/BT/BV-36-C',
'MBT/SR/BT/BV-37-C',
'MBT/SR/BT/BV-38-C',
'MBT/SR/BT/BI-01-C',
'MBT/SR/BT/BI-02-C',
'DFU/SR-CL/GEN/BV-01-C'
'DFUM/CL/FU/BV-01-C',
'DFUM/CL/FU/BV-02-C',
'DFUM/CL/FU/BV-03-C',
'DFUM/SR/FD/BV-01-C',
'DFUM/SR/FD/BV-02-C',
'DFUM/SR/FD/BV-03-C',
'DFUM/SR/FD/BV-04-C',
'DFUM/SR/FD/BV-05-C',
'DFUM/SR/FD/BV-06-C',
'DFUM/SR/FD/BV-07-C',
'DFUM/SR/FD/BV-08-C',
'DFUM/SR/FD/BV-09-C',
'DFUM/SR/FD/BV-10-C',
'DFUM/SR/FD/BV-11-C',
'DFUM/SR/FD/BV-12-C',
'DFUM/SR/FD/BV-13-C',
'DFUM/SR/FD/BV-14-C',
'DFUM/SR/FD/BV-15-C',
'DFUM/SR/FD/BV-16-C',
'DFUM/SR/FD/BV-17-C',
'DFUM/SR/FD/BV-18-C',
'DFUM/SR/FD/BV-19-C',
'DFUM/SR/FD/BV-20-C',
'DFUM/SR/FD/BV-21-C',
'DFUM/SR/FD/BV-22-C',
'DFUM/SR/FD/BV-23-C',
'DFUM/SR/FD/BV-24-C',
'DFUM/SR/FD/BV-25-C',
'DFUM/SR/FD/BV-26-C',
'DFUM/SR/FD/BV-27-C',
'DFUM/SR/FD/BV-28-C',
'DFUM/SR/FD/BV-29-C',
'DFUM/SR/FD/BV-30-C',
'DFUM/SR/FD/BV-31-C',
'DFUM/SR/FD/BV-32-C',
'DFUM/SR/FD/BV-33-C',
'DFUM/SR/FD/BV-34-C',
'DFUM/SR/FD/BV-59-C',
'DFUM/SR/FD/BV-50-C',
'DFUM/SR/FD/BV-35-C',
'DFUM/SR/FD/BV-36-C',
'DFUM/SR/FD/BV-37-C',
'DFUM/SR/FD/BV-38-C',
'DFUM/SR/FD/BV-39-C',
'DFUM/SR/FD/BV-40-C',
'DFUM/SR/FD/BV-41-C',
'DFUM/SR/FD/BV-51-C',
'DFUM/SR/FD/BV-42-C',
'DFUM/SR/FD/BV-43-C',
'DFUM/SR/FD/BV-44-C',
'DFUM/SR/FD/BV-45-C',
'DFUM/SR/FD/BV-46-C',
'DFUM/SR/FD/BV-47-C',
'DFUM/SR/FD/BV-49-C',
'DFUM/SR/FD/BV-52-C',
'DFUM/SR/FD/BV-53-C',
'DFUM/SR/FD/BV-54-C',
'DFUM/SR/FD/BV-55-C',
'DFUM/SR/FD/BV-56-C',
'DFUM/SR/FD/BV-57-C',
'DFUM/SR/FD/BV-58-C',
'MBTM/SR/BT/BV-01-C',
'MBTM/SR/BT/BV-02-C',
'MBTM/SR/BT/BV-03-C',
'MBTM/SR/BT/BV-04-C',
'MBTM/SR/BT/BV-05-C',
'MBTM/SR/BT/BV-06-C',
'MBTM/SR/BT/BV-07-C',
'MBTM/SR/BT/BV-08-C',
'MBTM/SR/BT/BV-09-C',
'MBTM/SR/BT/BV-10-C',
'MBTM/SR/BT/BV-11-C',
'MBTM/SR/BT/BV-12-C',
'MBTM/SR/BT/BV-13-C',
'MBTM/SR/BT/BV-14-C',
'MBTM/SR/BT/BV-15-C',
'MBTM/SR/BT/BV-16-C',
'MBTM/SR/BT/BV-17-C',
'MBTM/SR/BT/BV-18-C',
'MBTM/SR/BT/BV-19-C',
'MBTM/SR/BT/BV-20-C',
'MBTM/SR/BT/BV-21-C',
'MBTM/SR/BT/BV-22-C',
'MBTM/SR/BT/BV-23-C',
'MBTM/SR/BT/BV-24-C',
'MBTM/SR/BT/BV-25-C',
'MBTM/SR/BT/BV-26-C',
'MBTM/SR/BT/BV-27-C',
'MBTM/SR/BT/BV-28-C',
'MBTM/SR/BT/BV-29-C',
'MBTM/SR/BT/BV-30-C',
'MBTM/SR/BT/BV-31-C',
'MBTM/SR/BT/BV-32-C',
'MBTM/SR/BT/BV-33-C',
'MBTM/SR/BT/BV-34-C',
'MBTM/SR/BT/BV-35-C',
'MBTM/SR/BT/BV-36-C',
'MBTM/SR/BT/BV-37-C',
'MBTM/SR/BT/BV-38-C',
'MBTM/SR/BT/BI-01-C',
'MBTM/SR/BT/BI-02-C',
]
},

Expand All @@ -316,42 +320,43 @@
'CONFIG_FLASH_PAGE_LAYOUT': 'y',
'CONFIG_FLASH_MAP': 'y',
'CONFIG_NVS': 'y',
'CONFIG_BT_MESH_SETTINGS_WORKQ_STACK_SIZE': '1200',
'CONFIG_BT_MESH_DFD_SRV': 'n'
},
"test_cases": [
'DFU/SR/FU/BV-01-C',
'DFU/SR/FU/BV-02-C',
'DFU/SR/FU/BV-03-C',
'DFU/SR/FU/BV-04-C',
'DFU/SR/FU/BV-05-C',
'DFU/SR/FU/BV-06-C',
'DFU/SR/FU/BV-07-C',
'DFU/SR/FU/BV-08-C',
'DFU/SR/FU/BV-09-C',
'DFU/SR/FU/BV-10-C',
'DFU/SR/FU/BV-11-C',
'DFU/SR/FU/BV-12-C',
'DFU/SR/FU/BV-13-C',
'DFU/SR/FU/BV-14-C',
'DFU/SR/FU/BV-15-C',
'DFU/SR/FU/BV-16-C',
'DFU/SR/FU/BV-17-C',
'DFU/SR/FU/BV-18-C',
'DFU/SR/FU/BV-19-C',
'DFU/SR/FU/BV-20-C',
'DFU/SR/FU/BV-21-C',
'DFU/SR/FU/BV-22-C',
'DFU/SR/FU/BV-23-C',
'DFU/SR/FU/BV-24-C',
'DFU/SR/FU/BV-27-C',
'MBT/CL/BT/BV-01-C',
'MBT/CL/BT/BV-02-C',
'MBT/CL/BT/BV-03-C',
'MBT/CL/BT/BV-04-C',
'MBT/CL/BT/BV-05-C',
'MBT/CL/BT/BV-06-C',
'MBT/CL/BT/BV-07-C',
'MBT/CL/BT/BV-08-C'
'DFUM/SR/FU/BV-01-C',
'DFUM/SR/FU/BV-02-C',
'DFUM/SR/FU/BV-03-C',
'DFUM/SR/FU/BV-04-C',
'DFUM/SR/FU/BV-05-C',
'DFUM/SR/FU/BV-06-C',
'DFUM/SR/FU/BV-07-C',
'DFUM/SR/FU/BV-08-C',
'DFUM/SR/FU/BV-09-C',
'DFUM/SR/FU/BV-10-C',
'DFUM/SR/FU/BV-11-C',
'DFUM/SR/FU/BV-12-C',
'DFUM/SR/FU/BV-13-C',
'DFUM/SR/FU/BV-14-C',
'DFUM/SR/FU/BV-15-C',
'DFUM/SR/FU/BV-16-C',
'DFUM/SR/FU/BV-17-C',
'DFUM/SR/FU/BV-18-C',
'DFUM/SR/FU/BV-19-C',
'DFUM/SR/FU/BV-20-C',
'DFUM/SR/FU/BV-21-C',
'DFUM/SR/FU/BV-22-C',
'DFUM/SR/FU/BV-23-C',
'DFUM/SR/FU/BV-24-C',
'DFUM/SR/FU/BV-27-C',
'MBTM/CL/BT/BV-01-C',
'MBTM/CL/BT/BV-02-C',
'MBTM/CL/BT/BV-03-C',
'MBTM/CL/BT/BV-04-C',
'MBTM/CL/BT/BV-05-C',
'MBTM/CL/BT/BV-06-C',
'MBTM/CL/BT/BV-07-C',
'MBTM/CL/BT/BV-08-C'
]
},

Expand All @@ -363,10 +368,12 @@
'CONFIG_FLASH_PAGE_LAYOUT': 'y',
'CONFIG_FLASH_MAP': 'y',
'CONFIG_NVS': 'y',
'CONFIG_BT_MESH_BLOB_SIZE_MAX': '5000'
'CONFIG_BT_MESH_BLOB_SIZE_MAX': '5000',
'CONFIG_BT_MESH_SETTINGS_WORKQ_STACK_SIZE': '1200',
},
"test_cases": [
'DFU/SR/FD/BV-48-C',
'DFUM/SR/FD/BV-48-C',
'DFUM/SR/FD/BV-59-C'
]
},

Expand Down
8 changes: 4 additions & 4 deletions autopts/ptsprojects/stack/layers/mesh.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ def set_iut_provisioner(self, _is_prov):
def set_iut_addr(self, _addr):
self.address_iut = _addr

def timeout_set(self, timeout):
self.timeout = timeout
def timeout_base_set(self, timeout):
self.timeout_base = timeout

def timeout_get(self):
return self.timeout
def timeout_base_get(self):
return self.timeout_base

def transfer_ttl_set(self, ttl):
self.transfer_ttl = ttl
Expand Down
4 changes: 2 additions & 2 deletions autopts/ptsprojects/zephyr/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import autopts.ptsprojects.zephyr.mics
import autopts.ptsprojects.zephyr.ccp
import autopts.ptsprojects.zephyr.vcp
import autopts.ptsprojects.zephyr.dfu
import autopts.ptsprojects.zephyr.mbt
import autopts.ptsprojects.zephyr.dfum
import autopts.ptsprojects.zephyr.mbtm
import autopts.ptsprojects.zephyr.cas
import autopts.ptsprojects.zephyr.cap
import autopts.ptsprojects.zephyr.mcp
Expand Down
Loading

0 comments on commit 66fcc00

Please sign in to comment.