d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/nvmf: Do not use config files

Browse Source 
Use rpc methods instead config file in nvmf tests

Change-Id: I75354cae95e1dd5d0e08f5c694b369fb270b92a4
Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/419006
Reviewed-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Pawel Niedzwiecki 2018-07-11 22:28:56 +02:00 committed by Jim Harris
parent a691aa3121
commit 07926e1b55
13 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/nvmf/discovery/discovery.sh
View File

@ -27,12 +27,14 @@ fi
timing_enter discovery
timing_enter start_nvmf_tgt
# Start up the NVMf target in another process
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) "

6
test/nvmf/filesystem/filesystem.sh
View File

@ -23,14 +23,14 @@ timing_enter fs_test
for incapsule in 0 4096; do
# Start up the NVMf target in another process
cp $testdir/../nvmf.conf /tmp/nvmf.conf
echo "InCapsuleDataSize $incapsule" >> /tmp/nvmf.conf
$NVMF_APP -c /tmp/nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4 -c $incapsule
$rpc_py start_subsystem_init
bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

4
test/nvmf/fio/fio.sh
View File

@ -22,12 +22,14 @@ fi
timing_enter fio
timing_enter start_nvmf_tgt
# Start up the NVMf target in another process
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "

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

@ -19,12 +19,14 @@ fi
timing_enter aer
timing_enter start_nvmf_tgt
$NVMF_APP -s 512 -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
modprobe -v nvme-rdma

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

@ -22,12 +22,14 @@ fi
timing_enter bdevperf
timing_enter start_nvmf_tgt
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

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

@ -25,12 +25,14 @@ fi
timing_enter fio
timing_enter start_nvmf_tgt
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
bdevs="$bdevs $($rpc_py construct_malloc_bdev 64 512)"

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

@ -21,12 +21,14 @@ fi
timing_enter identify
timing_enter start_nvmf_tgt
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

13
test/nvmf/host/perf.sh
View File

@ -22,19 +22,18 @@ fi
timing_enter perf
timing_enter start_nvmf_tgt
cp $testdir/../nvmf.conf $testdir/nvmf.conf
$rootdir/scripts/gen_nvme.sh >> $testdir/nvmf.conf
local_nvme_trid=$(grep TransportID $testdir/nvmf.conf | head -n1 | awk -F"\"" '{print $2}')
$NVMF_APP -c $testdir/nvmf.conf -i 0 &
$NVMF_APP -m 0xF -w -i 0 &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
timing_exit start_nvmf_tgt
local_nvme_trid="trtype:PCIe traddr:"$($rpc_py get_subsystem_config bdev | jq -r '.[].params | select(.name=="Nvme0").traddr')
bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"
if [ -n "$local_nvme_trid" ]; then
@ -87,7 +86,5 @@ fi
trap - SIGINT SIGTERM EXIT
rm -f $testdir/nvmf.conf
killprocess $nvmfpid
timing_exit perf

4
test/nvmf/lvol/nvmf_lvol.sh
View File

@ -39,12 +39,14 @@ fi
timing_enter lvol_integrity
timing_enter start_nvmf_tgt
# Start up the NVMf target in another process
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
pid=$!
trap "disconnect_nvmf; killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
modprobe -v nvme-rdma

4
test/nvmf/multiconnection/multiconnection.sh
View File

@ -31,12 +31,14 @@ fi
timing_enter multiconnection
timing_enter start_nvmf_tgt
# Start up the NVMf target in another process
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
pid=$!
trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
modprobe -v nvme-rdma

4
test/nvmf/nvme_cli/nvme_cli.sh
View File

@ -28,12 +28,14 @@ fi
timing_enter nvme_cli
timing_enter start_nvmf_tgt
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
nvmfpid=$!
trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

4
test/nvmf/rpc/rpc.sh
View File

@ -19,12 +19,14 @@ fi
timing_enter rpc
timing_enter start_nvmf_tgt
# Start up the NVMf target in another process
$rootdir/app/nvmf_tgt/nvmf_tgt -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
pid=$!
trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
# set times for subsystem construct/delete

4
test/nvmf/shutdown/shutdown.sh
View File

@ -22,12 +22,14 @@ fi
timing_enter shutdown
timing_enter start_nvmf_tgt
# Start up the NVMf target in another process
$NVMF_APP -c $testdir/../nvmf.conf &
$NVMF_APP -m 0xF -w &
pid=$!
trap "killprocess $pid; nvmfcleanup; exit 1" SIGINT SIGTERM EXIT
waitforlisten $pid
$rpc_py set_nvmf_target_options -u 8192 -p 4
$rpc_py start_subsystem_init
timing_exit start_nvmf_tgt
num_subsystems=10