Commit 815949ed authored Aug 13, 2020 by yidong0635 Committed by Tomasz Zawadzki Aug 17, 2020

test/nvmf: Unify the ports in common file.



Put the NVMF_SECOND_PORT and NVMF_THIRD_PORT to common file.
And clean some wrong comments.

Signed-off-by: yidong0635 <dongx.yi@intel.com>
Change-Id: I2ccd420551bfa686a0d46e317b7a8767b171c2d9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3761


Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

parent b6ad5905

test/nvmf/common.sh

+2 −0

Original line number	Diff line number	Diff line
		NVMF_PORT=4420
		NVMF_SECOND_PORT=4421
		NVMF_THIRD_PORT=4422
		NVMF_IP_PREFIX="192.168.100"
		NVMF_IP_LEAST_ADDR=8
		NVMF_TCP_IP_ADDRESS="127.0.0.1"

test/nvmf/host/multipath.sh

+0 −3

Original line number	Diff line number	Diff line
		@@ -10,9 +10,6 @@ MALLOC_BLOCK_SIZE=512

		rpc_py="$rootdir/scripts/rpc.py"

		NVMF_SECOND_PORT="4421"
		NVMF_THIRD_PORT="4422"

		bdevperf_rpc_sock=/var/tmp/bdevperf.sock

		nvmftestinit

test/nvmf/target/nmic.sh

+3 −4

Original line number	Diff line number	Diff line
		@@ -35,11 +35,10 @@ else
		echo " Adding namespace failed - expected result."
		fi

		echo "test case2: host connect to nvmf target in multiple paths, using different ports between 49152 and 65535"
		NVMF_PORT2=49152
		$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT2"
		echo "test case2: host connect to nvmf target in multiple paths"
		$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s "$NVMF_SECOND_PORT"
		nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT"
		nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT2"
		nvme connect -t $TEST_TRANSPORT -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_SECOND_PORT"

		waitforserial "$NVMF_SERIAL"