From 6a31372511508067793844640c472a61a0e209b0 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 16 Apr 2020 06:04:36 +0900 Subject: [PATCH] lib/iscsi: Remove the "spdk_" prefix from internal APIs declared in tgt_node.h Signed-off-by: Shuhei Matsumoto Change-Id: I27419445fbd938b56b66a5ba2cc1cde75e7129ac Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1886 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki Reviewed-by: Seth Howell --- lib/iscsi/conn.c | 2 +- lib/iscsi/iscsi.c | 30 +++---- lib/iscsi/iscsi_rpc.c | 58 ++++++------- lib/iscsi/iscsi_subsystem.c | 18 ++-- lib/iscsi/portal_grp.c | 4 +- lib/iscsi/tgt_node.c | 86 ++++++++++---------- lib/iscsi/tgt_node.h | 64 +++++++-------- test/unit/lib/iscsi/conn.c/conn_ut.c | 2 +- test/unit/lib/iscsi/iscsi.c/iscsi_ut.c | 12 +-- test/unit/lib/iscsi/param.c/param_ut.c | 6 +- test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c | 58 ++++++------- 11 files changed, 170 insertions(+), 170 deletions(-) diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c index c0e0b6853..7de0e5042 100644 --- a/lib/iscsi/conn.c +++ b/lib/iscsi/conn.c @@ -380,7 +380,7 @@ iscsi_conn_cleanup_backend(struct spdk_iscsi_conn *conn) /* clean up all tasks to all LUNs for session */ target = conn->sess->target; if (target != NULL) { - rc = spdk_iscsi_tgt_node_cleanup_luns(conn, target); + rc = iscsi_tgt_node_cleanup_luns(conn, target); if (rc < 0) { SPDK_ERRLOG("target abort failed\n"); } diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index d50a0eebf..6e2e21ebb 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -1454,7 +1454,7 @@ iscsi_op_login_check_target(struct spdk_iscsi_conn *conn, struct iscsi_bhs_login_rsp *rsph; rsph = (struct iscsi_bhs_login_rsp *)&rsp_pdu->bhs; - *target = spdk_iscsi_find_tgt_node(target_name); + *target = iscsi_find_tgt_node(target_name); if (*target == NULL) { SPDK_WARNLOG("target %s not found\n", target_name); /* Not found */ @@ -1462,15 +1462,15 @@ iscsi_op_login_check_target(struct spdk_iscsi_conn *conn, rsph->status_detail = ISCSI_LOGIN_TARGET_NOT_FOUND; return SPDK_ISCSI_LOGIN_ERROR_RESPONSE; } - if (spdk_iscsi_tgt_node_is_destructed(*target)) { + if (iscsi_tgt_node_is_destructed(*target)) { SPDK_ERRLOG("target %s is removed\n", target_name); rsph->status_class = ISCSI_CLASS_INITIATOR_ERROR; rsph->status_detail = ISCSI_LOGIN_TARGET_REMOVED; return SPDK_ISCSI_LOGIN_ERROR_RESPONSE; } - result = spdk_iscsi_tgt_node_access(conn, *target, - conn->initiator_name, - conn->initiator_addr); + result = iscsi_tgt_node_access(conn, *target, + conn->initiator_name, + conn->initiator_addr); if (!result) { SPDK_ERRLOG("access denied\n"); rsph->status_class = ISCSI_CLASS_INITIATOR_ERROR; @@ -2398,11 +2398,11 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p val = "ALL"; } - data_len = spdk_iscsi_send_tgts(conn, - conn->initiator_name, - conn->initiator_addr, - val, data, alloc_len, - data_len); + data_len = iscsi_send_tgts(conn, + conn->initiator_name, + conn->initiator_addr, + val, data, alloc_len, + data_len); } else { if (strcasecmp(val, "") == 0) { val = conn->target->name; @@ -2415,11 +2415,11 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p "Reject", data, alloc_len, data_len); } else { - data_len = spdk_iscsi_send_tgts(conn, - conn->initiator_name, - conn->initiator_addr, - val, data, alloc_len, - data_len); + data_len = iscsi_send_tgts(conn, + conn->initiator_name, + conn->initiator_addr, + val, data, alloc_len, + data_len); } } } else { diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index f0711f6a5..134d8eefb 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -285,7 +285,7 @@ spdk_rpc_iscsi_delete_initiator_group(struct spdk_jsonrpc_request *request, if (!ig) { goto invalid; } - spdk_iscsi_tgt_node_delete_map(NULL, ig); + iscsi_tgt_node_delete_map(NULL, ig); spdk_iscsi_init_grp_destroy(ig); w = spdk_jsonrpc_begin_result(request); @@ -314,7 +314,7 @@ spdk_rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request, w = spdk_jsonrpc_begin_result(request); spdk_json_write_array_begin(w); - spdk_iscsi_tgt_nodes_info_json(w); + iscsi_tgt_nodes_info_json(w); spdk_json_write_array_end(w); spdk_jsonrpc_end_result(request, w); @@ -476,20 +476,20 @@ spdk_rpc_iscsi_create_target_node(struct spdk_jsonrpc_request *request, * index = -1 : automatically pick an index for the new target node * alias = NULL */ - target = spdk_iscsi_tgt_node_construct(-1, req.name, req.alias_name, - pg_tags, - ig_tags, - req.pg_ig_maps.num_maps, - (const char **)bdev_names, - lun_ids, - req.luns.num_luns, - req.queue_depth, - req.disable_chap, - req.require_chap, - req.mutual_chap, - req.chap_group, - req.header_digest, - req.data_digest); + target = iscsi_tgt_node_construct(-1, req.name, req.alias_name, + pg_tags, + ig_tags, + req.pg_ig_maps.num_maps, + (const char **)bdev_names, + lun_ids, + req.luns.num_luns, + req.queue_depth, + req.disable_chap, + req.require_chap, + req.mutual_chap, + req.chap_group, + req.header_digest, + req.data_digest); if (target == NULL) { goto invalid; @@ -537,7 +537,7 @@ spdk_rpc_iscsi_target_node_add_pg_ig_maps(struct spdk_jsonrpc_request *request, goto invalid; } - target = spdk_iscsi_find_tgt_node(req.name); + target = iscsi_find_tgt_node(req.name); if (target == NULL) { SPDK_ERRLOG("target is not found\n"); goto invalid; @@ -548,8 +548,8 @@ spdk_rpc_iscsi_target_node_add_pg_ig_maps(struct spdk_jsonrpc_request *request, ig_tags[i] = req.pg_ig_maps.maps[i].ig_tag; } - rc = spdk_iscsi_target_node_add_pg_ig_maps(target, pg_tags, ig_tags, - req.pg_ig_maps.num_maps); + rc = iscsi_target_node_add_pg_ig_maps(target, pg_tags, ig_tags, + req.pg_ig_maps.num_maps); if (rc < 0) { SPDK_ERRLOG("add pg-ig maps failed\n"); goto invalid; @@ -589,7 +589,7 @@ spdk_rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *reques goto invalid; } - target = spdk_iscsi_find_tgt_node(req.name); + target = iscsi_find_tgt_node(req.name); if (target == NULL) { SPDK_ERRLOG("target is not found\n"); goto invalid; @@ -600,7 +600,7 @@ spdk_rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *reques ig_tags[i] = req.pg_ig_maps.maps[i].ig_tag; } - rc = spdk_iscsi_target_node_remove_pg_ig_maps(target, pg_tags, ig_tags, + rc = iscsi_target_node_remove_pg_ig_maps(target, pg_tags, ig_tags, req.pg_ig_maps.num_maps); if (rc < 0) { SPDK_ERRLOG("remove pg-ig maps failed\n"); @@ -685,8 +685,8 @@ spdk_rpc_iscsi_delete_target_node(struct spdk_jsonrpc_request *request, ctx->request = request; - spdk_iscsi_shutdown_tgt_node_by_name(ctx->req.name, - rpc_iscsi_delete_target_node_done, ctx); + iscsi_shutdown_tgt_node_by_name(ctx->req.name, + rpc_iscsi_delete_target_node_done, ctx); return; invalid: @@ -876,7 +876,7 @@ spdk_rpc_iscsi_delete_portal_group(struct spdk_jsonrpc_request *request, goto invalid; } - spdk_iscsi_tgt_node_delete_map(pg, NULL); + iscsi_tgt_node_delete_map(pg, NULL); spdk_iscsi_portal_grp_release(pg); w = spdk_jsonrpc_begin_result(request); @@ -1053,13 +1053,13 @@ spdk_rpc_iscsi_target_node_add_lun(struct spdk_jsonrpc_request *request, goto invalid; } - target = spdk_iscsi_find_tgt_node(req.name); + target = iscsi_find_tgt_node(req.name); if (target == NULL) { SPDK_ERRLOG("target is not found\n"); goto invalid; } - rc = spdk_iscsi_tgt_node_add_lun(target, req.bdev_name, req.lun_id); + rc = iscsi_tgt_node_add_lun(target, req.bdev_name, req.lun_id); if (rc < 0) { SPDK_ERRLOG("add lun failed\n"); goto invalid; @@ -1119,15 +1119,15 @@ spdk_rpc_iscsi_target_node_set_auth(struct spdk_jsonrpc_request *request, goto exit; } - target = spdk_iscsi_find_tgt_node(req.name); + target = iscsi_find_tgt_node(req.name); if (target == NULL) { spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Could not find target %s", req.name); goto exit; } - rc = spdk_iscsi_tgt_node_set_chap_params(target, req.disable_chap, req.require_chap, - req.mutual_chap, req.chap_group); + rc = iscsi_tgt_node_set_chap_params(target, 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 2ad69237a..165d4a576 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -688,8 +688,8 @@ iscsi_opts_verify(struct spdk_iscsi_opts *opts) return -EINVAL; } - if (!spdk_iscsi_check_chap_params(opts->disable_chap, opts->require_chap, - opts->mutual_chap, opts->chap_group)) { + if (!iscsi_check_chap_params(opts->disable_chap, opts->require_chap, + opts->mutual_chap, opts->chap_group)) { SPDK_ERRLOG("CHAP params in opts are illegal combination\n"); return -EINVAL; } @@ -777,8 +777,8 @@ int spdk_iscsi_set_discovery_auth(bool disable_chap, bool require_chap, bool mutual_chap, int32_t chap_group) { - if (!spdk_iscsi_check_chap_params(disable_chap, require_chap, mutual_chap, - chap_group)) { + if (!iscsi_check_chap_params(disable_chap, require_chap, mutual_chap, + chap_group)) { SPDK_ERRLOG("CHAP params are illegal combination\n"); return -EINVAL; } @@ -1160,9 +1160,9 @@ iscsi_parse_configuration(void) goto end; } - rc = spdk_iscsi_parse_tgt_nodes(); + rc = iscsi_parse_tgt_nodes(); if (rc < 0) { - SPDK_ERRLOG("spdk_iscsi_parse_tgt_nodes() failed\n"); + SPDK_ERRLOG("iscsi_parse_tgt_nodes() failed\n"); } if (g_iscsi.authfile != NULL) { @@ -1407,7 +1407,7 @@ _iscsi_fini_dev_unreg(struct spdk_io_channel_iter *i, int status) assert(TAILQ_EMPTY(&g_iscsi.poll_group_head)); - spdk_iscsi_shutdown_tgt_nodes(); + iscsi_shutdown_tgt_nodes(); spdk_iscsi_init_grps_destroy(); spdk_iscsi_portal_grps_destroy(); iscsi_auth_groups_destroy(); @@ -1445,7 +1445,7 @@ spdk_iscsi_config_text(FILE *fp) iscsi_globals_config_text(fp); spdk_iscsi_portal_grps_config_text(fp); spdk_iscsi_init_grps_config_text(fp); - spdk_iscsi_tgt_nodes_config_text(fp); + iscsi_tgt_nodes_config_text(fp); } void @@ -1569,7 +1569,7 @@ spdk_iscsi_config_json(struct spdk_json_write_ctx *w) iscsi_opts_config_json(w); spdk_iscsi_portal_grps_config_json(w); spdk_iscsi_init_grps_config_json(w); - spdk_iscsi_tgt_nodes_config_json(w); + iscsi_tgt_nodes_config_json(w); iscsi_auth_groups_config_json(w); spdk_json_write_array_end(w); } diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c index 5e570d23c..e01f20c3e 100644 --- a/lib/iscsi/portal_grp.c +++ b/lib/iscsi/portal_grp.c @@ -360,8 +360,8 @@ 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) { - if (!spdk_iscsi_check_chap_params(disable_chap, require_chap, - mutual_chap, chap_group)) { + if (!iscsi_check_chap_params(disable_chap, require_chap, + mutual_chap, chap_group)) { return -EINVAL; } diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 22fbaa4d7..026b03030 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -230,8 +230,8 @@ iscsi_tgt_node_find_pg_map(struct spdk_iscsi_tgt_node *target, struct spdk_iscsi_portal_grp *pg); bool -spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, - struct spdk_iscsi_tgt_node *target, const char *iqn, const char *addr) +iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, + struct spdk_iscsi_tgt_node *target, const char *iqn, const char *addr) { struct spdk_iscsi_portal_grp *pg; struct spdk_iscsi_pg_map *pg_map; @@ -297,9 +297,9 @@ iscsi_tgt_node_allow_iscsi_name(struct spdk_iscsi_tgt_node *target, const char * } int -spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, - const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, - int data_len) +iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, + const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, + int data_len) { char buf[MAX_TMPBUF]; struct spdk_iscsi_portal_grp *pg; @@ -389,7 +389,7 @@ spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, } struct spdk_iscsi_tgt_node * -spdk_iscsi_find_tgt_node(const char *target_name) +iscsi_find_tgt_node(const char *target_name) { struct spdk_iscsi_tgt_node *target; @@ -410,7 +410,7 @@ iscsi_tgt_node_register(struct spdk_iscsi_tgt_node *target) { pthread_mutex_lock(&g_iscsi.mutex); - if (spdk_iscsi_find_tgt_node(target->name) != NULL) { + if (iscsi_find_tgt_node(target->name) != NULL) { pthread_mutex_unlock(&g_iscsi.mutex); return -EEXIST; } @@ -787,8 +787,8 @@ failed: } int -spdk_iscsi_target_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target, - int *pg_tag_list, int *ig_tag_list, uint16_t num_maps) +iscsi_target_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target, + int *pg_tag_list, int *ig_tag_list, uint16_t num_maps) { uint16_t i; int rc; @@ -815,8 +815,8 @@ invalid: } int -spdk_iscsi_target_node_remove_pg_ig_maps(struct spdk_iscsi_tgt_node *target, - int *pg_tag_list, int *ig_tag_list, uint16_t num_maps) +iscsi_target_node_remove_pg_ig_maps(struct spdk_iscsi_tgt_node *target, + int *pg_tag_list, int *ig_tag_list, uint16_t num_maps) { uint16_t i; int rc; @@ -900,7 +900,7 @@ check_iscsi_name(const char *name) } bool -spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int group) +iscsi_check_chap_params(bool disable, bool require, bool mutual, int group) { if (group < 0) { SPDK_ERRLOG("Invalid auth group ID (%d)\n", group); @@ -917,7 +917,7 @@ spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int group) return false; } -struct spdk_iscsi_tgt_node *spdk_iscsi_tgt_node_construct(int target_index, +struct spdk_iscsi_tgt_node *iscsi_tgt_node_construct(int target_index, const char *name, const char *alias, int *pg_tag_list, int *ig_tag_list, uint16_t num_maps, const char *bdev_name_list[], int *lun_id_list, int num_luns, @@ -929,8 +929,8 @@ struct spdk_iscsi_tgt_node *spdk_iscsi_tgt_node_construct(int target_index, struct spdk_iscsi_tgt_node *target; int rc; - if (!spdk_iscsi_check_chap_params(disable_chap, require_chap, - mutual_chap, chap_group)) { + if (!iscsi_check_chap_params(disable_chap, require_chap, + mutual_chap, chap_group)) { return NULL; } @@ -992,8 +992,8 @@ struct spdk_iscsi_tgt_node *spdk_iscsi_tgt_node_construct(int target_index, } TAILQ_INIT(&target->pg_map_head); - rc = spdk_iscsi_target_node_add_pg_ig_maps(target, pg_tag_list, - ig_tag_list, num_maps); + rc = iscsi_target_node_add_pg_ig_maps(target, pg_tag_list, + ig_tag_list, num_maps); if (rc != 0) { SPDK_ERRLOG("could not add map to target\n"); iscsi_tgt_node_destruct(target, NULL, NULL); @@ -1222,11 +1222,11 @@ iscsi_parse_tgt_node(struct spdk_conf_section *sp) return -1; } - target = spdk_iscsi_tgt_node_construct(target_num, name, alias, - pg_tag_list, ig_tag_list, num_target_maps, - bdev_name_list, lun_id_list, num_luns, queue_depth, - disable_chap, require_chap, mutual_chap, chap_group, - header_digest, data_digest); + target = iscsi_tgt_node_construct(target_num, name, alias, + pg_tag_list, ig_tag_list, num_target_maps, + bdev_name_list, lun_id_list, num_luns, queue_depth, + disable_chap, require_chap, mutual_chap, chap_group, + header_digest, data_digest); if (target == NULL) { SPDK_ERRLOG("tgt_node%d: add_iscsi_target_node error\n", target_num); @@ -1247,12 +1247,12 @@ iscsi_parse_tgt_node(struct spdk_conf_section *sp) return 0; } -int spdk_iscsi_parse_tgt_nodes(void) +int iscsi_parse_tgt_nodes(void) { struct spdk_conf_section *sp; int rc; - SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "spdk_iscsi_parse_tgt_nodes\n"); + SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "iscsi_parse_tgt_nodes\n"); sp = spdk_conf_first_section(NULL); while (sp != NULL) { @@ -1275,7 +1275,7 @@ int spdk_iscsi_parse_tgt_nodes(void) } void -spdk_iscsi_shutdown_tgt_nodes(void) +iscsi_shutdown_tgt_nodes(void) { struct spdk_iscsi_tgt_node *target; @@ -1294,13 +1294,13 @@ spdk_iscsi_shutdown_tgt_nodes(void) } void -spdk_iscsi_shutdown_tgt_node_by_name(const char *target_name, - iscsi_tgt_node_destruct_cb cb_fn, void *cb_arg) +iscsi_shutdown_tgt_node_by_name(const char *target_name, + iscsi_tgt_node_destruct_cb cb_fn, void *cb_arg) { struct spdk_iscsi_tgt_node *target; pthread_mutex_lock(&g_iscsi.mutex); - target = spdk_iscsi_find_tgt_node(target_name); + target = iscsi_find_tgt_node(target_name); if (target != NULL) { iscsi_tgt_node_unregister(target); pthread_mutex_unlock(&g_iscsi.mutex); @@ -1317,14 +1317,14 @@ spdk_iscsi_shutdown_tgt_node_by_name(const char *target_name, } bool -spdk_iscsi_tgt_node_is_destructed(struct spdk_iscsi_tgt_node *target) +iscsi_tgt_node_is_destructed(struct spdk_iscsi_tgt_node *target) { return target->destructed; } int -spdk_iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn, - struct spdk_iscsi_tgt_node *target) +iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn, + struct spdk_iscsi_tgt_node *target) { int i; struct spdk_iscsi_task *task; @@ -1353,8 +1353,8 @@ spdk_iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn, return 0; } -void spdk_iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group, - struct spdk_iscsi_init_grp *initiator_group) +void iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group, + struct spdk_iscsi_init_grp *initiator_group) { struct spdk_iscsi_tgt_node *target; @@ -1371,8 +1371,8 @@ void spdk_iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group, } int -spdk_iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target, - const char *bdev_name, int lun_id) +iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target, + const char *bdev_name, int lun_id) { struct spdk_scsi_dev *dev; int rc; @@ -1404,12 +1404,12 @@ spdk_iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target, } int -spdk_iscsi_tgt_node_set_chap_params(struct spdk_iscsi_tgt_node *target, - bool disable_chap, bool require_chap, - bool mutual_chap, int32_t chap_group) +iscsi_tgt_node_set_chap_params(struct spdk_iscsi_tgt_node *target, + bool disable_chap, bool require_chap, + bool mutual_chap, int32_t chap_group) { - if (!spdk_iscsi_check_chap_params(disable_chap, require_chap, - mutual_chap, chap_group)) { + if (!iscsi_check_chap_params(disable_chap, require_chap, + mutual_chap, chap_group)) { return -EINVAL; } @@ -1450,7 +1450,7 @@ static const char *target_nodes_section = \ " LUN%d %s\n" void -spdk_iscsi_tgt_nodes_config_text(FILE *fp) +iscsi_tgt_nodes_config_text(FILE *fp) { int l = 0; struct spdk_scsi_dev *dev = NULL; @@ -1589,7 +1589,7 @@ iscsi_tgt_node_config_json(struct spdk_iscsi_tgt_node *target, } void -spdk_iscsi_tgt_nodes_info_json(struct spdk_json_write_ctx *w) +iscsi_tgt_nodes_info_json(struct spdk_json_write_ctx *w) { struct spdk_iscsi_tgt_node *target; @@ -1599,7 +1599,7 @@ spdk_iscsi_tgt_nodes_info_json(struct spdk_json_write_ctx *w) } void -spdk_iscsi_tgt_nodes_config_json(struct spdk_json_write_ctx *w) +iscsi_tgt_nodes_config_json(struct spdk_json_write_ctx *w) { struct spdk_iscsi_tgt_node *target; diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index f27551dfd..2787fac91 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -95,15 +95,15 @@ struct spdk_iscsi_tgt_node { void *destruct_cb_arg; }; -int spdk_iscsi_parse_tgt_nodes(void); +int iscsi_parse_tgt_nodes(void); -void spdk_iscsi_shutdown_tgt_nodes(void); -void spdk_iscsi_shutdown_tgt_node_by_name(const char *target_name, - iscsi_tgt_node_destruct_cb cb_fn, void *cb_arg); -bool spdk_iscsi_tgt_node_is_destructed(struct spdk_iscsi_tgt_node *target); -int spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, - const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, - int data_len); +void iscsi_shutdown_tgt_nodes(void); +void iscsi_shutdown_tgt_node_by_name(const char *target_name, + iscsi_tgt_node_destruct_cb cb_fn, void *cb_arg); +bool iscsi_tgt_node_is_destructed(struct spdk_iscsi_tgt_node *target); +int iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, + const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, + int data_len); /* * bdev_name_list and lun_id_list are equal sized arrays of size num_luns. @@ -111,7 +111,7 @@ int spdk_iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, * new target node. * lun_id_list refers to the LUN IDs that will be used for the LUNs on the target node. */ -struct spdk_iscsi_tgt_node *spdk_iscsi_tgt_node_construct(int target_index, +struct spdk_iscsi_tgt_node *iscsi_tgt_node_construct(int target_index, const char *name, const char *alias, int *pg_tag_list, int *ig_tag_list, uint16_t num_maps, const char *bdev_name_list[], int *lun_id_list, int num_luns, @@ -119,29 +119,29 @@ struct spdk_iscsi_tgt_node *spdk_iscsi_tgt_node_construct(int target_index, bool disable_chap, bool require_chap, bool mutual_chap, int chap_group, bool header_digest, bool data_digest); -bool spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int group); +bool iscsi_check_chap_params(bool disable, bool require, bool mutual, int group); -int spdk_iscsi_target_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target, - int *pg_tag_list, int *ig_tag_list, - uint16_t num_maps); -int spdk_iscsi_target_node_remove_pg_ig_maps(struct spdk_iscsi_tgt_node *target, - int *pg_tag_list, int *ig_tag_list, - uint16_t num_maps); +int iscsi_target_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target, + int *pg_tag_list, int *ig_tag_list, + uint16_t num_maps); +int iscsi_target_node_remove_pg_ig_maps(struct spdk_iscsi_tgt_node *target, + int *pg_tag_list, int *ig_tag_list, + uint16_t num_maps); -bool spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, - struct spdk_iscsi_tgt_node *target, const char *iqn, - const char *addr); -struct spdk_iscsi_tgt_node *spdk_iscsi_find_tgt_node(const char *target_name); -int spdk_iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn, - struct spdk_iscsi_tgt_node *target); -void spdk_iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group, - struct spdk_iscsi_init_grp *initiator_group); -int spdk_iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target, - const char *bdev_name, int lun_id); -int spdk_iscsi_tgt_node_set_chap_params(struct spdk_iscsi_tgt_node *target, - bool disable_chap, bool require_chap, - bool mutual_chap, int32_t chap_group); -void spdk_iscsi_tgt_nodes_config_text(FILE *fp); -void spdk_iscsi_tgt_nodes_info_json(struct spdk_json_write_ctx *w); -void spdk_iscsi_tgt_nodes_config_json(struct spdk_json_write_ctx *w); +bool iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, + struct spdk_iscsi_tgt_node *target, const char *iqn, + const char *addr); +struct spdk_iscsi_tgt_node *iscsi_find_tgt_node(const char *target_name); +int iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn, + struct spdk_iscsi_tgt_node *target); +void iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group, + struct spdk_iscsi_init_grp *initiator_group); +int iscsi_tgt_node_add_lun(struct spdk_iscsi_tgt_node *target, + const char *bdev_name, int lun_id); +int iscsi_tgt_node_set_chap_params(struct spdk_iscsi_tgt_node *target, + bool disable_chap, bool require_chap, + bool mutual_chap, int32_t chap_group); +void iscsi_tgt_nodes_config_text(FILE *fp); +void iscsi_tgt_nodes_info_json(struct spdk_json_write_ctx *w); +void iscsi_tgt_nodes_config_json(struct spdk_json_write_ctx *w); #endif /* SPDK_ISCSI_TGT_NODE_H_ */ diff --git a/test/unit/lib/iscsi/conn.c/conn_ut.c b/test/unit/lib/iscsi/conn.c/conn_ut.c index 13b6fdc72..47fba3034 100644 --- a/test/unit/lib/iscsi/conn.c/conn_ut.c +++ b/test/unit/lib/iscsi/conn.c/conn_ut.c @@ -216,7 +216,7 @@ DEFINE_STUB(spdk_iscsi_handle_incoming_pdus, int, (struct spdk_iscsi_conn *conn) DEFINE_STUB_V(spdk_free_sess, (struct spdk_iscsi_sess *sess)); -DEFINE_STUB(spdk_iscsi_tgt_node_cleanup_luns, int, +DEFINE_STUB(iscsi_tgt_node_cleanup_luns, int, (struct spdk_iscsi_conn *conn, struct spdk_iscsi_tgt_node *target), 0); diff --git a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c index 594a96ce9..eaf79a5a1 100644 --- a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c +++ b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c @@ -57,7 +57,7 @@ struct spdk_iscsi_tgt_node g_tgt; struct spdk_iscsi_tgt_node * -spdk_iscsi_find_tgt_node(const char *target_name) +iscsi_find_tgt_node(const char *target_name) { if (strcasecmp(target_name, UT_TARGET_NAME1) == 0) { g_tgt.dev = NULL; @@ -68,9 +68,9 @@ spdk_iscsi_find_tgt_node(const char *target_name) } bool -spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, - struct spdk_iscsi_tgt_node *target, - const char *iqn, const char *addr) +iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, + struct spdk_iscsi_tgt_node *target, + const char *iqn, const char *addr) { if (strcasecmp(conn->initiator_name, UT_INITIATOR_NAME1) == 0) { return true; @@ -79,12 +79,12 @@ spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, } } -DEFINE_STUB(spdk_iscsi_send_tgts, int, +DEFINE_STUB(iscsi_send_tgts, int, (struct spdk_iscsi_conn *conn, const char *iiqn, const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, int data_len), 0); -DEFINE_STUB(spdk_iscsi_tgt_node_is_destructed, bool, +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)); diff --git a/test/unit/lib/iscsi/param.c/param_ut.c b/test/unit/lib/iscsi/param.c/param_ut.c index e84c35fb9..ccf62643f 100644 --- a/test/unit/lib/iscsi/param.c/param_ut.c +++ b/test/unit/lib/iscsi/param.c/param_ut.c @@ -44,15 +44,15 @@ struct spdk_iscsi_globals g_iscsi; -DEFINE_STUB(spdk_iscsi_find_tgt_node, struct spdk_iscsi_tgt_node *, +DEFINE_STUB(iscsi_find_tgt_node, struct spdk_iscsi_tgt_node *, (const char *target_name), NULL); -DEFINE_STUB(spdk_iscsi_tgt_node_access, bool, +DEFINE_STUB(iscsi_tgt_node_access, bool, (struct spdk_iscsi_conn *conn, struct spdk_iscsi_tgt_node *target, const char *iqn, const char *addr), false); -DEFINE_STUB(spdk_iscsi_send_tgts, int, +DEFINE_STUB(iscsi_send_tgts, int, (struct spdk_iscsi_conn *conn, const char *iiqn, const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, int data_len), 0); 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 19553b44b..0c547684a 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 @@ -111,39 +111,39 @@ add_lun_test_cases(void) /* case 1 */ tgtnode.num_active_conns = 1; - rc = spdk_iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); + rc = iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); CU_ASSERT(rc != 0); /* case 2 */ tgtnode.num_active_conns = 0; lun_id = -2; - rc = spdk_iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); + rc = iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); CU_ASSERT(rc != 0); /* case 3 */ lun_id = SPDK_SCSI_DEV_MAX_LUN; - rc = spdk_iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); + rc = iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); CU_ASSERT(rc != 0); /* case 4 */ lun_id = -1; tgtnode.dev = NULL; - rc = spdk_iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); + rc = iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); CU_ASSERT(rc != 0); /* case 5 */ tgtnode.dev = &scsi_dev; - rc = spdk_iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); + rc = iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); CU_ASSERT(rc != 0); /* case 6 */ bdev_name = "LUN0"; - rc = spdk_iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); + rc = iscsi_tgt_node_add_lun(&tgtnode, bdev_name, lun_id); CU_ASSERT(rc == 0); } @@ -390,7 +390,7 @@ node_access_allowed(void) iqn = "iqn.2017-10.spdk.io:0001"; addr = "192.168.2.1"; - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == true); iscsi_pg_map_delete_ig_map(pg_map, &ig); @@ -446,7 +446,7 @@ node_access_denied_by_empty_netmask(void) iqn = "iqn.2017-10.spdk.io:0001"; addr = "192.168.3.1"; - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); iscsi_pg_map_delete_ig_map(pg_map, &ig); @@ -533,7 +533,7 @@ node_access_multi_initiator_groups_cases(void) */ snprintf(iname1.name, sizeof(iname1.name), NO_IQN1); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); /* @@ -550,7 +550,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(iname1.name, sizeof(iname1.name), IQN1); snprintf(imask1.mask, sizeof(imask1.mask), IP1); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == true); /* @@ -568,7 +568,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(imask1.mask, sizeof(imask1.mask), IP2); snprintf(iname2.name, sizeof(iname2.name), NO_IQN1); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); /* @@ -587,7 +587,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(iname2.name, sizeof(iname2.name), IQN1); snprintf(imask2.mask, sizeof(imask2.mask), IP1); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == true); /* @@ -606,7 +606,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(iname2.name, sizeof(iname2.name), IQN1); snprintf(imask2.mask, sizeof(imask2.mask), IP2); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); /* @@ -624,7 +624,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(imask1.mask, sizeof(imask1.mask), IP2); snprintf(iname2.name, sizeof(iname2.name), IQN2); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); /* @@ -641,7 +641,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(iname1.name, sizeof(iname1.name), IQN2); snprintf(iname2.name, sizeof(iname2.name), NO_IQN1); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); /* @@ -659,7 +659,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(iname2.name, sizeof(iname2.name), IQN1); snprintf(imask2.mask, sizeof(imask2.mask), IP1); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == true); /* @@ -677,7 +677,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(iname2.name, sizeof(iname2.name), IQN1); snprintf(imask2.mask, sizeof(imask2.mask), IP2); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); /* @@ -694,7 +694,7 @@ node_access_multi_initiator_groups_cases(void) snprintf(iname1.name, sizeof(iname1.name), IQN2); snprintf(iname2.name, sizeof(iname2.name), IQN2); - result = spdk_iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); + result = iscsi_tgt_node_access(&conn, &tgtnode, iqn, addr); CU_ASSERT(result == false); iscsi_pg_map_delete_ig_map(pg_map, &ig1); @@ -756,39 +756,39 @@ allow_iscsi_name_multi_maps_case(void) /* * static bool - * spdk_iscsi_check_chap_params(bool disable_chap, bool require_chap, + * iscsi_check_chap_params(bool disable_chap, bool require_chap, * bool mutual_chap, int chap_group); */ static void chap_param_test_cases(void) { /* Auto */ - CU_ASSERT(spdk_iscsi_check_chap_params(false, false, false, 0) == true); + CU_ASSERT(iscsi_check_chap_params(false, false, false, 0) == true); /* None */ - CU_ASSERT(spdk_iscsi_check_chap_params(true, false, false, 0) == true); + CU_ASSERT(iscsi_check_chap_params(true, false, false, 0) == true); /* CHAP */ - CU_ASSERT(spdk_iscsi_check_chap_params(false, true, false, 0) == true); + CU_ASSERT(iscsi_check_chap_params(false, true, false, 0) == true); /* CHAP Mutual */ - CU_ASSERT(spdk_iscsi_check_chap_params(false, true, true, 0) == true); + CU_ASSERT(iscsi_check_chap_params(false, true, true, 0) == true); /* Check mutual exclusiveness of disabled and required */ - CU_ASSERT(spdk_iscsi_check_chap_params(true, true, false, 0) == false); + CU_ASSERT(iscsi_check_chap_params(true, true, false, 0) == false); /* Mutual requires Required */ - CU_ASSERT(spdk_iscsi_check_chap_params(false, false, true, 0) == false); + CU_ASSERT(iscsi_check_chap_params(false, false, true, 0) == false); /* Remaining combinations */ - CU_ASSERT(spdk_iscsi_check_chap_params(true, false, true, 0) == false); - CU_ASSERT(spdk_iscsi_check_chap_params(true, true, true, 0) == false); + CU_ASSERT(iscsi_check_chap_params(true, false, true, 0) == false); + CU_ASSERT(iscsi_check_chap_params(true, true, true, 0) == false); /* Valid auth group ID */ - CU_ASSERT(spdk_iscsi_check_chap_params(false, false, false, 1) == true); + CU_ASSERT(iscsi_check_chap_params(false, false, false, 1) == true); /* Invalid auth group ID */ - CU_ASSERT(spdk_iscsi_check_chap_params(false, false, false, -1) == false); + CU_ASSERT(iscsi_check_chap_params(false, false, false, -1) == false); } int