From a66c9ffd50cbd0bf6741c72b7904ca2d91d2d6b5 Mon Sep 17 00:00:00 2001
From: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Date: Thu, 15 Nov 2018 10:25:43 +0900
Subject: [PATCH] test/iscsi_tgt: Port config file from .INI to JSON in the FIO
 test

Port the config file used in the FIO test from .INI to JSON.

Besides, set_bdev_nvme_hotplug RPC cannot be used easily because
the iSCSI target is not the primary process in the FIO test.

The FIO test doesn't use the hotplug feature and hence remove
enabling hotplug simply.

Change-Id: Idf8809aa829b67a7028f6fa4778a7aae1b431bb8
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/433223
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
---
 test/iscsi_tgt/fio/fio.sh        | 10 +++++-----
 test/iscsi_tgt/fio/iscsi.conf.in | 16 ----------------
 test/iscsi_tgt/fio/iscsi.json    | 31 +++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 21 deletions(-)
 delete mode 100644 test/iscsi_tgt/fio/iscsi.conf.in
 create mode 100644 test/iscsi_tgt/fio/iscsi.json

diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh
index 5fdeaed2d..fbb12bc87 100755
--- a/test/iscsi_tgt/fio/fio.sh
+++ b/test/iscsi_tgt/fio/fio.sh
@@ -6,7 +6,6 @@ source $rootdir/test/common/autotest_common.sh
 source $rootdir/test/iscsi_tgt/common.sh
 
 delete_tmp_files() {
-	rm -f $testdir/iscsi.conf
 	rm -f ./local-job0-0-verify.state
 }
 
@@ -49,8 +48,6 @@ fi
 
 timing_enter fio
 
-cp $testdir/iscsi.conf.in $testdir/iscsi.conf
-
 MALLOC_BDEV_SIZE=64
 MALLOC_BLOCK_SIZE=4096
 
@@ -59,13 +56,16 @@ fio_py="$rootdir/scripts/fio.py"
 
 timing_enter start_iscsi_tgt
 
-$ISCSI_APP -c $testdir/iscsi.conf &
+$ISCSI_APP --wait-for-rpc &
 pid=$!
 echo "Process pid: $pid"
 
-trap "killprocess $pid; rm -f $testdir/iscsi.conf; exit 1" SIGINT SIGTERM EXIT
+trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT
 
 waitforlisten $pid
+
+$rpc_py load_config < $testdir/iscsi.json
+
 echo "iscsi_tgt is listening. Running tests..."
 
 timing_exit start_iscsi_tgt
diff --git a/test/iscsi_tgt/fio/iscsi.conf.in b/test/iscsi_tgt/fio/iscsi.conf.in
deleted file mode 100644
index be06af585..000000000
--- a/test/iscsi_tgt/fio/iscsi.conf.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Global]
-
-[iSCSI]
-  NodeBase "iqn.2016-06.io.spdk"
-  AuthFile /usr/local/etc/spdk/auth.conf
-  Timeout 30
-  DiscoveryAuthMethod Auto
-  MaxSessions 16
-  ImmediateData Yes
-  ErrorRecoveryLevel 0
-
-[Nvme]
-  RetryCount 4
-  ActionOnTimeout None
-  AdminPollRate 100000
-  HotplugEnable Yes
diff --git a/test/iscsi_tgt/fio/iscsi.json b/test/iscsi_tgt/fio/iscsi.json
new file mode 100644
index 000000000..de40e83e2
--- /dev/null
+++ b/test/iscsi_tgt/fio/iscsi.json
@@ -0,0 +1,31 @@
+{
+  "subsystems": [
+    {
+      "subsystem": "bdev",
+      "config": [
+        {
+          "params": {
+            "retry_count": 4,
+            "nvme_adminq_poll_period_us": 100000,
+            "action_on_timeout": "none"
+          },
+          "method": "set_bdev_nvme_options"
+        }
+      ]
+    },
+    {
+      "subsystem": "iscsi",
+      "config": [
+        {
+          "method": "set_iscsi_options",
+          "params": {
+            "nop_timeout": 30,
+            "node_base": "iqn.2016-06.io.spdk",
+            "max_sessions": 16,
+            "error_recovery_level": 0
+          }
+        }
+      ]
+    }
+  ]
+}