From 2c379bdabfd2f45d98ef91591c8fae42be7cf3a4 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Thu, 17 Sep 2020 15:57:00 -0700
Subject: [PATCH] test/iscsi: In ip_migration.sh, eliminate loop to start
 targets

The code is actually shorter without the loop

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: I872d0bcd6be0945220cfddba61034bd26cbb82f0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4303
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 test/iscsi_tgt/ip_migration/ip_migration.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh
index 005a11222..55732ccd9 100755
--- a/test/iscsi_tgt/ip_migration/ip_migration.sh
+++ b/test/iscsi_tgt/ip_migration/ip_migration.sh
@@ -53,18 +53,16 @@ function iscsi_tgt_start() {
 }
 
 echo "Running ip migration tests"
-for ((i = 0; i < 2; i++)); do
-	timing_enter start_iscsi_tgt_$i
-
-	rpc_addr="/var/tmp/spdk${i}.sock"
-	mask=$((1 << i))
-
-	iscsi_tgt_start $rpc_addr $mask
-
-	timing_exit start_iscsi_tgt_$i
-done
-
+timing_enter start_iscsi_tgt_0
 rpc_first_addr="/var/tmp/spdk0.sock"
+iscsi_tgt_start $rpc_first_addr 1
+timing_exit start_iscsi_tgt_0
+
+timing_enter start_iscsi_tgt_1
+rpc_second_addr="/var/tmp/spdk1.sock"
+iscsi_tgt_start $rpc_second_addr 2
+timing_exit start_iscsi_tgt_1
+
 rpc_add_target_node $rpc_first_addr
 
 sleep 1
@@ -80,7 +78,6 @@ sleep 3
 
 $rpc_py -s $rpc_first_addr spdk_kill_instance SIGTERM
 
-rpc_second_addr="/var/tmp/spdk1.sock"
 rpc_add_target_node $rpc_second_addr
 
 wait $fiopid