Commit f63b058d authored Apr 03, 2018 by Tomasz Zawadzki Committed by Daniel Verkamp Apr 06, 2018

test/iscsi: iSCSI initiator test now use common configuration



This patch changes hardcoded value for target IP to one from
common.sh.

Config file here should be replaced with RPC in the future.

Change-Id: I24ef413fcb9369a74b1db182338b5b41e0874a55
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/406364


Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>

parent 15d0dac5

test/iscsi_tgt/initiator/bdev.conf

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		[iSCSI_Initiator]
		URL iscsi://127.0.0.1/iqn.2016-06.io.spdk:disk1/0 iSCSI0

		[Ioat]
		Disable Yes

test/iscsi_tgt/initiator/bdev.conf.in

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		[Ioat]
		Disable Yes

test/iscsi_tgt/initiator/initiator.sh

+6 −0

Original line number	Diff line number	Diff line
		@@ -35,7 +35,13 @@ $rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
		$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

		# Prepare config file for iSCSI initiator
		cp $testdir/bdev.conf.in $testdir/bdev.conf
		echo "[iSCSI_Initiator]" >> $testdir/bdev.conf
		echo " URL iscsi://$TARGET_IP/iqn.2016-06.io.spdk:disk1/0 iSCSI0" >> $testdir/bdev.conf
		$rootdir/test/bdev/bdevperf/bdevperf -c $testdir/bdev.conf -q 128 -s 4096 -w verify -t 5 -d 512
		rm -f $testdir/bdev.conf

		trap - SIGINT SIGTERM EXIT