Commit aa7a1398 authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

test/nvmf: use TEST_TRANSPORT instead of 'rdma' 



This prepares for using scripts for tcp testing as well.
Note that this patch just hardcoded TEST_TRANSPORT to
'rdma' for now.  An upcoming patch will require the
caller to pass --transport=rdma instead.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I085fdf51910aaf960959c71c73a187be41fd7ee8

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456667


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent cddfe002

test/common/autotest_common.sh

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ if [ -z "$output_dir" ]; then 
fi



TEST_MODE=

TEST_TRANSPORT=rdma

for i in "$@"; do

	case "$i" in

		--iso)

test/nvmf/host/aer.sh

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



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192

$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

timing_exit start_nvmf_tgt



modprobe -v nvme-rdma
@@ -28,7 +28,7 @@ modprobe -v nvme-rdma 
$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

$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT



$rpc_py get_nvmf_subsystems
@@ -37,7 +37,7 @@ $rpc_py get_nvmf_subsystems 
#though so currently the test is disabled.



#$rootdir/test/nvme/aer/aer -r "\

#        trtype:RDMA \

#        trtype:$TEST_TRANSPORT \

#        adrfam:IPv4 \

#        traddr:$NVMF_FIRST_TARGET_IP \

#        trsvcid:$NVMF_PORT \
@@ -48,7 +48,7 @@ rm -f $AER_TOUCH_FILE 


# Namespace Attribute Notice Tests

$rootdir/test/nvme/aer/aer -r "\

        trtype:RDMA \

        trtype:$TEST_TRANSPORT \

        adrfam:IPv4 \

        traddr:$NVMF_FIRST_TARGET_IP \

        trsvcid:$NVMF_PORT \

test/nvmf/host/bdevperf.sh

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



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192

$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

timing_exit start_nvmf_tgt



$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0

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

$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT



echo "[Nvme]" > $testdir/bdevperf.conf

echo "  TransportID \"trtype:RDMA adrfam:IPv4 subnqn:nqn.2016-06.io.spdk:cnode1 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT\" Nvme0" >> $testdir/bdevperf.conf

echo "  TransportID \"trtype:$TEST_TRANSPORT adrfam:IPv4 subnqn:nqn.2016-06.io.spdk:cnode1 traddr:$NVMF_FIRST_TARGET_IP trsvcid:$NVMF_PORT\" Nvme0" >> $testdir/bdevperf.conf

$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdevperf.conf -q 128 -o 4096 -w verify -t 1

sync

rm -rf $testdir/bdevperf.conf

test/nvmf/host/fio.sh

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



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192

$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

timing_exit start_nvmf_tgt



$rpc_py construct_malloc_bdev 64 512 -b Malloc1

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

$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc1

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT



PLUGIN_DIR=$rootdir/examples/nvme/fio_plugin



# Test fio_plugin as host with malloc backend

LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=RDMA adrfam=IPv4 \

LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=$TEST_TRANSPORT adrfam=IPv4 \

traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"



# second test mocking multiple SGL elements

LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/mock_sgl_config.fio --filename="trtype=RDMA adrfam=IPv4 \

LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/mock_sgl_config.fio --filename="trtype=$TEST_TRANSPORT adrfam=IPv4 \

traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"

$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1
@@ -54,8 +54,8 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
	$rpc_py construct_lvol_bdev -l lvs_0 lbd_0 $free_mb

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

	$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode2 lvs_0/lbd_0

	$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode2 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

	LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=RDMA adrfam=IPv4 \

	$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode2 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

	LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=$TEST_TRANSPORT adrfam=IPv4 \

	traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"

	$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode2
@@ -65,8 +65,8 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
	$rpc_py construct_lvol_bdev -l lvs_n_0 lbd_nest_0 $free_mb

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

	$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode3 lvs_n_0/lbd_nest_0

	$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode3 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

	LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=RDMA adrfam=IPv4 \

	$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode3 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

	LD_PRELOAD=$PLUGIN_DIR/fio_plugin /usr/src/fio/fio $PLUGIN_DIR/example_config.fio --filename="trtype=$TEST_TRANSPORT adrfam=IPv4 \

	traddr=$NVMF_FIRST_TARGET_IP trsvcid=$NVMF_PORT ns=1"

	$rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode3

test/nvmf/host/identify.sh

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



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192

$rpc_py nvmf_create_transport -t $TEST_TRANSPORT -u 8192

timing_exit start_nvmf_tgt



$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0
@@ -32,18 +32,18 @@ $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -a -s SPDK0000000000000 
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0 \

	--nguid "ABCDEF0123456789ABCDEF0123456789" \

	--eui64 "ABCDEF0123456789"

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t RDMA -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT



$rpc_py get_nvmf_subsystems



$rootdir/examples/nvme/identify/identify -r "\

        trtype:RDMA \

        trtype:$TEST_TRANSPORT \

        adrfam:IPv4 \

        traddr:$NVMF_FIRST_TARGET_IP \

        trsvcid:$NVMF_PORT \

        subnqn:nqn.2014-08.org.nvmexpress.discovery" -L all

$rootdir/examples/nvme/identify/identify -r "\

        trtype:RDMA \

        trtype:$TEST_TRANSPORT \

        adrfam:IPv4 \

        traddr:$NVMF_FIRST_TARGET_IP \

        trsvcid:$NVMF_PORT \