Upmerge 2024 11 27

.gitignore

@@ -1,10 +1,16 @@
 *~
 *.pyc
 *.log
+tmp
 
 *.xlsx
 *.zip
 *.db
 */client_secret.json
 */credentials.json
 autopts/bot/config.py
+
+venv
+.venv
+
+.vscode

autopts/bot/zephyr.py

@@ -125,7 +125,7 @@ def apply_config(self, args, config, value):
 
             configs.append(name)
 
-        # The order is used in the -DOVERLAY_CONFIG="<overlay1>;<...>" option.
+        # The order is used in the -DEXTRA_CONF_FILE="<overlay1>;<...>" option.
         overlays = ';'.join(configs)
 
         log("TTY path: %s" % args.tty_file)

autopts/client.py

@@ -1280,7 +1280,7 @@ def run_test_cases(ptses, test_case_instances, args, stats, **kwargs):
             if repeat_until_failed and status == 'PASS':
                 continue
 
-            if (status == 'PASS' and not args.stress_test) or \
+            if (status in ('PASS', 'MISSING WID ERROR') and not args.stress_test) or \
                     stats.run_count == retry_limit:
                 if stats.db:
                     stats.db.update_statistics(test_case, duration, status)
@@ -1361,9 +1361,12 @@ def sigint_handler(sig, frame):
             signal.signal(signal.SIGINT, sigint_handler)
 
             return self.main(args)
-        except BaseException as e:  # Ctrl-C
-            if not isinstance(e, KeyboardInterrupt):
-                logging.exception(e)
+        except BaseException as e:
+            if not isinstance(e, KeyboardInterrupt):   # Ctrl-C
+                if e.code != 0:
+                    # Exit with traceback
+                    logging.exception(e)
+
             set_global_end()
             self.cleanup()
             raise

autopts/ptscontrol.py

@@ -784,6 +784,26 @@ def run_test_case(self, project_name, test_case_name):
             self._pts_logger.set_test_case_name(test_case_name)
             self._pts_sender.reopen()
 
+            # Workaround for PTS issue 145370.
+            # PTS server can detect that the PTS dongle had been corrupted
+            # by calling GetPTSBluetoothAddress() before test case started.
+            address = None
+            for i in range(10):
+                try:
+                    address = self._pts.GetPTSBluetoothAddress()
+                    log(f"GetPTSBluetoothAddress(): {address}")
+                    if address:
+                        break
+                except Exception as e:
+                    log(e)
+                finally:
+                    # The dongle verification should take less than 100ms,
+                    # but it might take longer on a slow VM.
+                    time.sleep(float(os.environ.get('GLOBAL_DONGLE_INIT_DELAY')))
+
+            if not address:
+                raise Exception("Bluetooth address not available")
+
             self._pts.RunTestCase(project_name, test_case_name)
 
             err = self._pts_logger.get_test_case_status(timeout=30)

autopts/ptsprojects/boards/nrf52_wsl.py

@@ -49,7 +49,7 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
 
     cmd = ['west', 'build', '-p', 'auto', '-b', board]
     if conf_file and conf_file != 'default' and conf_file != 'prj.conf':
-        cmd.extend(('--', '-DOVERLAY_CONFIG=\'{}\''.format(conf_file)))
+        cmd.extend(('--', '-DEXTRA_CONF_FILE=\'{}\''.format(conf_file)))
 
     shell = True
     if sys.platform == 'win32':

autopts/ptsprojects/boards/nrf53.py

@@ -35,17 +35,17 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
     check_call('rm -rf build/'.split(), cwd=tester_dir)
     check_call('rm -rf build/'.split(), cwd=controller_dir)
 
-    bttester_overlay = 'nrf5340_hci_ipc.conf'
+    bttester_overlay = 'hci_ipc.conf'
 
     if conf_file and conf_file != 'default' and conf_file != 'prj.conf':
         bttester_overlay += f';{conf_file}'
 
-    cmd = ['west', 'build', '-b', board, '--', f'-DOVERLAY_CONFIG=\'{bttester_overlay}\'']
+    cmd = ['west', 'build', '--no-sysbuild', '-b', board, '--', f'-DEXTRA_CONF_FILE=\'{bttester_overlay}\'']
     check_call(cmd, cwd=tester_dir)
     check_call(['west', 'flash', '--skip-rebuild', '--recover', '-i', debugger_snr], cwd=tester_dir)
 
-    cmd = ['west', 'build', '-b', 'nrf5340dk/nrf5340/cpunet', '--',
-           f'-DOVERLAY_CONFIG=\'nrf5340_cpunet_iso-bt_ll_sw_split.conf;'
-           f'../../../tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf\'']
+    cmd = ['west', 'build', '--no-sysbuild', '-b', 'nrf5340dk/nrf5340/cpunet', '--',
+           f'-DEXTRA_CONF_FILE=\'nrf5340_cpunet_iso-bt_ll_sw_split.conf;'
+           f'../../../tests/bluetooth/tester/hci_ipc_cpunet.conf\'']
     check_call(cmd, cwd=controller_dir)
     check_call(['west', 'flash', '--skip-rebuild', '-i', debugger_snr], cwd=controller_dir)

autopts/ptsprojects/boards/nrf53_appcore.py

@@ -33,11 +33,11 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
 
     check_call('rm -rf build/'.split(), cwd=tester_dir)
 
-    bttester_overlay = 'nrf5340_hci_ipc.conf'
+    bttester_overlay = 'hci_ipc.conf'
 
     if conf_file and conf_file != 'default' and conf_file != 'prj.conf':
         bttester_overlay += f';{conf_file}'
 
-    cmd = ['west', 'build', '-b', board, '--', f'-DOVERLAY_CONFIG=\'{bttester_overlay}\'']
+    cmd = ['west', 'build', '--no-sysbuild', '-b', board, '--', f'-DEXTRA_CONF_FILE=\'{bttester_overlay}\'']
     check_call(cmd, cwd=tester_dir)
     check_call(['west', 'flash', '--skip-rebuild', '--recover', '-i', debugger_snr], cwd=tester_dir)

autopts/ptsprojects/boards/nrf53_audio.py

@@ -28,7 +28,7 @@ def build_and_flash_core(zephyr_wd, build_dir, board, debugger_snr, configs, rec
     overlay = '-- -DCMAKE_C_FLAGS="-Werror"'
     for conf in configs:
         overlay += f' -D{conf}'
-    cmd = ['west', 'build', '-b', board]
+    cmd = ['west', 'build', '--no-sysbuild', '-b', board]
     cmd.extend(overlay.split())
     check_call(cmd, cwd=build_dir)
 
@@ -57,7 +57,7 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
 
     app_core_configs = []
     if conf_file and conf_file != 'default' and conf_file != 'prj.conf':
-        app_core_configs = [f'OVERLAY_CONFIG=\'{conf_file}\'']
+        app_core_configs = [f'EXTRA_CONF_FILE=\'{conf_file}\'']
 
     build_and_flash_core(zephyr_wd,
                          source_dir,
@@ -68,11 +68,11 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
 
     config_dir_net = os.getenv("AUTOPTS_SOURCE_DIR_NET")
     if config_dir_net is None:
-        net_core_configs = [f'OVERLAY_CONFIG=\'nrf5340_cpunet_iso-bt_ll_sw_split.conf;'
-                            f'../../../tests/bluetooth/tester/nrf5340_hci_ipc_cpunet.conf\'']
+        net_core_configs = [f'EXTRA_CONF_FILE=\'nrf5340_cpunet_iso-bt_ll_sw_split.conf;'
+                            f'../../../tests/bluetooth/tester/hci_ipc_cpunet.conf\'']
     else:
         conf_path = os.path.join(zephyr_wd, config_dir_net, 'hci_ipc.conf')
-        net_core_configs = [f'OVERLAY_CONFIG=\'{conf_path}\'']
+        net_core_configs = [f'EXTRA_CONF_FILE=\'{conf_path}\'']
 
     build_and_flash_core(zephyr_wd,
                          os.path.join('samples', 'bluetooth', 'hci_ipc'),

autopts/ptsprojects/boards/nrf54h.py

@@ -44,11 +44,11 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
 
     check_call('rm -rf build/'.split(), cwd=tester_dir)
 
-    cmd = ['west', 'build', '-p', 'auto', '-b', board]
+    cmd = ['west', 'build', '--sysbuild', '-p', 'auto', '-b', board]
     if conf_file and conf_file not in ['default', 'prj.conf']:
         if 'audio' in conf_file:
             conf_file += ';overlay-le-audio-ctlr.conf'
-        cmd.extend(('--', f'-DOVERLAY_CONFIG=\'{conf_file}\''))
+        cmd.extend(('--', f'-DEXTRA_CONF_FILE=\'{conf_file}\''))
 
     check_call(cmd, cwd=tester_dir)
     check_call(['west', 'flash', '--skip-rebuild',

autopts/ptsprojects/boards/nrf5x.py

@@ -48,7 +48,7 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
     if conf_file and conf_file not in ['default', 'prj.conf']:
         if 'audio' in conf_file:
             conf_file += ';overlay-le-audio-ctlr.conf'
-        cmd.extend(('--', f'-DOVERLAY_CONFIG=\'{conf_file}\''))
+        cmd.extend(('--', f'-DEXTRA_CONF_FILE=\'{conf_file}\''))
 
     check_call(cmd, cwd=tester_dir)
     check_call(['west', 'flash', '--skip-rebuild', '--recover',

autopts/ptsprojects/stack/layers/__init__.py

@@ -40,4 +40,5 @@
 from .gtbs import *
 from .tmap import *
 from .ots import *
+from .pbp import *
 # GENERATOR append 1

autopts/ptsprojects/stack/layers/hap.py

@@ -23,12 +23,15 @@ def __init__(self):
             self.hearing_aid_features_handle = None
             self.hearing_aid_control_point_handle = None
             self.active_preset_index_handle = None
+            self.discover_started = False
+            self.discovery_completed = False
 
     def __init__(self):
         self.peers = {}
         self.event_queues = {
             defs.HAP_EV_IAC_DISCOVERY_COMPLETE: [],
             defs.HAP_EV_HAUC_DISCOVERY_COMPLETE: [],
+            defs.HAP_EV_PRESET_CHANGED: [],
         }
         self.event_handlers = {
             defs.HAP_EV_HAUC_DISCOVERY_COMPLETE: self._ev_hauc_discovery_complete,
@@ -73,3 +76,11 @@ def _ev_hauc_discovery_complete(self, addr_type, addr, status,
         peer.hearing_aid_features_handle = hearing_aid_features_handle
         peer.hearing_aid_control_point_handle = hearing_aid_control_point_handle
         peer.active_preset_index_handle = active_preset_index_handle
+        peer.discovery_completed = (status == defs.BTP_STATUS_SUCCESS)
+
+    def wait_preset_changed_ev(self, addr_type, addr, timeout, change_id, remove=True):
+        return wait_for_queue_event(
+            self.event_queues[defs.HAP_EV_PRESET_CHANGED],
+            lambda _addr_type, _addr, _change_id, *_:
+                (addr_type, addr, change_id) == (_addr_type, _addr, _change_id),
+            timeout, remove)

autopts/ptsprojects/stack/layers/pbp.py

@@ -0,0 +1,33 @@
+#
+# auto-pts - The Bluetooth PTS Automation Framework
+#
+# Copyright (c) 2024, BlueKitchen GmbH.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU General Public License,
+# version 2, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+
+from autopts.ptsprojects.stack.common import wait_for_queue_event
+from autopts.pybtp import defs
+
+
+class PBP:
+    def __init__(self):
+        self.event_queues = {
+            defs.PBP_EV_PUBLIC_BROADCAST_ANNOUNCEMENT_FOUND: [],
+        }
+
+    def event_received(self, event_type, event_data):
+        self.event_queues[event_type].append(event_data)
+
+    def wait_public_broadcast_event_found_ev(self, addr_type, addr, broadcast_name, timeout, remove=True):
+        return wait_for_queue_event(
+            self.event_queues[defs.PBP_EV_PUBLIC_BROADCAST_ANNOUNCEMENT_FOUND],
+            lambda ev: (addr_type, addr, broadcast_name) == (ev['addr_type'], ev['addr'], ev['broadcast_name']),
+            timeout, remove)

autopts/ptsprojects/stack/stack.py

@@ -52,6 +52,7 @@
     "TBS": 1 << defs.BTP_SERVICE_ID_TBS,
     "TMAP": 1 << defs.BTP_SERVICE_ID_TMAP,
     "OTS": 1 << defs.BTP_SERVICE_ID_OTS,
+    "PBP": 1 << defs.BTP_SERVICE_ID_PBP,
     # GENERATOR append 1
 }
 
@@ -87,6 +88,7 @@ def __init__(self):
         self.gtbs = None
         self.tmap = None
         self.ots = None
+        self.pbp = None
         # GENERATOR append 2
 
     def is_svc_supported(self, svc):
@@ -186,6 +188,9 @@ def tmap_init(self):
     def ots_init(self):
         self.ots = OTS()
 
+    def pbp_init(self):
+        self.pbp = PBP()
+
     # GENERATOR append 3
 
     def cleanup(self):
@@ -267,6 +272,9 @@ def cleanup(self):
         if self.ots:
             self.ots_init()
 
+        if self.pbp:
+            self.pbp_init()
+
         # GENERATOR append 4
 
 

autopts/ptsprojects/zephyr/cap.py

@@ -145,8 +145,9 @@ def set_addr(addr):
         TestFunc(stack.aics_init),
         TestFunc(btp.core_reg_svc_vocs),
         TestFunc(stack.vocs_init),
-        # Enable GMCS to have a second CCID in Zephyr stack
+        # Enable GMCS and TBS to have 2 CCIDs in Zephyr stack which is required by some tests
         TestFunc(btp.core_reg_svc_gmcs),
+        TestFunc(btp.core_reg_svc_tbs),
         TestFunc(stack.gmcs_init),
         # Enable CSIP to have access to Start Ordered Access
         # procedure BTP command

autopts/pybtp/btp/__init__.py

@@ -45,4 +45,5 @@
 from autopts.pybtp.btp.tbs import *
 from autopts.pybtp.btp.tmap import *
 from autopts.pybtp.btp.ots import *
+from autopts.pybtp.btp.pbp import *
 # GENERATOR append 1

autopts/pybtp/btp/btp.py

@@ -129,6 +129,8 @@ def read_supp_svcs():
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_TMAP),
     "ots_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_OTS),
+    "pbp_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+                defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_PBP),
     # GENERATOR append 4
     "read_supp_cmds": (defs.BTP_SERVICE_ID_CORE,
                        defs.CORE_READ_SUPPORTED_COMMANDS,
@@ -704,6 +706,13 @@ def core_reg_svc_ots():
     iutctl.btp_socket.send_wait_rsp(*CORE['ots_reg'])
 
 
+def core_reg_svc_pbp():
+    logging.debug("%s", core_reg_svc_pbp.__name__)
+
+    iutctl = get_iut()
+    iutctl.btp_socket.send_wait_rsp(*CORE['pbp_reg'])
+
+
 # GENERATOR append 1
 
 def core_reg_svc_rsp_succ():
@@ -805,6 +814,7 @@ def init(get_iut_method):
 from .tbs import TBS_EV
 from .tmap import TMAP_EV
 from .ots import OTS_EV
+from .pbp import PBP_EV
 # GENERATOR append 2
 
 from autopts.pybtp.iutctl_common import set_event_handler
@@ -844,6 +854,7 @@ def event_handler(hdr, data):
         defs.BTP_SERVICE_ID_TBS: (TBS_EV, stack.tbs),
         defs.BTP_SERVICE_ID_TMAP: (TMAP_EV, stack.tmap),
         defs.BTP_SERVICE_ID_OTS: (OTS_EV, stack.ots),
+        defs.BTP_SERVICE_ID_PBP: (PBP_EV, stack.pbp),
         # GENERATOR append 3
     }
 

autopts/pybtp/btp/cap.py

@@ -122,11 +122,19 @@ def cap_unicast_audio_update(metadata_tuple):
     cap_command_rsp_succ()
 
 
-def cap_unicast_audio_stop(cig_id):
+BTP_CAP_UNICAST_AUDIO_STOP_FLAG_RELEASE = 0b00000001
+
+def cap_unicast_audio_stop(cig_id, release):
     logging.debug(f"{cap_unicast_audio_stop.__name__}")
 
     data = struct.pack('B', cig_id)
 
+    flags = 0x00
+    if release:
+        flags |= BTP_CAP_UNICAST_AUDIO_STOP_FLAG_RELEASE
+
+    data += struct.pack('?', flags)
+
     iutctl = get_iut()
     iutctl.btp_socket.send(*CAP['unicast_audio_stop'], data=data)