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/pasta/tcp | 79 +++++++++++++++++++++++----------------------------------- test/pasta/udp | 43 +++++++++++++------------------- 2 files changed, 48 insertions(+), 74 deletions(-) (limited to 'test/pasta') diff --git a/test/pasta/tcp b/test/pasta/tcp index d37e21c..eeda20b 100644 --- a/test/pasta/tcp +++ b/test/pasta/tcp @@ -11,103 +11,86 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio -htools dd socat ip jq md5sum cut -nstools socat ip jq md5sum cut +htools socat ip jq +nstools socat ip jq + +set TEMP_BIG __STATEDIR__/test_big.bin +set TEMP_NS_BIG __STATEDIR__/test_ns_big.bin +set TEMP_SMALL __STATEDIR__/test_small.bin +set TEMP_NS_SMALL __STATEDIR__/test_ns_small.bin test TCP/IPv4: host to ns: big transfer -set TEMP_BIG __STATEDIR__/big -set TEMP_NS_BIG __STATEDIR__/big_ns nsb socat -u TCP4-LISTEN:10002,bind=127.0.0.1 OPEN:__TEMP_NS_BIG__,create,trunc -host dd if=/dev/urandom bs=1M count=10 of=__TEMP_BIG__ -host socat -u OPEN:__TEMP_BIG__ TCP4:127.0.0.1:10002 +host socat -u OPEN:__BASEPATH__/big.bin TCP4:127.0.0.1:10002 nsw -hout MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -nsout NS_MD5_BIG md5sum __TEMP_NS_BIG__ | cut -d' ' -f1 -check [ "__NS_MD5_BIG__" = "__MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_NS_BIG__ test TCP/IPv4: ns to host (spliced): big transfer hostb socat -u TCP4-LISTEN:10003,bind=127.0.0.1 OPEN:__TEMP_BIG__,create,trunc -ns socat -u OPEN:__TEMP_NS_BIG__ TCP4:127.0.0.1:10003 +ns socat -u OPEN:__BASEPATH__/big.bin TCP4:127.0.0.1:10003 hostw -hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_BIG__ test TCP/IPv4: ns to host (via tap): big transfer hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' -ns socat -u OPEN:__TEMP_NS_BIG__ TCP4:__GW__:10003 +ns socat -u OPEN:__BASEPATH__/big.bin TCP4:__GW__:10003 hostw -hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_BIG__ test TCP/IPv4: host to ns: small transfer -set TEMP_SMALL __STATEDIR__/small -set TEMP_NS_SMALL __STATEDIR__/small_ns nsb socat -u TCP4-LISTEN:10002,bind=127.0.0.1 OPEN:__TEMP_NS_SMALL__,create,trunc -host dd if=/dev/urandom bs=2k count=1 of=__TEMP_SMALL__ -host socat OPEN:__TEMP_SMALL__ TCP4:127.0.0.1:10002 +host socat OPEN:__BASEPATH__/small.bin TCP4:127.0.0.1:10002 nsw -hout MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -nsout NS_MD5_SMALL md5sum __TEMP_NS_SMALL__ | cut -d' ' -f1 -check [ "__NS_MD5_SMALL__" = "__MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_NS_SMALL__ test TCP/IPv4: ns to host (spliced): small transfer hostb socat -u TCP4-LISTEN:10003,bind=127.0.0.1 OPEN:__TEMP_SMALL__,create,trunc -ns socat OPEN:__TEMP_NS_SMALL__ TCP4:127.0.0.1:10003 +ns socat OPEN:__BASEPATH__/small.bin TCP4:127.0.0.1:10003 hostw -hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_SMALL__ test TCP/IPv4: ns to host (via tap): small transfer hostb socat -u TCP4-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' -ns socat -u OPEN:__TEMP_NS_SMALL__ TCP4:__GW__:10003 +ns socat -u OPEN:__BASEPATH__/small.bin TCP4:__GW__:10003 hostw -hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_SMALL__ test TCP/IPv6: host to ns: big transfer nsb socat -u TCP6-LISTEN:10002,bind=[::1] OPEN:__TEMP_NS_BIG__,create,trunc -host socat -u OPEN:__TEMP_BIG__ TCP6:[::1]:10002 +host socat -u OPEN:__BASEPATH__/big.bin TCP6:[::1]:10002 nsw -hout MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -nsout NS_MD5_BIG md5sum __TEMP_NS_BIG__ | cut -d' ' -f1 -check [ "__NS_MD5_BIG__" = "__MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_NS_BIG__ test TCP/IPv6: ns to host (spliced): big transfer hostb socat -u TCP6-LISTEN:10003,bind=[::1] OPEN:__TEMP_BIG__,create,trunc -ns socat -u OPEN:__TEMP_NS_BIG__ TCP6:[::1]:10003 +ns socat -u OPEN:__BASEPATH__/big.bin TCP6:[::1]:10003 hostw -hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_BIG__ test TCP/IPv6: ns to host (via tap): big transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_BIG__,create,trunc nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' -ns socat -u OPEN:__TEMP_NS_BIG__ TCP6:[__GW6__%__IFNAME__]:10003 +ns socat -u OPEN:__BASEPATH__/big.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw -hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 -check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] +check cmp __BASEPATH__/big.bin __TEMP_BIG__ test TCP/IPv6: host to ns: small transfer nsb socat -u TCP6-LISTEN:10002,bind=[::1] OPEN:__TEMP_NS_SMALL__,create,trunc -host socat -u OPEN:__TEMP_SMALL__ TCP6:[::1]:10002 +host socat -u OPEN:__BASEPATH__/small.bin TCP6:[::1]:10002 nsw -hout MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -nsout NS_MD5_SMALL md5sum __TEMP_NS_SMALL__ | cut -d' ' -f1 -check [ "__NS_MD5_SMALL__" = "__MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_NS_SMALL__ test TCP/IPv6: ns to host (spliced): small transfer hostb socat -u TCP6-LISTEN:10003,bind=[::1] OPEN:__TEMP_SMALL__,create,trunc -ns socat -u OPEN:__TEMP_NS_SMALL__ TCP6:[::1]:10003 +ns socat -u OPEN:__BASEPATH__/small.bin TCP6:[::1]:10003 hostw -hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_SMALL__ test TCP/IPv6: ns to host (via tap): small transfer hostb socat -u TCP6-LISTEN:10003 OPEN:__TEMP_SMALL__,create,trunc -ns socat -u OPEN:__TEMP_NS_SMALL__ TCP6:[__GW6__%__IFNAME__]:10003 +ns socat -u OPEN:__BASEPATH__/small.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw -hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] +check cmp __BASEPATH__/small.bin __TEMP_SMALL__ diff --git a/test/pasta/udp b/test/pasta/udp index fc6bf0a..c8ff418 100644 --- a/test/pasta/udp +++ b/test/pasta/udp @@ -11,58 +11,49 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio -nstools socat ip jq md5sum cut -htools dd socat ip jq md5sum cut +nstools socat ip jq +htools dd socat ip jq + +set TEMP __STATEDIR__/test.bin +set TEMP_NS __STATEDIR__/test_ns.bin test UDP/IPv4: host to ns -set TEMP __STATEDIR__/data -set TEMP_NS __STATEDIR__/data_ns nsb socat -u UDP4-LISTEN:10002,bind=127.0.0.1,null-eof OPEN:__TEMP_NS__,create,trunc -host dd if=/dev/urandom bs=1k count=5 > __TEMP__ - -host socat OPEN:__TEMP__ UDP4:127.0.0.1:10002,shut-null +host socat OPEN:__BASEPATH__/medium.bin UDP4:127.0.0.1:10002,shut-null nsw -hout MD5 md5sum __TEMP__ | cut -d' ' -f1 -nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1 -check [ "__NS_MD5__" = "__MD5__" ] +check cmp __BASEPATH__/medium.bin __TEMP_NS__ test UDP/IPv4: ns to host (recvmmsg/sendmmsg) hostb socat -u UDP4-LISTEN:10003,bind=127.0.0.1,null-eof OPEN:__TEMP__,create,trunc sleep 1 -ns socat OPEN:__TEMP_NS__ UDP4:127.0.0.1:10003,shut-null +ns socat 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 __BASEPATH__/medium.bin __TEMP__ test UDP/IPv4: ns to host (via tap) hostb socat -u UDP4-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' -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 __BASEPATH__/medium.bin __TEMP__ test UDP/IPv6: host to ns nsb socat -u UDP6-LISTEN:10002,bind=[::1],null-eof OPEN:__TEMP_NS__,create,trunc -host socat -u OPEN:__TEMP__ UDP6:[::1]:10002,shut-null +host socat -u OPEN:__BASEPATH__/medium.bin UDP6:[::1]:10002,shut-null nsw -hout MD5 md5sum __TEMP__ | cut -d' ' -f1 -nsout NS_MD5 md5sum __TEMP_NS__ | cut -d' ' -f1 -check [ "__NS_MD5__" = "__MD5__" ] +check cmp __BASEPATH__/medium.bin __TEMP_NS__ test UDP/IPv6: ns to host (recvmmsg/sendmmsg) hostb socat -u UDP6-LISTEN:10003,bind=[::1],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 __BASEPATH__/medium.bin __TEMP__ test UDP/IPv6: ns to host (via tap) hostb socat -u UDP6-LISTEN:10003,null-eof OPEN:__TEMP__,create,trunc nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' -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 __BASEPATH__/medium.bin __TEMP__ -- cgit v1.2.3