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/tcp | 53 +++++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) (limited to 'test/passt/tcp') diff --git a/test/passt/tcp b/test/passt/tcp index 7af9c54..67668aa 100644 --- a/test/passt/tcp +++ b/test/passt/tcp @@ -11,77 +11,66 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio -gtools socat ip jq md5sum cut -htools dd socat ip jq md5sum cut +gtools socat ip jq cmp +htools socat ip jq + +set TEMP_BIG __STATEDIR__/test_big.bin +set TEMP_SMALL __STATEDIR__/test_small.bin test TCP/IPv4: host to guest: big transfer -set TEMP_BIG __STATEDIR__/big guestb socat -u TCP4-LISTEN:10001,reuseaddr OPEN:test_big.bin,create,trunc sleep 1 -host dd if=/dev/urandom bs=1M count=10 > __TEMP_BIG__ -host socat -u OPEN:__TEMP_BIG__ TCP4:127.0.0.1:10001 +host socat -u OPEN:__BASEPATH__/big.bin TCP4:127.0.0.1:10001 guestw -hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 -check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] +guest cmp /root/big.bin test_big.bin test TCP/IPv4: guest to host: big transfer hostb socat -u TCP4-LISTEN:10003,bind=127.0.0.1,reuseaddr OPEN:__TEMP_BIG__,create,trunc gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' -guest socat -u OPEN:test_big.bin TCP4:__GW__:10003 +guest socat -u OPEN:/root/big.bin TCP4:__GW__:10003 hostw -hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_BIG__ test TCP/IPv4: host to guest: small transfer -set TEMP_SMALL __STATEDIR__/small guestb socat -u TCP4-LISTEN:10001,reuseaddr OPEN:test_small.bin,create,trunc sleep 1 -host dd if=/dev/urandom bs=2k count=1 > __TEMP_SMALL__ -host socat -u OPEN:__TEMP_SMALL__ TCP4:127.0.0.1:10001 +host socat -u OPEN:__BASEPATH__/small.bin TCP4:127.0.0.1:10001 guestw -hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -gout GUEST_MD5_SMALL md5sum test_small.bin | cut -d' ' -f1 -check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] +guest cmp /root/small.bin test_small.bin test TCP/IPv4: guest to host: small transfer hostb socat -u TCP4-LISTEN:10003,bind=127.0.0.1,reuseaddr OPEN:__TEMP_SMALL__,create,trunc sleep 1 -guest socat -u OPEN:test_small.bin TCP4:__GW__:10003 +guest socat -u OPEN:/root/small.bin TCP4:__GW__:10003 hostw -hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_SMALL__ test TCP/IPv6: host to guest: big transfer guestb socat -u TCP6-LISTEN:10001,reuseaddr OPEN:test_big.bin,create,trunc sleep 1 -host socat -u OPEN:__TEMP_BIG__ TCP6:[::1]:10001 +host socat -u OPEN:__BASEPATH__/big.bin TCP6:[::1]:10001 guestw -gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 -check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] +guest cmp /root/big.bin test_big.bin test TCP/IPv6: guest to host: big transfer hostb socat -u TCP6-LISTEN:10003,bind=[::1],reuseaddr OPEN:__TEMP_BIG__,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' -guest socat -u OPEN:test_big.bin TCP6:[__GW6__%__IFNAME__]:10003 +guest socat -u OPEN:/root/big.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw -hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_BIG__ test TCP/IPv6: host to guest: small transfer guestb socat -u TCP6-LISTEN:10001,reuseaddr OPEN:test_small.bin,create,trunc sleep 1 -host socat -u OPEN:__TEMP_SMALL__ TCP6:[::1]:10001 +host socat -u OPEN:__BASEPATH__/small.bin TCP6:[::1]:10001 guestw -gout GUEST_MD5_SMALL md5sum test_small.bin | cut -d' ' -f1 -check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] +guest cmp /root/small.bin test_small.bin test TCP/IPv6: guest to host: small transfer hostb socat -u TCP6-LISTEN:10003,bind=[::1],reuseaddr OPEN:__TEMP_SMALL__,create,trunc sleep 1 -guest socat -u OPEN:test_small.bin TCP6:[__GW6__%__IFNAME__]:10003 +guest socat -u OPEN:/root/small.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw -hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_SMALL__ -- cgit v1.2.3