Commit 3b3688f8 authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Konrad Sztyber
Browse files

test/raid: don't use a temp file for RPCs 



Also, inline the configure_raid_bdev function because it doesn't improve
readability now.

Signed-off-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Suggested-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: I9df8bc02ad6ff3bda527962ea1d871d3462cde7c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24575


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 4e94e54e

test/bdev/bdev_raid.sh

+4 −15
Original line number Diff line number Diff line
@@ -60,20 +60,6 @@ function cleanup() { 
	rm -rf "$tmp_dir"

}



function configure_raid_bdev() {

	local raid_level=$1

	rm -rf $testdir/rpcs.txt



	cat <<- EOL >> $testdir/rpcs.txt

		bdev_malloc_create 32 $base_blocklen $base_malloc_params -b Base_1

		bdev_malloc_create 32 $base_blocklen $base_malloc_params -b Base_2

		bdev_raid_create -z 64 -r $raid_level -b "Base_1 Base_2" -n raid

	EOL

	$rootdir/scripts/rpc.py < $testdir/rpcs.txt



	rm -rf $testdir/rpcs.txt

}



function raid_function_test() {

	local raid_level=$1

	local nbd=/dev/nbd0
@@ -84,7 +70,10 @@ function raid_function_test() { 
	echo "Process raid pid: $raid_pid"

	waitforlisten $raid_pid



	configure_raid_bdev $raid_level

	$rpc_py bdev_malloc_create 32 $base_blocklen $base_malloc_params -b Base_1

	$rpc_py bdev_malloc_create 32 $base_blocklen $base_malloc_params -b Base_2

	$rpc_py bdev_raid_create -z 64 -r $raid_level -b "'Base_1 Base_2'" -n raid



	raid_bdev=$($rpc_py bdev_raid_get_bdevs online | jq -r '.[0]["name"] | select(.)')

	if [ $raid_bdev = "" ]; then

		echo "No raid0 device in SPDK app"