From 016cfd3b695691e60d3ba874cd22371f279b18b9 Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Tue, 27 Mar 2018 09:17:53 -0400
Subject: [PATCH] test/iscsi: move all iSCSI target configuration common
This moves all iSCSI configuration to common.sh that
should be sourced in each test file.
When particular tests requires different configuration,
it can overwrite those values.
(See ip_migration.sh)
Change-Id: Ia5f684142fb910184809ee7efe74b5a51063b374
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/405547
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
test/iscsi_tgt/calsoft/calsoft.sh | 5 ---
test/iscsi_tgt/common.sh | 31 ++++++-------------
test/iscsi_tgt/digests/digests.sh | 5 ---
test/iscsi_tgt/ext4test/ext4test.sh | 5 ---
test/iscsi_tgt/filesystem/filesystem.sh | 5 ---
test/iscsi_tgt/fio/fio.sh | 5 ---
test/iscsi_tgt/initiator/initiator.sh | 5 ---
test/iscsi_tgt/ip_migration/ip_migration.sh | 2 --
test/iscsi_tgt/iscsi_tgt.sh | 5 ---
test/iscsi_tgt/lvol/iscsi_lvol.sh | 8 -----
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh | 1 -
test/iscsi_tgt/pmem/iscsi_pmem.sh | 8 -----
test/iscsi_tgt/rbd/rbd.sh | 5 ---
test/iscsi_tgt/reset/reset.sh | 5 ---
test/iscsi_tgt/rpc_config/rpc_config.sh | 5 ---
15 files changed, 9 insertions(+), 91 deletions(-)
diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh
index ffad1ef0df..1dd75b86a8 100755
--- a/test/iscsi_tgt/calsoft/calsoft.sh
+++ b/test/iscsi_tgt/calsoft/calsoft.sh
@@ -11,11 +11,6 @@ fi
timing_enter calsoft
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
diff --git a/test/iscsi_tgt/common.sh b/test/iscsi_tgt/common.sh
index 72af0fc66b..d100ece100 100644
--- a/test/iscsi_tgt/common.sh
+++ b/test/iscsi_tgt/common.sh
@@ -1,22 +1,9 @@
-if [ -z $TARGET_IP ]; then
- TARGET_IP=127.0.0.1
- echo "TARGET_IP not defined in environment; defaulting to $TARGET_IP"
-fi
-
-if [ -z $INITIATOR_IP ]; then
- INITIATOR_IP=127.0.0.1
- echo "INITIATOR_IP not defined in environment; defaulting to $INITIATOR_IP"
-fi
-
-if [ -z $ISCSI_PORT ]; then
- ISCSI_PORT=3260
- echo "ISCSI_PORT not defined in environment; defaulting to $ISCSI_PORT"
-fi
-
-if [ -z "$ISCSI_APP" ]; then
- ISCSI_APP=./app/iscsi_tgt/iscsi_tgt
-fi
-
-if [ -z "$ISCSI_TEST_CORE_MASK" ]; then
- ISCSI_TEST_CORE_MASK=0xFF
-fi
+# iSCSI target configuration
+TARGET_IP=127.0.0.1
+INITIATOR_IP=127.0.0.1
+ISCSI_PORT=3260
+NETMASK=$INITIATOR_IP/32
+INITIATOR_TAG=2
+INITIATOR_NAME=ANY
+ISCSI_APP="./app/iscsi_tgt/iscsi_tgt -i 0"
+ISCSI_TEST_CORE_MASK=0xFF
diff --git a/test/iscsi_tgt/digests/digests.sh b/test/iscsi_tgt/digests/digests.sh
index 9dcf269b9d..d0d292aeea 100755
--- a/test/iscsi_tgt/digests/digests.sh
+++ b/test/iscsi_tgt/digests/digests.sh
@@ -59,11 +59,6 @@ function iscsi_header_data_digest_test()
timing_enter digests
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh
index 058df9e9c1..4c9680b47a 100755
--- a/test/iscsi_tgt/ext4test/ext4test.sh
+++ b/test/iscsi_tgt/ext4test/ext4test.sh
@@ -14,11 +14,6 @@ timing_enter ext4test
cp $testdir/iscsi.conf.in $testdir/iscsi.conf
$rootdir/scripts/gen_nvme.sh >> $testdir/iscsi.conf
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
rpc_py="python $rootdir/scripts/rpc.py"
diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh
index 1d5ffcbf33..fff4c9fa96 100755
--- a/test/iscsi_tgt/filesystem/filesystem.sh
+++ b/test/iscsi_tgt/filesystem/filesystem.sh
@@ -8,11 +8,6 @@ source $rootdir/scripts/common.sh
timing_enter filesystem
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
rpc_py="python $rootdir/scripts/rpc.py"
# Remove lvol bdevs and stores.
diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh
index 617d557822..83455a2262 100755
--- a/test/iscsi_tgt/fio/fio.sh
+++ b/test/iscsi_tgt/fio/fio.sh
@@ -46,11 +46,6 @@ timing_enter fio
cp $testdir/iscsi.conf.in $testdir/iscsi.conf
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=4096
diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh
index 9c28fdf5c8..d121bd018c 100755
--- a/test/iscsi_tgt/initiator/initiator.sh
+++ b/test/iscsi_tgt/initiator/initiator.sh
@@ -7,11 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
timing_enter initiator
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh
index 07b1a8b472..ce8b81d9f9 100755
--- a/test/iscsi_tgt/ip_migration/ip_migration.sh
+++ b/test/iscsi_tgt/ip_migration/ip_migration.sh
@@ -8,7 +8,6 @@ source $rootdir/test/iscsi_tgt/common.sh
rpc_py="python $rootdir/scripts/rpc.py"
fio_py="python $rootdir/scripts/fio.py"
-ISCSI_PORT=3260
NETMASK=127.0.0.0/24
MIGRATION_ADDRESS=127.0.0.2
@@ -35,7 +34,6 @@ function rpc_add_target_node() {
timing_enter ip_migration
-# iSCSI target configuration
echo "Running ip migration tests"
for ((i=0; i<2; i++))
diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh
index f525444dea..d28be12503 100755
--- a/test/iscsi_tgt/iscsi_tgt.sh
+++ b/test/iscsi_tgt/iscsi_tgt.sh
@@ -7,9 +7,6 @@ if [ ! $(uname -s) = Linux ]; then
exit 0
fi
-export TARGET_IP=127.0.0.1
-export INITIATOR_IP=127.0.0.1
-
source $rootdir/test/iscsi_tgt/common.sh
timing_enter iscsi_tgt
@@ -24,8 +21,6 @@ timing_enter iscsi_tgt
start_stub "-s 2048 -i 0 -m $ISCSI_TEST_CORE_MASK"
trap "kill_stub; exit 1" SIGINT SIGTERM EXIT
-export ISCSI_APP="./app/iscsi_tgt/iscsi_tgt -i 0"
-
run_test ./test/iscsi_tgt/calsoft/calsoft.sh
run_test ./test/iscsi_tgt/filesystem/filesystem.sh
run_test ./test/iscsi_tgt/reset/reset.sh
diff --git a/test/iscsi_tgt/lvol/iscsi_lvol.sh b/test/iscsi_tgt/lvol/iscsi_lvol.sh
index 13e45a0692..81ae345a2d 100755
--- a/test/iscsi_tgt/lvol/iscsi_lvol.sh
+++ b/test/iscsi_tgt/lvol/iscsi_lvol.sh
@@ -1,8 +1,5 @@
#!/usr/bin/env bash
-export TARGET_IP=127.0.0.1
-export INITIATOR_IP=127.0.0.1
-
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
@@ -10,11 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
timing_enter iscsi_lvol
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
MALLOC_BDEV_SIZE=128
MALLOC_BLOCK_SIZE=512
if [ $RUN_NIGHTLY -eq 1 ]; then
diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
index 44b3488cbc..ace03405c0 100755
--- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
+++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
@@ -18,7 +18,6 @@ fi
rpc_py="python $rootdir/scripts/rpc.py"
fio_py="python $rootdir/scripts/fio.py"
-ISCSI_PORT=3260
NVMF_PORT=4420
timing_enter nvme_remote
diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh
index a67ce89a7e..263d735a9c 100755
--- a/test/iscsi_tgt/pmem/iscsi_pmem.sh
+++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh
@@ -1,21 +1,13 @@
#!/usr/bin/env bash
-export TARGET_IP=127.0.0.1
-export INITIATOR_IP=127.0.0.1
-
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/iscsi_tgt/common.sh
-# iSCSI target configuration
BLOCKSIZE=$1
RUNTIME=$2
PMEM_BDEVS=""
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
PMEM_SIZE=128
PMEM_BLOCK_SIZE=512
TGT_NR=10
diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh
index 93768a6b11..c1a3c8d5b8 100755
--- a/test/iscsi_tgt/rbd/rbd.sh
+++ b/test/iscsi_tgt/rbd/rbd.sh
@@ -12,11 +12,6 @@ fi
timing_enter rbd
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
rpc_py="python $rootdir/scripts/rpc.py"
fio_py="python $rootdir/scripts/fio.py"
diff --git a/test/iscsi_tgt/reset/reset.sh b/test/iscsi_tgt/reset/reset.sh
index 2d92f2d6d5..716e466ef8 100755
--- a/test/iscsi_tgt/reset/reset.sh
+++ b/test/iscsi_tgt/reset/reset.sh
@@ -9,11 +9,6 @@ source $rootdir/test/iscsi_tgt/common.sh
timing_enter reset
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
MALLOC_BDEV_SIZE=64
MALLOC_BLOCK_SIZE=512
diff --git a/test/iscsi_tgt/rpc_config/rpc_config.sh b/test/iscsi_tgt/rpc_config/rpc_config.sh
index f5956c1d59..353dce935b 100755
--- a/test/iscsi_tgt/rpc_config/rpc_config.sh
+++ b/test/iscsi_tgt/rpc_config/rpc_config.sh
@@ -7,11 +7,6 @@ source $rootdir/test/iscsi_tgt/common.sh
timing_enter rpc_config
-# iSCSI target configuration
-ISCSI_PORT=3260
-INITIATOR_TAG=2
-INITIATOR_NAME=ANY
-NETMASK=$INITIATOR_IP/32
MALLOC_BDEV_SIZE=64