Commit 99dd44e8 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

test/iscsi: remove VPP tests 



All VPP tests were the same tests as usual posix iSCSI tests.
TEST_TYPE was used to direct which tests to run and in some cases
with what parameter.

Since VPP is deprecated, this type of selection is no longer needed.
All tests will run with default socket abstraction.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I292f1b5141ec8c4dacb4a43c6f51e4d30501a92a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3730


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 7d6e0802

autotest.sh

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
	timing_exit lib



	if [ $SPDK_TEST_ISCSI -eq 1 ]; then

		run_test "iscsi_tgt_posix" ./test/iscsi_tgt/iscsi_tgt.sh posix

		run_test "iscsi_tgt" ./test/iscsi_tgt/iscsi_tgt.sh

		run_test "spdkcli_iscsi" ./test/spdkcli/iscsi.sh



		# Run raid spdkcli test under iSCSI since blockdev tests run on systems that can't run spdkcli yet

test/fuzz/autofuzz_iscsi.sh

+3 −4
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ rootdir=$(readlink -f $testdir/../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



# $1 = test type posix or vpp. defaults to posix.

iscsitestinit $1

iscsitestinit



if [ -z "$TARGET_IP" ]; then

	echo "TARGET_IP not defined in environment"
@@ -56,7 +55,7 @@ $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
$rpc_py iscsi_create_target_node disk1 disk1_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 256 -d

sleep 1



trap 'killprocess $iscsipid; iscsitestfini $1; exit 1' SIGINT SIGTERM EXIT

trap 'killprocess $iscsipid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT



$rootdir/test/app/fuzz/iscsi_fuzz/iscsi_fuzz -m 0xF0 -T $TARGET_IP -t $TEST_TIMEOUT 2> $output_dir/iscsi_autofuzz_logs.txt
@@ -69,6 +68,6 @@ trap - SIGINT SIGTERM EXIT 


killprocess $iscsipid



iscsitestfini $1

iscsitestfini



timing_exit iscsi_fuzz_test

test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



iscsitestinit $1

iscsitestinit



MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=512
@@ -17,7 +17,7 @@ timing_enter start_iscsi_tgt 
"${ISCSI_APP[@]}" -m 0x2 -p 1 -s 512 --wait-for-rpc &

pid=$!

echo "iSCSI target launched. pid: $pid"

trap 'killprocess $pid; iscsitestfini $1; exit 1' SIGINT SIGTERM EXIT

trap 'killprocess $pid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT

waitforlisten $pid

$rpc_py iscsi_set_options -o 30 -a 4

# Minimal number of bdev io pool (5) and cache (1)
@@ -36,7 +36,7 @@ $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE 
# "-d" ==> disable CHAP authentication

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

sleep 1

trap 'killprocess $pid; iscsitestfini $1; exit 1' SIGINT SIGTERM EXIT

trap 'killprocess $pid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT



"$rootdir/test/bdev/bdevperf/bdevperf" --json <(initiator_json_config) -q 128 -o 4096 -w write -t 1

"$rootdir/test/bdev/bdevperf/bdevperf" --json <(initiator_json_config) -q 128 -o 4096 -w read -t 1
@@ -47,4 +47,4 @@ trap - SIGINT SIGTERM EXIT 


killprocess $pid



iscsitestfini $1
 
iscsitestfini

test/iscsi_tgt/digests/digests.sh

+3 −4
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



# $1 = test type posix or vpp. defaults to posix.

iscsitestinit $1

iscsitestinit



function node_login_fio_logout() {

	for arg in "$@"; do
@@ -56,7 +55,7 @@ timing_enter start_iscsi_tgt 
pid=$!

echo "Process pid: $pid"



trap 'killprocess $pid; iscsitestfini $1; exit 1' SIGINT SIGTERM EXIT

trap 'killprocess $pid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT



waitforlisten $pid

$rpc_py iscsi_set_options -o 30 -a 16
@@ -90,4 +89,4 @@ trap - SIGINT SIGTERM EXIT 


iscsicleanup

killprocess $pid

iscsitestfini $1
 
iscsitestfini

test/iscsi_tgt/ext4test/ext4test.sh

+4 −5
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ rootdir=$(readlink -f $testdir/../../..) 
source $rootdir/test/common/autotest_common.sh

source $rootdir/test/iscsi_tgt/common.sh



# $1 = test type posix or vpp. defaults to posix.

iscsitestinit $1

iscsitestinit



rpc_py="$rootdir/scripts/rpc.py"

node_base="iqn.2013-06.com.intel.ch.spdk"
@@ -17,7 +16,7 @@ timing_enter start_iscsi_tgt 
pid=$!

echo "Process pid: $pid"



trap '$rpc_py bdev_split_delete Name0n1 || true; killprocess $pid; iscsitestfini $1; exit 1' SIGINT SIGTERM EXIT

trap '$rpc_py bdev_split_delete Name0n1 || true; killprocess $pid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT



waitforlisten $pid

$rpc_py iscsi_set_options -o 30 -a 4 -b $node_base
@@ -42,7 +41,7 @@ iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT 
waitforiscsidevices 1



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

	iscsicleanup; killprocess $pid; iscsitestfini $1; exit 1' SIGINT SIGTERM EXIT

	iscsicleanup; killprocess $pid; iscsitestfini; exit 1' SIGINT SIGTERM EXIT



echo "Test error injection"

$rpc_py bdev_error_inject_error EE_Malloc0 'all' 'failure' -n 1000
@@ -127,4 +126,4 @@ if [ -z "$NO_NVME" ]; then 
fi



killprocess $pid

iscsitestfini $1
 
iscsitestfini