Commit f3f04bf9 authored by Jukka Rissanen's avatar Jukka Rissanen
Browse files

tests: net: Convert to new logging system



Use new logging system with support for network log level.

Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
parent 5ad399e0
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -15,12 +15,7 @@ CONFIG_NET_PKT_TX_COUNT=1
CONFIG_NET_BUF_RX_COUNT=3
CONFIG_NET_BUF_TX_COUNT=3
CONFIG_NET_LOG=y
CONFIG_SYS_LOG_NET_LEVEL=2
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_DEBUG_IF=y
CONFIG_NET_DEBUG_CORE=y
CONFIG_NET_DEBUG_6LO=y
CONFIG_NET_DEBUG_NET_PKT=y
CONFIG_NET_DEFAULT_LOG_LEVEL_WRN=y

CONFIG_NET_6LO_CONTEXT=y
#Before modifying this value, add respective code in src/main.c
+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@
 * SPDX-License-Identifier: Apache-2.0
 */

#define LOG_MODULE_NAME net_test
#define NET_LOG_LEVEL CONFIG_NET_6LO_LOG_LEVEL

#include <zephyr.h>
#include <ztest.h>
#include <linker/sections.h>
+35 −31
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
# applications.

# Generic options that are useful to be active
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_ENTROPY_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_ZTEST=y
@@ -12,16 +11,16 @@ CONFIG_ZTEST=y
# net_buf options
CONFIG_NET_BUF=y
CONFIG_NET_BUF_LOG=y
CONFIG_SYS_LOG_NET_BUF_LEVEL=4
CONFIG_NET_BUF_LOG_LEVEL_DBG=y
CONFIG_NET_BUF_WARN_ALLOC_INTERVAL=2
CONFIG_NET_BUF_SIMPLE_LOG=y
CONFIG_NET_BUF_POOL_USAGE=y

# Core IP options
CONFIG_NETWORKING=y
CONFIG_NET_INIT_PRIO=98
CONFIG_NET_SHELL=y
CONFIG_NET_IP_ADDR_CHECK=y
CONFIG_NET_HOSTNAME_ENABLE=y

# Statistics
CONFIG_NET_STATISTICS=y
@@ -60,14 +59,14 @@ CONFIG_NET_L2_BT_ZEP1656=y
CONFIG_NET_L2_BT_SEC_LEVEL=4
CONFIG_NET_L2_BT_MGMT=y
CONFIG_NET_L2_BT_SHELL=y
CONFIG_NET_DEBUG_L2_IEEE802154=y
CONFIG_NET_L2_IEEE802154_LOG_LEVEL_DBG=y
CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_DEBUG_L2_ETHERNET=y
CONFIG_NET_DEBUG_L2_BT=y
CONFIG_NET_L2_ETHERNET_LOG_LEVEL_DBG=y
CONFIG_NET_L2_BT_LOG_LEVEL_DBG=y

# IP offload support
CONFIG_NET_OFFLOAD=y
CONFIG_NET_DEBUG_NET_OFFLOAD=y
CONFIG_NET_OFFLOAD_LOG_LEVEL_DBG=y

# RPL
CONFIG_NET_RPL=y
@@ -77,7 +76,7 @@ CONFIG_NET_RPL_MC_ENERGY=y
CONFIG_NET_RPL_MOP2=n
CONFIG_NET_RPL_MOP3=y
CONFIG_NET_RPL_DAO_MAX_RETRANSMISSIONS=2
CONFIG_NET_DEBUG_RPL=y
CONFIG_NET_RPL_LOG_LEVEL_DBG=y

# Routing table
CONFIG_NET_MAX_ROUTERS=3
@@ -86,12 +85,12 @@ CONFIG_NET_ROUTE_MCAST=y

# TCP
CONFIG_NET_TCP=y
CONFIG_NET_DEBUG_TCP=y
CONFIG_NET_TCP_LOG_LEVEL_DBG=y
CONFIG_NET_TCP_TIME_WAIT_DELAY=20000

# UDP
CONFIG_NET_UDP=y
CONFIG_NET_DEBUG_UDP=y
CONFIG_NET_UDP_LOG_LEVEL_DBG=y

# Network context
CONFIG_NET_MAX_CONN=10
@@ -105,7 +104,7 @@ CONFIG_NET_CONTEXT_CHECK=y

# Trickle algo
CONFIG_NET_TRICKLE=y
CONFIG_NET_DEBUG_TRICKLE=y
CONFIG_NET_TRICKLE_LOG_LEVEL_DBG=y

# Network buffer
CONFIG_NET_PKT_RX_COUNT=10
@@ -130,15 +129,15 @@ CONFIG_NET_IPV6_NBR_CACHE=y
CONFIG_NET_IPV6_ND=y
CONFIG_NET_IPV6_DAD=y
CONFIG_NET_IPV6_RA_RDNSS=y
CONFIG_NET_DEBUG_IPV6=y
CONFIG_NET_DEBUG_ICMPV6=y
CONFIG_NET_DEBUG_IPV6_NBR_CACHE=y
CONFIG_NET_IPV6_LOG_LEVEL_DBG=y
CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL_DBG=y
CONFIG_NET_ICMPV6_LOG_LEVEL_DBG=y

# 6lo
CONFIG_NET_6LO=y
CONFIG_NET_6LO_CONTEXT=y
CONFIG_NET_MAX_6LO_CONTEXTS=2
CONFIG_NET_DEBUG_6LO=y
CONFIG_NET_6LO_LOG_LEVEL_DBG=y

# Sample application generic options
CONFIG_NET_CONFIG_SETTINGS=y
@@ -160,7 +159,7 @@ CONFIG_NET_MGMT_EVENT=y
CONFIG_NET_MGMT_EVENT_STACK_SIZE=800
CONFIG_NET_MGMT_EVENT_THREAD_PRIO=66
CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=2
CONFIG_NET_DEBUG_MGMT_EVENT=y
CONFIG_NET_MGMT_EVENT_LOG_LEVEL_DBG=y
CONFIG_NET_DEBUG_MGMT_EVENT_STACK=y

# IPv4
@@ -170,27 +169,26 @@ CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2
CONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT=2
CONFIG_NET_DHCPV4=y
CONFIG_NET_IPV4_AUTO=y
CONFIG_NET_DEBUG_IPV4=y
CONFIG_NET_DEBUG_ICMPV4=y
CONFIG_NET_DEBUG_DHCPV4=y
CONFIG_NET_IPV4_LOG_LEVEL_DBG=y
CONFIG_NET_IPV4_AUTO_LOG_LEVEL_DBG=y
CONFIG_NET_ICMPV4_LOG_LEVEL_DBG=y
CONFIG_NET_DHCPV4_LOG_LEVEL_DBG=y

# ARP
CONFIG_NET_ARP=y
CONFIG_NET_ARP_TABLE_SIZE=3
CONFIG_NET_DEBUG_ARP=y
CONFIG_NET_ARP_LOG_LEVEL_DBG=y

# Logging
CONFIG_NET_LOG=y
CONFIG_SYS_LOG_NET_LEVEL=4
CONFIG_NET_LOG_GLOBAL=y
CONFIG_NET_DEBUG_CORE=y
CONFIG_NET_DEBUG_IF=y
CONFIG_NET_DEBUG_UTILS=y
CONFIG_NET_DEBUG_CONTEXT=y
CONFIG_NET_DEBUG_NET_PKT=y
CONFIG_NET_CORE_LOG_LEVEL_DBG=y
CONFIG_NET_IF_LOG_LEVEL_DBG=y
CONFIG_NET_UTILS_LOG_LEVEL_DBG=y
CONFIG_NET_CONTEXT_LOG_LEVEL_DBG=y
CONFIG_NET_PKT_LOG_LEVEL_DBG=y
CONFIG_NET_DEBUG_NET_PKT_EXTERNALS=4
CONFIG_NET_DEBUG_CONN=y
CONFIG_NET_DEBUG_ROUTE=y
CONFIG_NET_CONN_LOG_LEVEL_DBG=y
CONFIG_NET_ROUTE_LOG_LEVEL_DBG=y

# IP threads stack size
CONFIG_NET_TX_STACK_SIZE=1024
@@ -209,10 +207,15 @@ CONFIG_DNS_SERVER3="192.0.2.42"
CONFIG_DNS_SERVER4="2001:db8::2"
CONFIG_DNS_SERVER5="192.0.2.11:1000"
CONFIG_DNS_NUM_CONCUR_QUERIES=2
CONFIG_NET_DEBUG_DNS_RESOLVE=y
CONFIG_DNS_RESOLVER_LOG_LEVEL_DBG=y
CONFIG_MDNS_RESPONDER=y
CONFIG_MDNS_RESPONDER_LOG_LEVEL_DBG=y
CONFIG_LLMNR_RESPONDER=y
CONFIG_LLMNR_RESPONDER_LOG_LEVEL_DBG=y

# CoAP
CONFIG_COAP=y
CONFIG_COAP_LOG_LEVEL_DBG=y

# MQTT
CONFIG_MQTT_LIB=y
@@ -226,6 +229,7 @@ CONFIG_HTTP_SERVER=y
CONFIG_HTTP_CLIENT=y
CONFIG_HTTP_PARSER=y
CONFIG_HTTP_PARSER_STRICT=y
CONFIG_HTTP_LOG_LEVEL_DBG=y

# VLAN
CONFIG_NET_VLAN=y
@@ -233,4 +237,4 @@ CONFIG_NET_VLAN=y
# gPTP
CONFIG_NET_GPTP=y
CONFIG_NET_GPTP_STATISTICS=y
CONFIG_NET_DEBUG_GPTP=y
CONFIG_NET_GPTP_LOG_LEVEL_DBG=y
+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@
 * SPDX-License-Identifier: Apache-2.0
 */

#define LOG_MODULE_NAME net_test
#define NET_LOG_LEVEL LOG_LEVEL_DBG

#include <ztest.h>

#include <net/net_if.h>
+0 −4
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ CONFIG_NET_DHCPV4=n
CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_L2_DUMMY=y
CONFIG_NET_LOG=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_ENTROPY_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_IPV6_DAD=n
@@ -30,6 +29,3 @@ CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_ZTEST=y
#CONFIG_NET_DEBUG_APP=y
#CONFIG_SYS_LOG_NET_LEVEL=4
#CONFIG_NET_SHELL=y
Loading