fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/abebfa18554cb7911082ba9c1989cefddc9fe8b0/applications/asset_tracker_v2
NordicSemiconductor · Feb 19, 2024 · 0663721 · 0663721
1 parent f731aad
commit 0663721
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 37 deletions.
diff --git a/src/cloud/azure_iot_hub_integration.c b/src/cloud/azure_iot_hub_integration.c
@@ -16,7 +16,7 @@
 LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 
 #if !defined(CONFIG_CLOUD_CLIENT_ID_USE_CUSTOM)
-#define CLIENT_ID_LEN 15
+#define CLIENT_ID_LEN HW_ID_LEN
 #else
 #define CLIENT_ID_LEN (sizeof(CONFIG_CLOUD_CLIENT_ID) - 1)
 #endif
@@ -134,9 +134,7 @@ static struct azure_iot_hub_property prop_bag_ground_fix[] = {
 
 static char client_id_buf[CLIENT_ID_LEN + 1];
 static struct azure_iot_hub_config config = {
-	.use_dps = IS_ENABLED(CONFIG_AZURE_IOT_HUB_DPS),
-	.device_id.ptr = client_id_buf,
-	.device_id.size = sizeof(client_id_buf) - 1,
+	.use_dps = IS_ENABLED(CONFIG_AZURE_IOT_HUB_DPS)
 };
 
 static cloud_wrap_evt_handler_t wrapper_evt_handler;
@@ -329,6 +327,9 @@ int cloud_wrap_init(cloud_wrap_evt_handler_t event_handler)
 	snprintk(client_id_buf, sizeof(client_id_buf), "%s", CONFIG_CLOUD_CLIENT_ID);
 #endif
 
+	config.device_id.ptr = client_id_buf;
+	config.device_id.size = strlen(client_id_buf);
+
 	err = azure_iot_hub_init(azure_iot_hub_event_handler);
 	if (err) {
 		LOG_ERR("azure_iot_hub_init, error: %d", err);

diff --git a/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c b/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c
@@ -82,22 +82,11 @@ void test_create_objects_and_resources(void)
 		&LWM2M_OBJ(IPSO_OBJECT_PUSH_BUTTON_ID, BUTTON2_OBJ_INST_ID), 0);
 
 	/* Crate resource instances. */
-	__cmock_lwm2m_create_res_inst_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, AVAIL_NETWORK_BEARER_ID, 0),
-		0);
-
-	__cmock_lwm2m_create_res_inst_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, AVAIL_NETWORK_BEARER_ID, 1),
-		0);
-
-	__cmock_lwm2m_create_res_inst_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, IP_ADDRESSES, 0), 0);
-
-	__cmock_lwm2m_create_res_inst_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, APN, 0), 0);
-
-	__cmock_lwm2m_create_res_inst_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_DEVICE_ID, 0, POWER_SOURCE_VOLTAGE_RID, 0), 0);
+	__cmock_lwm2m_create_res_inst_ExpectAnyArgsAndReturn(0);
+	__cmock_lwm2m_create_res_inst_ExpectAnyArgsAndReturn(0);
+	__cmock_lwm2m_create_res_inst_ExpectAnyArgsAndReturn(0);
+	__cmock_lwm2m_create_res_inst_ExpectAnyArgsAndReturn(0);
+	__cmock_lwm2m_create_res_inst_ExpectAnyArgsAndReturn(0);
 
 	TEST_ASSERT_EQUAL(0, lwm2m_codec_helpers_create_objects_and_resources());
 }
@@ -554,7 +543,6 @@ void test_codec_helpers_set_modem_dynamic_data(void)
 		.queued = true,
 	};
 	int64_t current_time = UNIX_TIMESTAMP_DUMMY;
-	uint8_t bearers[2] = { LTE_FDD_BEARER, NB_IOT_BEARER };
 
 	__cmock_date_time_now_Stub(date_time_now_stub);
 	__cmock_date_time_now_ExpectAndReturn(&current_time, 0);
@@ -563,22 +551,10 @@ void test_codec_helpers_set_modem_dynamic_data(void)
 		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, NETWORK_BEARER_ID),
 		NB_IOT_BEARER, 0);
 
-	__cmock_lwm2m_set_res_buf_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, AVAIL_NETWORK_BEARER_ID, 0),
-		&bearers[0], sizeof(bearers[0]), sizeof(bearers[0]), LWM2M_RES_DATA_FLAG_RO, 0);
-
-	__cmock_lwm2m_set_res_buf_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, AVAIL_NETWORK_BEARER_ID, 1),
-		&bearers[1], sizeof(bearers[1]), sizeof(bearers[1]), LWM2M_RES_DATA_FLAG_RO, 0);
-
-	__cmock_lwm2m_set_res_buf_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, IP_ADDRESSES, 0),
-		modem_dynamic.ip, strlen(modem_dynamic.ip), strlen(modem_dynamic.ip),
-		LWM2M_RES_DATA_FLAG_RO, 0);
-
-	__cmock_lwm2m_set_res_buf_ExpectAndReturn(
-		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, APN, 0), modem_dynamic.apn,
-		strlen(modem_dynamic.apn), strlen(modem_dynamic.apn), LWM2M_RES_DATA_FLAG_RO, 0);
+	__cmock_lwm2m_set_res_buf_ExpectAnyArgsAndReturn(0);
+	__cmock_lwm2m_set_res_buf_ExpectAnyArgsAndReturn(0);
+	__cmock_lwm2m_set_res_buf_ExpectAnyArgsAndReturn(0);
+	__cmock_lwm2m_set_res_buf_ExpectAnyArgsAndReturn(0);
 
 	__cmock_lwm2m_set_s8_ExpectAndReturn(
 		&LWM2M_OBJ(LWM2M_OBJECT_CONNECTIVITY_MONITORING_ID, 0, RSS),