tests: bsim: host: updates reflecting new schema

Bsim options schema was updated with explicit individual device
configuration, thus updating all test config files in host.

Signed-off-by: Artur Dobrynin <[email protected]>

Author: ardo-nordic

scripts/pylib/twister/twisterlib/harness.py

@@ -1010,7 +1010,7 @@ def replacer(exe_name):
                 exe_names[exe_name] = replacer(f'bs_{self.instance.platform.name}_{exe_name}')
 
         if not exe_names:
-            exe_names[None] = [f'bs_{replacer(self.instance.name)}']
+            exe_names[None] = f'bs_{replacer(self.instance.name)}'
 
         self._exe_paths = \
             {name_id: os.path.join(self._bsim_out_path, exe) for name_id, exe in exe_names.items()}

tests/bsim/bluetooth/host/adv/chain/testcase.yaml

@@ -8,10 +8,9 @@ tests:
     harness: bsim
     timeout: 30
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_chain_prj_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_chain_prj_conf
       bsim_verbosity: 2
       bsim_sim_length: 10e6
-      bsim_test_ids:
-        - adv
-        - scan
+      bsim_devices:
+        - test_id: adv
+        - test_id: scan

tests/bsim/bluetooth/host/adv/encrypted/css_sample_data/testcase.yaml

@@ -6,27 +6,38 @@ common:
   harness: bsim
   timeout: 30
   harness_config:
-    bsim_exe_name:
-      - tests_bsim_bluetooth_host_adv_encrypted_css_sample_data_prj_conf
+    bsim_exe_name: tests_bsim_bluetooth_host_adv_encrypted_css_sample_data_prj_conf
     bsim_verbosity: 2
     bsim_sim_length: 20e6
-    bsim_test_ids:
-      - central
-      - peripheral
     bsim_options:
       - -RealEncryption=1
-      - -argstest
 
 tests:
   bluetooth.host.adv.encrypted.build_css_sample_data:
     build_only: true
+
   bluetooth.host.adv.encrypted.css_sample_data_1:
     no_build: true
     harness_config:
-      bsim_options:
-        - data-set=1
+      bsim_devices:
+        - test_id: central
+          options:
+            - -argstest
+            - data-set=1
+        - test_id: peripheral
+          options:
+            - -argstest
+            - data-set=1
+
   bluetooth.host.adv.encrypted.css_sample_data_2:
     no_build: true
     harness_config:
-      bsim_options:
-        - data-set=2
+      bsim_devices:
+        - test_id: central
+          options:
+            - -argstest
+            - data-set=2
+        - test_id: peripheral
+          options:
+            - -argstest
+            - data-set=2

tests/bsim/bluetooth/host/adv/encrypted/ead_sample/testcase.yaml

@@ -7,12 +7,11 @@ tests:
     harness: bsim
     timeout: 30
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_encrypted_ead_sample_prj_conf
       bsim_verbosity: 2
       bsim_sim_length: 60e6
-      bsim_test_ids:
-        - central
-        - peripheral
       bsim_options:
         - -RealEncryption=0
+      bsim_devices:
+        - test_id: central
+        - test_id: peripheral

tests/bsim/bluetooth/host/adv/extended/testcase.yaml

@@ -16,41 +16,40 @@ tests:
   bluetooth.host.adv.extended.build_advertiser:
     build_only: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
     extra_args:
       CONF_FILE=prj_advertiser.conf
+
   bluetooth.host.adv.extended.build_scanner:
     build_only: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
     extra_args:
       CONF_FILE=prj_scanner.conf
+
   bluetooth.host.adv.extended.ext_adv:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
-        - tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
-      bsim_test_ids:
-        - ext_adv_advertiser
-        - ext_adv_scanner
+      bsim_devices:
+        - test_id: ext_adv_advertiser
+          exe: tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
+        - test_id: ext_adv_scanner
+          exe: tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
+
   bluetooth.host.adv.extended.ext_adv_conn:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
-        - tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
-      bsim_test_ids:
-        - ext_adv_conn_advertiser
-        - ext_adv_conn_scanner
+      bsim_devices:
+        - test_id: ext_adv_conn_advertiser
+          exe: tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
+        - test_id: ext_adv_conn_scanner
+          exe: tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
+
   bluetooth.host.adv.extended.ext_adv_conn_x5:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
-        - tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf
-      bsim_test_ids:
-        - ext_adv_conn_advertiser_x5
-        - ext_adv_conn_scanner_x5
+      bsim_devices:
+        - test_id: ext_adv_conn_advertiser_x5
+          exe: tests_bsim_bluetooth_host_adv_extended_prj_advertiser_conf
+        - test_id: ext_adv_conn_scanner_x5
+          exe: tests_bsim_bluetooth_host_adv_extended_prj_scanner_conf

tests/bsim/bluetooth/host/adv/long_ad/testcase.yaml

@@ -7,10 +7,9 @@ tests:
     harness: bsim
     timeout: 30
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_long_ad_prj_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_long_ad_prj_conf
       bsim_verbosity: 2
       bsim_sim_length: 2e6
-      bsim_test_ids:
-        - advertiser
-        - scanner
+      bsim_devices:
+        - test_id: advertiser
+        - test_id: scanner

tests/bsim/bluetooth/host/adv/periodic/testcase.yaml

@@ -16,67 +16,72 @@ tests:
   bluetooth.host.adv.periodic.build:
     build_only: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+
   bluetooth.host.adv.periodic.build_coded:
     build_only: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf
     extra_args:
       EXTRA_CONF_FILE=prj_coded.conf
+
   bluetooth.host.adv.periodic.build_long_data:
     build_only: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf
     extra_args:
       EXTRA_CONF_FILE=prj_long_data.conf
+
   bluetooth.host.adv.periodic.per_adv:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_conf
-      bsim_test_ids:
-        - per_adv_advertiser
-        - per_adv_sync
+      bsim_devices:
+        - test_id: per_adv_advertiser
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+        - test_id: per_adv_sync
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+
   bluetooth.host.adv.periodic.per_adv_conn:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_conf
-      bsim_test_ids:
-        - per_adv_conn_advertiser
-        - per_adv_conn_sync
+      bsim_devices:
+        - test_id: per_adv_conn_advertiser
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+        - test_id: per_adv_conn_sync
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+
   bluetooth.host.adv.periodic.per_adv_long_data:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf
-      bsim_test_ids:
-        - per_adv_long_data_advertiser
-        - per_adv_long_data_sync
+      bsim_devices:
+        - test_id: per_adv_long_data_advertiser
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf
+        - test_id: per_adv_long_data_sync
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_long_data_conf
+
   bluetooth.host.adv.periodic.per_adv_conn_privacy:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_conf
-      bsim_test_ids:
-        - per_adv_conn_privacy_advertiser
-        - per_adv_conn_privacy_sync
+      bsim_devices:
+        - test_id: per_adv_conn_privacy_advertiser
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+        - test_id: per_adv_conn_privacy_sync
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+
   bluetooth.host.adv.periodic.per_adv_not_scanning:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_conf
-      bsim_test_ids:
-        - per_adv_advertiser
-        - per_adv_sync_app_not_scanning
+      bsim_devices:
+        - test_id: per_adv_advertiser
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+        - test_id: per_adv_sync_app_not_scanning
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_conf
+
   bluetooth.host.adv.periodic.per_adv_app_not_scanning_coded:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf
-      bsim_test_ids:
-        - per_adv_advertiser_coded_phy
-        - per_adv_sync_app_not_scanning
+      bsim_devices:
+        - test_id: per_adv_advertiser_coded_phy
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf
+        - test_id: per_adv_sync_app_not_scanning
+          exe: tests_bsim_bluetooth_host_adv_periodic_prj_coded_conf

tests/bsim/bluetooth/host/att/eatt/testcase.yaml

@@ -15,57 +15,56 @@ tests:
   bluetooth.host.att.eatt.build_autoconnect:
     build_only: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
     extra_args:
       EXTRA_CONF_FILE=prj_autoconnect.conf
+
   bluetooth.host.att.eatt.build_lowres:
     build_only: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_prj_lowres_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_att_eatt_prj_lowres_conf
     extra_args:
       EXTRA_CONF_FILE=prj_lowres.conf
+
   bluetooth.host.att.eatt.autoconnect:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
-      bsim_test_ids:
-        - central_autoconnect
-        - peripheral_autoconnect
+      bsim_devices:
+        - test_id: central_autoconnect
+          exe: tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
+        - test_id: peripheral_autoconnect
+          exe: tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
+
   bluetooth.host.att.eatt.reconfigure:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
-      bsim_test_ids:
-        - central_reconfigure
-        - peripheral_reconfigure
+      bsim_devices:
+        - test_id: central_reconfigure
+          exe: tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
+        - test_id: peripheral_reconfigure
+          exe: tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
+
   bluetooth.host.adt.eatt.collision:
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_prj_collision_conf
-      bsim_test_ids:
-        - central
-        - peripheral
+      bsim_exe_name: tests_bsim_bluetooth_host_att_eatt_prj_collision_conf
+      bsim_devices:
+        - test_id: central
+        - test_id: peripheral
+
   bluetooth.host.att.eatt.lowres:
     no_build: true
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
-        - tests_bsim_bluetooth_host_att_eatt_prj_lowres_conf
-      bsim_test_ids:
-        - central_lowres
-        - peripheral_lowres
-    extra_args:
-      EXTRA_CONF_FILE=prj_lowres.conf
+      bsim_devices:
+        - test_id: central_lowres
+          exe: tests_bsim_bluetooth_host_att_eatt_prj_autoconnect_conf
+        - test_id: peripheral_lowres
+          exe: tests_bsim_bluetooth_host_att_eatt_prj_lowres_conf
+
   bluetooth.host.att.eatt.multiple_conn:
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf
-      bsim_test_ids:
-        - central
-        - peripheral
+      bsim_exe_name: tests_bsim_bluetooth_host_att_eatt_prj_multiple_conn_conf
+      bsim_devices:
+        - test_id: central
+        - test_id: peripheral
     extra_args:
       EXTRA_CONF_FILE=prj_multiple_conn.conf

tests/bsim/bluetooth/host/att/eatt_notif/testcase.yaml

@@ -8,12 +8,11 @@ tests:
     harness: bsim
     timeout: 120
     harness_config:
-      bsim_exe_name:
-        - tests_bsim_bluetooth_host_att_eatt_notif_prj_conf
+      bsim_exe_name: tests_bsim_bluetooth_host_att_eatt_notif_prj_conf
       bsim_verbosity: 2
       bsim_sim_length: 30e6
-      bsim_test_ids:
-        - client
-        - server
       bsim_options:
         - -RealEncryption=1
+      bsim_devices:
+        - test_id: client
+        - test_id: server