Commit d6a11694 authored by Seth Howell's avatar Seth Howell Committed by Ben Walker
Browse files

test/nvmf: add iso option to the host tests. 



Allows us to run them independent from autotest

Change-Id: I59843fb3e089494be32fd7aa47cad5439f2732c0
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/435937


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 8431fb11

test/nvmf/host/aer.sh

+7 −1
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ rpc_py="$rootdir/scripts/rpc.py" 


set -e



# pass the parameter 'iso' to this script when running it in isolation to trigger rdma device initialization.

# e.g. sudo ./aer.sh iso

nvmftestinit $1



RDMA_IP_LIST=$(get_available_rdma_ips)

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

if [ -z $NVMF_FIRST_TARGET_IP ]; then
@@ -22,7 +26,7 @@ timing_enter start_nvmf_tgt 
$NVMF_APP -m 0xF &

nvmfpid=$!



trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT

trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
@@ -73,6 +77,8 @@ $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 


trap - SIGINT SIGTERM EXIT





nvmfcleanup

killprocess $nvmfpid

nvmftestfini $1

timing_exit aer

test/nvmf/host/bdevperf.sh

+6 −1
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ rpc_py="$rootdir/scripts/rpc.py" 


set -e



# pass the parameter 'iso' to this script when running it in isolation to trigger rdma device initialization.

# e.g. sudo ./bdevperf.sh iso

nvmftestinit $1



RDMA_IP_LIST=$(get_available_rdma_ips)

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

if [ -z $NVMF_FIRST_TARGET_IP ]; then
@@ -25,7 +29,7 @@ timing_enter start_nvmf_tgt 
$NVMF_APP -m 0xF &

nvmfpid=$!



trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT

trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid;  nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
@@ -49,4 +53,5 @@ $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 
trap - SIGINT SIGTERM EXIT



killprocess $nvmfpid

nvmftestfini $1

timing_exit bdevperf

test/nvmf/host/fio.sh

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ rpc_py="$rootdir/scripts/rpc.py" 


set -e



# pass the parameter 'iso' to this script when running it in isolation to trigger rdma device initialization.

# e.g. sudo ./fio.sh iso

nvmftestinit $1



RDMA_IP_LIST=$(get_available_rdma_ips)

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

if [ -z $NVMF_FIRST_TARGET_IP ]; then
@@ -28,7 +32,7 @@ timing_enter start_nvmf_tgt 
$NVMF_APP -m 0xF &

nvmfpid=$!



trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT

trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid;  nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
@@ -89,4 +93,5 @@ fi 
trap - SIGINT SIGTERM EXIT



killprocess $nvmfpid

nvmftestfini $1

timing_exit fio

test/nvmf/host/identify.sh

+5 −1
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ MALLOC_BLOCK_SIZE=512 
rpc_py="$rootdir/scripts/rpc.py"



set -e

# pass the parameter 'iso' to this script when running it in isolation to trigger rdma device initialization.

# e.g. sudo ./identify.sh iso

nvmftestinit $1



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
@@ -24,7 +27,7 @@ timing_enter start_nvmf_tgt 
$NVMF_APP -m 0xF &

nvmfpid=$!



trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT

trap "process_shm --id $NVMF_APP_SHM_ID; killprocess $nvmfpid; nvmftestfini $1; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py nvmf_create_transport -t RDMA -u 8192 -p 4
@@ -62,4 +65,5 @@ $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 
trap - SIGINT SIGTERM EXIT



killprocess $nvmfpid

nvmftestfini $1

timing_exit identify

test/nvmf/host/identify_kernel_nvmf.sh

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ source $rootdir/test/common/autotest_common.sh 
source $rootdir/test/nvmf/common.sh



set -e

# pass the parameter 'iso' to this script when running it in isolation to trigger rdma device initialization.

# e.g. sudo ./identify_kernel_nvmf.sh iso

nvmftestinit $1



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
@@ -77,4 +80,5 @@ rmmod nvmet-rdma 
rmmod null_blk

rmmod nvmet



nvmftestfini $1

timing_exit identify_kernel_nvmf_tgt