aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2024-11-25 11:53:10 +0100
committerStefano Brivio <sbrivio@redhat.com>2024-11-26 08:30:18 +0100
commit2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5 (patch)
treead7424fb95a1ee3bd5db2a02af0f9ec88921a25e
parent6819b2e1020411661dc0487ee3614f012d45b049 (diff)
downloadpasst-2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5.tar
passt-2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5.tar.gz
passt-2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5.tar.bz2
passt-2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5.tar.lz
passt-2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5.tar.xz
passt-2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5.tar.zst
passt-2bf8ffcf078c5933e6a31dbffbfb4dc31bfd7bc5.zip
test/perf: Select a single IPv6 namespace address in pasta tests
By dropping the filter on prefix length, commit 910f4f910301 ("test: Don't require 64-bit prefixes in perf tests") broke tests on setups where two global unicast IPv6 addresses are available, which is the typical case when the "host" is a VM running under passt with addresses from SLAAC and DHCPv6, because two addresses will be returned. Pick the first one instead. We don't really care about the prefix length, any of these addresses will work. Fixes: 910f4f910301 ("test: Don't require 64-bit prefixes in perf tests") Link: https://archives.passt.top/passt-dev/20241119214344.6b4a5b3a@elisabeth/ Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--test/perf/pasta_tcp2
-rw-r--r--test/perf/pasta_udp2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/perf/pasta_tcp b/test/perf/pasta_tcp
index 88284b2..bc0de3c 100644
--- a/test/perf/pasta_tcp
+++ b/test/perf/pasta_tcp
@@ -211,7 +211,7 @@ tr TCP throughput over IPv6: host to ns
iperf3s ns 10002
nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'
-nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local'
+nsout ADDR6 ip -j -6 addr show|jq -rM '[.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local] | .[0]'
bw -
bw -
bw -
diff --git a/test/perf/pasta_udp b/test/perf/pasta_udp
index 3d07091..ab2f3e8 100644
--- a/test/perf/pasta_udp
+++ b/test/perf/pasta_udp
@@ -196,7 +196,7 @@ tr UDP throughput over IPv6: host to ns
iperf3s ns 10002
nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'
-nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local'
+nsout ADDR6 ip -j -6 addr show|jq -rM '[.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local] | .[0]'
iperf3 BW host __ADDR6__ 10002 __TIME__ __OPTS__ -b 8G -l 1472
bw __BW__ 0.3 0.5
iperf3 BW host __ADDR6__ 10002 __TIME__ __OPTS__ -b 12G -l 3972