All VPP tests were the same tests as usual posix iSCSI tests. TEST_TYPE was used to direct which tests to run and in some cases with what parameter. Since VPP is deprecated, this type of selection is no longer needed. All tests will run with default socket abstraction. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I292f1b5141ec8c4dacb4a43c6f51e4d30501a92a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3730 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
123 lines
2.8 KiB
Bash
Executable File
123 lines
2.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/iscsi_tgt/common.sh
|
|
|
|
function waitfortcp() {
|
|
local addr="$2"
|
|
|
|
if hash ip &> /dev/null; then
|
|
local have_ip_cmd=true
|
|
else
|
|
local have_ip_cmd=false
|
|
fi
|
|
|
|
if hash ss &> /dev/null; then
|
|
local have_ss_cmd=true
|
|
else
|
|
local have_ss_cmd=false
|
|
fi
|
|
|
|
echo "Waiting for process to start up and listen on address $addr..."
|
|
# turn off trace for this loop
|
|
xtrace_disable
|
|
local ret=0
|
|
local i
|
|
for ((i = 40; i != 0; i--)); do
|
|
# if the process is no longer running, then exit the script
|
|
# since it means the application crashed
|
|
if ! kill -s 0 $1; then
|
|
echo "ERROR: process (pid: $1) is no longer running"
|
|
ret=1
|
|
break
|
|
fi
|
|
|
|
if $have_ip_cmd; then
|
|
namespace=$(ip netns identify $1)
|
|
if [ -n "$namespace" ]; then
|
|
ns_cmd="ip netns exec $namespace"
|
|
fi
|
|
fi
|
|
|
|
if $have_ss_cmd; then
|
|
if $ns_cmd ss -ln | grep -E -q "\s+$addr\s+"; then
|
|
break
|
|
fi
|
|
elif [[ "$(uname -s)" == "Linux" ]]; then
|
|
# For Linux, if system doesn't have ss, just assume it has netstat
|
|
if $ns_cmd netstat -an | grep -iw LISTENING | grep -E -q "\s+$addr\$"; then
|
|
break
|
|
fi
|
|
fi
|
|
sleep 0.5
|
|
done
|
|
|
|
xtrace_restore
|
|
if ((i == 0)); then
|
|
echo "ERROR: timeout while waiting for process (pid: $1) to start listening on '$addr'"
|
|
ret=1
|
|
fi
|
|
return $ret
|
|
}
|
|
|
|
iscsitestinit
|
|
|
|
HELLO_SOCK_APP="${TARGET_NS_CMD[*]} $SPDK_EXAMPLE_DIR/hello_sock"
|
|
SOCAT_APP="socat"
|
|
|
|
# ----------------
|
|
# Test client path
|
|
# ----------------
|
|
timing_enter sock_client
|
|
echo "Testing client path"
|
|
|
|
# start echo server using socat
|
|
$SOCAT_APP tcp-l:$ISCSI_PORT,fork,bind=$INITIATOR_IP exec:'/bin/cat' &
|
|
server_pid=$!
|
|
trap 'killprocess $server_pid;iscsitestfini; exit 1' SIGINT SIGTERM EXIT
|
|
|
|
waitfortcp $server_pid $INITIATOR_IP:$ISCSI_PORT
|
|
|
|
# send message using hello_sock client
|
|
message="**MESSAGE:This is a test message from the client**"
|
|
response=$(echo $message | $HELLO_SOCK_APP -H $INITIATOR_IP -P $ISCSI_PORT -N "posix")
|
|
|
|
if ! echo "$response" | grep -q "$message"; then
|
|
exit 1
|
|
fi
|
|
|
|
trap '-' SIGINT SIGTERM EXIT
|
|
# NOTE: socat returns code 143 on SIGINT
|
|
killprocess $server_pid || true
|
|
|
|
timing_exit sock_client
|
|
|
|
# ----------------
|
|
# Test server path
|
|
# ----------------
|
|
|
|
timing_enter sock_server
|
|
|
|
# start echo server using hello_sock echo server
|
|
$HELLO_SOCK_APP -H $TARGET_IP -P $ISCSI_PORT -S -N "posix" &
|
|
server_pid=$!
|
|
trap 'killprocess $server_pid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT
|
|
waitforlisten $server_pid
|
|
|
|
# send message to server using socat
|
|
message="**MESSAGE:This is a test message to the server**"
|
|
response=$(echo $message | $SOCAT_APP - tcp:$TARGET_IP:$ISCSI_PORT 2> /dev/null)
|
|
|
|
if [ "$message" != "$response" ]; then
|
|
exit 1
|
|
fi
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
|
|
killprocess $server_pid
|
|
|
|
iscsitestfini
|
|
timing_exit sock_server
|