390542a39e
Adds an option to spdkcli.py to allow connection over a tcp via a host address and port. These options match the format that exists in rpc.py Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com> Change-Id: I7e9e1c376546dd765ffd6f4f4db88e193e9aa0ef Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467844 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
66 lines
1.4 KiB
Bash
Executable File
66 lines
1.4 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/spdkcli/common.sh
|
|
|
|
function waitfortcplisten() {
|
|
# $1 = process pid
|
|
if [ -z "$1" ]; then
|
|
exit 1
|
|
fi
|
|
|
|
local ipaddr=$2
|
|
local port=$3
|
|
|
|
echo "Waiting for process to start up and listen on TCP/IP Socket $ipaddr:$port..."
|
|
# 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 $rootdir/scripts/rpc.py -t 1 -s "$ipaddr" -p $port rpc_get_methods &>/dev/null; then
|
|
break
|
|
fi
|
|
|
|
sleep 0.5
|
|
done
|
|
|
|
xtrace_restore
|
|
if (( i == 0 )); then
|
|
echo "ERROR: timeout while waiting for process (pid: $1) to start listening on '$ipaddr:$port'"
|
|
ret=1
|
|
fi
|
|
return $ret
|
|
}
|
|
|
|
IP_ADDRESS="127.0.0.1"
|
|
PORT="9998"
|
|
|
|
timing_enter spdkcli_tcp
|
|
trap 'on_error_exit;' ERR
|
|
|
|
timing_enter run_spdk_tgt_tcp
|
|
$rootdir/app/spdk_tgt/spdk_tgt -m 0x3 -p 0 -s 2048 -r $IP_ADDRESS:$PORT &
|
|
spdk_tgt_pid=$!
|
|
|
|
# This will issue a rpc request to the spdk target thus validating tcp
|
|
waitfortcplisten $spdk_tgt_pid $IP_ADDRESS $PORT
|
|
|
|
timing_exit run_spdk_tgt_tcp
|
|
|
|
killprocess $spdk_tgt_pid
|
|
|
|
timing_exit spdkcli_tcp
|
|
|
|
report_test_completion spdkcli_tcp
|