Upmerge 14 may 2025

autopts/bot/iut_config/zephyr.py

@@ -296,7 +296,55 @@
         "test_cases": [
             'MBTM/CL/BT'
         ]
-    }
+    },
+
+    "br_sec_sc_only.conf": {
+        "overlay": {
+            'CONFIG_BT_CLASSIC': 'y',
+            'CONFIG_BT_CENTRAL': 'y',
+            'CONFIG_BT_PERIPHERAL': 'y',
+            'CONFIG_BT_SMP': 'y',
+            'CONFIG_BT_L2CAP_DYNAMIC_CHANNEL': 'y',
+            'CONFIG_BT_PAGE_TIMEOUT': '0xFFFF',
+            'CONFIG_BT_SMP_SC_ONLY': 'y',
+            'CONFIG_BT_SMP_SC_PAIR_ONLY': 'y',
+        },
+        "test_cases": [
+            'GAP/SEC/SEM/BV-11-C',
+            'GAP/SEC/SEM/BV-12-C',
+            'GAP/SEC/SEM/BV-13-C',
+            'GAP/SEC/SEM/BV-47-C',
+            'GAP/SEC/SEM/BV-16-C',
+            'GAP/SEC/SEM/BV-17-C',
+            'GAP/SEC/SEM/BV-18-C',
+            'GAP/SEC/SEM/BV-54-C',
+            'GAP/SEC/SEM/BI-32-C',
+            'GAP/SEC/SEM/BV-25-C',
+            'GAP/SEC/SEM/BV-30-C',
+        ]
+    },
+
+    "br_sec_ks_128.conf": {
+        "overlay": {
+            'CONFIG_BT_CLASSIC': 'y',
+            'CONFIG_BT_CENTRAL': 'y',
+            'CONFIG_BT_PERIPHERAL': 'y',
+            'CONFIG_BT_SMP': 'y',
+            'CONFIG_BT_L2CAP_DYNAMIC_CHANNEL': 'y',
+            'CONFIG_BT_PAGE_TIMEOUT': '0xFFFF',
+            'CONFIG_BT_SMP_MIN_ENC_KEY_SIZE': '16',
+        },
+        "test_cases": [
+            'GAP/SEC/SEM/BI-14-C',
+            'GAP/SEC/SEM/BI-15-C',
+            'GAP/SEC/SEM/BI-16-C',
+            'GAP/SEC/SEM/BI-04-C',
+            'GAP/SEC/SEM/BI-17-C',
+            'GAP/SEC/SEM/BI-18-C',
+            'GAP/SEC/SEM/BI-19-C',
+            'GAP/SEC/SEM/BI-08-C',
+        ]
+    },
 }
 
 retry_config = {

autopts/ptsprojects/boards/nrf53.py

@@ -12,13 +12,15 @@
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 #
+import logging
+import os
 
 from .nrf5x import *
 from autopts.bot.common import check_call
+from subprocess import CalledProcessError
 
 board_type = 'nrf5340dk/nrf5340/cpuapp'
 
-
 def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
     """Build and flash Zephyr binary
     :param zephyr_wd: Zephyr source path
@@ -30,22 +32,17 @@ def build_and_flash(zephyr_wd, board, debugger_snr, conf_file=None, *args):
                   board, conf_file)
 
     tester_dir = os.path.join(zephyr_wd, 'tests', 'bluetooth', 'tester')
-    controller_dir = os.path.join(zephyr_wd, 'samples', 'bluetooth', 'hci_ipc')
 
     check_call('rm -rf build/'.split(), cwd=tester_dir)
-    check_call('rm -rf build/'.split(), cwd=controller_dir)
 
     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', '--no-sysbuild', '-b', board, '--', f'-DEXTRA_CONF_FILE=\'{bttester_overlay}\'']
+    cmd = ['west', 'build', '--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', '--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)
+    try:
+        check_call(['west', 'flash', '--skip-rebuild', '-i', debugger_snr], cwd=tester_dir)
+    except CalledProcessError:
+        check_call(['west', 'flash', '--skip-rebuild', '--recover', '-i', debugger_snr], cwd=tester_dir)

autopts/ptsprojects/mynewt/l2cap.py

@@ -170,6 +170,10 @@ def test_cases(ptses):
         TestFunc(btp.l2cap_le_listen, le_psm, le_initial_mtu, L2cap.unacceptable_parameters)
     ]
 
+    pre_conditions_gatt = common + [
+              TestFunc(btp.core_reg_svc_gatt),
+    ]
+
     custom_test_cases = [
         # Connection Parameter Update
         ZTestCase("L2CAP", "L2CAP/LE/CFC/BV-04-C",
@@ -229,6 +233,10 @@ def test_cases(ptses):
                   [TestFunc(lambda: pts.update_pixit_param(
                       "L2CAP", "TSPX_l2ca_cbmps_min", "0040"))],
                   generic_wid_hdl=l2cap_wid_hdl),
+        # Collision mitigation handling
+        ZTestCase("L2CAP", "L2CAP/TIM/BV-03-C",
+                  pre_conditions_gatt,
+                  generic_wid_hdl=l2cap_wid_hdl),
     ]
 
     test_case_name_list = pts.get_test_case_list('L2CAP')

autopts/ptsprojects/stack/layers/gap.py

@@ -95,6 +95,7 @@ def __init__(self, name, manufacturer_data, appearance, svc_data, flags,
         self.passkey = Property(None)
         self.conn_params = Property(None)
         self.pairing_failed_rcvd = Property(None)
+        self.encryption_change_rcvd = Property(None)
 
         # bond_lost data (addr_type, addr)
         self.bond_lost_ev_data = Property(None)
@@ -224,6 +225,26 @@ def gap_wait_for_pairing_fail(self, timeout=5):
 
         return self.pairing_failed_rcvd.data
 
+    def gap_wait_for_encryption_change(self, timeout=5):
+        if self.encryption_change_rcvd.data is None:
+            wait_for_event(timeout, lambda: self.encryption_change_rcvd.data)
+
+        return self.encryption_change_rcvd.data
+
+    def gap_wait_for_encrypted(self, timeout=5):
+        if self.encryption_change_rcvd.data is None:
+            wait_for_event(timeout, lambda: self.encryption_change_rcvd.data)
+
+        if self.encryption_change_rcvd.data is None:
+            return False
+
+        (_, _, enabled, _) = self.encryption_change_rcvd.data
+
+        if enabled == 0:
+            return False
+        else:
+            return True
+
     def gap_wait_for_lost_bond(self, timeout=5):
         if self.bond_lost_ev_data.data is None:
             wait_for_event(timeout, lambda: self.bond_lost_ev_data.data)

autopts/ptsprojects/stack/stack.py

@@ -16,50 +16,16 @@
 import logging
 from autopts.ptsprojects.stack.layers import *
 from autopts.ptsprojects.stack.synch import Synch
-from autopts.pybtp import defs
+from autopts.pybtp import common
 
 STACK = None
 log = logging.debug
 
 
-# these are in little endian
-services = {
-    "CORE": 1 << defs.BTP_SERVICE_ID_CORE,
-    "GAP": 1 << defs.BTP_SERVICE_ID_GAP,
-    "GATT": 1 << defs.BTP_SERVICE_ID_GATT,
-    "L2CAP": 1 << defs.BTP_SERVICE_ID_L2CAP,
-    "MESH": 1 << defs.BTP_SERVICE_ID_MESH,
-    "MESH_MMDL": 1 << defs.BTP_SERVICE_ID_MMDL,
-    "GATT_CL": 1 << defs.BTP_SERVICE_ID_GATTC,
-    "VCS": 1 << defs.BTP_SERVICE_ID_VCS,
-    "IAS": 1 << defs.BTP_SERVICE_ID_IAS,
-    "AICS": 1 << defs.BTP_SERVICE_ID_AICS,
-    "VOCS": 1 << defs.BTP_SERVICE_ID_VOCS,
-    "PACS": 1 << defs.BTP_SERVICE_ID_PACS,
-    "ASCS": 1 << defs.BTP_SERVICE_ID_ASCS,
-    "BAP": 1 << defs.BTP_SERVICE_ID_BAP,
-    "MICP": 1 << defs.BTP_SERVICE_ID_MICP,
-    "HAS": 1 << defs.BTP_SERVICE_ID_HAS,
-    "CSIS": 1 << defs.BTP_SERVICE_ID_CSIS,
-    "MICS": 1 << defs.BTP_SERVICE_ID_MICS,
-    "CCP": 1 << defs.BTP_SERVICE_ID_CCP,
-    "VCP": 1 << defs.BTP_SERVICE_ID_VCP,
-    "MCP": 1 << defs.BTP_SERVICE_ID_MCP,
-    "GMCS": 1 << defs.BTP_SERVICE_ID_GMCS,
-    "HAP": 1 << defs.BTP_SERVICE_ID_HAP,
-    "CAP": 1 << defs.BTP_SERVICE_ID_CAP,
-    "CSIP": 1 << defs.BTP_SERVICE_ID_CSIP,
-    "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
-}
-
-
 class Stack:
     def __init__(self):
         self.supported_svcs = 0
+        self.supported_cmds = 0
         self.synch = None
 
         self.gap = None
@@ -90,9 +56,11 @@ def __init__(self):
         self.ots = None
         self.pbp = None
         # GENERATOR append 2
+        self.supported_svcs_cmds = common.supported_svcs_cmds
 
     def is_svc_supported(self, svc):
-        return self.supported_svcs & services[svc] > 0
+        svc_value = self.supported_svcs_cmds.get(svc, {}).get("service", 0)
+        return (self.supported_svcs & svc_value) > 0
 
     def gap_init(self, name=None, manufacturer_data=None, appearance=None,
                  svc_data=None, flags=None, svcs=None, uri=None, periodic_data=None,