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

test/nvmf: Always define host{id,nqn} while connecting over nvme-fabrics 

This relates to recent changes in nvme-fabrics:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ae8bd606e0



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent dbac81ec

test/nvmf/common.sh

+6 −1
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#  All rights reserved.

#



[[ $(uname -s) == FreeBSD ]] && return 0



NVMF_PORT=4420

NVMF_SECOND_PORT=4421

NVMF_THIRD_PORT=4422
@@ -12,6 +14,9 @@ NVMF_IP_LEAST_ADDR=8 
NVMF_TCP_IP_ADDRESS="127.0.0.1"

NVMF_TRANSPORT_OPTS=""

NVMF_SERIAL=SPDK00000000000001

NVME_HOSTNQN=$(nvme gen-hostnqn)

NVME_HOSTID=${NVME_HOSTNQN##*:}

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

NVME_CONNECT="nvme connect"

NET_TYPE=${NET_TYPE:-phy-fallback}
@@ -633,7 +638,7 @@ configure_kernel_target() { 
	ln -s "$kernel_subsystem" "$kernel_port/subsystems/"



	# Check if target is available

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

	nvme discover "${NVME_HOST[@]}" -a "$NVMF_INITIATOR_IP" -t "$TEST_TRANSPORT" -s "$NVMF_PORT"

}



clean_kernel_target() {

test/nvmf/target/connect_disconnect.sh

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ fi 


set +x

for i in $(seq 1 $num_iterations); do

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

	$NVME_CONNECT "${NVME_HOST[@]}" -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"

	waitforserial "$NVMF_SERIAL"

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

	waitforserial_disconnect "$NVMF_SERIAL"

test/nvmf/target/discovery.sh

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ $rpc_py nvmf_subsystem_add_listener discovery -t $TEST_TRANSPORT -a $NVMF_FIRST_ 
# Add a referral to another discovery service

$rpc_py nvmf_discovery_add_referral -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT_REFERRAL



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

nvme discover "${NVME_HOST[@]}" -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT



echo "Perform nvmf subsystem discovery via RPC"

$rpc_py nvmf_get_subsystems

test/nvmf/target/filesystem.sh

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ function nvmf_filesystem_part() { 


	malloc_size=$(($(get_bdev_size $malloc_name) * 1024 * 1024))



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

	$NVME_CONNECT "${NVME_HOST[@]}" -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"



	waitforserial "$NVMF_SERIAL"

	nvme_name=$(lsblk -l -o NAME,SERIAL | grep -oP "([\w]*)(?=\s+${NVMF_SERIAL})")

test/nvmf/target/fio.sh

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ $rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 raid0 
# Append the concat0 bdev into subsystem

$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 concat0



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

$NVME_CONNECT "${NVME_HOST[@]}" -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"



waitforserial $NVMF_SERIAL 4