From bc0c0bd0094be527f15de926482fb58374b61730 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 7 Jun 2022 10:45:27 +0200 Subject: [PATCH] test/nvmf: remove create_tranport test Transport layer creation is covered by basically any test in test/nvmf. Similarly "nvme discover" and subsystem deletion performed later in the script are also already covered by other test scripts. Let's remove this script and save about 10 seconds of run time. Change-Id: Id37d217972246b6cb1dfaaaf0443016931809dbc Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12921 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Tomasz Zawadzki Reviewed-by: Michal Berger --- test/nvmf/nvmf.sh | 1 - test/nvmf/target/create_transport.sh | 53 ---------------------------- 2 files changed, 54 deletions(-) delete mode 100755 test/nvmf/target/create_transport.sh diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index ea9e969ae..ee347a60c 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -18,7 +18,6 @@ if [[ $SPDK_TEST_URING -eq 0 ]]; then run_test "nvmf_filesystem" test/nvmf/target/filesystem.sh "${TEST_ARGS[@]}" run_test "nvmf_discovery" test/nvmf/target/discovery.sh "${TEST_ARGS[@]}" run_test "nvmf_connect_disconnect" test/nvmf/target/connect_disconnect.sh "${TEST_ARGS[@]}" - run_test "nvmf_create_transport" test/nvmf/target/create_transport.sh "${TEST_ARGS[@]}" run_test "nvmf_multitarget" test/nvmf/target/multitarget.sh "${TEST_ARGS[@]}" run_test "nvmf_rpc" test/nvmf/target/rpc.sh "${TEST_ARGS[@]}" run_test "nvmf_invalid" test/nvmf/target/invalid.sh "${TEST_ARGS[@]}" diff --git a/test/nvmf/target/create_transport.sh b/test/nvmf/target/create_transport.sh deleted file mode 100755 index 633b81562..000000000 --- a/test/nvmf/target/create_transport.sh +++ /dev/null @@ -1,53 +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/nvmf/common.sh - -NULL_BDEV_SIZE=102400 -NULL_BLOCK_SIZE=512 - -rpc_py="$rootdir/scripts/rpc.py" - -if ! hash nvme; then - echo "nvme command not found; skipping create transport test" - exit 0 -fi - -nvmftestinit -nvmfappstart -m 0xF - -# Use nvmf_create_transport call to create transport -$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192 - -null_bdevs="$($rpc_py bdev_null_create Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE) " -null_bdevs+="$($rpc_py bdev_null_create Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)" - -$rpc_py nvmf_create_subsystem nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001 -for null_bdev in $null_bdevs; do - $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 $null_bdev -done -$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -$rpc_py nvmf_subsystem_add_listener discovery -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT - -nvme discover -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT - -echo "Perform nvmf subsystem discovery via RPC" -$rpc_py nvmf_get_subsystems - -$rpc_py nvmf_delete_subsystem nqn.2016-06.io.spdk:cnode1 - -for null_bdev in $null_bdevs; do - $rpc_py bdev_null_delete $null_bdev -done - -check_bdevs=$($rpc_py bdev_get_bdevs | jq -r '.[].name') -if [ -n "$check_bdevs" ]; then - echo $check_bdevs - exit 1 -fi - -trap - SIGINT SIGTERM EXIT - -nvmftestfini