[nrf fromtree] Bluetooth: tests: Use bt_hci_cmd_alloc()

jhedberg · olivier-le-sage · commit eb980c8e9aec · 2025-07-09T08:47:53.000+02:00
Use bt_hci_cmd_alloc() instead of the soon to be deprecated bt_hci_cmd_create(). Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com> (cherry picked from commit b0bed23)
diff --git a/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c b/tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c
@@ -63,7 +63,7 @@ int send_conn_cte_req_enable(uint16_t conn_handle,
 	struct bt_hci_cp_le_conn_cte_req_enable *cp;
 	struct net_buf *buf;
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_CONN_CTE_REQ_ENABLE, sizeof(*cp));
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	if (!buf) {
 		return -ENOBUFS;
 	}
diff --git a/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c b/tests/bluetooth/df/connection_cte_req/src/test_cte_set_rx_params.c
@@ -48,7 +48,7 @@ int send_set_conn_cte_rx_params(uint16_t conn_handle,
 
 	uint8_t ant_ids_num = (params != NULL ? params->switch_pattern_len : 0);
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CONN_CTE_RX_PARAMS, sizeof(*cp) + ant_ids_num);
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	if (!buf) {
 		return -ENOBUFS;
 	}
diff --git a/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c b/tests/bluetooth/df/connection_cte_tx_params/src/test_set_conn_cte_tx_params.c
@@ -59,8 +59,7 @@ static int send_set_conn_cte_tx_params(uint16_t conn_handle,
 	uint8_t *dest_ant_ids;
 	struct net_buf *buf;
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CONN_CTE_TX_PARAMS,
-				sizeof(*cp) + params->switch_pattern_len);
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	if (!buf) {
 		return -ENOBUFS;
 	}
diff --git a/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c b/tests/bluetooth/df/connectionless_cte_rx/src/test_set_iq_sampling_enable.c
@@ -56,8 +56,7 @@ int send_set_scan_cte_rx_enable(uint16_t sync_handle,
 	struct bt_hci_cp_le_set_cl_cte_sampling_enable *cp;
 	struct net_buf *buf;
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CL_CTE_SAMPLING_ENABLE,
-				sizeof(*cp) + params->num_ant_ids);
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	if (!buf) {
 		return -ENOBUFS;
 	}
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/common.c b/tests/bluetooth/df/connectionless_cte_tx/src/common.c
@@ -59,8 +59,7 @@ void common_set_cl_cte_tx_params(void)
 	struct net_buf *buf;
 	int err;
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CL_CTE_TX_PARAMS,
-				sizeof(*cp) + ARRAY_SIZE(ant_ids));
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	zassert_not_null(buf, "Failed to create HCI cmd object");
 
 	cp = net_buf_add(buf, sizeof(*cp));
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c
@@ -35,7 +35,7 @@ int send_set_cl_cte_tx_enable(uint8_t adv_handle, atomic_t *adv_flags,
 	struct bt_hci_cmd_state_set state;
 	struct net_buf *buf;
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CL_CTE_TX_ENABLE, sizeof(*cp));
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	if (!buf) {
 		return -ENOBUFS;
 	}
diff --git a/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c b/tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_param.c
@@ -54,8 +54,7 @@ int send_set_cl_cte_tx_params(uint8_t adv_handle, uint8_t cte_len,
 	struct bt_hci_cp_le_set_cl_cte_tx_params *cp;
 	struct net_buf *buf;
 
-	buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CL_CTE_TX_PARAMS,
-				sizeof(*cp) + switch_pattern_len);
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	zassert_not_null(buf, "Failed to create HCI cmd object");
 
 	cp = net_buf_add(buf, sizeof(*cp));
diff --git a/tests/bluetooth/hci_codecs_info/src/main.c b/tests/bluetooth/hci_codecs_info/src/main.c
@@ -185,7 +185,7 @@ ZTEST(test_hci_codecs_info, test_read_codec_capabilities)
 	bt_enable(NULL);
 
 	/* Read Local Supported Codec Capabilities */
-	buf = bt_hci_cmd_create(BT_HCI_OP_READ_CODEC_CAPABILITIES, sizeof(*cp));
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	cp = net_buf_add(buf, sizeof(*cp));
 
 	cp->codec_id.coding_format = READ_CAPABS_CODING_FMT;
@@ -268,7 +268,7 @@ ZTEST(test_hci_codecs_info, test_read_ctlr_delay)
 	bt_enable(NULL);
 
 	/* Read Local Supported Controller Delay */
-	buf = bt_hci_cmd_create(BT_HCI_OP_READ_CTLR_DELAY, sizeof(*cp));
+	buf = bt_hci_cmd_alloc(K_FOREVER);
 	cp = net_buf_add(buf, sizeof(*cp) + sizeof(read_delay_codec_config));
 
 	cp->codec_id.coding_format = READ_DELAY_CODING_FMT;
diff --git a/tests/bluetooth/host/conn/mocks/hci_core.c b/tests/bluetooth/host/conn/mocks/hci_core.c
@@ -11,7 +11,7 @@
 
 #include "hci_core.h"
 
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_alloc, k_timeout_t);
 DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
 DEFINE_FAKE_VALUE_FUNC(int, bt_hci_le_read_remote_features, struct bt_conn *);
 DEFINE_FAKE_VALUE_FUNC(int, bt_hci_disconnect, uint16_t, uint8_t);
diff --git a/tests/bluetooth/host/conn/mocks/hci_core.h b/tests/bluetooth/host/conn/mocks/hci_core.h
@@ -9,7 +9,7 @@
 
 /* List of fakes used by this unit tester */
 #define HCI_CORE_MOCKS_FFF_FAKES_LIST(FAKE)                                                        \
-	FAKE(bt_hci_cmd_create)                                                                    \
+	FAKE(bt_hci_cmd_alloc)                                                                     \
 	FAKE(bt_hci_cmd_send_sync)                                                                 \
 	FAKE(bt_hci_le_read_remote_features)                                                       \
 	FAKE(bt_hci_disconnect)                                                                    \
@@ -24,7 +24,7 @@
 	FAKE(bt_lookup_id_addr)                                                                    \
 	FAKE(bt_le_set_phy)
 
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_alloc, k_timeout_t);
 DECLARE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
 DECLARE_FAKE_VALUE_FUNC(int, bt_hci_le_read_remote_features, struct bt_conn *);
 DECLARE_FAKE_VALUE_FUNC(int, bt_hci_disconnect, uint16_t, uint8_t);
diff --git a/tests/bluetooth/host/cs/mocks/hci_core.c b/tests/bluetooth/host/cs/mocks/hci_core.c
@@ -9,5 +9,5 @@
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/kernel.h>
 
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_alloc, k_timeout_t);
 DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/cs/mocks/hci_core.h b/tests/bluetooth/host/cs/mocks/hci_core.h
@@ -9,8 +9,8 @@
 
 /* List of fakes used by this unit tester */
 #define HCI_CORE_FFF_FAKES_LIST(FAKE)                                                              \
-	FAKE(bt_hci_cmd_create)                                                                    \
+	FAKE(bt_hci_cmd_alloc)                                                                    \
 	FAKE(bt_hci_cmd_send_sync)
 
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_alloc, k_timeout_t);
 DECLARE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/id/bt_id_add/src/main.c b/tests/bluetooth/host/id/bt_id_add/src/main.c
@@ -218,7 +218,7 @@ ZTEST(bt_id_add, test_conn_lookup_returns_null_broadcaster_no_ext_adv)
 	bt_conn_lookup_state_le_fake.return_val = NULL;
 
 	/* This makes addr_res_enable() succeeds and returns 0 */
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	bt_id_add(&keys);
@@ -268,7 +268,7 @@ ZTEST(bt_id_add, test_conn_lookup_returns_null_no_ext_adv_no_resolving_entries)
 
 	/* This makes hci_id_add() succeeds and returns 0 */
 	net_buf_simple_add_fake.return_val = &cp;
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	bt_id_add(&keys);
@@ -326,7 +326,7 @@ ZTEST(bt_id_add, test_scan_re_enabled_observer_enabled_ext_adv)
 
 	/* This makes hci_id_add() succeeds and returns 0 */
 	net_buf_simple_add_fake.return_val = &cp;
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	bt_id_add(&keys);
diff --git a/tests/bluetooth/host/id/bt_id_del/src/main.c b/tests/bluetooth/host/id/bt_id_del/src/main.c
@@ -232,7 +232,7 @@ ZTEST(bt_id_del, test_conn_lookup_returns_null_broadcaster_no_ext_adv)
 	keys.state |= BT_KEYS_ID_ADDED;
 
 	/* This makes addr_res_enable() succeeds and returns 0 */
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	bt_id_del(&keys);
@@ -284,7 +284,7 @@ ZTEST(bt_id_del, test_conn_lookup_returns_null_broadcaster_no_ext_adv_privacy_en
 	keys.state |= BT_KEYS_ID_ADDED;
 
 	/* This makes addr_res_enable() succeeds and returns 0 */
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	bt_id_del(&keys);
@@ -333,7 +333,7 @@ ZTEST(bt_id_del, test_send_hci_id_del)
 
 	/* This makes hci_id_del() succeeds and returns 0 */
 	net_buf_simple_add_fake.return_val = &cp;
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	bt_id_del(&keys);
@@ -388,7 +388,7 @@ ZTEST(bt_id_del, test_scan_re_enabled_observer_enabled_ext_adv)
 
 	/* This makes hci_id_del() succeeds and returns 0 */
 	net_buf_simple_add_fake.return_val = &cp;
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	bt_id_del(&keys);
diff --git a/tests/bluetooth/host/id/bt_id_init/src/test_suite_setup_static_random_identity.c b/tests/bluetooth/host/id/bt_id_init/src/test_suite_setup_static_random_identity.c
@@ -202,7 +202,7 @@ ZTEST(bt_id_init_setup_static_random_identity, test_init_dev_identity_set_random
 			  rp->num_addrs * sizeof(struct bt_hci_vs_static_addr);
 
 	/* This will make set_random_address() returns a negative number error code */
-	bt_hci_cmd_create_fake.return_val = NULL;
+	bt_hci_cmd_alloc_fake.return_val = NULL;
 	bt_hci_cmd_send_sync_fake.custom_fake = bt_hci_cmd_send_sync_custom_fake;
 
 	err = bt_id_init();
diff --git a/tests/bluetooth/host/id/bt_id_set_adv_private_addr/src/test_suite_invalid_cases.c b/tests/bluetooth/host/id/bt_id_set_adv_private_addr/src/test_suite_invalid_cases.c
@@ -86,7 +86,7 @@ ZTEST(bt_id_set_adv_private_addr_invalid_cases, test_set_adv_address_set_adv_ran
 
 	bt_rand_fake.custom_fake = bt_rand_custom_fake;
 	/* This will make set_random_address() returns a negative number error code */
-	bt_hci_cmd_create_fake.return_val = NULL;
+	bt_hci_cmd_alloc_fake.return_val = NULL;
 
 	err = bt_id_set_adv_private_addr(&adv_param);
 
@@ -158,7 +158,7 @@ ZTEST(bt_id_set_adv_private_addr_invalid_cases, test_set_adv_address_if_set_adv_
 
 	/* This will make bt_id_set_adv_random_addr() returns a negative number error code */
 	atomic_set_bit(adv_param.flags, BT_ADV_PARAMS_SET);
-	bt_hci_cmd_create_fake.return_val = NULL;
+	bt_hci_cmd_alloc_fake.return_val = NULL;
 
 	err = bt_id_set_adv_private_addr(&adv_param);
 
diff --git a/tests/bluetooth/host/id/bt_id_set_adv_random_addr/src/main.c b/tests/bluetooth/host/id/bt_id_set_adv_random_addr/src/main.c
@@ -52,7 +52,7 @@ ZTEST(bt_id_set_adv_random_addr, test_no_ext_adv)
 
 	err = bt_id_set_adv_random_addr(&adv_param, &BT_RPA_LE_ADDR->a);
 
-	expect_not_called_bt_hci_cmd_create();
+	expect_not_called_bt_hci_cmd_alloc();
 	expect_not_called_bt_hci_cmd_send_sync();
 	expect_not_called_net_buf_simple_add();
 
@@ -82,7 +82,7 @@ ZTEST(bt_id_set_adv_random_addr, test_ext_adv_enabled)
 
 	err = bt_id_set_adv_random_addr(&adv_param, &BT_RPA_LE_ADDR->a);
 
-	expect_not_called_bt_hci_cmd_create();
+	expect_not_called_bt_hci_cmd_alloc();
 	expect_not_called_bt_hci_cmd_send_sync();
 	expect_not_called_net_buf_simple_add();
 
@@ -102,7 +102,7 @@ ZTEST(bt_id_set_adv_random_addr, test_ext_adv_enabled)
  *  Constraints:
  *   - 'CONFIG_BT_EXT_ADV' is enabled
  *   - 'BT_ADV_PARAMS_SET' flag in advertising parameters reference is set
- *   - bt_hci_cmd_create() returns a valid buffer pointer
+ *   - bt_hci_cmd_alloc() returns a valid buffer pointer
  *   - bt_hci_cmd_send_sync() returns 0 (success)
  *
  *  Expected behaviour:
@@ -120,13 +120,13 @@ ZTEST(bt_id_set_adv_random_addr, test_ext_adv_enabled_hci_set_adv_set_random_add
 	atomic_set_bit(adv_param.flags, BT_ADV_PARAMS_SET);
 
 	net_buf_simple_add_fake.return_val = &cp;
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = 0;
 
 	err = bt_id_set_adv_random_addr(&adv_param, &BT_RPA_LE_ADDR->a);
 
 	expect_single_call_net_buf_simple_add(&net_buff.b, sizeof(cp));
-	expect_single_call_bt_hci_cmd_create(BT_HCI_OP_LE_SET_ADV_SET_RANDOM_ADDR, sizeof(cp));
+	expect_single_call_bt_hci_cmd_alloc();
 	expect_single_call_bt_hci_cmd_send_sync(BT_HCI_OP_LE_SET_ADV_SET_RANDOM_ADDR);
 
 	zassert_ok(err, "Unexpected error code '%d' was returned", err);
diff --git a/tests/bluetooth/host/id/bt_id_set_adv_random_addr/src/test_suite_invalid_cases.c b/tests/bluetooth/host/id/bt_id_set_adv_random_addr/src/test_suite_invalid_cases.c
@@ -73,17 +73,17 @@ ZTEST(bt_id_set_adv_random_addr_invalid_cases, test_null_arguments)
 /*
  *  Test setting advertising random address while 'CONFIG_BT_EXT_ADV' is enabled
  *  and 'BT_ADV_PARAMS_SET' flag in advertising parameters reference is set.
- *  bt_hci_cmd_create() fails to allocate buffers and returns NULL.
+ *  bt_hci_cmd_alloc() fails to allocate buffers and returns NULL.
  *
  *  Constraints:
  *   - 'CONFIG_BT_EXT_ADV' is enabled
  *   - 'BT_ADV_PARAMS_SET' flag in advertising parameters reference is set
- *   - bt_hci_cmd_create() returns null
+ *   - bt_hci_cmd_alloc() returns null
  *
  *  Expected behaviour:
  *   - bt_id_set_adv_random_addr() returns a negative error code (failure)
  */
-ZTEST(bt_id_set_adv_random_addr_invalid_cases, test_bt_hci_cmd_create_returns_null)
+ZTEST(bt_id_set_adv_random_addr_invalid_cases, test_bt_hci_cmd_alloc_returns_null)
 {
 	int err;
 	struct bt_le_ext_adv adv_param = {0};
@@ -92,7 +92,7 @@ ZTEST(bt_id_set_adv_random_addr_invalid_cases, test_bt_hci_cmd_create_returns_nu
 
 	atomic_set_bit(adv_param.flags, BT_ADV_PARAMS_SET);
 
-	bt_hci_cmd_create_fake.return_val = NULL;
+	bt_hci_cmd_alloc_fake.return_val = NULL;
 
 	err = bt_id_set_adv_random_addr(&adv_param, &BT_RPA_LE_ADDR->a);
 
@@ -107,7 +107,7 @@ ZTEST(bt_id_set_adv_random_addr_invalid_cases, test_bt_hci_cmd_create_returns_nu
  *  Constraints:
  *   - 'CONFIG_BT_EXT_ADV' is enabled
  *   - 'BT_ADV_PARAMS_SET' flag in advertising parameters reference is set
- *   - bt_hci_cmd_create() returns a valid buffer pointer
+ *   - bt_hci_cmd_alloc() returns a valid buffer pointer
  *   - bt_hci_cmd_send_sync() fails and returns a negative error code.
  *
  *  Expected behaviour:
@@ -125,7 +125,7 @@ ZTEST(bt_id_set_adv_random_addr_invalid_cases, test_bt_hci_cmd_send_sync_fails)
 	atomic_set_bit(adv_param.flags, BT_ADV_PARAMS_SET);
 
 	net_buf_simple_add_fake.return_val = &cp;
-	bt_hci_cmd_create_fake.return_val = &net_buff;
+	bt_hci_cmd_alloc_fake.return_val = &net_buff;
 	bt_hci_cmd_send_sync_fake.return_val = -1;
 
 	err = bt_id_set_adv_random_addr(&adv_param, &BT_RPA_LE_ADDR->a);
diff --git a/tests/bluetooth/host/id/bt_id_set_create_conn_own_addr/src/test_suite_invalid_inputs.c b/tests/bluetooth/host/id/bt_id_set_create_conn_own_addr/src/test_suite_invalid_inputs.c
@@ -59,7 +59,7 @@ ZTEST(bt_id_set_create_conn_own_addr_invalid_inputs, test_set_random_address_fai
 	bt_addr_le_copy(&bt_dev.id_addr[BT_ID_DEFAULT], BT_RPA_LE_ADDR);
 
 	/* This will cause set_random_address() to return (-ENOBUFS) */
-	bt_hci_cmd_create_fake.return_val = NULL;
+	bt_hci_cmd_alloc_fake.return_val = NULL;
 
 	err = bt_id_set_create_conn_own_addr(false, &own_addr_type);
 
diff --git a/tests/bluetooth/host/id/bt_id_set_private_addr/src/test_suite_invalid_cases.c b/tests/bluetooth/host/id/bt_id_set_private_addr/src/test_suite_invalid_cases.c
@@ -110,7 +110,7 @@ ZTEST(bt_id_set_private_addr_invalid_cases, test_setting_address_set_random_addr
 	}
 
 	/* This will make set_random_address() returns a negative number error code */
-	bt_hci_cmd_create_fake.return_val = NULL;
+	bt_hci_cmd_alloc_fake.return_val = NULL;
 
 	err = bt_id_set_private_addr(BT_ID_DEFAULT);
 
diff --git a/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c b/tests/bluetooth/host/id/bt_id_set_scan_own_addr/src/test_suite_invalid_inputs.c
@@ -91,7 +91,7 @@ ZTEST(bt_id_set_scan_own_addr_invalid_inputs, test_set_random_address_fails)
 	bt_addr_le_copy(&bt_dev.id_addr[BT_ID_DEFAULT], BT_RPA_LE_ADDR);
 
 	/* This will cause set_random_address() to return (-ENOBUFS) */
-	bt_hci_cmd_create_fake.return_val = NULL;
+	bt_hci_cmd_alloc_fake.return_val = NULL;
 
 	err = bt_id_set_scan_own_addr(false, &own_addr_type);
 
diff --git a/tests/bluetooth/host/id/mocks/hci_core.c b/tests/bluetooth/host/id/mocks/hci_core.c
@@ -16,5 +16,5 @@ struct bt_dev bt_dev = {
 };
 
 DEFINE_FAKE_VALUE_FUNC(int, bt_unpair, uint8_t, const bt_addr_le_t *);
-DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DEFINE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_alloc, k_timeout_t);
 DEFINE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/id/mocks/hci_core.h b/tests/bluetooth/host/id/mocks/hci_core.h
@@ -11,9 +11,9 @@
 /* List of fakes used by this unit tester */
 #define HCI_CORE_FFF_FAKES_LIST(FAKE)                                                              \
 	FAKE(bt_unpair)                                                                            \
-	FAKE(bt_hci_cmd_create)                                                                    \
+	FAKE(bt_hci_cmd_alloc)                                                                    \
 	FAKE(bt_hci_cmd_send_sync)
 
 DECLARE_FAKE_VALUE_FUNC(int, bt_unpair, uint8_t, const bt_addr_le_t *);
-DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_create, uint16_t, uint8_t);
+DECLARE_FAKE_VALUE_FUNC(struct net_buf *, bt_hci_cmd_alloc, k_timeout_t);
 DECLARE_FAKE_VALUE_FUNC(int, bt_hci_cmd_send_sync, uint16_t, struct net_buf *, struct net_buf **);
diff --git a/tests/bluetooth/host/id/mocks/hci_core_expects.c b/tests/bluetooth/host/id/mocks/hci_core_expects.c
@@ -35,24 +35,19 @@ void expect_not_called_bt_unpair(void)
 	zassert_equal(bt_unpair_fake.call_count, 0, "'%s()' was called unexpectedly", func_name);
 }
 
-void expect_single_call_bt_hci_cmd_create(uint16_t opcode, uint8_t param_len)
+void expect_single_call_bt_hci_cmd_alloc(void)
 {
-	const char *func_name = "bt_hci_cmd_create";
+	const char *func_name = "bt_hci_cmd_alloc";
 
-	zassert_equal(bt_hci_cmd_create_fake.call_count, 1, "'%s()' was called more than once",
+	zassert_equal(bt_hci_cmd_alloc_fake.call_count, 1, "'%s()' was called more than once",
 		      func_name);
-
-	zassert_equal(bt_hci_cmd_create_fake.arg0_val, opcode,
-		      "'%s()' was called with incorrect '%s' value", func_name, "opcode");
-	zassert_equal(bt_hci_cmd_create_fake.arg1_val, param_len,
-		      "'%s()' was called with incorrect '%s' value", func_name, "param_len");
 }
 
-void expect_not_called_bt_hci_cmd_create(void)
+void expect_not_called_bt_hci_cmd_alloc(void)
 {
-	const char *func_name = "bt_hci_cmd_create";
+	const char *func_name = "bt_hci_cmd_alloc";
 
-	zassert_equal(bt_hci_cmd_create_fake.call_count, 0, "'%s()' was called unexpectedly",
+	zassert_equal(bt_hci_cmd_alloc_fake.call_count, 0, "'%s()' was called unexpectedly",
 		      func_name);
 }
 
diff --git a/tests/bluetooth/host/id/mocks/hci_core_expects.h b/tests/bluetooth/host/id/mocks/hci_core_expects.h
diff --git a/tests/bsim/bluetooth/host/central/src/main.c b/tests/bsim/bluetooth/host/central/src/main.c

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ int send_conn_cte_req_enable(uint16_t conn_handle,`
`63`	`63`	`struct bt_hci_cp_le_conn_cte_req_enable *cp;`
`64`	`64`	`struct net_buf *buf;`
`65`	`65`
`66`		`- buf = bt_hci_cmd_create(BT_HCI_OP_LE_CONN_CTE_REQ_ENABLE, sizeof(*cp));`
	`66`	`+ buf = bt_hci_cmd_alloc(K_FOREVER);`
`67`	`67`	`if (!buf) {`
`68`	`68`	`return -ENOBUFS;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ int send_set_conn_cte_rx_params(uint16_t conn_handle,`
`48`	`48`
`49`	`49`	`uint8_t ant_ids_num = (params != NULL ? params->switch_pattern_len : 0);`
`50`	`50`
`51`		`- buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CONN_CTE_RX_PARAMS, sizeof(*cp) + ant_ids_num);`
	`51`	`+ buf = bt_hci_cmd_alloc(K_FOREVER);`
`52`	`52`	`if (!buf) {`
`53`	`53`	`return -ENOBUFS;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ static int send_set_conn_cte_tx_params(uint16_t conn_handle,`
`59`	`59`	`uint8_t *dest_ant_ids;`
`60`	`60`	`struct net_buf *buf;`
`61`	`61`
`62`		`- buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CONN_CTE_TX_PARAMS,`
`63`		`- sizeof(*cp) + params->switch_pattern_len);`
	`62`	`+ buf = bt_hci_cmd_alloc(K_FOREVER);`
`64`	`63`	`if (!buf) {`
`65`	`64`	`return -ENOBUFS;`
`66`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ int send_set_scan_cte_rx_enable(uint16_t sync_handle,`
`56`	`56`	`struct bt_hci_cp_le_set_cl_cte_sampling_enable *cp;`
`57`	`57`	`struct net_buf *buf;`
`58`	`58`
`59`		`- buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CL_CTE_SAMPLING_ENABLE,`
`60`		`- sizeof(*cp) + params->num_ant_ids);`
	`59`	`+ buf = bt_hci_cmd_alloc(K_FOREVER);`
`61`	`60`	`if (!buf) {`
`62`	`61`	`return -ENOBUFS;`
`63`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ int send_set_cl_cte_tx_enable(uint8_t adv_handle, atomic_t *adv_flags,`
`35`	`35`	`struct bt_hci_cmd_state_set state;`
`36`	`36`	`struct net_buf *buf;`
`37`	`37`
`38`		`- buf = bt_hci_cmd_create(BT_HCI_OP_LE_SET_CL_CTE_TX_ENABLE, sizeof(*cp));`
	`38`	`+ buf = bt_hci_cmd_alloc(K_FOREVER);`
`39`	`39`	`if (!buf) {`
`40`	`40`	`return -ENOBUFS;`
`41`	`41`	`}`