Commit 5fbbb6c0 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

test/nvmf: Use create_transport instead of set_tgt_opts 



When running these tests, we want to set the transport opts, not
necessarily the target opts. This will also open us up to doing broader
tests in the future against different transports.

Change-Id: I73112f82c371592456c65355f53f7970878a59c3
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/429049


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent e6dac39c

test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh

+1 −1
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ nvmfpid=$! 
echo "NVMf target launched. pid: $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

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

echo "NVMf target has started."

bdevs=$($rpc_py construct_malloc_bdev 64 512)

$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001

test/nvmf/bdev_io_wait/bdev_io_wait.sh

+1 −1
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ nvmfpid=$! 
trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py set_nvmf_target_options -u 8192 -p 4

# Minimal number of bdev io pool (5) and cache (1)

$rpc_py set_bdev_options -p 5 -c 1

$rpc_py start_subsystem_init

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt



modprobe -v nvme-rdma

test/nvmf/discovery/discovery.sh

+1 −1
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ nvmfpid=$! 
trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py set_nvmf_target_options -u 8192 -p 4

$rpc_py start_subsystem_init

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt



null_bdevs="$($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) "

test/nvmf/filesystem/filesystem.sh

+1 −1
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ for incapsule in 0 4096; do 
	trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



	waitforlisten $nvmfpid

	$rpc_py set_nvmf_target_options -u 8192 -p 4 -c $incapsule

	$rpc_py start_subsystem_init

	$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 -c $incapsule



	bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

	bdevs+=" $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

test/nvmf/fio/fio.sh

+2 −1
Original line number Diff line number Diff line
@@ -32,8 +32,9 @@ nvmfpid=$! 
trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py set_nvmf_target_options -u 8192 -p 4

$rpc_py start_subsystem_init

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4



timing_exit start_nvmf_tgt



malloc_bdevs="$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "