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

test/iscsi: rename PORT to ISCSI_PORT in tests 



This makes it clear and common among all iSCSI scripts
what ISCSI_PORT is refers to.

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


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 49b54629

test/iscsi_tgt/calsoft/calsoft.sh

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ fi 
timing_enter calsoft



# iSCSI target configuration

PORT=3260

ISCSI_PORT=3260

INITIATOR_TAG=2

INITIATOR_NAME=ANY

NETMASK=$INITIATOR_IP/32
@@ -40,7 +40,7 @@ echo "iscsi_tgt is listening. Running tests..." 


timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_bdev -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

# "MyBdev:0" ==> use MyBdev blockdev for LUN0

test/iscsi_tgt/digests/digests.sh

+7 −7
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ function node_login_fio_logout() 
{

	for arg in "$@"

	do

		iscsiadm -m node -p $TARGET_IP:$PORT -o update -n node.conn[0].iscsi.$arg

		iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT -o update -n node.conn[0].iscsi.$arg

	done

	iscsiadm -m node --login -p $TARGET_IP:$PORT

	iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT

	sleep 1

	$fio_py 512 1 write 2

	$fio_py 512 1 read 2

	iscsiadm -m node --logout -p $TARGET_IP:$PORT

	iscsiadm -m node --logout -p $TARGET_IP:$ISCSI_PORT

	sleep 1

}
@@ -60,7 +60,7 @@ function iscsi_header_data_digest_test() 
timing_enter digests



# iSCSI target configuration

PORT=3260

ISCSI_PORT=3260

INITIATOR_TAG=2

INITIATOR_NAME=ANY

NETMASK=$INITIATOR_IP/32
@@ -83,7 +83,7 @@ echo "iscsi_tgt is listening. Running tests..." 


timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

# "Malloc0:0" ==> use Malloc0 blockdev for LUN0
@@ -93,11 +93,11 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' '1:2' 64 -d

sleep 1



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

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



# iscsiadm installed by some Fedora releases loses DataDigest parameter.

# Check and avoid setting DataDigest.

DataDigestAbility=`iscsiadm -m node -p $TARGET_IP:$PORT | grep DataDigest || true`

DataDigestAbility=`iscsiadm -m node -p $TARGET_IP:$ISCSI_PORT | grep DataDigest || true`

if [ "$DataDigestAbility"x = x ]; then

	iscsi_header_digest_test

else

test/iscsi_tgt/ext4test/ext4test.sh

+6 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ cp $testdir/iscsi.conf.in $testdir/iscsi.conf 
$rootdir/scripts/gen_nvme.sh >> $testdir/iscsi.conf



# iSCSI target configuration

PORT=3260

ISCSI_PORT=3260

INITIATOR_TAG=2

INITIATOR_NAME=ANY

NETMASK=$INITIATOR_IP/32
@@ -35,7 +35,7 @@ echo "iscsi_tgt is listening. Running tests..." 


timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_error_bdev 'Malloc0'

# "1:2" ==> map PortalGroup1 to InitiatorGroup2
@@ -44,8 +44,8 @@ $rpc_py construct_error_bdev 'Malloc0' 
$rpc_py construct_target_node Target0 Target0_alias EE_Malloc0:0 1:2 64 -d

sleep 1



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

iscsiadm -m node --login -p $TARGET_IP:$PORT

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

iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT



trap 'for new_dir in `dir -d /mnt/*dir`; do umount $new_dir; rm -rf $new_dir; done; \

	iscsicleanup; killprocess $pid; exit 1' SIGINT SIGTERM EXIT
@@ -79,8 +79,8 @@ if [ -z "$NO_NVME" ]; then 
$rpc_py construct_target_node Target1 Target1_alias Nvme0n1:0 1:2 64 -d

fi



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

iscsiadm -m node --login -p $TARGET_IP:$PORT

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

iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT



devs=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')

test/iscsi_tgt/filesystem/filesystem.sh

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ source $rootdir/scripts/common.sh 
timing_enter filesystem



# iSCSI target configuration

PORT=3260

ISCSI_PORT=3260

INITIATOR_TAG=2

INITIATOR_NAME=ANY

NETMASK=$INITIATOR_IP/32
@@ -40,7 +40,7 @@ echo "iscsi_tgt is listening. Running tests..." 
timing_exit start_iscsi_tgt



bdf=`iter_pci_class_code 01 08 02 | head -1`

$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_nvme_bdev -b "Nvme0" -t "pcie" -a $bdf
@@ -59,8 +59,8 @@ fi 
$rpc_py construct_target_node Target1 Target1_alias 'lvs_0/lbd_0:0' '1:2' 256 -d

sleep 1



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

iscsiadm -m node --login -p $TARGET_IP:$PORT

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

iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT



trap "remove_backends; umount /mnt/device; rm -rf /mnt/device; iscsicleanup; killprocess $pid; exit 1" SIGINT SIGTERM EXIT
@@ -87,7 +87,7 @@ for fstype in "ext4" "btrfs" "xfs"; do 


	iscsiadm -m node --logout

	sleep 1

	iscsiadm -m node --login -p $TARGET_IP:$PORT

	iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT

	sleep 1

	dev=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')

	mount -o rw /dev/${dev}1 /mnt/device

test/iscsi_tgt/fio/fio.sh

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ timing_enter fio 
cp $testdir/iscsi.conf.in $testdir/iscsi.conf



# iSCSI target configuration

PORT=3260

ISCSI_PORT=3260

INITIATOR_TAG=2

INITIATOR_NAME=ANY

NETMASK=$INITIATOR_IP/32
@@ -70,7 +70,7 @@ echo "iscsi_tgt is listening. Running tests..." 


timing_exit start_iscsi_tgt



$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

# "Malloc0:0" ==> use Malloc0 blockdev for LUN0
@@ -80,8 +80,8 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
$rpc_py construct_target_node Target3 Target3_alias 'Malloc0:0' '1:2' 64 -d

sleep 1



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

iscsiadm -m node --login -p $TARGET_IP:$PORT

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

iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT



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