Commit 24ad09ba authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

test: Replace spdk/nvmecli with stock nvmecli 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I00998ce36b46902687065c5fa4684da9b7dd26d4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5541


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent 42580f7e

autotest.sh

+0 −3
Original line number Diff line number Diff line
@@ -206,9 +206,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
		run_test "blockdev_nvme" test/bdev/blockdev.sh "nvme"

		run_test "blockdev_nvme_gpt" test/bdev/blockdev.sh "gpt"

		run_test "nvme" test/nvme/nvme.sh

		if [[ $SPDK_TEST_NVME_CLI -eq 1 ]]; then

			run_test "nvme_cli" test/nvme/spdk_nvme_cli.sh

		fi

		if [[ $SPDK_TEST_NVME_CUSE -eq 1 ]]; then

			run_test "nvme_cuse" test/nvme/cuse/nvme_cuse.sh

		fi

test/nvme/spdk_nvme_cli.sh

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



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

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

source $rootdir/scripts/common.sh

source $rootdir/test/common/autotest_common.sh



if [[ $(uname) != "Linux" ]]; then

	echo "NVMe cuse tests only supported on Linux"

	exit 1

fi



nvme_cli_build



trap "kill_stub; exit 1" SIGINT SIGTERM EXIT

start_stub "-s 2048 -i 0 -m 0xF"



pushd ${DEPENDENCY_DIR}/nvme-cli



sed -i 's/spdk=0/spdk=1/g' spdk.conf

sed -i 's/shm_id=.*/shm_id=0/g' spdk.conf

for bdf in $(get_nvme_bdfs); do

	./nvme list

	./nvme id-ctrl $bdf

	./nvme list-ctrl $bdf

	./nvme get-ns-id $bdf

	./nvme id-ns $bdf

	./nvme fw-log $bdf

	./nvme smart-log $bdf

	./nvme error-log $bdf

	./nvme list-ns $bdf -n 1

	./nvme get-feature $bdf -f 1 -s 1 -l 100

	./nvme get-log $bdf -i 1 -l 100

	./nvme reset $bdf

done



popd



trap - SIGINT SIGTERM EXIT

kill_stub

test/nvmf/target/nvme_cli.sh

+4 −14
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc0 
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 Malloc1

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



nvme discover -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT"

nvme_num_before_connection=$(get_nvme_devs 2>&1 || echo 0)

nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"



waitforserial $NVMF_SERIAL 2
@@ -50,24 +52,12 @@ for ns in "${nvmes[@]}"; do 
	nvme id-ns $ns

done



nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"



# Test spdk/nvme-cli NVMe-oF commands: discover, connect and disconnect

nvme_cli_build

pushd "${DEPENDENCY_DIR}/nvme-cli"



sed -i 's/shm_id=.*/shm_id=-1/g' spdk.conf

./nvme discover -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT"

nvme_num_before_connection=$(get_nvme_devs 2>&1 || echo 0)

./nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"

sleep 1

nvme_num=$(get_nvme_devs 2>&1)

./nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"

nvme disconnect -n "nqn.2016-06.io.spdk:cnode1"

if [ $nvme_num -le $nvme_num_before_connection ]; then

	echo "spdk/nvme-cli connect target devices failed"

	echo "nvme-cli connect target devices failed"

	exit 1

fi

popd



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

trap - SIGINT SIGTERM EXIT