tests: shell: Add a test case to verify the limit statement.
PATCH 1/1 tests: shell: Add a test case to verify the limit statement.
--- tests/shell/features/ncat.sh | 4 + tests/shell/testcases/packetpath/rate_limit | 154 ++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100755 tests/shell/features/ncat.sh create mode 100755 tests/shell/testcases/packetpath/rate_limit
tests/shell/features/ncat.sh new file +4 -0
@@ -0,0 +1,4 @@ +#!/bin/sh + +# check whether ncat is installed +ncat -h >/dev/null 2>&1
tests/shell/testcases/packetpath/rate_limit new file +154 -0
154 lines not on this page · raw message
Signature · 1 line
2.49.0
Florian Westphal
maintainerQuoted 14 lines · Yi Chen
Signed-off-by Yi Chen <[email protected]>--- tests/shell/features/ncat.sh | 4 + tests/shell/testcases/packetpath/rate_limit | 154 ++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100755 tests/shell/features/ncat.sh create mode 100755 tests/shell/testcases/packetpath/rate_limittests/shell/features/ncat.sh new file +0
-0
tests/shell/features/ncat.sh line 4
Quoted 4 lines
tests/shell/features/ncat.sh new file +4
-0@@ -0,0 +1,4 @@ +#!/bin/sh + +# check whether ncat is installed +ncat -h >/dev/null 2>&1
Could you convert the test to use socat, which is already used by many other tests?
tests/shell/features/ncat.sh
Quoted 10 lines
tests/shell/features/ncat.sh new file +10
-0+assert_pass() +{ + local ret=$? + if [ $ret != 0 ]; then + echo "FAIL: ${@}" + exit 1 + else + echo "PASS: ${@}" + fi +}
This is now the 3rd copy of this helper.
Maybe its time to add a library/utility file that has these functions?
test-wrapper.sh could export an environment variable pointing to it, e.g.
export NFT_TEST_LIBRARY_FILE="$NFT_TEST_BASEDIR/helpers/lib.sh"
or whatever. Then tests can do
. $NFT_TEST_LIBRARY_FILE
and gain these helpers in case they need them.
tests/shell/features/ncat.sh
Quoted 2 lines
tests/shell/features/ncat.sh new file +2
-0+# tcp test +ip netns exec $S ncat -lk 80 > /dev/null & sleep 1
I guess sleep 1 is fine. But maybe its time to add a central helper for this wait.
You could submit a patch that adds the helpers/lib.sh file and then lifts the "wait_local_port_listen" helper function from
Other than that I think the test looks good, thanks Yi!
A message that is not in the archive (sent off-list or not yet received): CAJsUoE0etJbdwHsHFHDnY1CkdmAXLJy7PunwQg9Me4n-AMPWmQ@mail.gmail.com
Florian Westphal
maintainerQuoted 5 lines · Yi Chen
Quoted 3 lines
export NFT_TEST_LIBRARY_FILE="$NFT_TEST_BASEDIR/helpers/lib.sh" or whatever. Then tests can do
. $NFT_TEST_LIBRARY_FILEI prefer a single test script that can be executed independently.
Why? Its possible to execute only one test viatests/shell/run-tests.sh $filename
There is one exeception in the tree:
tests/shell/testcases/transactions/30s-stress
... because that script can be passed a run-time, when executed as part of the tests it runs for 30s but one can do "tests/shell/testcases/transactions/30s-stress 600" etc.
Thats also why it does this:
if [ x = x"$NFT" ] ; then
NFT=nft
fi
I missed this earlier when reviewing nft_nat test:
+ ip netns exec $R nft -f - <<-EOF
*ALL* "nft" should be replaced by "$NFT", so when the tests are executed the locally built nft version, i.e. src/nft, is used, not the system binary.
Also:tools/check-tree.sh |grep ftp
ERR: "tests/shell/testcases/packetpath/nat_ftp" has no "tests/shell/testcases/packetpath/dumps/nat_ftp.{nft,nodump}" file
In this case it makes sense to add
tests/shell/testcases/packetpath/dumps/nat_ftp.nodump
Can you send a followup patch?
Thanks, and sorry for missing this earlier.
Quoted 2 lines
So, Would you accept something like:
. $NFT_TEST_LIBRARY_FILE || . ${PWD%%/testcases*}/helpers/lib.sh?
Yes, but only if there is a compelling reason for the stand-alone requirement.
A message that is not in the archive (sent off-list or not yet received): CAJsUoE1ZChx7VcbZLnBpwbbkhGmfVVzomHUu7GP8xQCs00gZrw@mail.gmail.com
Using tests/shell/run-tests.sh $filename has a small drawback:
when run manually, all output is buffered and only displayed at once after the script finishes.
I guess it's not a compelling reason, but maybe we can improve the single test output with unbuffered mode.
nft -> $NFT:
I also noticed it.
Will send out a fix later, thanks!
PATCH 1/1 tests: shell: Verify limit statement with new test case.
In reply to Yi Chen1. Add rate_limit test case.
2. Consolidate frequently used functions in helper/lib.sh
3. Introduce NFT_TEST_LIBRARY_FILE variable to source helper/lib.sh in tests.
4. Replace sleep with wait_local_port_listen().
5. Other fixes: nft->$NFT; add dumps/*.nodump files
--- tests/shell/helpers/lib.sh | 51 +++++++ tests/shell/helpers/test-wrapper.sh | 1 + .../testcases/packetpath/dumps/nat_ftp.nodump | 0 .../packetpath/dumps/rate_limit.nodump | 0 tests/shell/testcases/packetpath/flowtables | 32 +--- tests/shell/testcases/packetpath/nat_ftp | 32 ++-- tests/shell/testcases/packetpath/rate_limit | 137 ++++++++++++++++++ 7 files changed, 211 insertions(+), 42 deletions(-) create mode 100755 tests/shell/helpers/lib.sh create mode 100644 tests/shell/testcases/packetpath/dumps/nat_ftp.nodump create mode 100644 tests/shell/testcases/packetpath/dumps/rate_limit.nodump create mode 100755 tests/shell/testcases/packetpath/rate_limit
tests/shell/helpers/lib.sh new file +51 -0
@@ -0,0 +1,51 @@ +#!/bin/bash + +# Frequently used functions. + +wait_local_port_listen() +{ + local listener_ns="${1}" + local port="${2}" + local protocol="${3}" + local pattern + local i + + pattern=":$(printf "%04X" "${port}") " + + # for tcp protocol additionally check the socket state + [ ${protocol} = "tcp" ] && pattern="${pattern}0A" + for i in $(seq 10); do + if ip netns exec "${listener_ns}" awk '{print $2" "$4}' \ + /proc/net/"${protocol}"* | grep -q "${pattern}"; then + break + fi + sleep 0.1 + done +} + +assert_pass() +{ + local ret=$? + if [ $ret != 0 ]; then + echo "FAIL: ${@}" + if type -t failout; then + failout + fi + exit 1 + else + echo "PASS: ${@}" + fi +} +assert_fail() +{ + local ret=$? + if [ $ret == 0 ]; then + echo "FAIL: ${@}" + if type -t failout; then + failout + fi + exit 1 + else + echo "PASS: ${@}" + fi +}
tests/shell/helpers/test-wrapper.sh +1 -0
@@ -36,6 +36,7 @@ TESTDIR="$(dirname "$TEST")" START_TIME="$(cut -d ' ' -f1 /proc/uptime)" export TMPDIR="$NFT_TEST_TESTTMPDIR" +export NFT_TEST_LIBRARY_FILE="$NFT_TEST_BASEDIR/helpers/lib.sh" CLEANUP_UMOUNT_VAR_RUN=n
tests/shell/testcases/packetpath/dumps/nat_ftp.nodump new file +0 -0
tests/shell/testcases/packetpath/dumps/rate_limit.nodump new file +0 -0
tests/shell/testcases/packetpath/flowtables +8 -24
@@ -3,6 +3,8 @@ # NFT_TEST_REQUIRES(NFT_TEST_HAVE_socat) # NFT_TEST_SKIP(NFT_TEST_SKIP_slow) +. $NFT_TEST_LIBRARY_FILE + rnd=$(mktemp -u XXXXXXXX) R="flowtable-router-$rnd" C="flowtable-client-$rnd"
@@ -17,29 +19,10 @@ cleanup() } trap cleanup EXIT -assert_pass() -{ - local ret=$? - if [ $ret != 0 ] - then - echo "FAIL: ${@}" - ip netns exec $R cat /proc/net/nf_conntrack - exit 1 - else - echo "PASS: ${@}" - fi -} -assert_fail() +# call back when assert failed +failout() { - local ret=$? - if [ $ret == 0 ] - then - echo "FAIL: ${@}" - ip netns exec $R cat /proc/net/nf_conntrack - exit 1 - else - echo "PASS: ${@}" - fi + ip netns exec $R cat /proc/net/nf_conntrack } ip netns add $R
@@ -67,7 +50,7 @@ sleep 3 ip netns exec $C ping -q -6 2001:db8:ffff:22::1 -c1 assert_pass "topo initialization" -ip netns exec $R nft -f - <<EOF +ip netns exec $R $NFT -f - <<EOF table ip6 filter { flowtable f1 { hook ingress priority -100
@@ -100,7 +83,8 @@ assert_pass "set net.netfilter.nf_conntrack_tcp_timeout_established=86400" # A trick to control the timing to send a packet ip netns exec $S socat TCP6-LISTEN:10001 GOPEN:/tmp/socat-$rnd,ignoreeof & -sleep 1 +wait_local_port_listen $S 10001 tcp + ip netns exec $C socat -b 2048 PIPE:/tmp/pipefile-$rnd 'TCP:[2001:db8:ffff:22::1]:10001' & sleep 1 ip netns exec $C echo "send sth" >> /tmp/pipefile-$rnd ; assert_pass "send a packet"
tests/shell/testcases/packetpath/nat_ftp +14 -18
@@ -4,6 +4,7 @@ # NFT_TEST_REQUIRES(NFT_TEST_HAVE_curl) # NFT_TEST_REQUIRES(NFT_TEST_HAVE_vsftpd) +. $NFT_TEST_LIBRARY_FILE cleanup() { for i in $R $C $S;do
@@ -14,22 +15,15 @@ cleanup() } trap cleanup EXIT -assert_pass() +# call back when assert failed +failout() { - local ret=$? - if [ $ret != 0 ] - then - echo "FAIL: ${@}" - ip netns exec $R nft list ruleset - tcpdump -nnr ${PCAP} - test -r /proc/net/nf_conntrack && ip netns exec $R cat /proc/net/nf_conntrack - ip netns exec $R conntrack -S - ip netns exec $R conntrack -L - ip netns exec $S ss -nitepal - exit 1 - else - echo "PASS: ${@}" - fi + ip netns exec $R $NFT list ruleset + tcpdump -nnr ${PCAP} + test -r /proc/net/nf_conntrack && ip netns exec $R cat /proc/net/nf_conntrack + ip netns exec $R conntrack -S + ip netns exec $R conntrack -L + ip netns exec $S ss -nitepal } rnd=$(mktemp -u XXXXXXXX)
@@ -82,7 +76,7 @@ assert_pass "topo initialization" reload_ruleset() { ip netns exec $R conntrack -F 2> /dev/null - ip netns exec $R nft -f - <<-EOF + ip netns exec $R $NFT -f - <<-EOF flush ruleset table ip6 ftp_helper_nat_test { ct helper ftp-standard {
@@ -138,7 +132,8 @@ pam_service_name=vsftpd background=YES EOF ip netns exec $S vsftpd ${FTPCONF} -sleep 1 +wait_local_port_listen $S 21 tcp + ip netns exec $S ss -6ltnp | grep -q '*:21' assert_pass "start vsftpd server"
@@ -147,7 +142,7 @@ assert_pass "start vsftpd server" reload_ruleset ip netns exec $S tcpdump -q --immediate-mode -Ui s_r -w ${PCAP} 2> /dev/null & pid=$! -sleep 1 +sleep 0.5 ip netns exec $C curl --no-progress-meter --connect-timeout 5 ftp://[${ip_rc}]:2121/$(basename $INFILE) -o $OUTFILE assert_pass "curl ftp passive mode "
@@ -164,6 +159,7 @@ reload_ruleset ip netns exec $S tcpdump -q --immediate-mode -Ui s_r -w ${PCAP} 2> /dev/null & pid=$! +sleep 0.5 ip netns exec $C curl --no-progress-meter -P - --connect-timeout 5 ftp://[${ip_rc}]:2121/$(basename $INFILE) -o $OUTFILE assert_pass "curl ftp active mode "
tests/shell/testcases/packetpath/rate_limit new file +137 -0
137 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH v2 1/1 tests: shell: Verify limit statement with new test case.
In reply to Yi Chen1. Add rate_limit test case.
2. Consolidate frequently used functions in helper/lib.sh
3. Introduce NFT_TEST_LIBRARY_FILE variable to source helper/lib.sh in tests.
4. Replace sleep with wait_local_port_listen().
5. Other fixes: nft->$NFT; add dumps/*.nodump files
--- tests/shell/helpers/lib.sh | 51 +++++++ tests/shell/helpers/test-wrapper.sh | 1 + .../testcases/packetpath/dumps/nat_ftp.nodump | 0 .../packetpath/dumps/rate_limit.nodump | 0 tests/shell/testcases/packetpath/flowtables | 32 +--- tests/shell/testcases/packetpath/nat_ftp | 32 ++-- tests/shell/testcases/packetpath/rate_limit | 137 ++++++++++++++++++ 7 files changed, 211 insertions(+), 42 deletions(-) create mode 100755 tests/shell/helpers/lib.sh create mode 100644 tests/shell/testcases/packetpath/dumps/nat_ftp.nodump create mode 100644 tests/shell/testcases/packetpath/dumps/rate_limit.nodump create mode 100755 tests/shell/testcases/packetpath/rate_limit
tests/shell/helpers/lib.sh new file +51 -0
@@ -0,0 +1,51 @@ +#!/bin/bash + +# Frequently used functions. + +wait_local_port_listen() +{ + local listener_ns="${1}" + local port="${2}" + local protocol="${3}" + local pattern + local i + + pattern=":$(printf "%04X" "${port}") " + + # for tcp protocol additionally check the socket state + [ ${protocol} = "tcp" ] && pattern="${pattern}0A" + for i in $(seq 10); do + if ip netns exec "${listener_ns}" awk '{print $2" "$4}' \ + /proc/net/"${protocol}"* | grep -q "${pattern}"; then + break + fi + sleep 0.1 + done +} + +assert_pass() +{ + local ret=$? + if [ $ret != 0 ]; then + echo "FAIL: ${@}" + if type -t failout; then + failout + fi + exit 1 + else + echo "PASS: ${@}" + fi +} +assert_fail() +{ + local ret=$? + if [ $ret == 0 ]; then + echo "FAIL: ${@}" + if type -t failout; then + failout + fi + exit 1 + else + echo "PASS: ${@}" + fi +}
tests/shell/helpers/test-wrapper.sh +1 -0
@@ -36,6 +36,7 @@ TESTDIR="$(dirname "$TEST")" START_TIME="$(cut -d ' ' -f1 /proc/uptime)" export TMPDIR="$NFT_TEST_TESTTMPDIR" +export NFT_TEST_LIBRARY_FILE="$NFT_TEST_BASEDIR/helpers/lib.sh" CLEANUP_UMOUNT_VAR_RUN=n
tests/shell/testcases/packetpath/dumps/nat_ftp.nodump new file +0 -0
tests/shell/testcases/packetpath/dumps/rate_limit.nodump new file +0 -0
tests/shell/testcases/packetpath/flowtables +8 -24
@@ -3,6 +3,8 @@ # NFT_TEST_REQUIRES(NFT_TEST_HAVE_socat) # NFT_TEST_SKIP(NFT_TEST_SKIP_slow) +. $NFT_TEST_LIBRARY_FILE + rnd=$(mktemp -u XXXXXXXX) R="flowtable-router-$rnd" C="flowtable-client-$rnd"
@@ -17,29 +19,10 @@ cleanup() } trap cleanup EXIT -assert_pass() -{ - local ret=$? - if [ $ret != 0 ] - then - echo "FAIL: ${@}" - ip netns exec $R cat /proc/net/nf_conntrack - exit 1 - else - echo "PASS: ${@}" - fi -} -assert_fail() +# call back when assert failed +failout() { - local ret=$? - if [ $ret == 0 ] - then - echo "FAIL: ${@}" - ip netns exec $R cat /proc/net/nf_conntrack - exit 1 - else - echo "PASS: ${@}" - fi + ip netns exec $R cat /proc/net/nf_conntrack } ip netns add $R
@@ -67,7 +50,7 @@ sleep 3 ip netns exec $C ping -q -6 2001:db8:ffff:22::1 -c1 assert_pass "topo initialization" -ip netns exec $R nft -f - <<EOF +ip netns exec $R $NFT -f - <<EOF table ip6 filter { flowtable f1 { hook ingress priority -100
@@ -100,7 +83,8 @@ assert_pass "set net.netfilter.nf_conntrack_tcp_timeout_established=86400" # A trick to control the timing to send a packet ip netns exec $S socat TCP6-LISTEN:10001 GOPEN:/tmp/socat-$rnd,ignoreeof & -sleep 1 +wait_local_port_listen $S 10001 tcp + ip netns exec $C socat -b 2048 PIPE:/tmp/pipefile-$rnd 'TCP:[2001:db8:ffff:22::1]:10001' & sleep 1 ip netns exec $C echo "send sth" >> /tmp/pipefile-$rnd ; assert_pass "send a packet"
tests/shell/testcases/packetpath/nat_ftp +14 -18
@@ -4,6 +4,7 @@ # NFT_TEST_REQUIRES(NFT_TEST_HAVE_curl) # NFT_TEST_REQUIRES(NFT_TEST_HAVE_vsftpd) +. $NFT_TEST_LIBRARY_FILE cleanup() { for i in $R $C $S;do
@@ -14,22 +15,15 @@ cleanup() } trap cleanup EXIT -assert_pass() +# call back when assert failed +failout() { - local ret=$? - if [ $ret != 0 ] - then - echo "FAIL: ${@}" - ip netns exec $R nft list ruleset - tcpdump -nnr ${PCAP} - test -r /proc/net/nf_conntrack && ip netns exec $R cat /proc/net/nf_conntrack - ip netns exec $R conntrack -S - ip netns exec $R conntrack -L - ip netns exec $S ss -nitepal - exit 1 - else - echo "PASS: ${@}" - fi + ip netns exec $R $NFT list ruleset + tcpdump -nnr ${PCAP} + test -r /proc/net/nf_conntrack && ip netns exec $R cat /proc/net/nf_conntrack + ip netns exec $R conntrack -S + ip netns exec $R conntrack -L + ip netns exec $S ss -nitepal } rnd=$(mktemp -u XXXXXXXX)
@@ -82,7 +76,7 @@ assert_pass "topo initialization" reload_ruleset() { ip netns exec $R conntrack -F 2> /dev/null - ip netns exec $R nft -f - <<-EOF + ip netns exec $R $NFT -f - <<-EOF flush ruleset table ip6 ftp_helper_nat_test { ct helper ftp-standard {
@@ -138,7 +132,8 @@ pam_service_name=vsftpd background=YES EOF ip netns exec $S vsftpd ${FTPCONF} -sleep 1 +wait_local_port_listen $S 21 tcp + ip netns exec $S ss -6ltnp | grep -q '*:21' assert_pass "start vsftpd server"
@@ -147,7 +142,7 @@ assert_pass "start vsftpd server" reload_ruleset ip netns exec $S tcpdump -q --immediate-mode -Ui s_r -w ${PCAP} 2> /dev/null & pid=$! -sleep 1 +sleep 0.5 ip netns exec $C curl --no-progress-meter --connect-timeout 5 ftp://[${ip_rc}]:2121/$(basename $INFILE) -o $OUTFILE assert_pass "curl ftp passive mode "
@@ -164,6 +159,7 @@ reload_ruleset ip netns exec $S tcpdump -q --immediate-mode -Ui s_r -w ${PCAP} 2> /dev/null & pid=$! +sleep 0.5 ip netns exec $C curl --no-progress-meter -P - --connect-timeout 5 ftp://[${ip_rc}]:2121/$(basename $INFILE) -o $OUTFILE assert_pass "curl ftp active mode "
tests/shell/testcases/packetpath/rate_limit new file +137 -0
137 lines not on this page · raw message
Signature · 1 line
2.49.0
Florian Westphal
maintainerRe: [PATCH v2] tests: shell: Verify limit statement with new test case.
Quoted 6 lines · Yi Chen
1. Add
rate_limittest case.
2. Consolidate frequently used functions inhelper/lib.sh
3. IntroduceNFT_TEST_LIBRARY_FILEvariable to sourcehelper/lib.shin tests.
4. Replace sleep withwait_local_port_listen().
5. Other fixes: nft->$NFT; add dumps/*.nodump files
This is hard to review, can you split this in multiple patches to make it easier? We prefer to have one logical patch per change. For example:
Patch1: don't use system nft binary
You can also add the .nodump file in this patch.
Patch 2:
Consolidate frequently used functions in helper/lib.sh
This also adds the NFT_TEST_LIBRARY_FILE environment variable and would switch nat_ftp and flowtables to use it.
Patch 3: add and use wait_local_port_listen
This would add the helper and convert sleeps after listener to use the new helper.
Patch 4:
Adds the new rate_limit test case and a nodump file.
I mean, the changes look good to me but I think its too big for one single change.