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

test/iscsi: use iSCSI configuration instead of hard coded values 



Change-Id: Ia536d956c7393c244afc29d44196207ac73f48be
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/405545


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 80d2e164

test/iscsi_tgt/calsoft/calsoft.sh

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ $rpc_py construct_malloc_bdev -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64

# "0 0 0 1" ==> enable CHAP authentication using auth group 1

$rpc_py construct_target_node Target3 Target3_alias 'MyBdev:0' '1:2' 64 -g 1

$rpc_py construct_target_node Target3 Target3_alias 'MyBdev:0' $PORTAL_TAG:$INITIATOR_TAG 64 -g 1

sleep 1



if [ "$1" ]; then

test/iscsi_tgt/digests/digests.sh

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64

# "-d" ==> disable CHAP authentication

$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' '1:2' 64 -d

$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d

sleep 1



iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT

test/iscsi_tgt/filesystem/filesystem.sh

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ fi 
# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "256" ==> iSCSI queue depth 256

# "-d" ==> disable CHAP authentication

$rpc_py construct_target_node Target1 Target1_alias 'lvs_0/lbd_0:0' '1:2' 256 -d

$rpc_py construct_target_node Target1 Target1_alias 'lvs_0/lbd_0:0' $PORTAL_TAG:$INITIATOR_TAG 256 -d

sleep 1



iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT

test/iscsi_tgt/fio/fio.sh

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64

# "-d" ==> disable CHAP authentication

$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' '1:2' 64 -d

$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d

sleep 1



iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT

test/iscsi_tgt/initiator/initiator.sh

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64

# "-d" ==> disable CHAP authentication

$rpc_py construct_target_node disk1 disk1_alias 'Malloc0:0' '1:2' 256 -d

$rpc_py construct_target_node disk1 disk1_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 256 -d

sleep 1

trap "killprocess $pid; exit 1" SIGINT SIGTERM EXIT

$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -s 4096 -w verify -t 5 -d 512