From c99069fd4602bcae7a2d7580681171b78b56ac02 Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Thu, 29 Mar 2018 11:52:12 -0400
Subject: [PATCH] test/iscsi: change target IP for calsoft tests

Target IP for Calsoft tests was hardcoded in config file.
Now it will be based on iSCSI tests common configuration.

Change-Id: Ic8db40b02d2be59f5fac5cb4503cc0c80b24cd91
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/405865
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
---
 test/iscsi_tgt/calsoft/calsoft.sh | 3 +++
 test/iscsi_tgt/calsoft/its.conf   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh
index 18f572488..e50a4129b 100755
--- a/test/iscsi_tgt/calsoft/calsoft.sh
+++ b/test/iscsi_tgt/calsoft/calsoft.sh
@@ -22,6 +22,9 @@ mkdir -p /usr/local/etc
 cp $testdir/its.conf /usr/local/etc/
 cp $testdir/auth.conf /usr/local/etc/
 
+# Append target ip to calsoft config
+echo "IP=$TARGET_IP" >> /usr/local/etc/its.conf
+
 timing_enter start_iscsi_tgt
 
 $ISCSI_APP -c $testdir/iscsi.conf -m 0x1 &
diff --git a/test/iscsi_tgt/calsoft/its.conf b/test/iscsi_tgt/calsoft/its.conf
index 15325da1e..6469dab63 100644
--- a/test/iscsi_tgt/calsoft/its.conf
+++ b/test/iscsi_tgt/calsoft/its.conf
@@ -2,7 +2,6 @@ InitiatorName=iqn.1994-05.com.redhat:b3283535dc3b
 TargetName=iqn.2016-06.io.spdk:Target3
 DefaultTime2Retain=20
 DefaultTime2Wait=2
-IP=127.0.0.1
 AuthMethod=CHAP,None
 UserName=root
 PassWord=tester