ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/bdev: Convert setup_nvme_conf() to RPC calls

Browse Source 
Change-Id: I49415a159a5849232637f281fd9360636691d339
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1018
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Michal Berger 2020-02-26 12:01:17 +01:00 committed by Tomasz Zawadzki
parent ae2d8097c3
commit 1db267cf0d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/bdev/blockdev.sh
View File

@ -58,7 +58,7 @@ function setup_bdev_conf() {
} }
function setup_nvme_conf() { function setup_nvme_conf() {
$rootdir/scripts/gen_nvme.sh >> $conf_file "$rootdir/scripts/gen_nvme.sh" --json | "$rpc_py" load_subsystem_config
} }
function setup_gpt_conf() { function setup_gpt_conf() {
@ -68,7 +68,8 @@ function setup_gpt_conf() {
# still depends on it # still depends on it
:>"$conf_file" :>"$conf_file"
fi fi
setup_nvme_conf # FIXME: Move this to json
$rootdir/scripts/gen_nvme.sh >> "$conf_file"
if grep -q Nvme0 $conf_file; then if grep -q Nvme0 $conf_file; then
[[ $1 == reset ]] && return 0 [[ $1 == reset ]] && return 0
part_dev_by_gpt $conf_file Nvme0n1 $rootdir part_dev_by_gpt $conf_file Nvme0n1 $rootdir
@ -299,7 +300,7 @@ case "$test_type" in
bdev ) bdev )
start_spdk_tgt; setup_bdev_conf;; start_spdk_tgt; setup_bdev_conf;;
nvme ) nvme )
setup_nvme_conf;; start_spdk_tgt; setup_nvme_conf;;
gpt ) gpt )
setup_gpt_conf;; setup_gpt_conf;;
crypto ) crypto )