From 9f815a839d1befc474c081995378695520035211 Mon Sep 17 00:00:00 2001
From: Michal Berger <michalx.berger@intel.com>
Date: Wed, 18 Mar 2020 10:37:19 +0100
Subject: [PATCH] test/openstack: Drop .init config in favor of json

Change-Id: I2cbc31c13df4c0ab75846a262fd50c1769fea5a3
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1357
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
---
 test/openstack/run_openstack_tests.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/openstack/run_openstack_tests.sh b/test/openstack/run_openstack_tests.sh
index 892bdb960..9d61a0a7e 100755
--- a/test/openstack/run_openstack_tests.sh
+++ b/test/openstack/run_openstack_tests.sh
@@ -20,9 +20,14 @@ function finish_test {
 
 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/scripts/gen_nvme.sh >> $testdir/conf.json
-$rootdir/app/spdk_tgt/spdk_tgt -m 0x3 -p 0 -s 1024 -c $testdir/conf.json &
+"$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