From a587a1072ab3949708257609e9534199baa0624d Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 16 Apr 2020 06:54:21 +0900 Subject: [PATCH] lib/iscsi: Remove the "spdk_" prefix from internal APIs declared in portal_grp.h Signed-off-by: Shuhei Matsumoto Change-Id: I2c9482c8a89b3dc87f9e4cb55bc298e87472d30c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1888 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki --- lib/iscsi/iscsi_rpc.c | 26 +++--- lib/iscsi/iscsi_subsystem.c | 10 +- lib/iscsi/portal_grp.c | 68 +++++++------- lib/iscsi/portal_grp.h | 40 ++++---- lib/iscsi/tgt_node.c | 4 +- test/unit/lib/iscsi/iscsi.c/iscsi_ut.c | 2 +- .../lib/iscsi/portal_grp.c/portal_grp_ut.c | 92 +++++++++---------- test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c | 2 +- 8 files changed, 122 insertions(+), 122 deletions(-) diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index 4e0c9dbbd..fe2eec4a3 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -711,7 +711,7 @@ spdk_rpc_iscsi_get_portal_groups(struct spdk_jsonrpc_request *request, w = spdk_jsonrpc_begin_result(request); spdk_json_write_array_begin(w); - spdk_iscsi_portal_grps_info_json(w); + iscsi_portal_grps_info_json(w); spdk_json_write_array_end(w); spdk_jsonrpc_end_result(request, w); @@ -805,28 +805,28 @@ spdk_rpc_iscsi_create_portal_group(struct spdk_jsonrpc_request *request, goto out; } - pg = spdk_iscsi_portal_grp_create(req.tag); + pg = iscsi_portal_grp_create(req.tag); if (pg == NULL) { SPDK_ERRLOG("portal_grp_create failed\n"); goto out; } for (i = 0; i < req.portal_list.num_portals; i++) { - portal = spdk_iscsi_portal_create(req.portal_list.portals[i].host, - req.portal_list.portals[i].port); + portal = iscsi_portal_create(req.portal_list.portals[i].host, + req.portal_list.portals[i].port); if (portal == NULL) { SPDK_ERRLOG("portal_create failed\n"); goto out; } - spdk_iscsi_portal_grp_add_portal(pg, portal); + iscsi_portal_grp_add_portal(pg, portal); } - rc = spdk_iscsi_portal_grp_open(pg); + rc = iscsi_portal_grp_open(pg); if (rc != 0) { SPDK_ERRLOG("portal_grp_open failed\n"); goto out; } - rc = spdk_iscsi_portal_grp_register(pg); + rc = iscsi_portal_grp_register(pg); if (rc != 0) { SPDK_ERRLOG("portal_grp_register failed\n"); } @@ -840,7 +840,7 @@ out: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); if (pg != NULL) { - spdk_iscsi_portal_grp_release(pg); + iscsi_portal_grp_release(pg); } } free_rpc_portal_group(&req); @@ -871,13 +871,13 @@ spdk_rpc_iscsi_delete_portal_group(struct spdk_jsonrpc_request *request, goto invalid; } - pg = spdk_iscsi_portal_grp_unregister(req.tag); + pg = iscsi_portal_grp_unregister(req.tag); if (!pg) { goto invalid; } iscsi_tgt_node_delete_map(pg, NULL); - spdk_iscsi_portal_grp_release(pg); + iscsi_portal_grp_release(pg); w = spdk_jsonrpc_begin_result(request); spdk_json_write_bool(w, true); @@ -925,15 +925,15 @@ spdk_rpc_iscsi_portal_group_set_auth(struct spdk_jsonrpc_request *request, pthread_mutex_lock(&g_iscsi.mutex); - pg = spdk_iscsi_portal_grp_find_by_tag(req.tag); + pg = iscsi_portal_grp_find_by_tag(req.tag); if (pg == NULL) { spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Could not find portal group %d", req.tag); goto exit; } - rc = spdk_iscsi_portal_grp_set_chap_params(pg, req.disable_chap, req.require_chap, - req.mutual_chap, req.chap_group); + rc = iscsi_portal_grp_set_chap_params(pg, req.disable_chap, req.require_chap, + req.mutual_chap, req.chap_group); if (rc < 0) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid combination of auth params"); diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index 7f5de05a0..b1a2227eb 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -1148,7 +1148,7 @@ iscsi_parse_configuration(void) { int rc; - rc = spdk_iscsi_parse_portal_grps(); + rc = iscsi_parse_portal_grps(); if (rc < 0) { SPDK_ERRLOG("spdk_iscsi_parse_portal_grps() failed\n"); goto end; @@ -1384,7 +1384,7 @@ spdk_iscsi_fini(spdk_iscsi_fini_cb cb_fn, void *cb_arg) g_fini_cb_fn = cb_fn; g_fini_cb_arg = cb_arg; - spdk_iscsi_portal_grp_close_all(); + iscsi_portal_grp_close_all(); spdk_shutdown_iscsi_conns(); } @@ -1409,7 +1409,7 @@ _iscsi_fini_dev_unreg(struct spdk_io_channel_iter *i, int status) iscsi_shutdown_tgt_nodes(); iscsi_init_grps_destroy(); - spdk_iscsi_portal_grps_destroy(); + iscsi_portal_grps_destroy(); iscsi_auth_groups_destroy(); spdk_io_device_unregister(&g_iscsi, iscsi_fini_done); @@ -1443,7 +1443,7 @@ void spdk_iscsi_config_text(FILE *fp) { iscsi_globals_config_text(fp); - spdk_iscsi_portal_grps_config_text(fp); + iscsi_portal_grps_config_text(fp); iscsi_init_grps_config_text(fp); iscsi_tgt_nodes_config_text(fp); } @@ -1567,7 +1567,7 @@ spdk_iscsi_config_json(struct spdk_json_write_ctx *w) { spdk_json_write_array_begin(w); iscsi_opts_config_json(w); - spdk_iscsi_portal_grps_config_json(w); + iscsi_portal_grps_config_json(w); iscsi_init_grps_config_json(w); iscsi_tgt_nodes_config_json(w); iscsi_auth_groups_config_json(w); diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c index e01f20c3e..75e278a9c 100644 --- a/lib/iscsi/portal_grp.c +++ b/lib/iscsi/portal_grp.c @@ -98,7 +98,7 @@ iscsi_portal_find_by_addr(const char *host, const char *port) /* Assumes caller allocated host and port strings on the heap */ struct spdk_iscsi_portal * -spdk_iscsi_portal_create(const char *host, const char *port) +iscsi_portal_create(const char *host, const char *port) { struct spdk_iscsi_portal *p = NULL, *tmp; @@ -156,11 +156,11 @@ error_out: } void -spdk_iscsi_portal_destroy(struct spdk_iscsi_portal *p) +iscsi_portal_destroy(struct spdk_iscsi_portal *p) { assert(p != NULL); - SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "spdk_iscsi_portal_destroy\n"); + SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "iscsi_portal_destroy\n"); pthread_mutex_lock(&g_iscsi.mutex); TAILQ_REMOVE(&g_iscsi.portal_head, p, g_tailq); @@ -272,7 +272,7 @@ iscsi_parse_portal(const char *portalstring, struct spdk_iscsi_portal **ip) port[len] = '\0'; } - *ip = spdk_iscsi_portal_create(host, port); + *ip = iscsi_portal_create(host, port); if (!*ip) { goto error_out; } @@ -286,7 +286,7 @@ error_out: } struct spdk_iscsi_portal_grp * -spdk_iscsi_portal_grp_create(int tag) +iscsi_portal_grp_create(int tag) { struct spdk_iscsi_portal_grp *pg = malloc(sizeof(*pg)); @@ -311,23 +311,23 @@ spdk_iscsi_portal_grp_create(int tag) } void -spdk_iscsi_portal_grp_destroy(struct spdk_iscsi_portal_grp *pg) +iscsi_portal_grp_destroy(struct spdk_iscsi_portal_grp *pg) { struct spdk_iscsi_portal *p; assert(pg != NULL); - SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "spdk_iscsi_portal_grp_destroy\n"); + SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "iscsi_portal_grp_destroy\n"); while (!TAILQ_EMPTY(&pg->head)) { p = TAILQ_FIRST(&pg->head); TAILQ_REMOVE(&pg->head, p, per_pg_tailq); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); } free(pg); } int -spdk_iscsi_portal_grp_register(struct spdk_iscsi_portal_grp *pg) +iscsi_portal_grp_register(struct spdk_iscsi_portal_grp *pg) { int rc = -1; struct spdk_iscsi_portal_grp *tmp; @@ -335,7 +335,7 @@ spdk_iscsi_portal_grp_register(struct spdk_iscsi_portal_grp *pg) assert(pg != NULL); pthread_mutex_lock(&g_iscsi.mutex); - tmp = spdk_iscsi_portal_grp_find_by_tag(pg->tag); + tmp = iscsi_portal_grp_find_by_tag(pg->tag); if (tmp == NULL) { TAILQ_INSERT_TAIL(&g_iscsi.pg_head, pg, tailq); rc = 0; @@ -345,8 +345,8 @@ spdk_iscsi_portal_grp_register(struct spdk_iscsi_portal_grp *pg) } void -spdk_iscsi_portal_grp_add_portal(struct spdk_iscsi_portal_grp *pg, - struct spdk_iscsi_portal *p) +iscsi_portal_grp_add_portal(struct spdk_iscsi_portal_grp *pg, + struct spdk_iscsi_portal *p) { assert(pg != NULL); assert(p != NULL); @@ -356,9 +356,9 @@ spdk_iscsi_portal_grp_add_portal(struct spdk_iscsi_portal_grp *pg, } int -spdk_iscsi_portal_grp_set_chap_params(struct spdk_iscsi_portal_grp *pg, - bool disable_chap, bool require_chap, - bool mutual_chap, int32_t chap_group) +iscsi_portal_grp_set_chap_params(struct spdk_iscsi_portal_grp *pg, + bool disable_chap, bool require_chap, + bool mutual_chap, int32_t chap_group) { if (!iscsi_check_chap_params(disable_chap, require_chap, mutual_chap, chap_group)) { @@ -390,7 +390,7 @@ iscsi_parse_portal_grp(struct spdk_conf_section *sp) SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "Comment %s\n", val); } - pg = spdk_iscsi_portal_grp_create(spdk_conf_section_get_num(sp)); + pg = iscsi_portal_grp_create(spdk_conf_section_get_num(sp)); if (!pg) { SPDK_ERRLOG("portal group malloc error (%s)\n", spdk_conf_section_get_name(sp)); return -1; @@ -413,17 +413,17 @@ iscsi_parse_portal_grp(struct spdk_conf_section *sp) "RIndex=%d, Host=%s, Port=%s, Tag=%d\n", i, p->host, p->port, spdk_conf_section_get_num(sp)); - spdk_iscsi_portal_grp_add_portal(pg, p); + iscsi_portal_grp_add_portal(pg, p); } - rc = spdk_iscsi_portal_grp_open(pg); + rc = iscsi_portal_grp_open(pg); if (rc != 0) { SPDK_ERRLOG("portal_grp_open failed\n"); goto error; } /* Add portal group to the end of the pg list */ - rc = spdk_iscsi_portal_grp_register(pg); + rc = iscsi_portal_grp_register(pg); if (rc != 0) { SPDK_ERRLOG("register portal failed\n"); goto error; @@ -432,12 +432,12 @@ iscsi_parse_portal_grp(struct spdk_conf_section *sp) return 0; error: - spdk_iscsi_portal_grp_release(pg); + iscsi_portal_grp_release(pg); return -1; } struct spdk_iscsi_portal_grp * -spdk_iscsi_portal_grp_find_by_tag(int tag) +iscsi_portal_grp_find_by_tag(int tag) { struct spdk_iscsi_portal_grp *pg; @@ -451,7 +451,7 @@ spdk_iscsi_portal_grp_find_by_tag(int tag) } int -spdk_iscsi_parse_portal_grps(void) +iscsi_parse_portal_grps(void) { int rc = 0; struct spdk_conf_section *sp; @@ -477,24 +477,24 @@ spdk_iscsi_parse_portal_grps(void) } void -spdk_iscsi_portal_grps_destroy(void) +iscsi_portal_grps_destroy(void) { struct spdk_iscsi_portal_grp *pg; - SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "spdk_iscsi_portal_grps_destroy\n"); + SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "iscsi_portal_grps_destroy\n"); pthread_mutex_lock(&g_iscsi.mutex); while (!TAILQ_EMPTY(&g_iscsi.pg_head)) { pg = TAILQ_FIRST(&g_iscsi.pg_head); TAILQ_REMOVE(&g_iscsi.pg_head, pg, tailq); pthread_mutex_unlock(&g_iscsi.mutex); - spdk_iscsi_portal_grp_destroy(pg); + iscsi_portal_grp_destroy(pg); pthread_mutex_lock(&g_iscsi.mutex); } pthread_mutex_unlock(&g_iscsi.mutex); } int -spdk_iscsi_portal_grp_open(struct spdk_iscsi_portal_grp *pg) +iscsi_portal_grp_open(struct spdk_iscsi_portal_grp *pg) { struct spdk_iscsi_portal *p; int rc; @@ -519,11 +519,11 @@ iscsi_portal_grp_close(struct spdk_iscsi_portal_grp *pg) } void -spdk_iscsi_portal_grp_close_all(void) +iscsi_portal_grp_close_all(void) { struct spdk_iscsi_portal_grp *pg; - SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "spdk_iscsi_portal_grp_close_all\n"); + SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "iscsi_portal_grp_close_all\n"); pthread_mutex_lock(&g_iscsi.mutex); TAILQ_FOREACH(pg, &g_iscsi.pg_head, tailq) { iscsi_portal_grp_close(pg); @@ -532,7 +532,7 @@ spdk_iscsi_portal_grp_close_all(void) } struct spdk_iscsi_portal_grp * -spdk_iscsi_portal_grp_unregister(int tag) +iscsi_portal_grp_unregister(int tag) { struct spdk_iscsi_portal_grp *pg; @@ -549,10 +549,10 @@ spdk_iscsi_portal_grp_unregister(int tag) } void -spdk_iscsi_portal_grp_release(struct spdk_iscsi_portal_grp *pg) +iscsi_portal_grp_release(struct spdk_iscsi_portal_grp *pg) { iscsi_portal_grp_close(pg); - spdk_iscsi_portal_grp_destroy(pg); + iscsi_portal_grp_destroy(pg); } static const char *portal_group_section = \ @@ -577,7 +577,7 @@ static const char *portal_group_section = \ " Portal DA1 %s:%s\n" void -spdk_iscsi_portal_grps_config_text(FILE *fp) +iscsi_portal_grps_config_text(FILE *fp) { struct spdk_iscsi_portal *p = NULL; struct spdk_iscsi_portal_grp *pg = NULL; @@ -636,7 +636,7 @@ iscsi_portal_grp_config_json(struct spdk_iscsi_portal_grp *pg, } void -spdk_iscsi_portal_grps_info_json(struct spdk_json_write_ctx *w) +iscsi_portal_grps_info_json(struct spdk_json_write_ctx *w) { struct spdk_iscsi_portal_grp *pg; @@ -646,7 +646,7 @@ spdk_iscsi_portal_grps_info_json(struct spdk_json_write_ctx *w) } void -spdk_iscsi_portal_grps_config_json(struct spdk_json_write_ctx *w) +iscsi_portal_grps_config_json(struct spdk_json_write_ctx *w) { struct spdk_iscsi_portal_grp *pg; diff --git a/lib/iscsi/portal_grp.h b/lib/iscsi/portal_grp.h index fd629c8db..7ac72e36c 100644 --- a/lib/iscsi/portal_grp.h +++ b/lib/iscsi/portal_grp.h @@ -64,27 +64,27 @@ struct spdk_iscsi_portal_grp { /* SPDK iSCSI Portal Group management API */ -struct spdk_iscsi_portal *spdk_iscsi_portal_create(const char *host, const char *port); -void spdk_iscsi_portal_destroy(struct spdk_iscsi_portal *p); +struct spdk_iscsi_portal *iscsi_portal_create(const char *host, const char *port); +void iscsi_portal_destroy(struct spdk_iscsi_portal *p); -struct spdk_iscsi_portal_grp *spdk_iscsi_portal_grp_create(int tag); -void spdk_iscsi_portal_grp_add_portal(struct spdk_iscsi_portal_grp *pg, - struct spdk_iscsi_portal *p); -void spdk_iscsi_portal_grp_destroy(struct spdk_iscsi_portal_grp *pg); -void spdk_iscsi_portal_grp_release(struct spdk_iscsi_portal_grp *pg); -int spdk_iscsi_parse_portal_grps(void); -void spdk_iscsi_portal_grps_destroy(void); -int spdk_iscsi_portal_grp_register(struct spdk_iscsi_portal_grp *pg); -struct spdk_iscsi_portal_grp *spdk_iscsi_portal_grp_unregister(int tag); -struct spdk_iscsi_portal_grp *spdk_iscsi_portal_grp_find_by_tag(int tag); -int spdk_iscsi_portal_grp_open(struct spdk_iscsi_portal_grp *pg); -int spdk_iscsi_portal_grp_set_chap_params(struct spdk_iscsi_portal_grp *pg, - bool disable_chap, bool require_chap, - bool mutual_chap, int32_t chap_group); +struct spdk_iscsi_portal_grp *iscsi_portal_grp_create(int tag); +void iscsi_portal_grp_add_portal(struct spdk_iscsi_portal_grp *pg, + struct spdk_iscsi_portal *p); +void iscsi_portal_grp_destroy(struct spdk_iscsi_portal_grp *pg); +void iscsi_portal_grp_release(struct spdk_iscsi_portal_grp *pg); +int iscsi_parse_portal_grps(void); +void iscsi_portal_grps_destroy(void); +int iscsi_portal_grp_register(struct spdk_iscsi_portal_grp *pg); +struct spdk_iscsi_portal_grp *iscsi_portal_grp_unregister(int tag); +struct spdk_iscsi_portal_grp *iscsi_portal_grp_find_by_tag(int tag); +int iscsi_portal_grp_open(struct spdk_iscsi_portal_grp *pg); +int iscsi_portal_grp_set_chap_params(struct spdk_iscsi_portal_grp *pg, + bool disable_chap, bool require_chap, + bool mutual_chap, int32_t chap_group); -void spdk_iscsi_portal_grp_close_all(void); -void spdk_iscsi_portal_grps_config_text(FILE *fp); -void spdk_iscsi_portal_grps_info_json(struct spdk_json_write_ctx *w); -void spdk_iscsi_portal_grps_config_json(struct spdk_json_write_ctx *w); +void iscsi_portal_grp_close_all(void); +void iscsi_portal_grps_config_text(FILE *fp); +void iscsi_portal_grps_info_json(struct spdk_json_write_ctx *w); +void iscsi_portal_grps_config_json(struct spdk_json_write_ctx *w); #endif /* SPDK_PORTAL_GRP_H */ diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index a44a36970..a8a6a23b2 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -709,7 +709,7 @@ iscsi_tgt_node_delete_pg_ig_map(struct spdk_iscsi_tgt_node *target, struct spdk_iscsi_pg_map *pg_map; struct spdk_iscsi_ig_map *ig_map; - pg = spdk_iscsi_portal_grp_find_by_tag(pg_tag); + pg = iscsi_portal_grp_find_by_tag(pg_tag); if (pg == NULL) { SPDK_ERRLOG("%s: PortalGroup%d not found\n", target->name, pg_tag); return -ENOENT; @@ -749,7 +749,7 @@ iscsi_tgt_node_add_pg_ig_map(struct spdk_iscsi_tgt_node *target, struct spdk_iscsi_ig_map *ig_map; bool new_pg_map = false; - pg = spdk_iscsi_portal_grp_find_by_tag(pg_tag); + pg = iscsi_portal_grp_find_by_tag(pg_tag); if (pg == NULL) { SPDK_ERRLOG("%s: PortalGroup%d not found\n", target->name, pg_tag); return -ENOENT; diff --git a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c index eaf79a5a1..1d2cc5608 100644 --- a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c +++ b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c @@ -87,7 +87,7 @@ DEFINE_STUB(iscsi_send_tgts, int, DEFINE_STUB(iscsi_tgt_node_is_destructed, bool, (struct spdk_iscsi_tgt_node *target), false); -DEFINE_STUB_V(spdk_iscsi_portal_grp_close_all, (void)); +DEFINE_STUB_V(iscsi_portal_grp_close_all, (void)); DEFINE_STUB_V(spdk_iscsi_conn_schedule, (struct spdk_iscsi_conn *conn)); diff --git a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c index 3b343ba8d..01da435d6 100644 --- a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c +++ b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c @@ -68,10 +68,10 @@ portal_create_ipv4_normal_case(void) const char *host = "192.168.2.0"; const char *port = "3260"; - p = spdk_iscsi_portal_create(host, port); + p = iscsi_portal_create(host, port); CU_ASSERT(p != NULL); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -83,10 +83,10 @@ portal_create_ipv6_normal_case(void) const char *host = "[2001:ad6:1234::]"; const char *port = "3260"; - p = spdk_iscsi_portal_create(host, port); + p = iscsi_portal_create(host, port); CU_ASSERT(p != NULL); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -98,10 +98,10 @@ portal_create_ipv4_wildcard_case(void) const char *host = "*"; const char *port = "3260"; - p = spdk_iscsi_portal_create(host, port); + p = iscsi_portal_create(host, port); CU_ASSERT(p != NULL); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -113,10 +113,10 @@ portal_create_ipv6_wildcard_case(void) const char *host = "[*]"; const char *port = "3260"; - p = spdk_iscsi_portal_create(host, port); + p = iscsi_portal_create(host, port); CU_ASSERT(p != NULL); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -128,13 +128,13 @@ portal_create_twice_case(void) const char *host = "192.168.2.0"; const char *port = "3260"; - p1 = spdk_iscsi_portal_create(host, port); + p1 = iscsi_portal_create(host, port); CU_ASSERT(p1 != NULL); - p2 = spdk_iscsi_portal_create(host, port); + p2 = iscsi_portal_create(host, port); CU_ASSERT(p2 == NULL); - spdk_iscsi_portal_destroy(p1); + iscsi_portal_destroy(p1); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -153,7 +153,7 @@ parse_portal_ipv4_normal_case(void) CU_ASSERT(strcmp(p->host, host_str) == 0); CU_ASSERT(strcmp(p->port, port_str) == 0); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -173,7 +173,7 @@ parse_portal_ipv6_normal_case(void) CU_ASSERT(strcmp(p->host, host_str) == 0); CU_ASSERT(strcmp(p->port, port_str) == 0); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -192,7 +192,7 @@ parse_portal_ipv4_skip_port_case(void) CU_ASSERT(strcmp(p->host, host_str) == 0); CU_ASSERT(strcmp(p->port, port_str) == 0); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -211,7 +211,7 @@ parse_portal_ipv6_skip_port_case(void) CU_ASSERT(strcmp(p->host, host_str) == 0); CU_ASSERT(strcmp(p->port, port_str) == 0); - spdk_iscsi_portal_destroy(p); + iscsi_portal_destroy(p); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -224,24 +224,24 @@ portal_grp_register_unregister_case(void) const char *host = "192.168.2.0"; const char *port = "3260"; - pg1 = spdk_iscsi_portal_grp_create(1); + pg1 = iscsi_portal_grp_create(1); CU_ASSERT(pg1 != NULL); - p = spdk_iscsi_portal_create(host, port); + p = iscsi_portal_create(host, port); CU_ASSERT(p != NULL); - spdk_iscsi_portal_grp_add_portal(pg1, p); + iscsi_portal_grp_add_portal(pg1, p); - rc = spdk_iscsi_portal_grp_register(pg1); + rc = iscsi_portal_grp_register(pg1); CU_ASSERT(rc == 0); - pg2 = spdk_iscsi_portal_grp_unregister(1); + pg2 = iscsi_portal_grp_unregister(1); CU_ASSERT(pg2 != NULL); CU_ASSERT(pg1 == pg2); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.pg_head)); - spdk_iscsi_portal_grp_destroy(pg1); + iscsi_portal_grp_destroy(pg1); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -255,27 +255,27 @@ portal_grp_register_twice_case(void) const char *host = "192.168.2.0"; const char *port = "3260"; - pg1 = spdk_iscsi_portal_grp_create(1); + pg1 = iscsi_portal_grp_create(1); CU_ASSERT(pg1 != NULL); - p = spdk_iscsi_portal_create(host, port); + p = iscsi_portal_create(host, port); CU_ASSERT(p != NULL); - spdk_iscsi_portal_grp_add_portal(pg1, p); + iscsi_portal_grp_add_portal(pg1, p); - rc = spdk_iscsi_portal_grp_register(pg1); + rc = iscsi_portal_grp_register(pg1); CU_ASSERT(rc == 0); - rc = spdk_iscsi_portal_grp_register(pg1); + rc = iscsi_portal_grp_register(pg1); CU_ASSERT(rc != 0); - pg2 = spdk_iscsi_portal_grp_unregister(1); + pg2 = iscsi_portal_grp_unregister(1); CU_ASSERT(pg2 != NULL); CU_ASSERT(pg1 == pg2); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.pg_head)); - spdk_iscsi_portal_grp_destroy(pg1); + iscsi_portal_grp_destroy(pg1); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); } @@ -295,28 +295,28 @@ portal_grp_add_delete_case(void) set_thread(0); /* internal of iscsi_create_portal_group */ - pg1 = spdk_iscsi_portal_grp_create(1); + pg1 = iscsi_portal_grp_create(1); CU_ASSERT(pg1 != NULL); - p = spdk_iscsi_portal_create(host, port); + p = iscsi_portal_create(host, port); CU_ASSERT(p != NULL); - spdk_iscsi_portal_grp_add_portal(pg1, p); + iscsi_portal_grp_add_portal(pg1, p); MOCK_SET(spdk_sock_listen, &sock); - rc = spdk_iscsi_portal_grp_open(pg1); + rc = iscsi_portal_grp_open(pg1); CU_ASSERT(rc == 0); MOCK_CLEAR_P(spdk_sock_listen); - rc = spdk_iscsi_portal_grp_register(pg1); + rc = iscsi_portal_grp_register(pg1); CU_ASSERT(rc == 0); /* internal of delete_portal_group */ - pg2 = spdk_iscsi_portal_grp_unregister(1); + pg2 = iscsi_portal_grp_unregister(1); CU_ASSERT(pg2 != NULL); CU_ASSERT(pg1 == pg2); - spdk_iscsi_portal_grp_release(pg2); + iscsi_portal_grp_release(pg2); poll_thread(0); @@ -341,34 +341,34 @@ portal_grp_add_delete_twice_case(void) set_thread(0); /* internal of iscsi_create_portal_group related */ - pg1 = spdk_iscsi_portal_grp_create(1); + pg1 = iscsi_portal_grp_create(1); CU_ASSERT(pg1 != NULL); - p = spdk_iscsi_portal_create(host, port1); + p = iscsi_portal_create(host, port1); CU_ASSERT(p != NULL); - spdk_iscsi_portal_grp_add_portal(pg1, p); + iscsi_portal_grp_add_portal(pg1, p); MOCK_SET(spdk_sock_listen, &sock); - rc = spdk_iscsi_portal_grp_open(pg1); + rc = iscsi_portal_grp_open(pg1); CU_ASSERT(rc == 0); - rc = spdk_iscsi_portal_grp_register(pg1); + rc = iscsi_portal_grp_register(pg1); CU_ASSERT(rc == 0); /* internal of iscsi_create_portal_group related */ - pg2 = spdk_iscsi_portal_grp_create(2); + pg2 = iscsi_portal_grp_create(2); CU_ASSERT(pg2 != NULL); - p = spdk_iscsi_portal_create(host, port2); + p = iscsi_portal_create(host, port2); CU_ASSERT(p != NULL); - spdk_iscsi_portal_grp_add_portal(pg2, p); + iscsi_portal_grp_add_portal(pg2, p); - rc = spdk_iscsi_portal_grp_open(pg2); + rc = iscsi_portal_grp_open(pg2); CU_ASSERT(rc == 0); - rc = spdk_iscsi_portal_grp_register(pg2); + rc = iscsi_portal_grp_register(pg2); CU_ASSERT(rc == 0); /* internal of destroy_portal_group related */ @@ -377,7 +377,7 @@ portal_grp_add_delete_twice_case(void) poll_thread(0); - spdk_iscsi_portal_grps_destroy(); + iscsi_portal_grps_destroy(); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.portal_head)); CU_ASSERT(TAILQ_EMPTY(&g_iscsi.pg_head)); diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c index 22e2efe4f..3f3bda39b 100644 --- a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c +++ b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c @@ -71,7 +71,7 @@ DEFINE_STUB(spdk_sock_is_ipv6, bool, (struct spdk_sock *sock), false); DEFINE_STUB(spdk_sock_is_ipv4, bool, (struct spdk_sock *sock), false); -DEFINE_STUB(spdk_iscsi_portal_grp_find_by_tag, +DEFINE_STUB(iscsi_portal_grp_find_by_tag, struct spdk_iscsi_portal_grp *, (int tag), NULL); DEFINE_STUB(iscsi_init_grp_find_by_tag, struct spdk_iscsi_init_grp *,