Commit d380f586 authored by Jim Harris's avatar Jim Harris
Browse files

test/nvmf: use "rdma" when creating transport 



This is a preparatory patch for specifying the transport
when calling the script.  Better to use "rdma" across the
board instead of a mix of "rdma" and "RDMA".

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

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


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

test/nvmf/target/bdev_io_wait.sh

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ nvmfappstart "-m 0xF --wait-for-rpc" 
# 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

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



$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
@@ -29,7 +29,7 @@ $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

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

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

$rootdir/test/bdev/bdevperf/bdevperf -m 0x10 -i 1 -c $testdir/bdevperf.conf -q 128 -o 4096 -w write -t 1 &

WRITE_PID=$!

$rootdir/test/bdev/bdevperf/bdevperf -m 0x20 -i 2 -c $testdir/bdevperf.conf -q 128 -o 4096 -w read -t 1 &

test/nvmf/target/bdevio.sh

+2 −2
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ timing_enter bdevio 
nvmftestinit

nvmfappstart "-m 0xF"



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

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

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



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

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

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



$rootdir/test/bdev/bdevio/bdevio -c $testdir/bdevperf.conf

test/nvmf/target/connect_disconnect.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ timing_enter connect_disconnect 
nvmftestinit

nvmfappstart "-m 0xF"



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

$rpc_py nvmf_create_transport -t rdma -u 8192 -p 4 -c 0



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

test/nvmf/target/create_transport.sh

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ nvmftestinit 
nvmfappstart "-m 0xF"



# Use nvmf_create_transport call to create transport

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

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



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

null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"

test/nvmf/target/discovery.sh

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ timing_enter discovery 
nvmftestinit

nvmfappstart "-m 0xF"



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

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



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

null_bdevs+="$($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"