net: openthread: rpc: Add netdiag unit tests.

- Add netdiag unit tests
- Fix bugs found during testing
- Simplify encoding of tlv types array, using buffer as it is
an array of 1-byte uint8 types.

Signed-off-by: Maciej Baczmanski <[email protected]>

Author: maciejbaczmanski

subsys/net/openthread/rpc/client/ot_rpc_netdiag.c

@@ -251,14 +251,9 @@ otError otThreadSendDiagnosticGet(otInstance *aInstance, const otIp6Address *aDe
 	receive_diag_get_cb = aCallback;
 	receive_diag_get_cb_context = aCallbackContext;
 
-	NRF_RPC_CBOR_ALLOC(&ot_group, ctx, 1 + OT_IP6_ADDRESS_SIZE + 4 + aCount * 2);
+	NRF_RPC_CBOR_ALLOC(&ot_group, ctx, 1 + OT_IP6_ADDRESS_SIZE + 2 + aCount);
 	nrf_rpc_encode_buffer(&ctx, aDestination->mFields.m8, OT_IP6_ADDRESS_SIZE);
-	nrf_rpc_encode_uint(&ctx, aCount);
-	zcbor_list_start_encode(ctx.zs, aCount);
-	for (int i = 0; i < aCount; i++) {
-		nrf_rpc_encode_uint(&ctx, aTlvTypes[i]);
-	}
-	zcbor_list_end_encode(ctx.zs, aCount);
+	nrf_rpc_encode_buffer(&ctx, aTlvTypes, aCount);
 
 	nrf_rpc_cbor_cmd_no_err(&ot_group, OT_RPC_CMD_THREAD_SEND_DIAGNOSTIC_GET,
 				&ctx, ot_rpc_decode_error, &error);
@@ -274,14 +269,9 @@ otError otThreadSendDiagnosticReset(otInstance *aInstance, const otIp6Address *a
 
 	ARG_UNUSED(aInstance);
 
-	NRF_RPC_CBOR_ALLOC(&ot_group, ctx, 1 + OT_IP6_ADDRESS_SIZE + 4 + aCount * 2);
+	NRF_RPC_CBOR_ALLOC(&ot_group, ctx, 1 + OT_IP6_ADDRESS_SIZE + 2 + aCount);
 	nrf_rpc_encode_buffer(&ctx, aDestination->mFields.m8, OT_IP6_ADDRESS_SIZE);
-	nrf_rpc_encode_uint(&ctx, aCount);
-	zcbor_list_start_encode(ctx.zs, aCount);
-	for (int i = 0; i < aCount; i++) {
-		nrf_rpc_encode_uint(&ctx, aTlvTypes[i]);
-	}
-	zcbor_list_end_encode(ctx.zs, aCount);
+	nrf_rpc_encode_buffer(&ctx, aTlvTypes, aCount);
 
 	nrf_rpc_cbor_cmd_no_err(&ot_group, OT_RPC_CMD_THREAD_SEND_DIAGNOSTIC_RESET,
 				&ctx, ot_rpc_decode_error, &error);

subsys/net/openthread/rpc/server/ot_rpc_netdiag.c

@@ -151,7 +151,6 @@ static void ot_rpc_encode_network_diag_tlv(struct nrf_rpc_cbor_ctx *ctx,
 		nrf_rpc_encode_uint64(ctx, aNetworkDiagTlv->mData.mMleCounters.mDetachedTime);
 		nrf_rpc_encode_uint64(ctx, aNetworkDiagTlv->mData.mMleCounters.mChildTime);
 		nrf_rpc_encode_uint64(ctx, aNetworkDiagTlv->mData.mMleCounters.mRouterTime);
-		nrf_rpc_encode_uint64(ctx, aNetworkDiagTlv->mData.mMleCounters.mParentChanges);
 		nrf_rpc_encode_uint64(ctx, aNetworkDiagTlv->mData.mMleCounters.mLeaderTime);
 		break;
 	case OT_NETWORK_DIAGNOSTIC_TLV_BATTERY_LEVEL:
@@ -310,61 +309,54 @@ static void ot_rpc_cmd_send_diagnostic_get(const struct nrf_rpc_group *group,
 					   struct nrf_rpc_cbor_ctx *ctx, void *handler_data)
 {
 	otIp6Address addr;
-	otError error;
-	uint8_t count;
-	uint8_t tlvTypes[35];
+	otError error = OT_ERROR_INVALID_ARGS;
+	size_t count;
+	const uint8_t *tlvTypes;
 
 	nrf_rpc_decode_buffer(ctx, addr.mFields.m8, OT_IP6_ADDRESS_SIZE);
 
-	count = nrf_rpc_decode_uint(ctx);
+	tlvTypes = nrf_rpc_decode_buffer_ptr_and_size(ctx, &count);
 
-	zcbor_list_start_decode(ctx->zs);
-	for (int i = 0; i < count; i++) {
-		tlvTypes[i] = nrf_rpc_decode_uint(ctx);
+	if (tlvTypes) {
+		openthread_api_mutex_lock(openthread_get_default_context());
+		error = otThreadSendDiagnosticGet(openthread_get_default_instance(), &addr,
+						  tlvTypes, count, handle_receive_diagnostic_get,
+						  NULL);
+		openthread_api_mutex_unlock(openthread_get_default_context());
 	}
-	zcbor_list_end_decode(ctx->zs);
 
 	if (!nrf_rpc_decoding_done_and_check(group, ctx)) {
 		ot_rpc_report_cmd_decoding_error(OT_RPC_CMD_THREAD_SEND_DIAGNOSTIC_GET);
 		return;
 	}
 
-	openthread_api_mutex_lock(openthread_get_default_context());
-	error = otThreadSendDiagnosticGet(openthread_get_default_instance(), &addr, tlvTypes, count,
-					  handle_receive_diagnostic_get, NULL);
-	openthread_api_mutex_unlock(openthread_get_default_context());
-
 	nrf_rpc_rsp_send_uint(group, error);
 }
 
 static void ot_rpc_cmd_send_diagnostic_reset(const struct nrf_rpc_group *group,
 					     struct nrf_rpc_cbor_ctx *ctx, void *handler_data)
 {
 	otIp6Address addr;
-	otError error;
-	uint8_t count;
-	uint8_t tlvTypes[35];
+	otError error = OT_ERROR_INVALID_ARGS;
+	size_t count;
+	const uint8_t *tlvTypes;
 
 	nrf_rpc_decode_buffer(ctx, addr.mFields.m8, OT_IP6_ADDRESS_SIZE);
 
-	count = nrf_rpc_decode_uint(ctx);
+	tlvTypes = nrf_rpc_decode_buffer_ptr_and_size(ctx, &count);
 
-	zcbor_list_start_decode(ctx->zs);
-	for (int i = 0; i < count; i++) {
-		tlvTypes[i] = nrf_rpc_decode_uint(ctx);
+	if (tlvTypes) {
+		openthread_api_mutex_lock(openthread_get_default_context());
+		error = otThreadSendDiagnosticReset(openthread_get_default_instance(), &addr,
+						    tlvTypes, count);
+		openthread_api_mutex_unlock(openthread_get_default_context());
 	}
-	zcbor_list_end_decode(ctx->zs);
 
 	if (!nrf_rpc_decoding_done_and_check(group, ctx)) {
 		ot_rpc_report_cmd_decoding_error(OT_RPC_CMD_THREAD_SEND_DIAGNOSTIC_RESET);
 		return;
 	}
 
-	openthread_api_mutex_lock(openthread_get_default_context());
-	error = otThreadSendDiagnosticReset(openthread_get_default_instance(), &addr, tlvTypes,
-					    count);
-	openthread_api_mutex_lock(openthread_get_default_context());
-
 	nrf_rpc_rsp_send_uint(group, error);
 }