From 6b8f9a0f8191dd4f72869e1d09140633ea8e6cd5 Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Wed, 26 Feb 2020 12:40:09 +0100
Subject: [PATCH] test/bdev: Convert setup_rbd_conf() to RPC calls

Change-Id: Icfbb571d1cd2a2539cd9026f1437c75450b77512
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1022
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 scripts/gen_rbd.sh    | 11 -----------
 test/bdev/blockdev.sh |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100755 scripts/gen_rbd.sh

diff --git a/scripts/gen_rbd.sh b/scripts/gen_rbd.sh
deleted file mode 100755
index 07fdbd1e7..000000000
--- a/scripts/gen_rbd.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if ! hash ceph &> /dev/null; then
-        exit 0
-fi
-
-echo
-echo "[Ceph]"
-echo "  Ceph $RBD_POOL $RBD_NAME 512"
diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index a310ed9da..ac301bb0d 100755
--- a/test/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -144,7 +144,7 @@ function setup_rbd_conf() {
 	rbd_setup 127.0.0.1
 	timing_exit rbd_setup
 
-	$rootdir/scripts/gen_rbd.sh >> $conf_file
+	"$rpc_py" bdev_rbd_create -b Ceph0 rbd foo 512
 }
 
 function bdev_bounds() {
@@ -351,7 +351,7 @@ case "$test_type" in
 	pmem )
 		start_spdk_tgt; setup_pmem_conf;;
 	rbd )
-		setup_rbd_conf;;
+		start_spdk_tgt; setup_rbd_conf;;
 	* )
 		echo "invalid test name"
 		exit 1