From 0d33baa14c289cbf0029873f3f93b10eb3a32d71 Mon Sep 17 00:00:00 2001 From: Vitaliy Mysak Date: Tue, 16 Jul 2019 23:44:51 +0000 Subject: [PATCH] test/spdkcli: test start_subsystem_init command Add an invocation of `start_subsystem_init` method of spdkcli to iscsi test. This method is one of few that left untested in spdkcli. iscsi test had to be changed a bit because `start_subsystem_init` requires spdk to be started with `--wait-for-rpc`. This patch is related to trello task: https://trello.com/c/CHOOxcGj/151-spdkcli-extend-test-coverage Change-Id: I4f49f2ce499ef849d4d41a391844f5947c1b133d Signed-off-by: Vitaliy Mysak Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/462213 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Darek Stojaczyk --- test/spdkcli/common.sh | 6 ------ test/spdkcli/iscsi.sh | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/spdkcli/common.sh b/test/spdkcli/common.sh index 40d3d3d14..7334c1039 100644 --- a/test/spdkcli/common.sh +++ b/test/spdkcli/common.sh @@ -32,12 +32,6 @@ function run_nvmf_tgt() { waitforlisten $nvmf_tgt_pid } -function run_iscsi_tgt() { - $rootdir/app/iscsi_tgt/iscsi_tgt -m 0x3 -p 0 -s 4096 & - iscsi_tgt_pid=$! - waitforlisten $iscsi_tgt_pid -} - function run_vhost_tgt() { $rootdir/app/vhost/vhost -m 0x3 -p 0 -s 4096 & vhost_tgt_pid=$! diff --git a/test/spdkcli/iscsi.sh b/test/spdkcli/iscsi.sh index 10ae362dd..9f1e90723 100755 --- a/test/spdkcli/iscsi.sh +++ b/test/spdkcli/iscsi.sh @@ -13,7 +13,13 @@ timing_enter spdkcli_iscsi trap 'on_error_exit;' ERR timing_enter run_iscsi_tgt -run_iscsi_tgt + +# Running iscsi target with --wait-for-rpc. Implies start_subsystem_init later +$rootdir/app/iscsi_tgt/iscsi_tgt -m 0x3 -p 0 -s 4096 --wait-for-rpc & +iscsi_tgt_pid=$! +waitforlisten $iscsi_tgt_pid +$rootdir/scripts/rpc.py start_subsystem_init + timing_exit run_iscsi_tgt timing_enter spdkcli_create_iscsi_config