diff options
Diffstat (limited to 'tests/shell/testcases')
9 files changed, 26 insertions, 20 deletions
diff --git a/tests/shell/testcases/rule_management/0011reset_0 b/tests/shell/testcases/rule_management/0011reset_0 index 2004b17d..5e65ced9 100755 --- a/tests/shell/testcases/rule_management/0011reset_0 +++ b/tests/shell/testcases/rule_management/0011reset_0 @@ -4,6 +4,12 @@ set -e +if [ $NFT_TEST_HAVE_setcount = y ]; then + size="size 65535 # count 1" +else + size="size 65535" +fi + echo "loading ruleset with anonymous set" $NFT -f - <<EOF table t { @@ -60,10 +66,10 @@ EOF echo "resetting specific rule" handle=$($NFT -a list chain t c | sed -n 's/.*accept # handle \([0-9]*\)$/\1/p') $NFT reset rule t c handle $handle -EXPECT='table ip t { +EXPECT="table ip t { set s { type ipv4_addr - size 65535 + $size flags dynamic counter elements = { 1.1.1.1 counter packets 1 bytes 11 } @@ -90,7 +96,7 @@ table ip t2 { counter packets 7 bytes 17 accept counter packets 8 bytes 18 drop } -}' +}" $DIFF -u <(echo "$EXPECT") <($NFT list ruleset) echo "resetting specific chain" @@ -103,10 +109,10 @@ EXPECT='table ip t { $DIFF -u <(echo "$EXPECT") <($NFT reset rules chain t c2) echo "resetting specific table" -EXPECT='table ip t { +EXPECT="table ip t { set s { type ipv4_addr - size 65535 + $size flags dynamic counter elements = { 1.1.1.1 counter packets 1 bytes 11 } @@ -121,14 +127,14 @@ EXPECT='table ip t { counter packets 0 bytes 0 accept counter packets 0 bytes 0 drop } -}' +}" $DIFF -u <(echo "$EXPECT") <($NFT reset rules table t) echo "resetting specific family" -EXPECT='table ip t { +EXPECT="table ip t { set s { type ipv4_addr - size 65535 + $size flags dynamic counter elements = { 1.1.1.1 counter packets 1 bytes 11 } @@ -149,14 +155,14 @@ table ip t2 { counter packets 7 bytes 17 accept counter packets 8 bytes 18 drop } -}' +}" $DIFF -u <(echo "$EXPECT") <($NFT reset rules ip) echo "resetting whole ruleset" -EXPECT='table ip t { +EXPECT="table ip t { set s { type ipv4_addr - size 65535 + $size flags dynamic counter elements = { 1.1.1.1 counter packets 1 bytes 11 } @@ -183,5 +189,5 @@ table ip t2 { counter packets 0 bytes 0 accept counter packets 0 bytes 0 drop } -}' +}" $DIFF -u <(echo "$EXPECT") <($NFT reset rules) diff --git a/tests/shell/testcases/rule_management/dumps/0011reset_0.nft b/tests/shell/testcases/rule_management/dumps/0011reset_0.nft index 3b4f5a11..3c29b582 100644 --- a/tests/shell/testcases/rule_management/dumps/0011reset_0.nft +++ b/tests/shell/testcases/rule_management/dumps/0011reset_0.nft @@ -1,7 +1,7 @@ table ip t { set s { type ipv4_addr - size 65535 + size 65535 # count 1 flags dynamic counter elements = { 1.1.1.1 counter packets 1 bytes 11 } diff --git a/tests/shell/testcases/sets/dumps/0016element_leak_0.nft b/tests/shell/testcases/sets/dumps/0016element_leak_0.nft index 9d2b0afe..debd819d 100644 --- a/tests/shell/testcases/sets/dumps/0016element_leak_0.nft +++ b/tests/shell/testcases/sets/dumps/0016element_leak_0.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 1 elements = { 1.1.1.1 } } } diff --git a/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft b/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft index 9d2b0afe..debd819d 100644 --- a/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft +++ b/tests/shell/testcases/sets/dumps/0017add_after_flush_0.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 1 elements = { 1.1.1.1 } } } diff --git a/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft b/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft index 8cd37076..c4b69ef8 100644 --- a/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft +++ b/tests/shell/testcases/sets/dumps/0018set_check_size_1.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 2 elements = { 1.1.1.1, 1.1.1.2 } } } diff --git a/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft b/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft index 8cd37076..c4b69ef8 100644 --- a/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft +++ b/tests/shell/testcases/sets/dumps/0019set_check_size_0.nft @@ -1,7 +1,7 @@ table ip x { set s { type ipv4_addr - size 2 + size 2 # count 2 elements = { 1.1.1.1, 1.1.1.2 } } } diff --git a/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft b/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft index e548a17a..fb9634e6 100644 --- a/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft +++ b/tests/shell/testcases/sets/dumps/0045concat_ipv4_service.nft @@ -1,7 +1,7 @@ table inet t { set s { type ipv4_addr . inet_service - size 65536 + size 65536 # count 1 flags dynamic,timeout elements = { 192.168.7.1 . 22 } } diff --git a/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft b/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft index de43d565..443ca711 100644 --- a/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft +++ b/tests/shell/testcases/sets/dumps/0057set_create_fails_0.nft @@ -1,7 +1,7 @@ table inet filter { set test { type ipv4_addr - size 65535 + size 65535 # count 1 elements = { 1.1.1.1 } } } diff --git a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft index befc2f75..0743453f 100644 --- a/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft +++ b/tests/shell/testcases/sets/dumps/0060set_multistmt_1.nft @@ -1,7 +1,7 @@ table ip x { set y { type ipv4_addr - size 65535 + size 65535 # count 3 flags dynamic counter quota 500 bytes elements = { 1.1.1.1 counter packets 0 bytes 0 quota 500 bytes, |