Commit 41456afc authored by Jim Harris's avatar Jim Harris Committed by Changpeng Liu
Browse files

test/nvmf: simplify more of the nvmf test scripts 



This should cover all of the cases that we want to
changes for now - where it was doing an unnecessarily
loop over just one malloc bdev.

A few cases remain, but I'm planning to strengthen
those tests with more bdevs.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I16f9e82b4a551bcf1f491fc506e11c0ee98b60d9
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452917


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 1ddf2b5e

test/nvmf/host/bdevperf.sh

+2 −5
Original line number Diff line number Diff line
@@ -35,12 +35,9 @@ waitforlisten $nvmfpid 
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt



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



$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

for bdev in $bdevs; do

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

done

$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 4420



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

test/nvmf/host/identify.sh

+6 −9
Original line number Diff line number Diff line
@@ -33,16 +33,13 @@ waitforlisten $nvmfpid 
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt



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



$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

for bdev in $bdevs; do

# NOTE: This will assign the same NGUID and EUI64 to all bdevs,

# but currently we only have one (see above), so this is OK.

	$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 "$bdev" \

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

	--nguid "ABCDEF0123456789ABCDEF0123456789" \

	--eui64 "ABCDEF0123456789"

done

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



$rpc_py get_nvmf_subsystems

test/nvmf/multiconnection/multiconnection.sh

+2 −4
Original line number Diff line number Diff line
@@ -48,11 +48,9 @@ modprobe -v nvme-rdma 


for i in `seq 1 $NVMF_SUBSYS`

do

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

	$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc$i

	$rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode$i -a -s SPDK$i

	for bdev in $bdevs; do

		$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode$i $bdev

	done

	$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode$i Malloc$i

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

done

test/nvmf/nmic/nmic.sh

+12 −16
Original line number Diff line number Diff line
@@ -37,19 +37,16 @@ $rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4 
timing_exit start_nvmf_tgt



# Create subsystems

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

$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 SPDK1

for bdev in $bdevs; do

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

done

$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"



echo "test case1: single bdev can't be used in multiple subsystems"

set +e

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

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

for bdev in $bdevs; do

	$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode2 $bdev

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

nmic_status=$?



if [ $nmic_status -eq 0 ]; then
@@ -59,7 +56,6 @@ for bdev in $bdevs; do 
else

	echo " Adding namespace failed - expected result."

fi

done

set -e



modprobe -v nvme-rdma

test/nvmf/nvme_cli/nvme_cli.sh

+4 −5
Original line number Diff line number Diff line
@@ -41,15 +41,14 @@ waitforlisten $nvmfpid 
$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4

timing_exit start_nvmf_tgt



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

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

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc0

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE -b Malloc1



modprobe -v nvme-rdma



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

for bdev in $bdevs; do

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

done

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

$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



nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"