From 1db267cf0d5616fcdd69962927f1364cb0a6a334 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 26 Feb 2020 12:01:17 +0100 Subject: [PATCH] test/bdev: Convert setup_nvme_conf() to RPC calls Change-Id: I49415a159a5849232637f281fd9360636691d339 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1018 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk Reviewed-by: Shuhei Matsumoto --- test/bdev/blockdev.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh index b735d7ff1..a68de8ac9 100755 --- a/test/bdev/blockdev.sh +++ b/test/bdev/blockdev.sh @@ -58,7 +58,7 @@ function setup_bdev_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() { @@ -68,7 +68,8 @@ function setup_gpt_conf() { # still depends on it :>"$conf_file" fi - setup_nvme_conf + # FIXME: Move this to json + $rootdir/scripts/gen_nvme.sh >> "$conf_file" if grep -q Nvme0 $conf_file; then [[ $1 == reset ]] && return 0 part_dev_by_gpt $conf_file Nvme0n1 $rootdir @@ -299,7 +300,7 @@ case "$test_type" in bdev ) start_spdk_tgt; setup_bdev_conf;; nvme ) - setup_nvme_conf;; + start_spdk_tgt; setup_nvme_conf;; gpt ) setup_gpt_conf;; crypto )