tests: Update network module tests

Update network module test to handle new message types.
The module now has input/output types instead of listening to
the trigger channel.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>

Author: jtguggedal

app/src/common/message_channel.h

@@ -53,12 +53,27 @@ struct payload {
 #define MSG_TO_PAYLOAD(_msg) ((struct payload *)_msg)
 
 enum network_status {
+	/* Output message types */
 	NETWORK_DISCONNECTED = 0x1,
 	NETWORK_CONNECTED,
+	NETWORK_MODEM_RESET_LOOP,
 	NETWORK_UICC_FAILURE,
-	NETWORK_DISCONNECT,
+	NETWORK_LIGHT_SERACH_DONE,
+	NETWORK_ATTACH_REJECTED,
+	NETWORK_PSM_PARAMS,
+	NETWORK_EDRX_PARAMS,
+	NETWORK_CURRENT_SYSTEM_MODE,
+	NETWORK_QUALITY_SAMPLE_RESPONSE,
+
+	/* Input message types */
 	NETWORK_CONNECT,
-	NETWORK_QUALITY_SAMPLE,
+	NETWORK_DISCONNECT,
+	NETWORK_SEARCH_STOP,
+	NETWORK_SEARCH_START,
+	NETWORK_QUALITY_SAMPLE_REQUEST,
+	NETWORK_SYSTEM_MODE_SET_LTE_M,
+	NETWORK_SYSTEM_MODE_SET_NBIOT,
+	NETWORK_SYSTEM_MODE_QUERY,
 };
 
 #define MSG_TO_NETWORK_STATUS(_msg)	(*(const enum network_status *)_msg)

app/src/modules/network/network.c

@@ -189,8 +189,9 @@ static void lte_lc_evt_handler(const struct lte_lc_evt *const evt)
 
 static void sample_network_quality(void)
 {
-	int ret;
+	int ret, err;
 	struct lte_lc_conn_eval_params conn_eval_params;
+	enum network_status status = NETWORK_QUALITY_SAMPLE_RESPONSE;
 
 	ret = lte_lc_conn_eval_params_get(&conn_eval_params);
 	if (ret == -EOPNOTSUPP) {
@@ -206,6 +207,14 @@ static void sample_network_quality(void)
 	}
 
 	/* No further use of the network quality data is implemented */
+
+	/* Send NETWORK_QUALITY_SAMPLE_RESPONSE */
+
+	err = zbus_chan_pub(&NETWORK_CHAN, &status, K_SECONDS(1));
+	if (err) {
+		LOG_ERR("zbus_chan_pub, error: %d", err);
+		SEND_FATAL_ERROR();
+	}
 }
 
 static int network_disconnect(void)
@@ -382,7 +391,7 @@ static void state_connected_run(void *obj)
 		enum network_status status = MSG_TO_NETWORK_STATUS(state_object->msg_buf);
 
 		switch (status) {
-		case NETWORK_QUALITY_SAMPLE:
+		case NETWORK_QUALITY_SAMPLE_REQUEST:
 			LOG_DBG("Sampling network quality data");
 			sample_network_quality();
 			break;

tests/module/network/CMakeLists.txt

@@ -22,7 +22,6 @@ zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/)
 zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 zephyr_include_directories(../../../app/src/common)
 
-
 target_link_options(app PRIVATE --whole-archive)
 # Options that cannot be passed through Kconfig fragments
 target_compile_definitions(app PRIVATE
@@ -32,36 +31,6 @@ target_compile_definitions(app PRIVATE
 	-DCONFIG_APP_NETWORK_MESSAGE_QUEUE_SIZE=5
 	-DCONFIG_APP_NETWORK_EXEC_TIME_SECONDS_MAX=1
 	-DCONFIG_APP_NETWORK_WATCHDOG_TIMEOUT_SECONDS=2
-	-DCONFIG_APP_NETWORK_SAMPLE_NETWORK_QUALITY
+	-DCONFIG_APP_NETWORK_SAMPLE_NETWORK_QUALITY=1
 	-DCONFIG_NET_MGMT_EVENT
 )
-
-# generate decoder using zcbor
-set(zcbor_command
-	zcbor code # Invoke code generation
-	--cddl ${ZEPHYR_BASE}/subsys/net/lib/lwm2m/lwm2m_senml_cbor.cddl
-	--cddl ${APPLICATION_SOURCE_DIR}/../../../app/src/modules/network/conn_info.cddl
-	--encode # Generate encoding functions
-	--decode # Generate decoding functions
-	--short-names # Attempt to make generated symbol names shorter (at the risk of collision)
-	-t conn-info-object # Name of the top-level CDDL object
-	--output-cmake conn_info_object.cmake # The generated cmake file will be placed here
-)
-execute_process(COMMAND ${zcbor_command}
-				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-				COMMAND_ERROR_IS_FATAL ANY)
-
-# Include the cmake file generated by zcbor. It adds the
-# generated code and the necessary zcbor C code files.
-include(${CMAKE_CURRENT_BINARY_DIR}/conn_info_object.cmake)
-
-# Ensure that the cmake reconfiguration is triggerred everytime the cddl file changes.
-# This ensures that the codec generation is triggered.
-set_property(
-	DIRECTORY
-	PROPERTY
-	CMAKE_CONFIGURE_DEPENDS ${APPLICATION_SOURCE_DIR}/../../../app/src/modules/network/conn_info.cddl
-)
-
-zephyr_link_libraries(conn_info_object)
-target_link_libraries(conn_info_object PRIVATE zephyr_interface)

tests/module/network/src/main.c

@@ -15,9 +15,6 @@
 
 #include "message_channel.h"
 
-#include "zcbor_decode.h"
-#include "conn_info_object_decode.h"
-
 DEFINE_FFF_GLOBALS;
 
 FAKE_VALUE_FUNC(int, date_time_now, int64_t *);
@@ -26,12 +23,13 @@ FAKE_VALUE_FUNC(int, task_wdt_add, uint32_t, task_wdt_callback_t, void *);
 FAKE_VALUE_FUNC(int, lte_lc_conn_eval_params_get, struct lte_lc_conn_eval_params *);
 FAKE_VALUE_FUNC(int, conn_mgr_all_if_connect, bool);
 FAKE_VALUE_FUNC(int, conn_mgr_all_if_up, bool);
+FAKE_VALUE_FUNC(int, conn_mgr_all_if_disconnect, bool);
 FAKE_VOID_FUNC(net_mgmt_add_event_callback, struct net_mgmt_event_callback *);
 
 LOG_MODULE_REGISTER(network_module_test, 4);
 
 ZBUS_MSG_SUBSCRIBER_DEFINE(test_subscriber);
-ZBUS_CHAN_ADD_OBS(PAYLOAD_CHAN, test_subscriber, 0);
+ZBUS_CHAN_ADD_OBS(NETWORK_CHAN, test_subscriber, 0);
 
 #define FAKE_TIME_MS 1723099642000
 #define FAKE_RSRP_IDX_MAX 97
@@ -56,78 +54,56 @@ static int lte_lc_conn_eval_params_get_custom_fake(struct lte_lc_conn_eval_param
 	return 0;
 }
 
-static int lte_lc_conn_eval_params_get_max_custom_fake(struct lte_lc_conn_eval_params *params)
-{
-	params->energy_estimate = FAKE_ENERGY_ESTIMATE_MAX;
-	params->rsrp = FAKE_RSRP_IDX_MAX;
-
-	return 0;
-}
-
-static int lte_lc_conn_eval_params_get_invalid_custom_fake(struct lte_lc_conn_eval_params *params)
-{
-	params->energy_estimate = FAKE_ENERGY_ESTIMATE_MAX;
-	params->rsrp = FAKE_RSRP_IDX_INVALID;
-
-	return 0;
-}
-
-static int lte_lc_conn_eval_params_get_min_custom_fake(struct lte_lc_conn_eval_params *params)
-{
-	params->energy_estimate = FAKE_ENERGY_ESTIMATE_MIN;
-	params->rsrp = FAKE_RSRP_IDX_MIN;
-
-	return 0;
-}
-
-static void send_time_available(void)
+static void send_connected(void)
 {
-	enum time_status time_type = TIME_AVAILABLE;
-	int err = zbus_chan_pub(&TIME_CHAN, &time_type, K_SECONDS(1));
+	enum network_status network_status = NETWORK_CONNECTED;
+	int err = zbus_chan_pub(&NETWORK_CHAN, &network_status, K_SECONDS(1));
 
 	TEST_ASSERT_EQUAL(0, err);
 }
 
 static void send_trigger(void)
 {
-	enum trigger_type trigger_type = TRIGGER_DATA_SAMPLE;
-	int err = zbus_chan_pub(&TRIGGER_CHAN, &trigger_type, K_SECONDS(1));
+	enum network_status status = NETWORK_QUALITY_SAMPLE_REQUEST;
+
+	int err = zbus_chan_pub(&NETWORK_CHAN, &status, K_SECONDS(1));
 
 	TEST_ASSERT_EQUAL(0, err);
 }
 
-static void wait_for_and_decode_payload(struct conn_info_object *conn_info_obj)
+static void wait_for_and_decode_payload(enum network_status *output)
 {
 	const struct zbus_channel *chan;
-	static struct payload payload;
 	int err;
 
-	/* Allow the test thread to sleep so that the DUT's thread is allowed to run. */
-	k_sleep(K_MSEC(100));
-
-	err = zbus_sub_wait_msg(&test_subscriber, &chan, &payload, K_MSEC(1000));
-	if (err == -ENOMSG) {
-		LOG_ERR("No payload message received");
-		TEST_FAIL();
-	} else if (err) {
-		LOG_ERR("zbus_sub_wait, error: %d", err);
-		SEND_FATAL_ERROR();
-
-		return;
-	}
-
-	/* check if chan is payload channel */
-	if (chan != &PAYLOAD_CHAN) {
-		LOG_ERR("Received message from wrong channel");
-		TEST_FAIL();
+	/* Give the test 500 ms to complete */
+	uint64_t end_time = k_uptime_get() + 1500;
+
+	while (k_uptime_get() < end_time) {
+		err = zbus_sub_wait_msg(&test_subscriber, &chan, output, K_MSEC(1000));
+		if (err == -ENOMSG) {
+			LOG_ERR("No payload message received");
+			TEST_FAIL();
+		} else if (err) {
+			LOG_ERR("zbus_sub_wait, error: %d", err);
+			SEND_FATAL_ERROR();
+
+			return;
+		}
+
+		/* check if chan is payload channel */
+		if (chan != &NETWORK_CHAN) {
+			LOG_ERR("Received message from wrong channel");
+			TEST_FAIL();
+		}
+
+		if (*output == NETWORK_QUALITY_SAMPLE_RESPONSE) {
+			return;
+		}
 	}
 
-	/* decode payload */
-	cbor_decode_conn_info_object(payload.buffer, payload.buffer_len, conn_info_obj, NULL);
-	if (err != ZCBOR_SUCCESS) {
-		LOG_ERR("Failed to decode payload");
-		TEST_FAIL();
-	}
+	LOG_ERR("Timeout waiting for payload message");
+	TEST_FAIL();
 }
 
 void setUp(void)
@@ -140,26 +116,22 @@ void setUp(void)
 	RESET_FAKE(conn_mgr_all_if_up);
 
 	date_time_now_fake.custom_fake = date_time_now_custom_fake;
-	send_time_available();
+	send_connected();
 }
 
 void tearDown(void)
 {
 	const struct zbus_channel *chan;
-	static struct payload received_payload;
-	int err;
+	static enum network_status status;
 
-	err = zbus_sub_wait_msg(&test_subscriber, &chan, &received_payload, K_MSEC(1000));
-	if (err == 0) {
-		LOG_ERR("Unhandled message in payload channel");
-		TEST_FAIL();
+	while (zbus_sub_wait_msg(&test_subscriber, &chan, &status, K_MSEC(1000)) == 0) {
+		LOG_INF("Unhandled message in payload channel: %d", status);
 	}
 }
 
-
 void test_energy_estimate(void)
 {
-	static struct conn_info_object conn_info_obj = {0};
+	static enum network_status status;
 
 	/* Given */
 	lte_lc_conn_eval_params_get_fake.custom_fake = lte_lc_conn_eval_params_get_custom_fake;
@@ -168,65 +140,8 @@ void test_energy_estimate(void)
 	send_trigger();
 
 	/* Then */
-	wait_for_and_decode_payload(&conn_info_obj);
-	TEST_ASSERT_EQUAL(FAKE_TIME_MS / 1000, conn_info_obj.base_attributes_m.bt);
-	TEST_ASSERT_EQUAL(FAKE_ENERGY_ESTIMATE, conn_info_obj.energy_estimate_m.vi);
-	TEST_ASSERT_EQUAL(RSRP_IDX_TO_DBM(FAKE_RSRP_IDX), conn_info_obj.rsrp_m.vi.vi);
-}
-
-void test_conn_info_max_values(void)
-{
-	static struct conn_info_object conn_info_obj = {0};
-
-	/* Given */
-	lte_lc_conn_eval_params_get_fake.custom_fake = lte_lc_conn_eval_params_get_max_custom_fake;
-
-	/* When */
-	send_trigger();
-
-	/* Then */
-	wait_for_and_decode_payload(&conn_info_obj);
-	TEST_ASSERT_EQUAL(FAKE_TIME_MS / 1000, conn_info_obj.base_attributes_m.bt);
-	TEST_ASSERT_EQUAL(FAKE_ENERGY_ESTIMATE_MAX, conn_info_obj.energy_estimate_m.vi);
-	TEST_ASSERT_EQUAL(RSRP_IDX_TO_DBM(FAKE_RSRP_IDX_MAX), conn_info_obj.rsrp_m.vi.vi);
-}
-
-void test_conn_info_invalid_values(void)
-{
-	static struct conn_info_object conn_info_obj = {0};
-
-	/* Given */
-	lte_lc_conn_eval_params_get_fake.custom_fake =
-		lte_lc_conn_eval_params_get_invalid_custom_fake;
-
-	/* When */
-	send_trigger();
-
-	/* Then */
-	wait_for_and_decode_payload(&conn_info_obj);
-	TEST_ASSERT_EQUAL(FAKE_TIME_MS / 1000, conn_info_obj.base_attributes_m.bt);
-	TEST_ASSERT_EQUAL(FAKE_ENERGY_ESTIMATE_MAX, conn_info_obj.energy_estimate_m.vi);
-
-	if (conn_info_obj.rsrp_m.vi_present) {
-		TEST_FAIL();
-	}
-}
-
-void test_conn_info_min_values(void)
-{
-	static struct conn_info_object conn_info_obj = {0};
-
-	/* Given */
-	lte_lc_conn_eval_params_get_fake.custom_fake = lte_lc_conn_eval_params_get_min_custom_fake;
-
-	/* When */
-	send_trigger();
-
-	/* Then */
-	wait_for_and_decode_payload(&conn_info_obj);
-	TEST_ASSERT_EQUAL(FAKE_TIME_MS / 1000, conn_info_obj.base_attributes_m.bt);
-	TEST_ASSERT_EQUAL(FAKE_ENERGY_ESTIMATE_MIN, conn_info_obj.energy_estimate_m.vi);
-	TEST_ASSERT_EQUAL(RSRP_IDX_TO_DBM(FAKE_RSRP_IDX_MIN), conn_info_obj.rsrp_m.vi.vi);
+	wait_for_and_decode_payload(&status);
+	TEST_ASSERT_EQUAL(NETWORK_QUALITY_SAMPLE_RESPONSE, status);
 }
 
 void test_no_events_on_zbus_until_watchdog_timeout(void)