Bluetooth: Tests: Remove usage of auto name in AD

The advertiser options to automatically add the name in the scan
response and the advertising data will be deprecated.

Update the tests that were relying on those options. A lot of test were
actually not using the name, for those the name have simply been
removed. For the others that were using the name, add it in the
advertising data or the scan response data.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>

tests/bluetooth/common/testlib/include/testlib/adv.h

@@ -7,6 +7,6 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 
-int bt_testlib_adv_conn(struct bt_conn **conn, int id, uint32_t adv_options);
+int bt_testlib_adv_conn(struct bt_conn **conn, int id, const char *name);
 
 #endif /* ZEPHYR_TESTS_BLUETOOTH_COMMON_TESTLIB_INCLUDE_TESTLIB_ADV_H_ */

tests/bluetooth/common/testlib/src/adv.c

@@ -35,7 +35,7 @@ static void connected_cb(struct bt_le_ext_adv *adv, struct bt_le_ext_adv_connect
 	k_mutex_unlock(&g_ctx_lock);
 }
 
-int bt_testlib_adv_conn(struct bt_conn **conn, int id, uint32_t adv_options)
+int bt_testlib_adv_conn(struct bt_conn **conn, int id, const char *name)
 {
 	int api_err;
 	struct bt_le_ext_adv *adv = NULL;
@@ -51,7 +51,6 @@ int bt_testlib_adv_conn(struct bt_conn **conn, int id, uint32_t adv_options)
 	param.interval_min = BT_GAP_ADV_FAST_INT_MIN_1;
 	param.interval_max = BT_GAP_ADV_FAST_INT_MAX_1;
 	param.options |= BT_LE_ADV_OPT_CONNECTABLE;
-	param.options |= adv_options;
 
 	k_condvar_init(&ctx.done);
 
@@ -60,6 +59,16 @@ int bt_testlib_adv_conn(struct bt_conn **conn, int id, uint32_t adv_options)
 	g_ctx = &ctx;
 
 	api_err = bt_le_ext_adv_create(&param, &cb, &adv);
+	if (!api_err && name != NULL) {
+		struct bt_data ad;
+
+		ad.type = BT_DATA_NAME_COMPLETE;
+		ad.data_len = strlen(name);
+		ad.data = (const uint8_t *)name;
+
+		api_err = bt_le_ext_adv_set_data(adv, &ad, 1, NULL, 0);
+	}
+
 	if (!api_err) {
 		api_err = bt_le_ext_adv_start(adv, BT_LE_EXT_ADV_START_DEFAULT);
 	}

tests/bluetooth/shell/src/main.c

@@ -53,7 +53,7 @@ static int cmd_hrs_simulate(const struct shell *sh,
 		if (!hrs_registered && IS_ENABLED(CONFIG_BT_BROADCASTER)) {
 			shell_print(sh, "Registering HRS Service");
 			hrs_registered = true;
-			err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad,
+			err = bt_le_adv_start(BT_LE_ADV_CONN, ad,
 					      ARRAY_SIZE(ad), NULL, 0);
 			if (err) {
 				shell_error(sh, "Advertising failed to start"

tests/bluetooth/tester/src/btp_bap_broadcast.c

@@ -295,7 +295,7 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	struct bt_audio_codec_cfg codec_cfg;
 	const struct btp_bap_broadcast_source_setup_cmd *cp = cmd;
 	struct btp_bap_broadcast_source_setup_rp *rp = rsp;
-	struct bt_le_adv_param *param = BT_LE_EXT_ADV_NCONN_NAME;
+	struct bt_le_adv_param *param = BT_LE_EXT_ADV_NCONN;
 
 	/* Only one local source/BIG supported for now */
 	struct btp_bap_broadcast_local_source *source = &local_source;
@@ -306,6 +306,10 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 
+	struct bt_data sd;
+
+	const char *dev_name = bt_get_name();
+
 	/* Broadcast Audio Streaming Endpoint advertising data */
 	struct bt_data base_ad;
 	struct bt_data per_ad;
@@ -347,8 +351,11 @@ uint8_t btp_bap_broadcast_source_setup(const void *cmd, uint16_t cmd_len,
 	base_ad.type = BT_DATA_SVC_DATA16;
 	base_ad.data_len = ad_buf.len;
 	base_ad.data = ad_buf.data;
-	err = tester_gap_create_adv_instance(param, BTP_GAP_ADDR_TYPE_IDENTITY, &base_ad, 1, NULL,
+	sd.type = BT_DATA_NAME_COMPLETE;
-					     0, &gap_settings);
+	sd.data_len = strlen(dev_name);
+	sd.data = (const uint8_t *)dev_name;
+	err = tester_gap_create_adv_instance(param, BTP_GAP_ADDR_TYPE_IDENTITY, &base_ad, 1,
+					     &sd, 1, &gap_settings);
 	if (err != 0) {
 		LOG_DBG("Failed to create extended advertising instance: %d", err);
 

tests/bluetooth/tester/src/btp_cap.c

@@ -531,11 +531,15 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 					  uint32_t *gap_settings)
 {
 	int err;
-	struct bt_le_adv_param *param = BT_LE_EXT_ADV_NCONN_NAME;
+	struct bt_le_adv_param *param = BT_LE_EXT_ADV_NCONN;
 
 	NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 
+	struct bt_data sd;
+
+	const char *dev_name = bt_get_name();
+
 	/* Broadcast Audio Streaming Endpoint advertising data */
 	struct bt_data base_ad;
 	struct bt_data per_ad;
@@ -555,8 +559,11 @@ static int cap_broadcast_source_adv_setup(struct btp_bap_broadcast_local_source
 	base_ad.type = BT_DATA_SVC_DATA16;
 	base_ad.data_len = ad_buf.len;
 	base_ad.data = ad_buf.data;
-	err = tester_gap_create_adv_instance(param, BTP_GAP_ADDR_TYPE_IDENTITY, &base_ad, 1, NULL,
+	sd.type = BT_DATA_NAME_COMPLETE;
-					     0, gap_settings);
+	sd.data_len = strlen(dev_name);
+	sd.data = (const uint8_t *) dev_name;
+	err = tester_gap_create_adv_instance(param, BTP_GAP_ADDR_TYPE_IDENTITY, &base_ad, 1,
+					     &sd, 1, gap_settings);
 	if (err != 0) {
 		LOG_DBG("Failed to create extended advertising instance: %d", err);
 

tests/bsim/bluetooth/audio/src/bap_bass_broadcaster_test.c

@@ -32,7 +32,7 @@ static void test_main(void)
 	printk("Bluetooth initialized\n");
 
 	/* Create a non-connectable non-scannable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, &adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, &adv);
 	if (err) {
 		FAIL("Failed to create advertising set (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/bap_broadcast_sink_test.c

@@ -899,7 +899,7 @@ static void test_start_adv(void)
 	int err;
 
 	/* Create a non-connectable non-scannable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN_NAME, NULL, &ext_adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &ext_adv);
 	if (err != 0) {
 		FAIL("Failed to create advertising set (err %d)\n", err);
 

tests/bsim/bluetooth/audio/src/bap_broadcast_source_test.c

@@ -214,7 +214,7 @@ static int setup_extended_adv(struct bt_bap_broadcast_source *source, struct bt_
 	NET_BUF_SIMPLE_DEFINE(ad_buf,
 			      BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE);
 	struct bt_le_adv_param adv_param = BT_LE_ADV_PARAM_INIT(
-		BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_USE_NAME, 0x80, 0x80, NULL);
+		BT_LE_ADV_OPT_EXT_ADV, 0x80, 0x80, NULL);
 	NET_BUF_SIMPLE_DEFINE(base_buf, 128);
 	struct bt_data ext_ad;
 	struct bt_data per_ad;

tests/bsim/bluetooth/audio/src/bap_scan_delegator_test.c

@@ -680,7 +680,7 @@ static int common_init(void)
 	bt_bap_scan_delegator_register_cb(&scan_delegator_cb);
 	bt_le_per_adv_sync_cb_register(&pa_sync_cb);
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return err;

tests/bsim/bluetooth/audio/src/bap_unicast_server_test.c

@@ -491,7 +491,7 @@ static void init(void)
 	}
 
 	/* Create a non-connectable non-scannable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN_NAME, NULL, &ext_adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &ext_adv);
 	if (err != 0) {
 		FAIL("Failed to create advertising set (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/cap_acceptor_test.c

@@ -616,7 +616,7 @@ static void init(void)
 			bt_cap_stream_ops_register(&unicast_streams[i], &unicast_stream_ops);
 		}
 
-		err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, cap_acceptor_ad,
+		err = bt_le_adv_start(BT_LE_ADV_CONN, cap_acceptor_ad,
 				      ARRAY_SIZE(cap_acceptor_ad), NULL, 0);
 		if (err != 0) {
 			FAIL("Advertising failed to start (err %d)\n", err);

tests/bsim/bluetooth/audio/src/cap_initiator_broadcast_test.c

@@ -21,8 +21,7 @@
  * Broadcast ISO radio events.
  */
 #define BT_LE_EXT_ADV_CUSTOM \
-		BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV | \
+		BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, \
-				BT_LE_ADV_OPT_USE_NAME, \
 				0x0080, 0x0080, NULL)
 
 #define BT_LE_PER_ADV_CUSTOM \

tests/bsim/bluetooth/audio/src/csip_notify_server_test.c

@@ -66,7 +66,7 @@ static void test_main(void)
 	}
 
 	printk("Start Advertising\n");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;
@@ -107,7 +107,7 @@ static void test_main(void)
 	}
 
 	printk("Start Advertising\n");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/csip_set_member_test.c

@@ -70,7 +70,7 @@ static void bt_ready(int err)
 		return;
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 	}

tests/bsim/bluetooth/audio/src/gmap_ugg_test.c

@@ -23,8 +23,7 @@
  * Broadcast ISO radio events.
  */
 #define BT_LE_EXT_ADV_CUSTOM \
-		BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV | \
+		BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, \
-				BT_LE_ADV_OPT_USE_NAME, \
 				0x0080, 0x0080, NULL)
 
 #define BT_LE_PER_ADV_CUSTOM \

tests/bsim/bluetooth/audio/src/gmap_ugt_test.c

@@ -416,7 +416,7 @@ static void test_main(void)
 		return;
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, gmap_acceptor_ad, ARRAY_SIZE(gmap_acceptor_ad),
+	err = bt_le_adv_start(BT_LE_ADV_CONN, gmap_acceptor_ad, ARRAY_SIZE(gmap_acceptor_ad),
 			      NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);

tests/bsim/bluetooth/audio/src/has_test.c

@@ -46,7 +46,7 @@ static void test_common(void)
 
 	LOG_DBG("Bluetooth initialized");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/ias_test.c

@@ -58,7 +58,7 @@ static void test_main(void)
 		return;
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/mcs_test.c

@@ -22,7 +22,7 @@ static void bt_ready(int err)
 
 	printk("Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/media_controller_test.c

@@ -1647,7 +1647,7 @@ void test_media_controller_remote_player(void)
 	initialize_bluetooth();
 	initialize_media();
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 	}

tests/bsim/bluetooth/audio/src/micp_mic_dev_test.c

@@ -420,7 +420,7 @@ static void test_main(void)
 
 	printk("MICP initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/pacs_notify_server_test.c

@@ -176,7 +176,7 @@ static void test_main(void)
 	}
 
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;
@@ -210,7 +210,7 @@ static void test_main(void)
 	trigger_notifications();
 
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;
@@ -227,7 +227,7 @@ static void test_main(void)
 	}
 
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;
@@ -261,7 +261,7 @@ static void test_main(void)
 	}
 
 	LOG_DBG("Start Advertising");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;

tests/bsim/bluetooth/audio/src/pbp_public_broadcast_source_test.c

@@ -217,7 +217,7 @@ static int setup_extended_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	/* Create a non-connectable non-scannable advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
 	if (err != 0) {
 		printk("Unable to create extended advertising set: %d\n", err);
 

tests/bsim/bluetooth/audio/src/tbs_client_test.c

@@ -494,7 +494,7 @@ static void test_main(void)
 
 	printk("Audio Server: Bluetooth discovered\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/tmap_server_test.c

@@ -53,7 +53,7 @@ static void test_main(void)
 	}
 	printk("TMAP initialized. Start advertising...\n");
 	/* Create a connectable extended advertising set */
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN_NAME, NULL, &adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, &adv);
 	if (err) {
 		printk("Failed to create advertising set (err %d)\n", err);
 		return;

tests/bsim/bluetooth/audio/src/vcp_vol_rend_test.c

@@ -1032,7 +1032,7 @@ static void test_main(void)
 
 	printk("VCP initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, AD_SIZE, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, AD_SIZE, NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/adv/extended/src/ext_adv_advertiser.c

@@ -45,7 +45,7 @@ static void create_ext_adv_set(struct bt_le_ext_adv **adv, bool connectable)
 	printk("Creating extended advertising set...");
 
 	const struct bt_le_adv_param *adv_param = connectable ?
-		BT_LE_EXT_ADV_CONN_NAME : BT_LE_EXT_ADV_NCONN_NAME;
+		BT_LE_EXT_ADV_CONN : BT_LE_EXT_ADV_NCONN;
 
 	err = bt_le_ext_adv_create(adv_param, NULL, adv);
 	if (err) {

tests/bsim/bluetooth/host/adv/periodic/src/per_adv_advertiser.c

@@ -89,7 +89,7 @@ static void create_per_adv_set(struct bt_le_ext_adv **adv)
 	int err;
 
 	printk("Creating extended advertising set...");
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
 	if (err) {
 		printk("Failed to create advertising set: %d\n", err);
 		return;
@@ -111,7 +111,7 @@ static void create_conn_adv_set(struct bt_le_ext_adv **adv)
 	int err;
 
 	printk("Creating connectable extended advertising set...");
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN_NAME, NULL, adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, NULL, adv);
 	if (err) {
 		printk("Failed to create advertising set: %d\n", err);
 		return;

tests/bsim/bluetooth/host/adv/resume2/connectable/main.c

@@ -34,9 +34,7 @@ int main(void)
 
 		bt_testlib_conn_wait_free();
 
-		err = bt_testlib_adv_conn(
+		err = bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, bt_get_name());
-			&conn, BT_ID_DEFAULT,
-			(BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD));
 		__ASSERT_NO_MSG(!err);
 
 		bt_testlib_wait_disconnected(conn);

tests/bsim/bluetooth/host/adv/resume2/dut/main.c

@@ -70,13 +70,24 @@ int main(void)
 	err = bt_set_name("dut");
 	__ASSERT_NO_MSG(!err);
 
+	struct bt_data ad[1] = {0};
+
+	const char *dev_name = bt_get_name();
+
+	ad[0].type = BT_DATA_NAME_COMPLETE;
+	ad[0].data_len = strlen(dev_name);
+	ad[0].data = (const uint8_t *)dev_name;
+
 	LOG_INF("---------- Test setup ----------");
 
 	LOG_INF("Environment test: Advertiser fills connection capacity.");
 
 	/* `bt_le_adv_start` is invoked once, and.. */
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME_AD, NULL, 0, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, NULL, 0, NULL, 0);
+	__ASSERT_NO_MSG(!err);
+
+	err = bt_le_adv_update_data(ad, 1, NULL, 0);
 	__ASSERT_NO_MSG(!err);
 
 	/* .. the advertiser shall autoresume. Since it's not
@@ -154,7 +165,10 @@ int main(void)
 
 	/* With one connection slot taken by the central role, we fill the rest. */
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME_AD, NULL, 0, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, NULL, 0, NULL, 0);
+	__ASSERT_NO_MSG(!err);
+
+	err = bt_le_adv_update_data(ad, 1, NULL, 0);
 	__ASSERT_NO_MSG(!err);
 
 	LOG_INF("Waiting for connections...");

tests/bsim/bluetooth/host/att/eatt/src/common.c

@@ -140,7 +140,7 @@ void peripheral_setup_and_connect(void)
 		FAIL("Can't enable Bluetooth (err %d)\n", err);
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 	}

tests/bsim/bluetooth/host/att/eatt_notif/src/server_test.c

@@ -190,7 +190,7 @@ static void test_main(void)
 
 	printk("Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/att/long_read/main.c

@@ -194,9 +194,7 @@ void the_test(void)
 
 	if (peripheral) {
 		EXPECT_ZERO(bt_set_name("peripheral"));
-		EXPECT_ZERO(bt_testlib_adv_conn(
+		EXPECT_ZERO(bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, bt_get_name()));
-			&conn, BT_ID_DEFAULT,
-			(BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD)));
 	}
 
 	if (central) {

tests/bsim/bluetooth/host/att/open_close/src/main.c

@@ -136,9 +136,7 @@ void a_test_iteration(int i)
 
 	if (peripheral) {
 		EXPECT_ZERO(bt_set_name("peripheral"));
-		EXPECT_ZERO(bt_testlib_adv_conn(
+		EXPECT_ZERO(bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, bt_get_name()));
-			&conn, BT_ID_DEFAULT,
-			(BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD)));
 	}
 
 	if (central) {

tests/bsim/bluetooth/host/att/read_fill_buf/server/main.c

@@ -45,8 +45,7 @@ void the_test(void)
 	err = bt_set_name("d1");
 	__ASSERT_NO_MSG(!err);
 
-	err = bt_testlib_adv_conn(NULL, BT_ID_DEFAULT,
+	err = bt_testlib_adv_conn(NULL, BT_ID_DEFAULT, bt_get_name());
-				  (BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD));
 	__ASSERT_NO_MSG(!err);
 
 	PASS("PASS\n");

tests/bsim/bluetooth/host/att/retry_on_sec_err/server/main.c

@@ -39,8 +39,7 @@ static void test_common(struct bt_conn **conn)
 	err = bt_set_name("d1");
 	__ASSERT_NO_MSG(!err);
 
-	err = bt_testlib_adv_conn(conn, BT_ID_DEFAULT,
+	err = bt_testlib_adv_conn(conn, BT_ID_DEFAULT, bt_get_name());
-				  (BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD));
 	__ASSERT_NO_MSG(!err);
 }
 

tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c

@@ -339,7 +339,7 @@ static void test_main(void)
 
 	printk("Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/gatt/caching/src/gatt_server_test.c

@@ -101,7 +101,7 @@ static void test_main_common(bool connect_eatt)
 
 	printk("Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 

tests/bsim/bluetooth/host/gatt/general/src/gatt_server_test.c

@@ -159,7 +159,7 @@ static void test_main(void)
 
 	printk("Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/gatt/notify/src/gatt_server_test.c

@@ -183,7 +183,7 @@ static void setup(void)
 
 	printk("Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/gatt/notify_multiple/src/gatt_server_test.c

@@ -145,7 +145,7 @@ static void test_main(void)
 
 	printk("Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/iso/cis/src/cis_peripheral.c

@@ -144,7 +144,7 @@ static void adv_connect(void)
 {
 	int err;
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 

tests/bsim/bluetooth/host/l2cap/credits/src/main.c

@@ -210,16 +210,11 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	WAIT_FOR_FLAG_UNSET(is_connected);
 }
 
-#define BT_LE_ADV_CONN_NAME_OT BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | \
+#define BT_LE_ADV_CONN_OT BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | \
-					    BT_LE_ADV_OPT_USE_NAME |	\
 					  BT_LE_ADV_OPT_ONE_TIME,	\
 					  BT_GAP_ADV_FAST_INT_MIN_2, \
 					  BT_GAP_ADV_FAST_INT_MAX_2, NULL)
 
-static const struct bt_data ad[] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-};
-
 static void test_peripheral_main(void)
 {
 	LOG_DBG("*L2CAP CREDITS Peripheral started*");
@@ -238,7 +233,7 @@ static void test_peripheral_main(void)
 
 	LOG_DBG("Peripheral Bluetooth initialized.");
 	LOG_DBG("Connectable advertising...");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME_OT, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN_OT, NULL, 0, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;

tests/bsim/bluetooth/host/l2cap/credits_seg_recv/src/main.c

@@ -227,15 +227,10 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	WAIT_FOR_FLAG_UNSET(is_connected);
 }
 
-#define BT_LE_ADV_CONN_NAME_OT                                                                     \
+#define BT_LE_ADV_CONN_OT                                                                          \
-	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_USE_NAME |                       \
+	BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_ONE_TIME,                        \
-				BT_LE_ADV_OPT_ONE_TIME,                                            \
 			BT_GAP_ADV_FAST_INT_MIN_2, BT_GAP_ADV_FAST_INT_MAX_2, NULL)
 
-static const struct bt_data ad[] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-};
-
 static void test_peripheral_main(void)
 {
 	int err;
@@ -256,7 +251,7 @@ static void test_peripheral_main(void)
 
 	LOG_DBG("Peripheral Bluetooth initialized.");
 	LOG_DBG("Connectable advertising...");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME_OT, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN_OT, NULL, 0, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;

tests/bsim/bluetooth/host/l2cap/general/src/main_l2cap_ecred.c

@@ -449,7 +449,7 @@ static void test_peripheral_main(void)
 
 	LOG_DBG("Peripheral Bluetooth initialized.");
 	LOG_DBG("Connectable advertising...");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;

tests/bsim/bluetooth/host/l2cap/send_on_connect/src/main_l2cap_send_on_connect.c

@@ -187,7 +187,7 @@ static void test_peripheral_main(void)
 
 	register_l2cap_server();
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/l2cap/stress/src/main.c

@@ -309,16 +309,11 @@ static void disconnect_device(struct bt_conn *conn, void *data)
 	WAIT_FOR_FLAG_UNSET(is_connected);
 }
 
-#define BT_LE_ADV_CONN_NAME_OT BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | \
+#define BT_LE_ADV_CONN_OT BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | \
-					    BT_LE_ADV_OPT_USE_NAME |	\
 					  BT_LE_ADV_OPT_ONE_TIME,	\
 					  BT_GAP_ADV_FAST_INT_MIN_2, \
 					  BT_GAP_ADV_FAST_INT_MAX_2, NULL)
 
-static const struct bt_data ad[] = {
-	BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)),
-};
-
 static void test_peripheral_main(void)
 {
 	LOG_DBG("*L2CAP STRESS Peripheral started*");
@@ -337,7 +332,7 @@ static void test_peripheral_main(void)
 
 	LOG_DBG("Peripheral Bluetooth initialized.");
 	LOG_DBG("Connectable advertising...");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME_OT, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN_OT, NULL, 0, NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)", err);
 		return;

tests/bsim/bluetooth/host/l2cap/userdata/src/main_l2cap_userdata.c

@@ -151,7 +151,7 @@ static void test_peripheral_main(void)
 		return;
 	}
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/misc/conn_stress/peripheral/src/main.c

@@ -400,7 +400,7 @@ void test_peripheral_main(void)
 	sprintf(name, "per-%d", get_device_nbr());
 	bt_set_name(name);
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, NULL, 0, NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, NULL, 0, NULL, 0);
 	if (err) {
 		LOG_ERR("Advertising failed to start (err %d)", err);
 		__ASSERT_NO_MSG(err);

tests/bsim/bluetooth/host/misc/disable/src/gatt_server_test.c

@@ -154,7 +154,7 @@ static void test_main(void)
 
 		printk("Bluetooth initialized\n");
 
-		err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+		err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 		if (err != 0) {
 			FAIL("Advertising failed to start (err %d)\n", err);
 			return;

tests/bsim/bluetooth/host/misc/sample_test/src/peer.c

@@ -172,8 +172,7 @@ void entrypoint_peer(void)
 
 	LOG_DBG("Bluetooth initialized");
 
-	err = bt_testlib_adv_conn(&conn, BT_ID_DEFAULT,
+	err = bt_testlib_adv_conn(&conn, BT_ID_DEFAULT, bt_get_name());
-				  (BT_LE_ADV_OPT_USE_NAME | BT_LE_ADV_OPT_FORCE_NAME_IN_AD));
 	TEST_ASSERT(!err, "Failed to start connectable advertising (err %d)", err);
 
 	LOG_DBG("Discover test characteristic");

tests/bsim/bluetooth/host/misc/unregister_conn_cb/src/main.c

@@ -127,7 +127,7 @@ static void test_peripheral_main(void)
 
 	bt_conn_cb_register(&conn_callbacks);
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err != 0) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;

tests/bsim/bluetooth/host/privacy/central/src/tester.c

@@ -88,7 +88,7 @@ void start_advertising(void)
 	params.sid = 0;
 	params.secondary_max_skip = 0;
 	params.options = BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_SCANNABLE |
-			 BT_LE_ADV_OPT_NOTIFY_SCAN_REQ | BT_LE_ADV_OPT_USE_NAME;
+			 BT_LE_ADV_OPT_NOTIFY_SCAN_REQ;
 	params.interval_min = BT_GAP_ADV_FAST_INT_MIN_1;
 	params.interval_max = BT_GAP_ADV_FAST_INT_MAX_1;
 	params.peer = NULL;

tests/bsim/bluetooth/ll/advx/src/main.c

@@ -167,6 +167,7 @@ static void test_advx_main(void)
 	struct bt_le_ext_adv_start_param ext_adv_param;
 	struct bt_le_ext_adv *adv;
 	uint8_t num_sent_expected;
+	struct bt_data sd[1];
 	uint16_t evt_prop;
 	uint8_t adv_type;
 	uint16_t handle;
@@ -184,7 +185,7 @@ static void test_advx_main(void)
 	printk("success.\n");
 
 	printk("Connectable advertising...");
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
 		printk("Advertising failed to start (err %d)\n", err);
 		return;
@@ -299,13 +300,24 @@ static void test_advx_main(void)
 	printk("success.\n");
 
 	printk("Create scannable extended advertising set...");
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_SCAN_NAME, &adv_callbacks,
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_SCAN, &adv_callbacks,
 				   &adv);
 	if (err) {
 		goto exit;
 	}
 	printk("success.\n");
 
+	/* Scannable advertiser need to have scan response data */
+	printk("Set scan response data...");
+	sd[0].type = BT_DATA_NAME_COMPLETE;
+	sd[0].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
+	sd[0].data = CONFIG_BT_DEVICE_NAME;
+	err = bt_le_ext_adv_set_data(adv, NULL, 0, sd, 1);
+	if (err) {
+		goto exit;
+	}
+	printk("success.\n");
+
 	printk("Start scannable advertising...");
 	ext_adv_param.timeout = 0;
 	ext_adv_param.num_events = 0;
@@ -334,7 +346,7 @@ static void test_advx_main(void)
 	printk("Create connectable extended advertising set...");
 	is_connected = false;
 	is_disconnected = false;
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN_NAME, &adv_callbacks, &adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CONN, &adv_callbacks, &adv);
 	if (err) {
 		goto exit;
 	}
@@ -389,7 +401,7 @@ static void test_advx_main(void)
 	k_sleep(K_MSEC(1000));
 
 	printk("Create connectable advertising set...");
-	err = bt_le_ext_adv_create(BT_LE_ADV_CONN_NAME, &adv_callbacks, &adv);
+	err = bt_le_ext_adv_create(BT_LE_ADV_CONN, &adv_callbacks, &adv);
 	if (err) {
 		goto exit;
 	}

tests/bsim/bluetooth/ll/bis/src/main.c

@@ -199,7 +199,7 @@ static void setup_ext_adv(struct bt_le_ext_adv **adv)
 	int err;
 
 	printk("Create advertising set...");
-	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, adv);
+	err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, adv);
 	if (err) {
 		FAIL("Failed to create advertising set (err %d)\n", err);
 		return;

tests/bsim/bluetooth/ll/cis/src/main.c

@@ -76,16 +76,14 @@ static bt_addr_le_t peer_addr;
 
 #if defined(CONFIG_TEST_USE_LEGACY_ADVERTISING)
 #define BT_LE_ADV_CONN_CUSTOM BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | \
-					      BT_LE_ADV_OPT_ONE_TIME | \
+					      BT_LE_ADV_OPT_ONE_TIME, \
-					      BT_LE_ADV_OPT_USE_NAME, \
 					      ADV_INTERVAL_MIN, \
 					      ADV_INTERVAL_MAX, \
 					      NULL)
 #else /* !CONFIG_TEST_USE_LEGACY_ADVERTISING */
 #define BT_LE_ADV_CONN_CUSTOM BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | \
 					      BT_LE_ADV_OPT_EXT_ADV | \
-					      BT_LE_ADV_OPT_ONE_TIME | \
+					      BT_LE_ADV_OPT_ONE_TIME, \
-					      BT_LE_ADV_OPT_USE_NAME, \
 					      ADV_INTERVAL_MIN, \
 					      ADV_INTERVAL_MAX, \
 					      NULL)

tests/bsim/bluetooth/ll/conn/src/test_connect2.c

@@ -133,7 +133,7 @@ static void bt_ready(void)
 
 	printk("Peripheral Bluetooth initialized\n");
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
+	err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
 	if (err) {
 		FAIL("Advertising failed to start (err %d)\n", err);
 		return;