diff options
author | Thomas Haller <thaller@redhat.com> | 2023-09-18 12:28:28 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2023-09-18 13:09:03 +0200 |
commit | 78fa7db4885496fd906ccbfbe0a6a3deed81c8a8 (patch) | |
tree | 1071d3d16d640244609cabab9107882ca2b4b7b1 /tests/shell/testcases/sets/typeof_sets_0 | |
parent | f30cb622d27e4b14454bccb4b9c0c990a68888df (diff) |
tests/shell: check diff in "maps/typeof_maps_0" and "sets/typeof_sets_0" test
These tests run different variants based on NFT_TEST_HAVE_osf support.
Consequently, we cannot check the pre-generated diff.
Instead, construct what we expect dynamically in the script, and compare
the ruleset against that.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/shell/testcases/sets/typeof_sets_0')
-rwxr-xr-x | tests/shell/testcases/sets/typeof_sets_0 | 133 |
1 files changed, 118 insertions, 15 deletions
diff --git a/tests/shell/testcases/sets/typeof_sets_0 b/tests/shell/testcases/sets/typeof_sets_0 index 6ed0c354..c1c0f51f 100755 --- a/tests/shell/testcases/sets/typeof_sets_0 +++ b/tests/shell/testcases/sets/typeof_sets_0 @@ -4,21 +4,35 @@ # s1 and s2 are identical, they just use different # ways for declaration. -OSFSET="" -OSFCHAIN="" -if [ "$NFT_TEST_HAVE_osf" != n ] ; then - OSFSET="set s1 { +set -e + +die() { + printf '%s\n' "$*" + exit 1 +} + +INPUT_OSF_SET=" + set s1 { typeof osf name elements = { \"Linux\" } - }" - OSFCHAIN="chain c1 { + } +" +INPUT_OSF_CHAIN=" + chain c1 { osf name @s1 accept - }" -fi + } +" -EXPECTED="table inet t { - $OSFSET +if [ "$NFT_TEST_HAVE_osf" = n ] ; then + if [ "$((RANDOM % 2))" -eq 1 ] ; then + # Regardless of $NFT_TEST_HAVE_osf, we can define the set. + # Randomly do so. + INPUT_OSF_SET= + fi + INPUT_OSF_CHAIN= +fi +INPUT="table inet t {$INPUT_OSF_SET set s2 { typeof vlan id elements = { 2, 3, 103 } @@ -68,9 +82,7 @@ EXPECTED="table inet t { typeof vlan id . ip saddr elements = { 3567 . 1.2.3.4 } } - - $OSFCHAIN - +$INPUT_OSF_CHAIN chain c2 { ether type vlan vlan id @s2 accept } @@ -108,8 +120,99 @@ EXPECTED="table inet t { } }" -set -e -$NFT -f - <<< $EXPECTED +EXPECTED="table inet t {$INPUT_OSF_SET + set s2 { + typeof vlan id + elements = { 2, 3, 103 } + } + + set s3 { + typeof meta ibrpvid + elements = { 2, 3, 103 } + } + + set s4 { + typeof frag frag-off + elements = { 1, 1024 } + } + + set s5 { + typeof ip option ra value + elements = { 1, 1024 } + } + + set s6 { + typeof tcp option maxseg size + elements = { 1, 1024 } + } + + set s7 { + typeof sctp chunk init num-inbound-streams + elements = { 1, 4 } + } + + set s8 { + typeof ip version + elements = { 4, 6 } + } + + set s9 { + typeof ip hdrlength + elements = { 0, 1, 2, 3, 4, + 15 } + } + + set s10 { + typeof iifname . ip saddr . ipsec in reqid + elements = { \"eth0\" . 10.1.1.2 . 42 } + } + + set s11 { + typeof vlan id . ip saddr + elements = { 3567 . 1.2.3.4 } + } +$INPUT_OSF_CHAIN + chain c2 { + vlan id @s2 accept + } + + chain c4 { + frag frag-off @s4 accept + } + + chain c5 { + ip option ra value @s5 accept + } + + chain c6 { + tcp option maxseg size @s6 accept + } + + chain c7 { + sctp chunk init num-inbound-streams @s7 accept + } + + chain c8 { + ip version @s8 accept + } + + chain c9 { + ip hdrlength @s9 accept + } + + chain c10 { + iifname . ip saddr . ipsec in reqid @s10 accept + } + + chain c11 { + vlan id . ip saddr @s11 accept + } +}" + + +$NFT -f - <<< "$INPUT" || die $'nft command failed to process input:\n'">$INPUT<" + +$DIFF -u <($NFT list ruleset) - <<<"$EXPECTED" || die $'diff failed between ruleset and expected data.\nExpected:\n'">$EXPECTED<" if [ "$NFT_TEST_HAVE_osf" = n ] ; then echo "Partial test due to NFT_TEST_HAVE_osf=n. Skip" |