Commit a9668509 authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

test/nvmf: Tweak nvme_connect() 



Make sure nvme-cli doesn't write anything to stdout since that's
where the function returns ctrl devices. In newer releases of
nvme-cli (e.g. 2.8), the following prompt is written to stdout
upon successful connect:

  connecting to device: nvme0

Explicitly return from the function with proper status.

Change-Id: Ic33c99eb3eabb7a69893596b9cde1a8ab91e2d03
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25410


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 90486f7e

test/nvmf/target/nsid.sh

+4 −4
Original line number Diff line number Diff line
@@ -23,17 +23,17 @@ nvme_connect() { 
	local ctrlr



	nvme connect -t "$TEST_TRANSPORT" -a "$tgt2addr" -s "$NVMF_SECOND_PORT" -n "$subnqn3" \

		"${NVME_HOST[@]}" "$@"

		"${NVME_HOST[@]}" "$@" >&2



	for ctrlr in /sys/class/nvme/nvme*; do

		# shellcheck disable=SC2053

		[[ -e $ctrlr/subsysnqn && $(< "$ctrlr/subsysnqn") == "$subnqn3" ]] || continue

		echo "${ctrlr##*/}"

		return

		return 0

	done



	nvme disconnect -n "$subnqn3"

	false

	nvme disconnect -n "$subnqn3" >&2

	return 1

}



nvme_get_nguid() {