[nrf fromtree] tests: bluetooth: tester: Move bt_mesh_init call to BT…

…P_MESH_INIT cmd In some RPR tests we need to pass alternative composition data when testing CDP128. When bt_mesh_init is called from mesh service registration callback, we can't pass any arguments. Therefore we need to move bt_mesh_init call out from mesh service registration to BTP_MESH_INIT command. Signed-off-by: Pavel Vasilyev <[email protected]> (cherry picked from commit 2445e55) Signed-off-by: Alperen Şener <[email protected]>
MarGasiorek · Oct 11, 2023 · 0d70886 · 0d70886
1 parent f825ca8
commit 0d70886
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/tests/bluetooth/tester/src/btp/btp_mesh.h b/tests/bluetooth/tester/src/btp/btp_mesh.h
@@ -77,6 +77,10 @@ struct btp_mesh_provision_node_cmd_v2 {
 } __packed;
 
 #define BTP_MESH_INIT				0x04
+struct btp_mesh_init_cmd {
+	bool comp_alt;
+} __packed;
+
 #define BTP_MESH_RESET				0x05
 #define BTP_MESH_INPUT_NUMBER			0x06
 struct btp_mesh_input_number_cmd {

diff --git a/tests/bluetooth/tester/src/btp_mesh.c b/tests/bluetooth/tester/src/btp_mesh.c
@@ -1258,8 +1258,24 @@ static uint8_t provision_adv(const void *cmd, uint16_t cmd_len,
 static uint8_t init(const void *cmd, uint16_t cmd_len,
 		    void *rsp, uint16_t *rsp_len)
 {
+	const struct btp_mesh_init_cmd *cp = cmd;
 	int err;
 
+	if (!cp->comp_alt) {
+		LOG_WRN("Loading default comp data");
+		err = bt_mesh_init(&prov, &comp);
+	} else {
+		LOG_WRN("Loading alternative comp data");
+#ifdef CONFIG_BT_MESH_LARGE_COMP_DATA_SRV
+		health_srv.metadata = health_srv_meta_alt;
+#endif
+		err = bt_mesh_init(&prov, &comp_alt);
+	}
+
+	if (err) {
+		return BTP_STATUS_FAILED;
+	}
+
 	LOG_DBG("");
 
 	if (IS_ENABLED(CONFIG_BT_SETTINGS)) {
@@ -4419,7 +4435,7 @@ static const struct btp_handler handlers[] = {
 	},
 	{
 		.opcode = BTP_MESH_INIT,
-		.expect_len = 0,
+		.expect_len = sizeof(struct btp_mesh_init_cmd),
 		.func = init,
 	},
 	{
@@ -5224,8 +5240,6 @@ BT_MESH_LPN_CB_DEFINE(lpn_cb) = {
 
 uint8_t tester_init_mesh(void)
 {
-	int err;
-
 	if (IS_ENABLED(CONFIG_BT_TESTING)) {
 		bt_test_cb_register(&bt_test_cb);
 	}
@@ -5236,18 +5250,6 @@ uint8_t tester_init_mesh(void)
 
 	tester_register_command_handlers(BTP_SERVICE_ID_MESH, handlers,
 					 ARRAY_SIZE(handlers));
-	if (default_comp) {
-		err = bt_mesh_init(&prov, &comp);
-	} else {
-#ifdef CONFIG_BT_MESH_LARGE_COMP_DATA_SRV
-		health_srv.metadata = health_srv_meta_alt;
-#endif
-		err = bt_mesh_init(&prov, &comp_alt);
-	}
-
-	if (err) {
-		return BTP_STATUS_FAILED;
-	}
 
 	return BTP_STATUS_SUCCESS;
 }