patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

tests: net: virtual: Fix the tests

Browse source 
The tests are now working as expected after the virtual interface
refactoring which required changes to IP tunneling.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen 2024-03-21 12:37:23 +02:00 committed by Alberto Escolar
parent 280391ded8
commit 4ac3392611
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/net/virtual/src/main.c
View file

@ -738,6 +738,12 @@ ZTEST(net_virtual, test_virtual_05_set_peer)
net_if_get_by_iface(iface),
net_if_get_by_iface(dummy_interfaces[0]),
ret);
ret = net_virtual_interface_attach(iface, NULL);
zassert_equal(ret, 0, "Cannot deattach %d from %d (%d)",
net_if_get_by_iface(iface),
net_if_get_by_iface(eth_interfaces[0]),
ret);
}
ZTEST(net_virtual, test_virtual_06_get_peer)
@ -792,11 +798,24 @@ ZTEST(net_virtual, test_virtual_07_verify_name)
"Cannot get name");
}
ZTEST(net_virtual, test_virtual_08_detach)
{
struct net_if *iface = virtual_interfaces[0];
int ret;
ret = net_virtual_interface_attach(iface, NULL);
zassert_true((ret == 0) || (ret == -EALREADY),
"Cannot deattach %d from %d (%d)",
net_if_get_by_iface(iface),
net_if_get_by_iface(eth_interfaces[0]),
ret);
}
ZTEST(net_virtual, test_virtual_08_send_data_to_tunnel)
{
struct virtual_interface_req_params params = { 0 };
struct net_if *iface = virtual_interfaces[0];
struct net_if *attached;
struct net_if *attached = eth_interfaces[0];
struct sockaddr dst_addr, src_addr;
void *addr;
int addrlen;
@ -1011,7 +1030,12 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip,
net_pkt_write(inner, test_data, strlen(test_data));
net_pkt_cursor_init(inner);
net_ipv4_finalize(inner, IPPROTO_UDP);
if (virtual_addr.sa_family == AF_INET) {
net_ipv4_finalize(inner, IPPROTO_UDP);
} else {
net_ipv6_finalize(inner, IPPROTO_UDP);
}
net_buf_frag_add(outer->buffer, inner->buffer);
inner->buffer = NULL;
@ -1050,7 +1074,7 @@ static void test_virtual_recv_data_from_tunnel(int remote_ip,
}
if (expected_ok) {
zassert_equal(verdict, NET_CONTINUE,
zassert_equal(verdict, NET_OK,
"Packet not accepted (%d)",
verdict);
} else {