From 86d8214d157b9ca0b4af259124a606dd7169b188 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 15 May 2019 16:44:27 -0700 Subject: [PATCH] test/nvmf: simplify rpc.sh test Just name the malloc bdev explicitly. And since there is only one bdev, remove all of the unnecessary loops. Signed-off-by: Jim Harris Change-Id: Ie3b55161d6ebee64497bc9726edaa3fbf04bb445 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454690 Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker Reviewed-by: Seth Howell Reviewed-by: Paul Luse Tested-by: SPDK CI Jenkins --- test/nvmf/target/rpc.sh | 62 +++++++++++------------------------------ 1 file changed, 16 insertions(+), 46 deletions(-) diff --git a/test/nvmf/target/rpc.sh b/test/nvmf/target/rpc.sh index bba53fa02..c3539db3e 100755 --- a/test/nvmf/target/rpc.sh +++ b/test/nvmf/target/rpc.sh @@ -27,13 +27,11 @@ fi MALLOC_BDEV_SIZE=64 MALLOC_BLOCK_SIZE=512 -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 Malloc1 # Disallow host NQN and make sure connect fails $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 Malloc1 $rpc_py nvmf_subsystem_allow_any_host -d nqn.2016-06.io.spdk:cnode1 $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT @@ -61,34 +59,18 @@ $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 # do frequent add delete of namespaces with different nsid. for i in `seq 1 $times` do - j=0 - for bdev in $bdevs; do - let j=j+1 - $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode$j -s SPDK00000000000001 - $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode$j -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT - $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode$j $bdev -n 5 - $rpc_py nvmf_subsystem_allow_any_host nqn.2016-06.io.spdk:cnode$j - nvme connect -t rdma -n nqn.2016-06.io.spdk:cnode$j -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT" - done + $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -s SPDK00000000000001 + $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_ns nqn.2016-06.io.spdk:cnode1 Malloc1 -n 5 + $rpc_py nvmf_subsystem_allow_any_host nqn.2016-06.io.spdk:cnode1 + nvme connect -t rdma -n nqn.2016-06.io.spdk:cnode1 -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT" waitforblk "nvme0n1" - n=$j - for j in `seq 1 $n` - do - nvme disconnect -n nqn.2016-06.io.spdk:cnode$j - done - j=0 - for bdev in $bdevs; do - let j=j+1 - $rpc_py nvmf_subsystem_remove_ns nqn.2016-06.io.spdk:cnode$j 5 - done + nvme disconnect -n nqn.2016-06.io.spdk:cnode1 - n=$j - for j in `seq 1 $n` - do - $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$j - done + $rpc_py nvmf_subsystem_remove_ns nqn.2016-06.io.spdk:cnode1 5 + $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 done @@ -97,26 +79,14 @@ nvmfcleanup # do frequent add delete. for i in `seq 1 $times` do - j=0 - for bdev in $bdevs; do - let j=j+1 - $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode$j -s SPDK00000000000001 - $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode$j -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT - $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode$j $bdev - $rpc_py nvmf_subsystem_allow_any_host nqn.2016-06.io.spdk:cnode$j - done + $rpc_py nvmf_subsystem_create nqn.2016-06.io.spdk:cnode1 -s SPDK00000000000001 + $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_ns nqn.2016-06.io.spdk:cnode1 Malloc1 + $rpc_py nvmf_subsystem_allow_any_host nqn.2016-06.io.spdk:cnode1 - j=0 - for bdev in $bdevs; do - let j=j+1 - $rpc_py nvmf_subsystem_remove_ns nqn.2016-06.io.spdk:cnode$j $j - done + $rpc_py nvmf_subsystem_remove_ns nqn.2016-06.io.spdk:cnode1 1 - n=$j - for j in `seq 1 $n` - do - $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode$j - done + $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 done trap - SIGINT SIGTERM EXIT