Commit 9857ff60 authored by Anil Veerabhadrappa's avatar Anil Veerabhadrappa Committed by Tomasz Zawadzki
Browse files

nvmf/fc: Fix compilation errors in FC ut 



   Fix includes passing correct argument to spdk_nvmf_get_transport_ops()
and also add the spdk_nvme_trid_populate_transport() function stub.

Signed-off-by: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Change-Id: Ic470dbf7c4c674531358df2dec14a09c12a41f4e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482199


Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
parent 5e8a3a77

test/unit/lib/nvmf/fc.c/fc_ut.c

+4 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 


#include "transport.h"

#include "nvmf_internal.h"



#include "nvmf_fc.h"



#include "json/json_util.c"
@@ -123,6 +124,8 @@ DEFINE_STUB(spdk_bdev_get_block_size, uint32_t, (const struct spdk_bdev *bdev), 
DEFINE_STUB(spdk_bdev_get_num_blocks, uint64_t, (const struct spdk_bdev *bdev), 1024);



DEFINE_STUB(spdk_nvmf_ctrlr_async_event_ns_notice, int, (struct spdk_nvmf_ctrlr *ctrlr), 0);

DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid,

		enum spdk_nvme_transport_type trtype));



const char *

spdk_nvme_transport_id_trtype_str(enum spdk_nvme_transport_type trtype)
@@ -276,7 +279,7 @@ create_transport_test(void) 
	g_nvmf_tgt = spdk_nvmf_tgt_create(&tgt_opts);

	SPDK_CU_ASSERT_FATAL(g_nvmf_tgt != NULL);



	ops = spdk_nvmf_get_transport_ops((enum spdk_nvme_transport_type) SPDK_NVMF_TRTYPE_FC);

	ops = spdk_nvmf_get_transport_ops(SPDK_NVME_TRANSPORT_NAME_FC);

	SPDK_CU_ASSERT_FATAL(ops != NULL);



	ops->opts_init(&opts);

test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ void spdk_set_thread(struct spdk_thread *thread); 
DEFINE_STUB(spdk_nvmf_request_complete, int, (struct spdk_nvmf_request *req), -ENOSPC);

DEFINE_STUB(spdk_nvmf_subsystem_host_allowed, bool,

	    (struct spdk_nvmf_subsystem *subsystem, const char *hostnqn), true);

DEFINE_STUB_V(spdk_nvme_trid_populate_transport, (struct spdk_nvme_transport_id *trid,

		enum spdk_nvme_transport_type trtype));



static const char *fc_ut_subsystem_nqn =

	"nqn.2017-11.io.spdk:sn.390c0dc7c87011e786b300a0989adc53:subsystem.good";