Commit 015ef22a authored by Seth Howell's avatar Seth Howell Committed by Changpeng Liu
Browse files

test/nvmf: add NVMF_TRANSPORT_OPTS global 



For a lot of the tests, we may want to specify different options for
each transport. I believe this will be more prevalent as we add more
transport specific options.

Change-Id: I83a915629460d1d869eaba4bc86822d7563402ac
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/461740


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 1d717c7c

test/nvmf/common.sh

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ NVMF_PORT=4420 
NVMF_IP_PREFIX="192.168.100"

NVMF_IP_LEAST_ADDR=8

NVMF_TCP_IP_ADDRESS="127.0.0.1"

NVMF_TRANSPORT_OPTS=""



: ${NVMF_APP_SHM_ID="0"}; export NVMF_APP_SHM_ID

: ${NVMF_APP="./app/nvmf_tgt/nvmf_tgt -i $NVMF_APP_SHM_ID -e 0xFFFF"}; export NVMF_APP
@@ -169,6 +170,8 @@ function nvmftestinit() 
			rdma_device_init

		fi

	fi



	NVMF_TRANSPORT_OPTS="-t $TEST_TRANSPORT"

	if [ "$TEST_TRANSPORT" == "rdma" ]; then

		RDMA_IP_LIST=$(get_available_rdma_ips)

		NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

test/nvmf/host/aer.sh

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ timing_enter aer 
nvmftestinit

nvmfappstart "-m 0xF"



$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192



$rpc_py construct_malloc_bdev 64 512 --name Malloc0

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

test/nvmf/host/bdevperf.sh

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



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192

timing_exit start_nvmf_tgt



$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0

test/nvmf/host/fio.sh

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



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192

timing_exit start_nvmf_tgt



$rpc_py construct_malloc_bdev 64 512 -b Malloc1

test/nvmf/host/identify.sh

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



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192

timing_exit start_nvmf_tgt



$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0