Commit 07926e1b authored by Pawel Niedzwiecki's avatar Pawel Niedzwiecki Committed by Jim Harris
Browse files

test/nvmf: Do not use config files 



Use rpc methods instead config file in nvmf tests

Change-Id: I75354cae95e1dd5d0e08f5c694b369fb270b92a4
Signed-off-by: default avatarPawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/419006


Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent a691aa31

test/nvmf/discovery/discovery.sh

+3 −1
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@ fi 
timing_enter discovery

timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$NVMF_APP -c $testdir/../nvmf.conf &

$NVMF_APP -m 0xF -w &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py set_nvmf_target_options -u 8192 -p 4

$rpc_py start_subsystem_init

timing_exit start_nvmf_tgt



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

test/nvmf/filesystem/filesystem.sh

+3 −3
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ timing_enter fs_test 


for incapsule in 0 4096; do

	# Start up the NVMf target in another process

	cp $testdir/../nvmf.conf /tmp/nvmf.conf

	echo "InCapsuleDataSize $incapsule" >> /tmp/nvmf.conf

	$NVMF_APP -c /tmp/nvmf.conf &

	$NVMF_APP -m 0xF -w &

	nvmfpid=$!



	trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



	waitforlisten $nvmfpid

	$rpc_py set_nvmf_target_options -u 8192 -p 4 -c $incapsule

	$rpc_py start_subsystem_init



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

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

test/nvmf/fio/fio.sh

+3 −1
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ fi 
timing_enter fio

timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$NVMF_APP -c $testdir/../nvmf.conf &

$NVMF_APP -m 0xF -w &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py set_nvmf_target_options -u 8192 -p 4

$rpc_py start_subsystem_init

timing_exit start_nvmf_tgt



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

test/nvmf/host/aer.sh

+3 −1
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ fi 
timing_enter aer

timing_enter start_nvmf_tgt



$NVMF_APP -s 512 -c $testdir/../nvmf.conf &

$NVMF_APP -m 0xF -w &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py set_nvmf_target_options -u 8192 -p 4

$rpc_py start_subsystem_init

timing_exit start_nvmf_tgt



modprobe -v nvme-rdma

test/nvmf/host/bdevperf.sh

+3 −1
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ fi 
timing_enter bdevperf

timing_enter start_nvmf_tgt



$NVMF_APP -c $testdir/../nvmf.conf &

$NVMF_APP -m 0xF -w &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid

$rpc_py set_nvmf_target_options -u 8192 -p 4

$rpc_py start_subsystem_init

timing_exit start_nvmf_tgt



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