Revert "test/iscsi: add application for target fuzz testing."
This reverts commit 4700ef0fa6.
This has merge conflicts with the iSCSI async write patch
series that was merged.
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I5a27460a369ef5f13bf490a287603e566071be40
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482482
This commit is contained in:
Jim Harris
parent
42226f33ed
commit
12ae64f863
@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
|
|||||||
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
||||||
|
|
||||||
DIRS-y += nvme_fuzz
|
DIRS-y += nvme_fuzz
|
||||||
DIRS-y += iscsi_fuzz
|
|
||||||
|
|
||||||
ifeq ($(OS),Linux)
|
ifeq ($(OS),Linux)
|
||||||
DIRS-$(CONFIG_VIRTIO) += vhost_fuzz
|
DIRS-$(CONFIG_VIRTIO) += vhost_fuzz
|
||||||
|
|||||||
1
test/app/fuzz/iscsi_fuzz/.gitignore
vendored
1
test/app/fuzz/iscsi_fuzz/.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
iscsi_fuzz
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright (c) Intel Corporation.
|
|
||||||
# All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions
|
|
||||||
# are met:
|
|
||||||
#
|
|
||||||
# * Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
# * Redistributions in binary form must reproduce the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer in
|
|
||||||
# the documentation and/or other materials provided with the
|
|
||||||
# distribution.
|
|
||||||
# * Neither the name of Intel Corporation nor the names of its
|
|
||||||
# contributors may be used to endorse or promote products derived
|
|
||||||
# from this software without specific prior written permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
||||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
||||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
#
|
|
||||||
|
|
||||||
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
|
|
||||||
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
|
||||||
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
|
|
||||||
|
|
||||||
APP = iscsi_fuzz
|
|
||||||
|
|
||||||
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
|
|
||||||
CFLAGS += -I$(SPDK_ROOT_DIR)/include
|
|
||||||
|
|
||||||
C_SRCS := iscsi_fuzz.c
|
|
||||||
|
|
||||||
ISCSI_OBJS = md5 param conn tgt_node init_grp portal_grp
|
|
||||||
|
|
||||||
LIBS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)
|
|
||||||
LIBS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)
|
|
||||||
|
|
||||||
SPDK_LIB_LIST += $(SOCK_MODULES_LIST)
|
|
||||||
SPDK_LIB_LIST += conf event json jsonrpc log scsi bdev notify rpc sock thread trace util
|
|
||||||
|
|
||||||
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,67 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
testdir=$(readlink -f $(dirname $0))
|
|
||||||
rootdir=$(readlink -f $testdir/../../..)
|
|
||||||
source $rootdir/test/common/autotest_common.sh
|
|
||||||
source $rootdir/test/iscsi_tgt/common.sh
|
|
||||||
|
|
||||||
# $1 = "iso" - triggers isolation mode (setting up required environment).
|
|
||||||
# $2 = test type posix or vpp. defaults to posix.
|
|
||||||
iscsitestinit $1 $2
|
|
||||||
|
|
||||||
delete_tmp_files() {
|
|
||||||
rm -f ./local-job0-0-verify.state
|
|
||||||
rm -f ./local-job1-1-verify.state
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -z "$TARGET_IP" ]; then
|
|
||||||
echo "TARGET_IP not defined in environment"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$INITIATOR_IP" ]; then
|
|
||||||
echo "INITIATOR_IP not defined in environment"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
timing_enter iscsi_fuzz
|
|
||||||
|
|
||||||
MALLOC_BDEV_SIZE=64
|
|
||||||
MALLOC_BLOCK_SIZE=4096
|
|
||||||
|
|
||||||
rpc_py="$rootdir/scripts/rpc.py"
|
|
||||||
|
|
||||||
timing_enter start_iscsi_tgt
|
|
||||||
$ISCSI_APP &
|
|
||||||
iscsipid=$!
|
|
||||||
|
|
||||||
trap 'killprocess $iscsipid; exit 1' SIGINT SIGTERM EXIT
|
|
||||||
|
|
||||||
waitforlisten $iscsipid
|
|
||||||
echo "iscsi_tgt is listening. Running tests..."
|
|
||||||
timing_exit start_iscsi_tgt
|
|
||||||
|
|
||||||
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
|
||||||
$rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
|
||||||
$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 $2; delete_tmp_files; exit 1' SIGINT SIGTERM EXIT
|
|
||||||
|
|
||||||
$rootdir/test/app/fuzz/iscsi_fuzz/iscsi_fuzz -m 0xF0 -T $TARGET_IP -t 30 2>$output_dir/iscsi_autofuzz_logs.txt
|
|
||||||
|
|
||||||
$rpc_py iscsi_delete_target_node 'iqn.2016-06.io.spdk:disk1'
|
|
||||||
|
|
||||||
# Delete malloc device
|
|
||||||
$rpc_py bdev_malloc_delete Malloc0
|
|
||||||
|
|
||||||
delete_tmp_files
|
|
||||||
|
|
||||||
trap - SIGINT SIGTERM EXIT
|
|
||||||
|
|
||||||
killprocess $iscsipid
|
|
||||||
|
|
||||||
iscsitestfini $1 $2
|
|
||||||
|
|
||||||
timing_exit iscsi_fuzz
|
|
||||||
@ -70,9 +70,6 @@ if [ $SPDK_TEST_NVMF -eq 1 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $RUN_NIGHTLY -eq 1 ]; then
|
if [ $RUN_NIGHTLY -eq 1 ]; then
|
||||||
if [ "$TEST_TYPE" == "posix" ]; then
|
|
||||||
run_test "iscsi_tgt_fuzz" ./test/iscsi_tgt/fuzz/fuzz.sh
|
|
||||||
fi
|
|
||||||
run_test "iscsi_tgt_multiconnection" ./test/iscsi_tgt/multiconnection/multiconnection.sh
|
run_test "iscsi_tgt_multiconnection" ./test/iscsi_tgt/multiconnection/multiconnection.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user