Commit e762dcb2 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

test/iscsi: delete fio_remote_nvme test 



This test is never executed in continous
integration pipelines. It needs both
SPDK_TEST_ISCSI and SPDK_TEST_NVMF flags
to be run which would result in a very
long execution time (up to 1 hour).
It is unlikely that such combination
be ever used in CI for testing.

Furthermore - the whole scenario of using
SPDK NVMe-oF Target & Initiator & iSCSI
Target in a single script seems a bit
convoluted. Unfortunately the change
introducing the test did not provide any
description if this is a real use case.
Pretty sure all of actions done here are
already covered by other test scripts
separately.

Change-Id: I9042d50a68a83295dd5feeb89617184ccd18b565
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22267


Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent fe22b505

test/common/skipped_tests.txt

+0 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ ftl_write_after_write 
ftl_fio_extended

ftl_fio_nightly



# Waiting for test refactor

iscsi_tgt_fio_remote_nvme



# Waiting on Boot Partition support in CI

nvme_bp

nvme_boot_partition

test/iscsi_tgt/iscsi_tgt.sh

+0 −5
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ fi 


trap 'cleanup_veth_interfaces; exit 1' SIGINT SIGTERM EXIT



if [ $SPDK_TEST_NVMF -eq 1 ]; then

	# Test configure remote NVMe device from rpc and conf file

	run_test "iscsi_tgt_fio_remote_nvme" $rootdir/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh

fi



if [ $SPDK_TEST_ISCSI_INITIATOR -eq 1 ]; then

	run_test "iscsi_tgt_initiator" $rootdir/test/iscsi_tgt/initiator/initiator.sh

	run_test "iscsi_tgt_bdev_io_wait" $rootdir/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh

test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh

deleted100755 → 0
+0 −99
Original line number Diff line number Diff line 
#!/usr/bin/env bash

#  SPDX-License-Identifier: BSD-3-Clause

#  Copyright (C) 2016 Intel Corporation

#  All rights reserved.

#

testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/nvmf/common.sh

source $rootdir/test/iscsi_tgt/common.sh



nvmftestinit

iscsitestinit



fio_py="$rootdir/scripts/fio-wrapper"



# Namespaces are NOT used here on purpose. Rxe_cfg utility used for NVMf tests do not support namespaces.

TARGET_IP=127.0.0.1

INITIATOR_IP=127.0.0.1

NETMASK=$INITIATOR_IP/32



function run_nvme_remote() {

	echo "now use $1 method to run iscsi tgt."



	iscsi_rpc_addr="/var/tmp/spdk-iscsi.sock"

	"${ISCSI_APP[@]}" -r "$iscsi_rpc_addr" -m 0x1 -p 0 -s 512 --wait-for-rpc &

	iscsipid=$!

	echo "iSCSI target launched. pid: $iscsipid"

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

	waitforlisten $iscsipid "$iscsi_rpc_addr"

	$rpc_py -s "$iscsi_rpc_addr" iscsi_set_options -o 30 -a 16

	$rpc_py -s "$iscsi_rpc_addr" framework_start_init

	if [ "$1" = "remote" ]; then

		$rpc_py -s $iscsi_rpc_addr bdev_nvme_attach_controller -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1

	fi



	echo "iSCSI target has started."



	timing_exit start_iscsi_tgt



	echo "Creating an iSCSI target node."

	$rpc_py -s "$iscsi_rpc_addr" iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT

	$rpc_py -s "$iscsi_rpc_addr" iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

	if [ "$1" = "local" ]; then

		$rpc_py -s "$iscsi_rpc_addr" bdev_nvme_attach_controller -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1

	fi

	$rpc_py -s "$iscsi_rpc_addr" iscsi_create_target_node Target1 Target1_alias 'Nvme0n1:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d

	sleep 1



	echo "Logging in to iSCSI target."

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

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

}



# Start the NVMf target

"${NVMF_APP[@]}" -m 0x2 -p 1 -s 512 --wait-for-rpc &

nvmfpid=$!

echo "NVMf target launched. pid: $nvmfpid"

trap 'iscsitestfini; nvmftestfini; exit 1' SIGINT SIGTERM EXIT

waitforlisten $nvmfpid

$rpc_py framework_start_init

$rpc_py nvmf_create_transport -t RDMA -u 8192

echo "NVMf target has started."

bdevs=$($rpc_py bdev_malloc_create 64 512)

$rpc_py nvmf_create_subsystem nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t rdma -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT

for bdev in $bdevs; do

	$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $bdev

done

echo "NVMf subsystem created."



timing_enter start_iscsi_tgt



run_nvme_remote "local"



trap 'iscsicleanup; killprocess $iscsipid;

	rm -f ./local-job0-0-verify.state; iscsitestfini; nvmftestfini; exit 1' SIGINT SIGTERM EXIT



echo "Running FIO"

$fio_py -p iscsi -i 4096 -d 1 -t randrw -r 1 -v



rm -f ./local-job0-0-verify.state

iscsicleanup

killprocess $iscsipid



run_nvme_remote "remote"



echo "Running FIO"

$fio_py -p iscsi -i 4096 -d 1 -t randrw -r 1 -v



rm -f ./local-job0-0-verify.state

trap - SIGINT SIGTERM EXIT



iscsicleanup

killprocess $iscsipid

$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1



iscsitestfini

nvmftestfini