From 8f1f9137b1477ee8618d218a5795abb7acdc786a Mon Sep 17 00:00:00 2001 From: GangCao Date: Thu, 8 Mar 2018 15:54:22 -0500 Subject: [PATCH] test/nvme-cli: use the macro instead of hard-coded value Change-Id: Iee2ae343d5e6a292a6c0e188903d80c794202dde Signed-off-by: GangCao Reviewed-on: https://review.gerrithub.io/403246 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- test/nvmf/nvme_cli/nvme_cli.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/nvme_cli/nvme_cli.sh index 989eb1e03..fbe59f8ac 100755 --- a/test/nvmf/nvme_cli/nvme_cli.sh +++ b/test/nvmf/nvme_cli/nvme_cli.sh @@ -36,7 +36,7 @@ bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SI modprobe -v nvme-rdma $rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 '' '' -a -s SPDK00000000000001 -n "$bdevs" -$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t RDMA -a $NVMF_FIRST_TARGET_IP -s 4420 +$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t RDMA -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT" nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT" @@ -57,7 +57,7 @@ nvme disconnect -n "nqn.2016-06.io.spdk:cnode2" || true if [ -d $spdk_nvme_cli ]; then # Test spdk/nvme-cli NVMe-oF commands: discover, connect and disconnet cd $spdk_nvme_cli - ./nvme discover -t rdma -a $NVMF_FIRST_TARGET_IP -s 4420 + ./nvme discover -t rdma -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT" nvme_num_before_connection=$(nvme list |grep "/dev/nvme*"|awk '{print $1}'|wc -l) ./nvme connect -t rdma -n "nqn.2016-06.io.spdk:cnode1" -a "$NVMF_FIRST_TARGET_IP" -s "$NVMF_PORT" nvme_num=$(nvme list |grep "/dev/nvme*"|awk '{print $1}'|wc -l)