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

This reverts commit 5e03beae70.

As it happens, Soft-RoCE is not capable of handling all the test cases
in the vhost suite.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: Iccbbe3a7314cc68bb4feca700fa6d943c961bd2b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8894
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2021-07-22 11:17:35 +02:00 committed by Tomasz Zawadzki
parent a42ccffa0a
commit c9e23c2b34

View File

@ -34,10 +34,7 @@ function migration_tc2_cleanup_vhost_config() {
function migration_tc2_configure_vhost() {
timing_enter migration_tc2_configure_vhost
# 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
TEST_TRANSPORT=rdma TEST_MODE=iso nvmftestinit
# Those are global intentionally - they will be unset in cleanup handler
@ -60,7 +57,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 -t rdma -u 8192
rpc_cmd nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
mapfile -t json < <("$rootdir/scripts/gen_nvme.sh")
rpc_cmd load_subsystem_config -j "'${json[*]}'"
timing_exit start_nvmf_tgt