From ab9451bcd0f30cb05b390784b7349cf54827633c Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Mon, 6 Aug 2018 13:27:52 -0700 Subject: [PATCH] test/nvmf: Only use Soft-RoCE when RNICs aren't available Change-Id: I1a48d873afb7579327607182042b2474d8f191cf Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/421412 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu --- test/nvmf/common.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh index d982b022b..17875dc66 100755 --- a/test/nvmf/common.sh +++ b/test/nvmf/common.sh @@ -48,6 +48,7 @@ function detect_soft_roce_nics() function detect_mellanox_nics() { if ! hash lspci; then + echo "No NICs" return 0 fi @@ -57,6 +58,7 @@ function detect_mellanox_nics() mlx_en_driver="mlx4_en" if [ -z "$nvmf_nic_bdfs" ]; then + echo "No NICs" return 0 fi @@ -85,8 +87,10 @@ function detect_mellanox_nics() function detect_rdma_nics() { - detect_mellanox_nics - detect_soft_roce_nics + nics=$(detect_mellanox_nics) + if [ "$nics" == "No NICs" ]; then + detect_soft_roce_nics + fi } function allocate_nic_ips()