From 6d50e520bed653bc12b30a9936af77c8fe3b4efd Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Mon, 21 Aug 2023 17:16:49 +0200 Subject: tests/shell: expand vmap test case to also cause batch abort Let the last few batches also push an update that contains elements twice. This is expected to cause the batch to be aborted, which increases code coverage on kernel side. Signed-off-by: Florian Westphal --- tests/shell/testcases/maps/vmap_timeout | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'tests/shell/testcases/maps/vmap_timeout') diff --git a/tests/shell/testcases/maps/vmap_timeout b/tests/shell/testcases/maps/vmap_timeout index a81ff4f5..e59d37ab 100755 --- a/tests/shell/testcases/maps/vmap_timeout +++ b/tests/shell/testcases/maps/vmap_timeout @@ -6,22 +6,36 @@ dumpfile=$(dirname $0)/dumps/$(basename $0).nft $NFT -f $dumpfile port=23 -for i in $(seq 1 400) ; do - timeout=$((RANDOM%3)) +for i in $(seq 1 100) ; do + timeout=$((RANDOM%5)) timeout=$((timeout+1)) j=1 batched="{ $port timeout 3s : jump other_input " - batched_addr="{ 10.0.$((i%256)).$j . $port timeout 3s : jump other_input " + batched_addr="{ 10.0.$((i%256)).$j . $port timeout ${timeout}s : jump other_input " port=$((port + 1)) - for j in $(seq 2 100); do + for j in $(seq 2 400); do + timeout=$((RANDOM%5)) + timeout=$((timeout+1)) + batched="$batched, $port timeout ${timeout}s : jump other_input " - batched_addr="$batched_addr, 10.0.$((i%256)).$j . $port timeout ${timeout}s : jump other_input " + batched_addr="$batched_addr, 10.0.$((i%256)).$((j%256)) . $port timeout ${timeout}s : jump other_input " port=$((port + 1)) done + fail_addr="$batched_addr, 1.2.3.4 . 23 timeout 5m : jump other_input, + 1.2.3.4 . 23 timeout 3m : jump other_input }" + fail="$batched, 23 timeout 1m : jump other_input, 23 : jump other_input }" + batched="$batched }" batched_addr="$batched_addr }" + + if [ $i -gt 90 ]; then + # must fail, we create and $fail/$fail_addr contain one element twice. + $NFT create element inet filter portmap "$fail" && exit 111 + $NFT create element inet filter portaddrmap "$fail_addr" && exit 112 + fi + $NFT add element inet filter portmap "$batched" $NFT add element inet filter portaddrmap "$batched_addr" done @@ -30,4 +44,4 @@ $NFT add element inet filter portaddrmap { "* timeout 2s : drop" } $NFT add element inet filter portmap { "* timeout 3s : drop" } # wait for elements to time out -sleep 4 +sleep 5 -- cgit v1.2.3