From feb8946ff5f0b6813409146a9c0e0915dc602ebd Mon Sep 17 00:00:00 2001 From: David Gibson Date: Mon, 26 Sep 2022 20:43:40 +1000 Subject: test: Simplify data handling for transfer tests Many of our tests are based around performing transfers of sample data across passt/pasta created links. The data flow here can be a bit hard to follow since, e.g. we create a file transfer it to the guest, then transfer it back to the host across several different tests. This also means that the test cases aren't independent of each other. Because we don't have the original file available at both ends in some cases, we compare them by generating md5sums at each end and comparing them, which is a bit complicated. Make a number of changes to simplify this: 1. Pre-generate the sample data files as a test asset, rather than building them on the fly during the tests proper 2. Include the sample data files in the mbuto guest image 3. Because we have good copies of the original data available in all contexts, we can now simply use 'cmp' to check if the transfer has worked, avoiding md5sum complications. 4. Similarly we can always use the original copy of the sample data on the send side of each transfer, meaning that the tests become more independent of each other. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- test/passt_in_ns/udp | 93 +++++++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 55 deletions(-) (limited to 'test/passt_in_ns/udp') diff --git a/test/passt_in_ns/udp b/test/passt_in_ns/udp index b7e9cf3..d9cd85a 100644 --- a/test/passt_in_ns/udp +++ b/test/passt_in_ns/udp @@ -11,145 +11,128 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio -gtools socat ip jq md5sum cut -nstools socat ip jq md5sum cut -htools dd socat ip jq md5sum cut +gtools socat ip jq +nstools socat ip jq +htools socat ip jq + +set TEMP __STATEDIR__/test.bin +set TEMP_NS __STATEDIR__/test_ns.bin test UDP/IPv4: host to guest -set TEMP __STATEDIR__/data guestb socat -u UDP4-LISTEN:10001,null-eof OPEN:test.bin,create,trunc -host dd if=/dev/urandom bs=1k count=5 > __TEMP__ sleep 1 -host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10001,shut-null +host socat -u OPEN:__BASEPATH__/medium.bin UDP4:127.0.0.1:10001,shut-null guestw -hout MD5 md5sum __TEMP__ | cut -d' ' -f1 -gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 -check [ "__GUEST_MD5__" = "__MD5__" ] +guest cmp test.bin /root/medium.bin test UDP/IPv4: host to ns -set TEMP_NS __STATEDIR__/data_ns nsb socat -u UDP4-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc sleep 1 -host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10002,shut-null +host socat -u OPEN:__BASEPATH__/medium.bin UDP4:127.0.0.1:10002,shut-null nsw -nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1 -check [ "__NS_MD5__" = "__MD5__" ] +check cmp __TEMP_NS__ __BASEPATH__/medium.bin test UDP/IPv4: guest to host hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' sleep 1 -guest socat -u OPEN:test.bin UDP4:__GW__:10003,shut-null +guest socat -u OPEN:/root/medium.bin UDP4:__GW__:10003,shut-null hostw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP__ __BASEPATH__/medium.bin test UDP/IPv4: guest to ns nsb socat -u UDP4-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc sleep 1 -guest socat -u OPEN:test.bin UDP4:__GW__:10002,shut-null +guest socat -u OPEN:/root/medium.bin UDP4:__GW__:10002,shut-null nsw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP_NS__ __BASEPATH__/medium.bin test UDP/IPv4: ns to host (recvmmsg/sendmmsg) hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP4:127.0.0.1:10003,shut-null hostw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP__ __BASEPATH__/medium.bin test UDP/IPv4: ns to host (via tap) hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP4:__GW__:10003,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP4:__GW__:10003,shut-null hostw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP__ __BASEPATH__/medium.bin test UDP/IPv4: ns to guest (using loopback address) guestb socat -u UDP4-LISTEN:10001,null-eof OPEN:test.bin,create,trunc sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP4:127.0.0.1:10001,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP4:127.0.0.1:10001,shut-null guestw -gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 -check [ "__GUEST_MD5__" = "__MD5__" ] +guest cmp test.bin /root/medium.bin test UDP/IPv4: ns to guest (using namespace address) guestb socat -u UDP4-LISTEN:10001,null-eof OPEN:test.bin,create,trunc nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' nsout ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP4:__ADDR__:10001,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP4:__ADDR__:10001,shut-null guestw -gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 -check [ "__GUEST_MD5__" = "__MD5__" ] +guest cmp test.bin /root/medium.bin test UDP/IPv6: host to guest guestb socat -u UDP6-LISTEN:10001,null-eof OPEN:test.bin,create,trunc sleep 1 -host socat -u OPEN:__TEMP__ UDP6:[::1]:10001,shut-null +host socat -u OPEN:__BASEPATH__/medium.bin UDP6:[::1]:10001,shut-null guestw -gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 -check [ "__GUEST_MD5__" = "__MD5__" ] +guest cmp test.bin /root/medium.bin test UDP/IPv6: host to ns nsb socat -u UDP6-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc sleep 1 -host socat -u OPEN:__TEMP__ UDP6:[::1]:10002,shut-null +host socat -u OPEN:__BASEPATH__/medium.bin UDP6:[::1]:10002,shut-null nsw -nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1 -check [ "__NS_MD5__" = "__MD5__" ] +check cmp __TEMP_NS__ __BASEPATH__/medium.bin test UDP/IPv6: guest to host hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' sleep 1 -guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10003,shut-null +guest socat -u OPEN:/root/medium.bin UDP6:[__GW6__%__IFNAME__]:10003,shut-null hostw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP__ __BASEPATH__/medium.bin test UDP/IPv6: guest to ns nsb socat -u UDP6-LISTEN:10002,null-eof OPEN:__TEMP_NS__,create,trunc sleep 1 -guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10002,shut-null +guest socat -u OPEN:/root/medium.bin UDP6:[__GW6__%__IFNAME__]:10002,shut-null nsw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP_NS__ __BASEPATH__/medium.bin test UDP/IPv6: ns to host (recvmmsg/sendmmsg) hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10003,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP6:[::1]:10003,shut-null hostw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP__ __BASEPATH__/medium.bin test UDP/IPv6: ns to host (via tap) hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP6:[__GW6__%__IFNAME__]:10003,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP6:[__GW6__%__IFNAME__]:10003,shut-null hostw -hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 -check [ "__HOST_MD5__" = "__MD5__" ] +check cmp __TEMP__ __BASEPATH__/medium.bin test UDP/IPv6: ns to guest (using loopback address) guestb socat -u UDP6-LISTEN:10001,null-eof OPEN:test.bin,create,trunc sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP6:[::1]:10001,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP6:[::1]:10001,shut-null guestw -gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 -check [ "__GUEST_MD5__" = "__MD5__" ] +guest cmp test.bin /root/medium.bin test UDP/IPv6: ns to guest (using namespace address) guestb socat -u UDP6-LISTEN:10001,null-eof OPEN:test.bin,create,trunc nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' sleep 1 -ns socat -u OPEN:__TEMP_NS__ UDP6:[__ADDR6__]:10001,shut-null +ns socat -u OPEN:__BASEPATH__/medium.bin UDP6:[__ADDR6__]:10001,shut-null guestw -gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 -check [ "__GUEST_MD5__" = "__MD5__" ] +guest cmp test.bin /root/medium.bin -- cgit v1.2.3