Commit 016cfd3b authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

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: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/405547


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent b4db5cf9

test/iscsi_tgt/calsoft/calsoft.sh

+0 −5
Original line number Diff line number Diff line
@@ -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

test/iscsi_tgt/common.sh

+9 −22
Original line number Diff line number Diff line 
if [ -z $TARGET_IP ]; then

# iSCSI target configuration

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

NETMASK=$INITIATOR_IP/32

INITIATOR_TAG=2

INITIATOR_NAME=ANY

ISCSI_APP="./app/iscsi_tgt/iscsi_tgt -i 0"

ISCSI_TEST_CORE_MASK=0xFF
 
fi

test/iscsi_tgt/digests/digests.sh

+0 −5
Original line number Diff line number Diff line
@@ -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

test/iscsi_tgt/ext4test/ext4test.sh

+0 −5
Original line number Diff line number Diff line
@@ -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"

test/iscsi_tgt/filesystem/filesystem.sh

+0 −5
Original line number Diff line number Diff line
@@ -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.