Commit dde1b149 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/nvmf: Change $NVMF_SERIAL 



The serial can be 20 chars in length, if it's shorter, kernel pads
it with spaces - this is a bit annoying while trying to compare
$NVMF_SERIAL directly with the serial string exposed under sysfs.

To make it less annoying, just make the string 20 bytes long.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent cee4a298

test/nvmf/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ NVMF_IP_PREFIX="192.168.100" 
NVMF_IP_LEAST_ADDR=8

NVMF_TCP_IP_ADDRESS="127.0.0.1"

NVMF_TRANSPORT_OPTS=""

NVMF_SERIAL=SPDK00000000000001

NVMF_SERIAL=SPDKISFASTANDAWESOME

NVME_HOSTNQN=$(nvme gen-hostnqn)

NVME_HOSTID=${NVME_HOSTNQN##*:}

NVME_HOST=("--hostnqn=$NVME_HOSTNQN" "--hostid=$NVME_HOSTID")

test/nvmf/target/multipath.sh

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ get_subsystem() { 
	local nqn=$1 serial=$2 s



	for s in /sys/class/nvme-subsystem/*; do

		[[ $nqn == "$(< "$s/subsysnqn")" && "$(< "$s/serial")" == "$serial"* ]] || continue

		[[ $nqn == "$(< "$s/subsysnqn")" && "$serial" == "$(< "$s/serial")" ]] || continue

		echo "${s##*/}" && return 0

	done

	return 1