ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest_common.sh: change rpc_py to rpc_cmd

Browse Source 
Change rpc_py to use rpc_cmd function.
The former needs to be defined explicitly in the scripts
that uses function, while the latter is a function
already available in autotest_common.sh.
Additionally delete unnecessary rpc_py declarations
and override rpc_cmd where additional arguments are
needed (like -s sock_name.sock).

Change-Id: I835f7eb308cd77658a2a425e153ab7ca460b5b61
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12872
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Krzysztof Karas 2022-06-02 07:58:39 +00:00 committed by Tomasz Zawadzki
parent 4cbd23e28b
commit eaebf84102
59 changed files with 6 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/bdev/bdev_raid.sh
View File

@ -3,12 +3,13 @@
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..)
rpc_server=/var/tmp/spdk-raid.sock
rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"
tmp_file=$SPDK_TEST_STORAGE/raidrandtest
source $rootdir/test/common/autotest_common.sh
source $testdir/nbd_common.sh
rpc_py="$rootdir/scripts/rpc.py -s $rpc_server"
function raid_unmap_data_verify() {
if hash blkdiscard; then
local nbd=$1

1
test/blobstore/blob_io_wait/blob_io_wait.sh
View File

@ -9,7 +9,6 @@ fi
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
rpc_py="$rootdir/scripts/rpc.py"
truncate -s 64M $testdir/aio.bdev

2
test/common/autotest_common.sh
View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash
rpc_py=rpc_cmd
function xtrace_fd() {
if [[ -n $BASH_XTRACEFD && -e /proc/self/fd/$BASH_XTRACEFD ]]; then
# Close it first to make sure it's sane

2
test/compress/compress.sh
View File

@ -5,10 +5,10 @@ set -e
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..)
plugindir=$rootdir/examples/bdev/fio_plugin
rpc_py="$rootdir/scripts/rpc.py"
source "$rootdir/scripts/common.sh"
source "$rootdir/test/common/autotest_common.sh"
source "$rootdir/test/nvmf/common.sh"
rpc_py="$rootdir/scripts/rpc.py"
function error_cleanup() {
# force delete pmem file and wipe on-disk metadata

1
test/dpdk_memory_utility/test_dpdk_mem_info.sh
View File

@ -4,7 +4,6 @@ testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..)
source $rootdir/test/common/autotest_common.sh
rpc_py="$rootdir/scripts/rpc.py"
MEM_SCRIPT="$rootdir/scripts/dpdk_mem_info.py"
"${SPDK_APP[@]}" &

2
test/fuzz/autofuzz_iscsi.sh
View File

@ -22,8 +22,6 @@ timing_enter iscsi_fuzz_test
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=4096
rpc_py="$rootdir/scripts/rpc.py"
TEST_TIMEOUT=1200
# This argument is used in addition to the test arguments in autotest_common.sh

2
test/fuzz/autofuzz_nvmf.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
TEST_TIMEOUT=1200
# This argument is used in addition to the test arguments in autotest_common.sh

2
test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
View File

@ -10,8 +10,6 @@ iscsitestinit
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
timing_enter start_iscsi_tgt
"${ISCSI_APP[@]}" -m 0x2 -p 1 -s 512 --wait-for-rpc &

1
test/iscsi_tgt/digests/digests.sh
View File

@ -46,7 +46,6 @@ function iscsi_header_data_digest_test() {
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
timing_enter start_iscsi_tgt

1
test/iscsi_tgt/ext4test/ext4test.sh
View File

@ -7,7 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
iscsitestinit
rpc_py="$rootdir/scripts/rpc.py"
node_base="iqn.2013-06.com.intel.ch.spdk"
timing_enter start_iscsi_tgt

1
test/iscsi_tgt/filesystem/filesystem.sh
View File

@ -9,7 +9,6 @@ source $rootdir/scripts/common.sh
iscsitestinit
rpc_py="$rootdir/scripts/rpc.py"
# Remove lvol bdevs and stores.
function remove_backends() {
echo "INFO: Removing lvol bdev"

1
test/iscsi_tgt/fio/fio.sh
View File

@ -54,7 +54,6 @@ fi
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=4096
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"

2
test/iscsi_tgt/fuzz/fuzz.sh
View File

@ -22,8 +22,6 @@ timing_enter iscsi_fuzz
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=4096
rpc_py="$rootdir/scripts/rpc.py"
timing_enter start_iscsi_tgt
"${ISCSI_APP[@]}" -m $ISCSI_TEST_CORE_MASK --wait-for-rpc &

2
test/iscsi_tgt/initiator/initiator.sh
View File

@ -10,8 +10,6 @@ iscsitestinit
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
timing_enter start_iscsi_tgt
"${ISCSI_APP[@]}" -m 0x2 -p 1 -s 512 --wait-for-rpc &

1
test/iscsi_tgt/ip_migration/ip_migration.sh
View File

@ -7,7 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
iscsitestinit
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
pids=()

1
test/iscsi_tgt/multiconnection/multiconnection.sh
View File

@ -7,7 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
iscsitestinit
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
CONNECTION_NUMBER=30

1
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -9,7 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh
nvmftestinit
iscsitestinit
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
# Namespaces are NOT used here on purpose. Rxe_cfg utility used for NVMf tests do not support namespaces.

1
test/iscsi_tgt/pmem/iscsi_pmem.sh
View File

@ -12,7 +12,6 @@ PMEM_SIZE=128
PMEM_BLOCK_SIZE=512
TGT_NR=10
PMEM_PER_TGT=1
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
timing_enter start_iscsi_target

1
test/iscsi_tgt/qos/qos.sh
View File

@ -52,7 +52,6 @@ MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
IOPS_RESULT=
BANDWIDTH_RESULT=
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
timing_enter start_iscsi_tgt

1
test/iscsi_tgt/rbd/rbd.sh
View File

@ -12,7 +12,6 @@ rbd_setup $TARGET_IP $TARGET_NAMESPACE
trap 'rbd_cleanup; exit 1' SIGINT SIGTERM EXIT
timing_exit rbd_setup
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
timing_enter start_iscsi_tgt

1
test/iscsi_tgt/reset/reset.sh
View File

@ -10,7 +10,6 @@ iscsitestinit
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
fio_py="$rootdir/scripts/fio-wrapper"
if ! hash sg_reset; then

2
test/iscsi_tgt/resize/resize.sh
View File

@ -12,8 +12,6 @@ BDEV_NEW_SIZE=128
BLOCK_SIZE=512
RESIZE_SOCK="/var/tmp/spdk-resize.sock"
rpc_py="$rootdir/scripts/rpc.py"
timing_enter start_iscsi_tgt
# Remove the sock file first

2
test/nvme/compliance/compliance.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
export TEST_TRANSPORT=VFIOUSER
rm -rf /var/run/vfio-user

1
test/nvme/nvme_opal.sh
View File

@ -4,7 +4,6 @@ set -e
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..)
rpc_py="$rootdir/scripts/rpc.py"
source "$rootdir/scripts/common.sh"
source "$rootdir/test/common/autotest_common.sh"

2
test/nvmf/host/aer.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xF

2
test/nvmf/host/bdevperf.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
function tgt_init() {
nvmfappstart -m 0xF

2
test/nvmf/host/discovery.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
if [ "$TEST_TRANSPORT" == "rdma" ]; then
echo "Skipping tests on RDMA because the rdma stack fails to configure the same IP for host and target."
exit 0

1
test/nvmf/host/dma.sh
View File

@ -12,7 +12,6 @@ fi
MALLOC_BDEV_SIZE=256
MALLOC_BLOCK_SIZE=512
subsystem="0"
rpc_py="$rootdir/scripts/rpc.py"
function gen_malloc_json() {
jq . <<- JSON

2
test/nvmf/host/fio.sh
View File

@ -6,8 +6,6 @@ source $rootdir/test/common/autotest_common.sh
source $rootdir/scripts/common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
if [[ $CONFIG_FIO_PLUGIN != y ]]; then

2
test/nvmf/host/identify.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
timing_enter start_nvmf_tgt

2
test/nvmf/host/multicontroller.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
NVMF_HOST_FIRST_PORT="60000"

2
test/nvmf/host/target_disconnect.sh
View File

@ -10,8 +10,6 @@ PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
function disconnect_init() {
nvmfappstart -m 0xF0

2
test/nvmf/target/abort.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=4096
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xE

2
test/nvmf/target/bdev_io_wait.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xF --wait-for-rpc

2
test/nvmf/target/bdevio.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
# Don't use cores 0 - 2 to avoid overlap with bdevio.
nvmfappstart -m 0x78

2
test/nvmf/target/connect_disconnect.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
# connect disconnect is geared towards ensuring that we are properly freeing resources after disconnecting qpairs.
nvmftestinit
nvmfappstart -m 0xF

2
test/nvmf/target/connect_stress.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xE

2
test/nvmf/target/delete_subsystem.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0x3

2
test/nvmf/target/discovery.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
NULL_BDEV_SIZE=102400
NULL_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
if ! hash nvme; then
echo "nvme command not found; skipping discovery test"
exit 0

2
test/nvmf/target/fabrics_fuzz.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
"${NVMF_APP[@]}" -m 0x1 > $output_dir/nvmf_fuzz_tgt_output.txt 2>&1 &

2
test/nvmf/target/filesystem.sh
View File

@ -9,8 +9,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=128
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
function nvmf_filesystem_create() {

2
test/nvmf/target/fused_ordering.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0x2

2
test/nvmf/target/host_management.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
function starttarget() {
# Start the target
nvmfappstart -m 0x1E

2
test/nvmf/target/identify_passthru.sh
View File

@ -6,8 +6,6 @@ source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
source $rootdir/scripts/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
timing_enter nvme_identify

2
test/nvmf/target/initiator_timeout.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xF

2
test/nvmf/target/multiconnection.sh
View File

@ -10,8 +10,6 @@ MALLOC_BLOCK_SIZE=512
NVMF_SUBSYS=11
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xF

2
test/nvmf/target/nmic.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xF

1
test/nvmf/target/nvme_cli.sh
View File

@ -13,7 +13,6 @@ fi
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
devs=()
nvmftestinit

2
test/nvmf/target/nvmf_example.sh
View File

@ -5,8 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
NVMF_EXAMPLE=("$SPDK_EXAMPLE_DIR/nvmf")
MALLOC_BDEV_SIZE=64

1
test/nvmf/target/perf_adq.sh
View File

@ -12,7 +12,6 @@ if ((${#TCP_INTERFACE_LIST[@]} == 0)); then
exit 1
fi
rpc_py="$rootdir/scripts/rpc.py"
perf="$SPDK_EXAMPLE_DIR/perf"
function adq_configure_driver() {

2
test/nvmf/target/queue_depth.sh
View File

@ -10,8 +10,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
bdevperf_rpc_sock=/var/tmp/bdevperf.sock
nvmftestinit

1
test/nvmf/target/rpc.sh
View File

@ -5,7 +5,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
loops=5
function jcount() {

2
test/nvmf/target/shutdown.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
function starttarget() {
nvmftestinit

2
test/nvmf/target/srq_overwhelm.sh
View File

@ -8,8 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart -m 0xF

1
test/nvmf/target/vfio_user_fuzz.sh
View File

@ -8,7 +8,6 @@ source $rootdir/test/nvmf/common.sh
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
rpc_py="$rootdir/scripts/rpc.py"
nqn=nqn.2021-09.io.spdk:cnode0
traddr=/var/run/vfio-user

2
test/nvmf/target/zcopy.sh
View File

@ -6,8 +6,6 @@ rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/nvmf/common.sh
rpc_py="$rootdir/scripts/rpc.py"
nvmftestinit
nvmfappstart

1
test/ocf/integrity/bdevperf-iotypes.sh
View File

@ -5,7 +5,6 @@ rootdir=$(readlink -f $curdir/../../..)
source $rootdir/test/common/autotest_common.sh
bdevperf=$rootdir/test/bdev/bdevperf/bdevperf
rpc_py="$rootdir/scripts/rpc.py"
source "$curdir/mallocs.conf"
$bdevperf --json <(gen_malloc_ocf_json) -q 128 -o 4096 -t 4 -w flush

1
test/ocf/integrity/stats.sh
View File

@ -5,7 +5,6 @@ rootdir=$(readlink -f $curdir/../../..)
source $rootdir/test/common/autotest_common.sh
bdevperf=$rootdir/test/bdev/bdevperf/bdevperf
rpc_py="$rootdir/scripts/rpc.py"
source "$curdir/mallocs.conf"
$bdevperf --json <(gen_malloc_ocf_json) -q 128 -o 4096 -w write -t 120 -r /var/tmp/spdk.sock &

2
test/sma/discovery.sh
View File

@ -6,8 +6,8 @@ rootdir=$(readlink -f "$testdir/../..")
source "$rootdir/test/common/autotest_common.sh"
source "$testdir/common.sh"
rpc_py="$rootdir/scripts/rpc.py"
sma_py="$rootdir/scripts/sma-client.py"
rpc_py="$rootdir/scripts/rpc.py"
t1sock='/var/tmp/spdk.sock1'
t2sock='/var/tmp/spdk.sock2'