Commit ab9451bc authored Aug 06, 2018 by Seth Howell Committed by Changpeng Liu Aug 09, 2018

test/nvmf: Only use Soft-RoCE when RNICs aren't available



Change-Id: I1a48d873afb7579327607182042b2474d8f191cf
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/421412


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>

parent 25a89b2a

test/nvmf/common.sh

+6 −2

Original line number	Diff line number	Diff line
		@@ -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
		nics=$(detect_mellanox_nics)
		if [ "$nics" == "No NICs" ]; then
		detect_soft_roce_nics
		fi
		}

		function allocate_nic_ips()