diff options
| author | Phil Sutter <phil@nwl.cc> | 2023-03-05 12:46:49 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2023-03-10 13:16:51 +0100 |
| commit | 844f591866865e1d6ff0066e93123458a46b1caf (patch) | |
| tree | 8eb00dce7bf5fa4eafc385f104b3192836c8180f | |
| parent | 621f3a27d058d1e2e3e884fa70503e2de5b6c742 (diff) | |
tests: xlate: Make test input valid
Make sure ipset at least accepts the test input by running it against
plain ipset once for sanity. This exposed two issues:
* Set 'hip5' doesn't have comment support, so add the commented elements
to 'hip6' instead (likely a typo).
* Set 'bip1' range 2.0.0.1-2.1.0.1 exceeds the max allowed for bitmap
sets. Reduce it accordingly.
Fixes: 7587d1c4b5465 ("tests: add tests ipset to nftables")
Signed-off-by: Phil Sutter <phil@nwl.cc>
| -rwxr-xr-x | tests/xlate/runtest.sh | 10 | ||||
| -rw-r--r-- | tests/xlate/xlate.t | 6 | ||||
| -rw-r--r-- | tests/xlate/xlate.t.nft | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/tests/xlate/runtest.sh b/tests/xlate/runtest.sh index 6a2f80c..8b42f0b 100755 --- a/tests/xlate/runtest.sh +++ b/tests/xlate/runtest.sh @@ -6,8 +6,18 @@ if [ ! -x "$DIFF" ] ; then exit 1 fi +ipset=${IPSET_BIN:-../../src/ipset} ipset_xlate=${IPSET_XLATE_BIN:-$(dirname $0)/ipset-translate} +$ipset restore < xlate.t +rc=$? +$ipset destroy +if [ $rc -ne 0 ] +then + echo -e "[\033[0;31mERROR\033[0m] invalid test input" + exit 1 +fi + TMP=$(mktemp) $ipset_xlate restore < xlate.t &> $TMP if [ $? -ne 0 ] diff --git a/tests/xlate/xlate.t b/tests/xlate/xlate.t index f09cb20..38cbc78 100644 --- a/tests/xlate/xlate.t +++ b/tests/xlate/xlate.t @@ -11,8 +11,8 @@ add hip4 192.168.10.0 create hip5 hash:ip maxelem 24 add hip5 192.168.10.0 create hip6 hash:ip comment -add hip5 192.168.10.1 -add hip5 192.168.10.2 comment "this is a comment" +add hip6 192.168.10.1 +add hip6 192.168.10.2 comment "this is a comment" create ipp1 hash:ip,port add ipp1 192.168.10.1,0 add ipp1 192.168.10.2,5 @@ -23,7 +23,7 @@ create ipp3 hash:ip,port counters add ipp3 192.168.10.3,20 packets 5 bytes 3456 create ipp4 hash:ip,port timeout 4 counters add ipp4 192.168.10.3,20 packets 5 bytes 3456 -create bip1 bitmap:ip range 2.0.0.1-2.1.0.1 timeout 5 +create bip1 bitmap:ip range 2.0.0.1-2.0.1.1 timeout 5 create bip2 bitmap:ip range 10.0.0.0/8 netmask 24 timeout 5 add bip2 10.10.10.0 add bip2 10.10.20.0 timeout 12 diff --git a/tests/xlate/xlate.t.nft b/tests/xlate/xlate.t.nft index 0152a30..8fb2a29 100644 --- a/tests/xlate/xlate.t.nft +++ b/tests/xlate/xlate.t.nft @@ -12,8 +12,8 @@ add element inet global hip4 { 192.168.10.0/24 } add set inet global hip5 { type ipv4_addr; size 24; } add element inet global hip5 { 192.168.10.0 } add set inet global hip6 { type ipv4_addr; } -add element inet global hip5 { 192.168.10.1 } -add element inet global hip5 { 192.168.10.2 comment "this is a comment" } +add element inet global hip6 { 192.168.10.1 } +add element inet global hip6 { 192.168.10.2 comment "this is a comment" } add set inet global ipp1 { type ipv4_addr . inet_proto . inet_service; } add element inet global ipp1 { 192.168.10.1 . tcp . 0 } add element inet global ipp1 { 192.168.10.2 . tcp . 5 } |