Commit 5e03beae authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/vhost: Don't use nvmftestinit() in vhost tests 



For now this function is not working very well in case it finds E810
cards (we do have some installed across CI pool) as we don't have
proper irdma driver in place.

Instead, and since it shouldn't be relevant for vhost tests, enable
soft-RoCE devices and use them (or any other rdma-capable NIC that
ip is going to be allocated on) during the vhost migration tests.

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: I4e8cc7b8eea3ce91684d8a68d0a0e11b8d1e4b9b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8750


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 8b19bc23

test/vhost/migration/migration-tc2.sh

+5 −2
Original line number Diff line number Diff line
@@ -34,7 +34,10 @@ function migration_tc2_cleanup_vhost_config() { 
function migration_tc2_configure_vhost() {

	timing_enter migration_tc2_configure_vhost



	TEST_TRANSPORT=rdma TEST_MODE=iso nvmftestinit

	# Just in case we don't have any rdma-capable NICs on board - using hw or

	# soft-RoCE during vhost tests should not matter.

	detect_soft_roce_nics

	allocate_nic_ips



	# Those are global intentionally - they will be unset in cleanup handler
@@ -57,7 +60,7 @@ function migration_tc2_configure_vhost() { 
	# Override the trap set in place via nvmfappstart()

	trap 'migration_tc2_error_cleanup; error_exit "${FUNCNAME}" "${LINENO}"' INT ERR EXIT

	rpc_cmd framework_start_init

	rpc_cmd nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192

	rpc_cmd nvmf_create_transport -t rdma -u 8192

	mapfile -t json < <("$rootdir/scripts/gen_nvme.sh")

	rpc_cmd load_subsystem_config -j "'${json[*]}'"

	timing_exit start_nvmf_tgt