Commit 15df8980 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Tomasz Zawadzki
Browse files

test/openstack: Use nvmf_tgt wrappers instead of spdk_tgt app 



This is for the sheer convenience and cleanup purposes.

Change-Id: I526c4fb682eef94fbfae20b1d5a03dcf325ff647
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/761


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 5000bd48

test/openstack/run_openstack_tests.sh

+4 −9
Original line number Diff line number Diff line
@@ -13,26 +13,21 @@ function finish_test { 
	{

	  "$rpc_py" bdev_lvol_delete_lvstore -l lvs0

	  kill -9 $rpc_proxy_pid

	  killprocess $nvmfpid

	  rm "$testdir/conf.json"

	} || :

}



trap "finish_test" SIGINT SIGTERM EXIT



cat <<-JSON >"$testdir/conf.json"

	{"subsystems":[

	$("$rootdir/scripts/gen_nvme.sh" --json)

	]}

JSON



timing_enter run_spdk_tgt

"$rootdir/app/spdk_tgt/spdk_tgt" -m 0x3 -p 0 -s 1024 --json "$testdir/conf.json" &

nvmfpid=$!

waitforlisten $nvmfpid

$rpc_py bdev_nvme_set_hotplug -e

timing_exit run_spdk_tgt

nvmfappstart "-m 0x3 -p 0 -s 1024 --json $testdir/conf.json"



trap 'finish_test; process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT



$rpc_py bdev_nvme_set_hotplug -e

timing_enter run_rpc_proxy

$rootdir/scripts/rpc_http_proxy.py 127.0.0.1 3333 secret secret &

rpc_proxy_pid=$!