d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/nvmf: remove hardcoded NVMF ip address.

Browse Source 
This is the first in a series of patches to remove network configuration assumptions from the NVMF test suite.

Change-Id: I9d8a9daab6910c5e80276db7e6701e1aa8e1d38f
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/371193
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Seth Howell 2017-07-25 08:39:51 -07:00 committed by Ben Walker
parent b1617bf80f
commit e4cfa8e34e
14 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -8,7 +8,9 @@ source $rootdir/scripts/autotest_common.sh
source $rootdir/test/nvmf/common.sh
source $rootdir/test/iscsi_tgt/common.sh
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

16
test/nvmf/common.sh
View File

@ -3,7 +3,6 @@
NVMF_PORT=4420
NVMF_IP_PREFIX="192.168.100"
NVMF_IP_LEAST_ADDR=8
NVMF_FIRST_TARGET_IP=$NVMF_IP_PREFIX.$NVMF_IP_LEAST_ADDR
RPC_PORT=5260
if [ -z "$NVMF_APP" ]; then
@ -88,6 +87,16 @@ function allocate_nic_ips()
done
}
function get_available_rdma_ips()
{
nic_list=""
for nic_type in `ls /sys/class/infiniband`; do
for nic_name in `ls /sys/class/infiniband/${nic_type}/device/net`; do
ifconfig $nic_name | grep "inet " | awk '{print $2}'
done
done
}
function nvmfcleanup()
{
sync
@ -100,8 +109,3 @@ function rdma_device_init()
detect_rdma_nics
allocate_nic_ips
}
function rdma_nic_available()
{
ifconfig | grep -q $NVMF_IP_PREFIX
}

4
test/nvmf/discovery/discovery.sh
View File

@ -17,7 +17,9 @@ if ! hash nvme; then
exit 0
fi
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

4
test/nvmf/filesystem/filesystem.sh
View File

@ -12,7 +12,9 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

4
test/nvmf/fio/fio.sh
View File

@ -12,7 +12,9 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

8
test/nvmf/host/aer.sh
View File

@ -9,9 +9,11 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
echo "no NIC for nvmf test"
exit 0
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi
timing_enter aer

8
test/nvmf/host/fio.sh
View File

@ -9,9 +9,11 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
echo "no NIC for nvmf test"
exit 0
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi
if [ ! -d /usr/src/fio ]; then

9
test/nvmf/host/identify.sh
View File

@ -12,11 +12,12 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
echo "no NIC for nvmf test"
exit 0
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi
timing_enter identify
timing_enter start_nvmf_tgt

4
test/nvmf/host/identify_kernel_nvmf.sh
View File

@ -7,7 +7,9 @@ source $rootdir/test/nvmf/common.sh
set -e
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

8
test/nvmf/host/perf.sh
View File

@ -12,9 +12,11 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
echo "no NIC for nvmf test"
exit 0
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi
timing_enter perf

4
test/nvmf/multiconnection/multiconnection.sh
View File

@ -12,7 +12,9 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

4
test/nvmf/nvme_cli/nvme_cli.sh
View File

@ -12,7 +12,9 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

4
test/nvmf/rpc/rpc.sh
View File

@ -9,7 +9,9 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi

4
test/nvmf/shutdown/shutdown.sh
View File

@ -12,7 +12,9 @@ rpc_py="python $rootdir/scripts/rpc.py"
set -e
if ! rdma_nic_available; then
RDMA_IP_LIST=$(get_available_rdma_ips)
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
if [ -z $NVMF_FIRST_TARGET_IP ]; then
echo "no NIC for nvmf test"
exit 0
fi