d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/openstack: Use nvmf_tgt wrappers instead of spdk_tgt app

Browse Source 
This is for the sheer convenience and cleanup purposes.

Change-Id: I526c4fb682eef94fbfae20b1d5a03dcf325ff647
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/761
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Pawel Kaminski 2019-12-18 04:40:21 -05:00 committed by Tomasz Zawadzki
parent 5000bd4885
commit 15df89808a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/openstack/run_openstack_tests.sh
View File

@ -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=$!