network: deprecate connection manager

Deprecate conn mgr in favor of lte_lc

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

Author: DematteisGiacomo

app/prj.conf

@@ -32,21 +32,10 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1408
 # Enable Networking and Connection Manager.
 CONFIG_NETWORKING=y
 CONFIG_NET_SOCKETS=y
-CONFIG_NET_SOCKETS_OFFLOAD=y
-CONFIG_POSIX_API=y
-
-# Enable LTE Connectivity using Connection Manager
-CONFIG_NET_IPV4=y
-CONFIG_NET_IPV6=y
-CONFIG_NET_IPV6_NBR_CACHE=n
-CONFIG_NET_IPV6_MLD=n
-CONFIG_NET_CONNECTION_MANAGER=y
-CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=512
-CONFIG_NRF_MODEM_LIB_NET_IF=y
-CONFIG_NRF_MODEM_LIB_NET_IF_AUTO_DOWN=y
-CONFIG_NRF_MODEM_LIB_NET_IF_DOWN_DEFAULT_LTE_DISCONNECT=y
 
 # Enable Link Controller modules
+CONFIG_LTE_LINK_CONTROL=y
+CONFIG_LTE_LC_PDN_MODULE=y
 CONFIG_LTE_LC_PSM_MODULE=y
 CONFIG_LTE_LC_EDRX_MODULE=y
 CONFIG_LTE_LC_CONN_EVAL_MODULE=y
@@ -183,10 +172,6 @@ CONFIG_LOCATION_REQUEST_DEFAULT_GNSS_VISIBILITY_DETECTION=y
 CONFIG_LTE_NETWORK_MODE_LTE_M_NBIOT_GPS=y
 CONFIG_NRF_CLOUD_AGNSS=y
 
-# Not for LTE throughput testing
-CONFIG_NRF_MODEM_LIB_SHMEM_TX_SIZE=4096
-CONFIG_NRF_MODEM_LIB_SHMEM_RX_SIZE=4096
-
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y
 CONFIG_MBEDTLS=n

app/src/modules/network/Kconfig.network

@@ -5,7 +5,7 @@
 #
 
 menu "Network"
-	depends on NRF_MODEM_LIB_NET_IF || (WIFI_NRF700X && WIFI_MGMT_EXT) || BOARD_NATIVE_POSIX
+	depends on LTE_LINK_CONTROL
 
 config APP_NETWORK_SHELL
 	bool "Network module shell commands"

app/src/modules/network/network.c

@@ -7,8 +7,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/zbus/zbus.h>
-#include <zephyr/net/conn_mgr_connectivity.h>
-#include <zephyr/net/conn_mgr_monitor.h>
+#include <modem/nrf_modem_lib.h>
 #include <zephyr/task_wdt/task_wdt.h>
 #include <date_time.h>
 #include <zephyr/smf.h>
@@ -42,14 +41,6 @@ ZBUS_CHAN_ADD_OBS(NETWORK_CHAN, network, 0);
 
 #define MAX_MSG_SIZE sizeof(struct network_msg)
 
-/* Macros used to subscribe to specific Zephyr NET management events. */
-#define L4_EVENT_MASK (NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED)
-#define CONN_LAYER_EVENT_MASK (NET_EVENT_CONN_IF_FATAL_ERROR)
-
-/* Zephyr NET management event callback structures. */
-static struct net_mgmt_event_callback l4_cb;
-static struct net_mgmt_event_callback conn_cb;
-
 /* State machine */
 
 /* Network module states.
@@ -161,42 +152,6 @@ static void network_msg_send(const struct network_msg *msg)
 	}
 }
 
-static void l4_event_handler(struct net_mgmt_event_callback *cb,
-			     uint64_t event,
-			     struct net_if *iface)
-{
-	ARG_UNUSED(cb);
-	ARG_UNUSED(iface);
-
-	switch (event) {
-	case NET_EVENT_L4_CONNECTED:
-		LOG_DBG("Network connectivity established");
-		network_status_notify(NETWORK_CONNECTED);
-		break;
-	case NET_EVENT_L4_DISCONNECTED:
-		LOG_DBG("Network connectivity lost");
-		network_status_notify(NETWORK_DISCONNECTED);
-		break;
-	default:
-		/* Don't care */
-		return;
-	}
-}
-
-static void connectivity_event_handler(struct net_mgmt_event_callback *cb,
-				       uint64_t event,
-				       struct net_if *iface)
-{
-	ARG_UNUSED(cb);
-	ARG_UNUSED(iface);
-
-	if (event == NET_EVENT_CONN_IF_FATAL_ERROR) {
-		LOG_ERR("NET_EVENT_CONN_IF_FATAL_ERROR");
-		SEND_FATAL_ERROR();
-		return;
-	}
-}
-
 static void lte_lc_evt_handler(const struct lte_lc_evt *const evt)
 {
 	switch (evt->type) {
@@ -208,6 +163,38 @@ static void lte_lc_evt_handler(const struct lte_lc_evt *const evt)
 			LOG_WRN("Not registered, check rejection cause");
 			network_status_notify(NETWORK_ATTACH_REJECTED);
 		}
+
+		break;
+	case LTE_LC_EVT_PDN:
+		switch (evt->pdn.type) {
+		case LTE_LC_EVT_PDN_ACTIVATED:
+			LOG_DBG("PDN connection activated");
+			network_status_notify(NETWORK_CONNECTED);
+
+			break;
+		case LTE_LC_EVT_PDN_DEACTIVATED:
+			LOG_DBG("PDN connection deactivated");
+			network_status_notify(NETWORK_DISCONNECTED);
+
+			break;
+		case LTE_LC_EVT_PDN_NETWORK_DETACH:
+			LOG_DBG("PDN connection network detached");
+			network_status_notify(NETWORK_DISCONNECTED);
+
+			break;
+		case LTE_LC_EVT_PDN_SUSPENDED:
+			LOG_DBG("PDN connection suspended");
+			network_status_notify(NETWORK_DISCONNECTED);
+
+			break;
+		case LTE_LC_EVT_PDN_RESUMED:
+			LOG_DBG("PDN connection resumed");
+			network_status_notify(NETWORK_CONNECTED);
+
+		default:
+			break;
+		}
+
 		break;
 	case LTE_LC_EVT_MODEM_EVENT:
 		/* If a reset loop happens in the field, it should not be necessary
@@ -224,6 +211,7 @@ static void lte_lc_evt_handler(const struct lte_lc_evt *const evt)
 			LOG_DBG("LTE_LC_MODEM_EVT_SEARCH_DONE");
 			network_status_notify(NETWORK_SEARCH_DONE);
 		}
+
 		break;
 	case LTE_LC_EVT_PSM_UPDATE: {
 		struct network_msg msg = {
@@ -302,10 +290,10 @@ static int network_disconnect(void)
 {
 	int err;
 
-	err = conn_mgr_all_if_disconnect(true);
+	err = lte_lc_offline();
 	if (err) {
-		LOG_ERR("conn_mgr_all_if_down, error: %d", err);
-		SEND_FATAL_ERROR();
+		LOG_ERR("lte_lc_offline, error: %d", err);
+
 		return err;
 	}
 
@@ -322,26 +310,23 @@ static void state_running_entry(void *obj)
 
 	LOG_DBG("state_running_entry");
 
-	/* Setup handler for Zephyr NET Connection Manager events. */
-	net_mgmt_init_event_callback(&l4_cb, &l4_event_handler, L4_EVENT_MASK);
-	net_mgmt_add_event_callback(&l4_cb);
+	err = nrf_modem_lib_init();
+	if (err) {
+		LOG_ERR("Failed to initialize the modem library, error: %d", err);
 
-	/* Setup handler for Zephyr NET Connection Manager Connectivity layer. */
-	net_mgmt_init_event_callback(&conn_cb, &connectivity_event_handler, CONN_LAYER_EVENT_MASK);
-	net_mgmt_add_event_callback(&conn_cb);
+		return;
+	}
 
-	/* Connecting to the configured connectivity layer. */
-	LOG_DBG("Bringing network interface up and connecting to the network");
+	lte_lc_register_handler(lte_lc_evt_handler);
 
-	err = conn_mgr_all_if_up(true);
+	/* Register handler for default PDP context. */
+	err = lte_lc_pdn_default_ctx_events_enable();
 	if (err) {
-		LOG_ERR("conn_mgr_all_if_up, error: %d", err);
-		SEND_FATAL_ERROR();
+		LOG_ERR("lte_lc_pdn_default_ctx_events_enable, error: %d", err);
+
 		return;
 	}
 
-	lte_lc_register_handler(lte_lc_evt_handler);
-
 	LOG_DBG("Network module started");
 }
 
@@ -382,16 +367,6 @@ static void state_disconnected_entry(void *obj)
 	ARG_UNUSED(obj);
 
 	LOG_DBG("state_disconnected_entry");
-
-	/* Resend connection status if the sample is built for Native Sim.
-	 * This is necessary because the network interface is automatically brought up
-	 * at SYS_INIT() before main() is called.
-	 * This means that NET_EVENT_L4_CONNECTED fires before the
-	 * appropriate handler l4_event_handler() is registered.
-	 */
-	if (IS_ENABLED(CONFIG_BOARD_NATIVE_SIM)) {
-		conn_mgr_mon_resend_status();
-	}
 }
 
 static enum smf_state_result state_disconnected_run(void *obj)
@@ -424,21 +399,11 @@ static void state_disconnected_searching_entry(void *obj)
 
 	LOG_DBG("state_disconnected_searching_entry");
 
-	err = conn_mgr_all_if_connect(true);
+	err = lte_lc_connect_async(lte_lc_evt_handler);
 	if (err) {
-		LOG_ERR("conn_mgr_all_if_connect, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
-	}
+		LOG_ERR("lte_lc_connect_async, error: %d", err);
 
-	/* Resend connection status if the sample is built for Native Sim.
-	 * This is necessary because the network interface is automatically brought up
-	 * at SYS_INIT() before main() is called.
-	 * This means that NET_EVENT_L4_CONNECTED fires before the
-	 * appropriate handler l4_event_handler() is registered.
-	 */
-	if (IS_ENABLED(CONFIG_BOARD_NATIVE_SIM)) {
-		conn_mgr_mon_resend_status();
+		return;
 	}
 }
 

tests/module/network/CMakeLists.txt

@@ -22,6 +22,8 @@ zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 zephyr_include_directories(../../../app/src/common)
 zephyr_include_directories(../../../app/src/modules/cloud)
 zephyr_include_directories(../../../app/src/modules/network)
+zephyr_include_directories(${NRF_BASE}/include/)
+zephyr_include_directories(${ZEPHYR_BASE}/../nrfxlib/nrf_modem/include/)
 
 target_link_options(app PRIVATE --whole-archive)
 # Options that cannot be passed through Kconfig fragments
@@ -32,9 +34,9 @@ target_compile_definitions(app PRIVATE
 	-DCONFIG_APP_NETWORK_MESSAGE_QUEUE_SIZE=5
 	-DCONFIG_APP_NETWORK_MSG_PROCESSING_TIMEOUT_SECONDS=1
 	-DCONFIG_APP_NETWORK_WATCHDOG_TIMEOUT_SECONDS=2
-	-DCONFIG_NET_MGMT_EVENT
 	-DCONFIG_LTE_LC_NETWORK_REGISTRATION_MODULE=1
 	-DCONFIG_LTE_LC_CONN_EVAL_MODULE=1
 	-DCONFIG_LTE_LC_EDRX_MODULE=1
 	-DCONFIG_LTE_LC_PSM_MODULE=1
+	-DCONFIG_LTE_LC_PDN_MODULE=1
 )