From ff454d7f019d0347e0abcdad90b527b8debdd9ac Mon Sep 17 00:00:00 2001 From: m-alperen-sener Date: Wed, 10 Jul 2024 08:38:28 +0200 Subject: [PATCH] zephyr: mesh: apply the name change for MBT and DFU profiles With TCRL-2024-1 profiles MBT and DFU changes to MBTM and DFUM respectively. Updating the test case names and profile names. Signed-off-by: m-alperen-sener --- autopts/bot/iut_config/zephyr.py | 268 +++++++++--------- .../ptsprojects/zephyr/{dfu.py => dfum.py} | 108 +++---- .../ptsprojects/zephyr/{mbt.py => mbtm.py} | 87 +++--- autopts/wid/mmdl.py | 2 +- 4 files changed, 233 insertions(+), 232 deletions(-) rename autopts/ptsprojects/zephyr/{dfu.py => dfum.py} (58%) rename autopts/ptsprojects/zephyr/{mbt.py => mbtm.py} (61%) diff --git a/autopts/bot/iut_config/zephyr.py b/autopts/bot/iut_config/zephyr.py index b4315c6680..39f4a5004a 100644 --- a/autopts/bot/iut_config/zephyr.py +++ b/autopts/bot/iut_config/zephyr.py @@ -205,106 +205,106 @@ 'CONFIG_BT_MESH_BLOB_BLOCK_SIZE_MAX': '1024' }, "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', + '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-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', ] }, @@ -319,39 +319,39 @@ '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' ] }, @@ -366,7 +366,7 @@ 'CONFIG_BT_MESH_BLOB_SIZE_MAX': '5000' }, "test_cases": [ - 'DFU/SR/FD/BV-48-C', + 'DFUM/SR/FD/BV-48-C', ] }, diff --git a/autopts/ptsprojects/zephyr/dfu.py b/autopts/ptsprojects/zephyr/dfum.py similarity index 58% rename from autopts/ptsprojects/zephyr/dfu.py rename to autopts/ptsprojects/zephyr/dfum.py index b5733219f6..d5e1c8ce7f 100644 --- a/autopts/ptsprojects/zephyr/dfu.py +++ b/autopts/ptsprojects/zephyr/dfum.py @@ -40,39 +40,39 @@ def set_pixits(ptses): pts = ptses[0] - pts.set_pixit("DFU", "TSPX_bd_addr_iut", "DEADBEEFDEAD") - pts.set_pixit("DFU", "TSPX_time_guard", "300000") - pts.set_pixit("DFU", "TSPX_use_implicit_send", "TRUE") - pts.set_pixit("DFU", "TSPX_tester_database_file", + pts.set_pixit("DFUM", "TSPX_bd_addr_iut", "DEADBEEFDEAD") + pts.set_pixit("DFUM", "TSPX_time_guard", "300000") + pts.set_pixit("DFUM", "TSPX_use_implicit_send", "TRUE") + pts.set_pixit("DFUM", "TSPX_tester_database_file", r"C:\Program Files\Bluetooth SIG\Bluetooth PTS\Data\SIGDatabase\PTS_SMPP_db.xml") - pts.set_pixit("DFU", "TSPX_mtu_size", "23") - pts.set_pixit("DFU", "TSPX_delete_link_key", "TRUE") - pts.set_pixit("DFU", "TSPX_delete_ltk", "TRUE") - pts.set_pixit("DFU", "TSPX_security_enabled", "FALSE") - pts.set_pixit("DFU", "TSPX_iut_setup_att_over_br_edr", "FALSE") - pts.set_pixit("DFU", "TSPX_scan_interval", "30") - pts.set_pixit("DFU", "TSPX_scan_window", "30") - pts.set_pixit("DFU", "TSPX_scan_filter", "00") - pts.set_pixit("DFU", "TSPX_advertising_interval_min", "160") - pts.set_pixit("DFU", "TSPX_advertising_interval_max", "160") - pts.set_pixit("DFU", "TSPX_tester_OOB_information", "F87F") - pts.set_pixit("DFU", "TSPX_device_uuid", "00000000000000000000000000000000") - pts.set_pixit("DFU", "TSPX_device_uuid2", "001BDC0810210B0E0A0C000B0E0A0C00") - pts.set_pixit("DFU", "TSPX_use_pb_gatt_bearer", "FALSE") - pts.set_pixit("DFU", "TSPX_iut_comp_data_page", "2") - pts.set_pixit("DFU", "TSPX_oob_state_change", "FALSE") - pts.set_pixit("DFU", "TSPX_enable_IUT_provisioner", "FALSE") - pts.set_pixit("DFU", "TSPX_Procedure_Timeout", "60") - pts.set_pixit("DFU", "TSPX_Client_BLOB_ID", "1100000000000011") - pts.set_pixit("DFU", "TSPX_Client_BLOB_Data", r"data.txt") - pts.set_pixit("DFU", "TSPX_TTL", "2") - pts.set_pixit("DFU", "TSPX_Reception_Counter", "1") - pts.set_pixit("DFU", "TSPX_Server_Timeout", "10") - pts.set_pixit("DFU", "TSPX_Firmware_ID", "11000011") - pts.set_pixit("DFU", "TSPX_Firmware_Metadata", "1100000000000011") - pts.set_pixit("DFU", "TSPX_Firmware_Update_URI", "http://www.dummy.com") - pts.set_pixit("DFU", "TSPX_New_Firmware_Image", r"data2.txt") - pts.set_pixit("DFU", "TSPX_Update_Firmware_Image_Index", "0") + pts.set_pixit("DFUM", "TSPX_mtu_size", "23") + pts.set_pixit("DFUM", "TSPX_delete_link_key", "TRUE") + pts.set_pixit("DFUM", "TSPX_delete_ltk", "TRUE") + pts.set_pixit("DFUM", "TSPX_security_enabled", "FALSE") + pts.set_pixit("DFUM", "TSPX_iut_setup_att_over_br_edr", "FALSE") + pts.set_pixit("DFUM", "TSPX_scan_interval", "30") + pts.set_pixit("DFUM", "TSPX_scan_window", "30") + pts.set_pixit("DFUM", "TSPX_scan_filter", "00") + pts.set_pixit("DFUM", "TSPX_advertising_interval_min", "160") + pts.set_pixit("DFUM", "TSPX_advertising_interval_max", "160") + pts.set_pixit("DFUM", "TSPX_tester_OOB_information", "F87F") + pts.set_pixit("DFUM", "TSPX_device_uuid", "00000000000000000000000000000000") + pts.set_pixit("DFUM", "TSPX_device_uuid2", "001BDC0810210B0E0A0C000B0E0A0C00") + pts.set_pixit("DFUM", "TSPX_use_pb_gatt_bearer", "FALSE") + pts.set_pixit("DFUM", "TSPX_iut_comp_data_page", "2") + pts.set_pixit("DFUM", "TSPX_oob_state_change", "FALSE") + pts.set_pixit("DFUM", "TSPX_enable_IUT_provisioner", "FALSE") + pts.set_pixit("DFUM", "TSPX_Procedure_Timeout", "60") + pts.set_pixit("DFUM", "TSPX_Client_BLOB_ID", "1100000000000011") + pts.set_pixit("DFUM", "TSPX_Client_BLOB_Data", r"data.txt") + pts.set_pixit("DFUM", "TSPX_TTL", "2") + pts.set_pixit("DFUM", "TSPX_Reception_Counter", "1") + pts.set_pixit("DFUM", "TSPX_Server_Timeout", "10") + pts.set_pixit("DFUM", "TSPX_Firmware_ID", "11000011") + pts.set_pixit("DFUM", "TSPX_Firmware_Metadata", "1100000000000011") + pts.set_pixit("DFUM", "TSPX_Firmware_Update_URI", "http://www.dummy.com") + pts.set_pixit("DFUM", "TSPX_New_Firmware_Image", r"data2.txt") + pts.set_pixit("DFUM", "TSPX_Update_Firmware_Image_Index", "0") def test_cases(ptses): @@ -81,7 +81,7 @@ def test_cases(ptses): pts = ptses[0] - if 'DFU' not in pts.get_project_list(): + if 'DFUM' not in pts.get_project_list(): return [] stack = get_stack() @@ -117,58 +117,58 @@ def test_cases(ptses): TestFunc(lambda: stack.mesh.set_prov_data(oob, out_size, rand_out_actions, in_size, rand_in_actions, crpl_size, auth_method)), TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_device_uuid", stack.mesh.get_dev_uuid())), + "DFUM", "TSPX_device_uuid", stack.mesh.get_dev_uuid())), TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_device_uuid2", stack.mesh.get_dev_uuid_lt2())), + "DFUM", "TSPX_device_uuid2", stack.mesh.get_dev_uuid_lt2())), TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_bd_addr_iut", + "DFUM", "TSPX_bd_addr_iut", stack.gap.iut_addr_get_str())), TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_Client_BLOB_Data", + "DFUM", "TSPX_Client_BLOB_Data", get_test_data_path(pts) + "sample_data_1.txt")), TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_New_Firmware_Image", + "DFUM", "TSPX_New_Firmware_Image", get_test_data_path(pts) + "sample_data_1.txt"))] custom_test_cases = [ - ZTestCase("DFU", "DFU/SR/FD/BV-05-C", cmds=pre_conditions + [ + ZTestCase("DFUM", "DFUM/SR/FD/BV-05-C", cmds=pre_conditions + [ TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_New_Firmware_Image", + "DFUM", "TSPX_New_Firmware_Image", get_test_data_path(pts) + "sample_data_2.txt"))], generic_wid_hdl=mmdl_wid_hdl), - ZTestCase("DFU", "DFU/SR/FD/BV-07-C", cmds=pre_conditions + [ + ZTestCase("DFUM", "DFUM/SR/FD/BV-07-C", cmds=pre_conditions + [ TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_Server_Timeout", FD_timeout))], + "DFUM", "TSPX_Server_Timeout", FD_timeout))], generic_wid_hdl=mmdl_wid_hdl), - ZTestCase("DFU", "DFU/SR/FD/BV-19-C", cmds=pre_conditions + [ + ZTestCase("DFUM", "DFUM/SR/FD/BV-19-C", cmds=pre_conditions + [ TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_Server_Timeout", FD_timeout))], + "DFUM", "TSPX_Server_Timeout", FD_timeout))], generic_wid_hdl=mmdl_wid_hdl), - ZTestCase("DFU", "DFU/SR/FD/BV-48-C", cmds=pre_conditions + [ + ZTestCase("DFUM", "DFUM/SR/FD/BV-48-C", cmds=pre_conditions + [ TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_Firmware_ID", "010000000100000000000000"))], + "DFUM", "TSPX_Firmware_ID", "010000000100000000000000"))], generic_wid_hdl=mmdl_wid_hdl), - ZTestCase("DFU", "DFU/SR/FU/BV-24-C", cmds=pre_conditions + [ + ZTestCase("DFUM", "DFUM/SR/FU/BV-24-C", cmds=pre_conditions + [ TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_New_Firmware_Image", + "DFUM", "TSPX_New_Firmware_Image", get_test_data_path(pts) + "sample_data_2.txt"))], generic_wid_hdl=mmdl_wid_hdl), - ZTestCase("DFU", "DFU/SR/FU/BV-27-C", cmds=pre_conditions + [ + ZTestCase("DFUM", "DFUM/SR/FU/BV-27-C", cmds=pre_conditions + [ TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_New_Firmware_Image", + "DFUM", "TSPX_New_Firmware_Image", get_test_data_path(pts) + "sample_data_2.txt"))], generic_wid_hdl=mmdl_wid_hdl), - ZTestCase("DFU", "DFU/SR/FD/BV-13-C", cmds=pre_conditions + [ + ZTestCase("DFUM", "DFUM/SR/FD/BV-13-C", cmds=pre_conditions + [ TestFunc(lambda: pts.update_pixit_param( - "DFU", "TSPX_Server_Timeout", FD_timeout))], + "DFUM", "TSPX_Server_Timeout", FD_timeout))], generic_wid_hdl=mmdl_wid_hdl), ] - test_case_name_list = pts.get_test_case_list('DFU') + test_case_name_list = pts.get_test_case_list('DFUM') tc_list = [] for tc_name in test_case_name_list: - instance = ZTestCase('DFU', tc_name, + instance = ZTestCase('DFUM', tc_name, cmds=pre_conditions, generic_wid_hdl=mmdl_wid_hdl) diff --git a/autopts/ptsprojects/zephyr/mbt.py b/autopts/ptsprojects/zephyr/mbtm.py similarity index 61% rename from autopts/ptsprojects/zephyr/mbt.py rename to autopts/ptsprojects/zephyr/mbtm.py index 496a351ed2..294374378e 100644 --- a/autopts/ptsprojects/zephyr/mbt.py +++ b/autopts/ptsprojects/zephyr/mbtm.py @@ -40,39 +40,39 @@ def set_pixits(ptses): pts = ptses[0] - pts.set_pixit("MBT", "TSPX_bd_addr_iut", "DEADBEEFDEAD") - pts.set_pixit("MBT", "TSPX_time_guard", "300000") - pts.set_pixit("MBT", "TSPX_use_implicit_send", "TRUE") - pts.set_pixit("MBT", "TSPX_tester_database_file", + pts.set_pixit("MBTM", "TSPX_bd_addr_iut", "DEADBEEFDEAD") + pts.set_pixit("MBTM", "TSPX_time_guard", "300000") + pts.set_pixit("MBTM", "TSPX_use_implicit_send", "TRUE") + pts.set_pixit("MBTM", "TSPX_tester_database_file", r"C:\Program Files\Bluetooth SIG\Bluetooth PTS\Data\SIGDatabase\PTS_SMPP_db.xml") - pts.set_pixit("MBT", "TSPX_mtu_size", "23") - pts.set_pixit("MBT", "TSPX_delete_link_key", "TRUE") - pts.set_pixit("MBT", "TSPX_delete_ltk", "TRUE") - pts.set_pixit("MBT", "TSPX_security_enabled", "FALSE") - pts.set_pixit("MBT", "TSPX_iut_setup_att_over_br_edr", "FALSE") - pts.set_pixit("MBT", "TSPX_scan_interval", "30") - pts.set_pixit("MBT", "TSPX_scan_window", "30") - pts.set_pixit("MBT", "TSPX_scan_filter", "00") - pts.set_pixit("MBT", "TSPX_advertising_interval_min", "160") - pts.set_pixit("MBT", "TSPX_advertising_interval_max", "160") - pts.set_pixit("MBT", "TSPX_tester_OOB_information", "F87F") - pts.set_pixit("MBT", "TSPX_device_uuid", "00000000000000000000000000000000") - pts.set_pixit("MBT", "TSPX_device_uuid2", "001BDC0810210B0E0A0C000B0E0A0C00") - pts.set_pixit("MBT", "TSPX_use_pb_gatt_bearer", "FALSE") - pts.set_pixit("MBT", "TSPX_iut_comp_data_page", "2") - pts.set_pixit("MBT", "TSPX_oob_state_change", "FALSE") - pts.set_pixit("MBT", "TSPX_enable_IUT_provisioner", "FALSE") - pts.set_pixit("MBT", "TSPX_Procedure_Timeout", "60") - pts.set_pixit("MBT", "TSPX_Client_BLOB_ID", "1100000000000011") - pts.set_pixit("MBT", "TSPX_Client_BLOB_Data", r"data.txt") - pts.set_pixit("MBT", "TSPX_Reception_Counter", "1") - pts.set_pixit("MBT", "TSPX_Server_Timeout", "20") - pts.set_pixit("MBT", "TSPX_Transfer_TTL", "3") - pts.set_pixit("MBT", "TSPX_Firmware_ID", "11000011") - pts.set_pixit("MBT", "TSPX_Firmware_Metadata", "1100000000000011") - pts.set_pixit("MBT", "TSPX_Firmware_Update_URI", "http://www.dummy.com") - pts.set_pixit("MBT", "TSPX_New_Firmware_Image", r"data2.txt") - pts.set_pixit("MBT", "TSPX_Update_Firmware_Image_Index", "0") + pts.set_pixit("MBTM", "TSPX_mtu_size", "23") + pts.set_pixit("MBTM", "TSPX_delete_link_key", "TRUE") + pts.set_pixit("MBTM", "TSPX_delete_ltk", "TRUE") + pts.set_pixit("MBTM", "TSPX_security_enabled", "FALSE") + pts.set_pixit("MBTM", "TSPX_iut_setup_att_over_br_edr", "FALSE") + pts.set_pixit("MBTM", "TSPX_scan_interval", "30") + pts.set_pixit("MBTM", "TSPX_scan_window", "30") + pts.set_pixit("MBTM", "TSPX_scan_filter", "00") + pts.set_pixit("MBTM", "TSPX_advertising_interval_min", "160") + pts.set_pixit("MBTM", "TSPX_advertising_interval_max", "160") + pts.set_pixit("MBTM", "TSPX_tester_OOB_information", "F87F") + pts.set_pixit("MBTM", "TSPX_device_uuid", "00000000000000000000000000000000") + pts.set_pixit("MBTM", "TSPX_device_uuid2", "001BDC0810210B0E0A0C000B0E0A0C00") + pts.set_pixit("MBTM", "TSPX_use_pb_gatt_bearer", "FALSE") + pts.set_pixit("MBTM", "TSPX_iut_comp_data_page", "2") + pts.set_pixit("MBTM", "TSPX_oob_state_change", "FALSE") + pts.set_pixit("MBTM", "TSPX_enable_IUT_provisioner", "FALSE") + pts.set_pixit("MBTM", "TSPX_Procedure_Timeout", "60") + pts.set_pixit("MBTM", "TSPX_Client_BLOB_ID", "1100000000000011") + pts.set_pixit("MBTM", "TSPX_Client_BLOB_Data", r"data.txt") + pts.set_pixit("MBTM", "TSPX_Reception_Counter", "1") + pts.set_pixit("MBTM", "TSPX_Server_Timeout", "20") + pts.set_pixit("MBTM", "TSPX_Transfer_TTL", "3") + pts.set_pixit("MBTM", "TSPX_Firmware_ID", "11000011") + pts.set_pixit("MBTM", "TSPX_Firmware_Metadata", "1100000000000011") + pts.set_pixit("MBTM", "TSPX_Firmware_Update_URI", "http://www.dummy.com") + pts.set_pixit("MBTM", "TSPX_New_Firmware_Image", r"data2.txt") + pts.set_pixit("MBTM", "TSPX_Update_Firmware_Image_Index", "0") def test_cases(ptses): @@ -81,11 +81,12 @@ def test_cases(ptses): pts = ptses[0] - if 'MBT' not in pts.get_project_list(): + if 'MBTM' not in pts.get_project_list(): return [] - + stack = get_stack() + device_uuid = hexlify(uuid4().bytes) device_uuid2 = hexlify(uuid4().bytes) @@ -120,32 +121,32 @@ def test_cases(ptses): TestFunc(lambda: stack.mesh.set_prov_data(oob, out_size, rand_out_actions, in_size, rand_in_actions, crpl_size, auth_method)), TestFunc(lambda: pts.update_pixit_param( - "MBT", "TSPX_device_uuid", stack.mesh.get_dev_uuid())), + "MBTM", "TSPX_device_uuid", stack.mesh.get_dev_uuid())), TestFunc(lambda: pts.update_pixit_param( - "MBT", "TSPX_device_uuid2", stack.mesh.get_dev_uuid_lt2())), + "MBTM", "TSPX_device_uuid2", stack.mesh.get_dev_uuid_lt2())), TestFunc(lambda: pts.update_pixit_param( - "MBT", "TSPX_bd_addr_iut", + "MBTM", "TSPX_bd_addr_iut", stack.gap.iut_addr_get_str())), TestFunc(lambda: pts.update_pixit_param( - "MBT", "TSPX_Client_BLOB_Data", + "MBTM", "TSPX_Client_BLOB_Data", get_test_data_path(pts) + "sample_data_1.txt")), TestFunc(lambda: pts.update_pixit_param( - "MBT", "TSPX_New_Firmware_Image", + "MBTM", "TSPX_New_Firmware_Image", get_test_data_path(pts) + "sample_data_1.txt")), TestFunc(lambda: pts.update_pixit_param( - "MBT", "TSPX_Server_Timeout", timeout)), + "MBTM", "TSPX_Server_Timeout", timeout)), TestFunc(lambda: stack.mesh.timeout_set(timeout_base)), TestFunc(lambda: pts.update_pixit_param( - "MBT", "TSPX_Transfer_TTL", transfer_ttl)), + "MBTM", "TSPX_Transfer_TTL", transfer_ttl)), TestFunc(lambda: stack.mesh.transfer_ttl_set(transfer_ttl))] custom_test_cases = [] - test_case_name_list = pts.get_test_case_list('MBT') + test_case_name_list = pts.get_test_case_list('MBTM') tc_list = [] for tc_name in test_case_name_list: - instance = ZTestCase('MBT', tc_name, + instance = ZTestCase('MBTM', tc_name, cmds=pre_conditions, generic_wid_hdl=mmdl_wid_hdl) diff --git a/autopts/wid/mmdl.py b/autopts/wid/mmdl.py index 05689d19a1..acaa31d85c 100644 --- a/autopts/wid/mmdl.py +++ b/autopts/wid/mmdl.py @@ -2188,7 +2188,7 @@ def hdl_wid_850(params: WIDParams): Please initiate the transfer of the test object to the Lower Tester. """ # Do not execute this wid, it's automatically send as part of FU procedure - if params.test_case_name == 'DFU/CL/FU/BV-02-C': + if params.test_case_name == 'DFUM/CL/FU/BV-02-C': return True stack = get_stack()