samples: net: lwm2m: Refactor to use NET_SAMPLE Kconfig prefix

It is easier to separate a sample application Kconfig
values from ones that configure something inside Zephyr.

Signed-off-by: Seppo Takalo <seppo.takalo@nordicsemi.no>

Author: SeppoTakalo

samples/net/lwm2m_client/Kconfig

@@ -5,36 +5,36 @@
 
 mainmenu "LwM2M Client sample"
 
-config LWM2M_APP_ID
+config NET_SAMPLE_LWM2M_ID
 	string "LwM2M Client identity"
 	default ""
 	help
 	  This is used as client endpoint name as well as PSK ID.
 	  Leave empty for using CONFIG_BOARD
 
 if LWM2M_DTLS_SUPPORT
-config LWM2M_APP_PSK
+config NET_SAMPLE_LWM2M_PSK
 	string "PSK key"
 	default "000102030405060708090a0b0c0d0e0f"
 	help
 	  PSK key as a hex string.
 	  Maximum binary size is CONFIG_LWM2M_SECURITY_KEY_SIZE.
 
-config LWM2M_APP_TLS_TAG
+config NET_SAMPLE_LWM2M_TLS_TAG
 	int "TLS security tag"
 	default 1
 	help
 	  TLS security tag to use when connecting.
 endif
 
-config HAS_INTERNET
+config NET_SAMPLE_MIGHT_HAVE_INTERNET
 	bool
 	default y if (WIFI || MODEM)
 
-config LWM2M_APP_SERVER
+config NET_SAMPLE_LWM2M_SERVER
 	string "LwM2M server address"
-	default "coap://leshan.eclipseprojects.io:5683" if (HAS_INTERNET && !LWM2M_DTLS_SUPPORT)
-	default "coaps://leshan.eclipseprojects.io:5684" if (HAS_INTERNET && LWM2M_DTLS_SUPPORT)
+	default "coap://leshan.eclipseprojects.io:5683" if (NET_SAMPLE_MIGHT_HAVE_INTERNET && !LWM2M_DTLS_SUPPORT)
+	default "coaps://leshan.eclipseprojects.io:5684" if (NET_SAMPLE_MIGHT_HAVE_INTERNET && LWM2M_DTLS_SUPPORT)
 	default "coap://192.0.2.2:5683" if !LWM2M_DTLS_SUPPORT
 	default "coaps://192.0.2.2:5684" if (LWM2M_DTLS_SUPPORT && !LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
 	default "coaps://192.0.2.2:5784" if (LWM2M_DTLS_SUPPORT && LWM2M_RD_CLIENT_SUPPORT_BOOTSTRAP)
@@ -45,7 +45,7 @@ config LWM2M_APP_SERVER
 	  When port number is missing, CONFIG_LWM2M_PEER_PORT is used instead.
 	  IPv6 addresses must be enclosed in square brackets, for example "coap://[fd00::1]".
 
-config WAIT_DNS_SERVER_ADDITION
+config NET_SAMPLE_LWM2M_WAIT_DNS
 	bool "Wait DNS server addition before considering connection to be up"
 	depends on MODEM_HL7800 && !DNS_SERVER_IP_ADDRESSES
 	help

samples/net/lwm2m_client/overlay-hl7800.conf

@@ -5,7 +5,7 @@ CONFIG_MODEM_HL7800=y
 # The HL7800 driver gets its IP settings from the cell network
 CONFIG_NET_CONFIG_SETTINGS=n
 CONFIG_NET_CONNECTION_MANAGER=y
-CONFIG_WAIT_DNS_SERVER_ADDITION=y
+CONFIG_NET_SAMPLE_LWM2M_WAIT_DNS=y
 CONFIG_DNS_RESOLVER=y
 
 # NB-IoT has large latency, so increase timeouts. It is ok to use this for Cat-M1 as well.

samples/net/lwm2m_client/overlay-ot.conf

@@ -35,7 +35,7 @@ CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
 
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"
-CONFIG_LWM2M_APP_SERVER="coap://[fdde:ad00:beef::2]"
+CONFIG_NET_SAMPLE_LWM2M_SERVER="coap://[fdde:ad00:beef::2]"
 
 # mbedTLS tweaks
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=768

samples/net/lwm2m_client/src/lwm2m-client.c

@@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #define TEMP_SENSOR_UNITS       "Celsius"
 
 /* Macros used to subscribe to specific Zephyr NET management events. */
-#if defined(CONFIG_WAIT_DNS_SERVER_ADDITION)
+#if defined(CONFIG_NET_SAMPLE_LWM2M_WAIT_DNS)
 #define L4_EVENT_MASK (NET_EVENT_DNS_SERVER_ADD | NET_EVENT_L4_DISCONNECTED)
 #else
 #define L4_EVENT_MASK (NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED)
@@ -56,7 +56,7 @@ static double max_range = 100;
 static struct lwm2m_ctx client_ctx;
 
 static const char *endpoint =
-	(sizeof(CONFIG_LWM2M_APP_ID) > 1 ? CONFIG_LWM2M_APP_ID : CONFIG_BOARD);
+	(sizeof(CONFIG_NET_SAMPLE_LWM2M_ID) > 1 ? CONFIG_NET_SAMPLE_LWM2M_ID : CONFIG_BOARD);
 
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
 BUILD_ASSERT(sizeof(endpoint) <= CONFIG_LWM2M_SECURITY_KEY_SIZE,
@@ -109,17 +109,17 @@ static int lwm2m_setup(void)
 	/* setup SECURITY object */
 
 	/* Server URL */
-	lwm2m_set_string(&LWM2M_OBJ(0, 0, 0), CONFIG_LWM2M_APP_SERVER);
+	lwm2m_set_string(&LWM2M_OBJ(0, 0, 0), CONFIG_NET_SAMPLE_LWM2M_SERVER);
 
 	/* Security Mode */
 	lwm2m_set_u8(&LWM2M_OBJ(0, 0, 2), IS_ENABLED(CONFIG_LWM2M_DTLS_SUPPORT) ? 0 : 3);
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
 	lwm2m_set_string(&LWM2M_OBJ(0, 0, 3), endpoint);
-	if (sizeof(CONFIG_LWM2M_APP_PSK) > 1) {
-		char psk[1 + sizeof(CONFIG_LWM2M_APP_PSK) / 2];
+	if (sizeof(CONFIG_NET_SAMPLE_LWM2M_PSK) > 1) {
+		char psk[1 + sizeof(CONFIG_NET_SAMPLE_LWM2M_PSK) / 2];
 		/* Need to skip the nul terminator from string */
-		size_t len = hex2bin(CONFIG_LWM2M_APP_PSK, sizeof(CONFIG_LWM2M_APP_PSK) - 1, psk,
-				     sizeof(psk));
+		size_t len = hex2bin(CONFIG_NET_SAMPLE_LWM2M_PSK,
+				     sizeof(CONFIG_NET_SAMPLE_LWM2M_PSK) - 1, psk, sizeof(psk));
 		if (len <= 0) {
 			return -EINVAL;
 		}
@@ -338,7 +338,7 @@ static void l4_event_handler(struct net_mgmt_event_callback *cb,
 			     struct net_if *iface)
 {
 	switch (event) {
-#if defined(CONFIG_WAIT_DNS_SERVER_ADDITION)
+#if defined(CONFIG_NET_SAMPLE_LWM2M_WAIT_DNS)
 	case NET_EVENT_DNS_SERVER_ADD:
 #else
 	case NET_EVENT_L4_CONNECTED:
@@ -413,7 +413,7 @@ int main(void)
 
 	(void)memset(&client_ctx, 0x0, sizeof(client_ctx));
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
-	client_ctx.tls_tag = CONFIG_LWM2M_APP_TLS_TAG;
+	client_ctx.tls_tag = CONFIG_NET_SAMPLE_LWM2M_TLS_TAG;
 #endif
 	client_ctx.set_socket_state = socket_state;