d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iscsi: Add CHAP authentication group configuration to JSON config dump

Browse Source 
Adding CHAP authentication group configuration to JSON config dump.
This addition is done unconditionally because the path to the CHAP secret file
have to be specified explicitly now.

Change-Id: Ibd4085222a6767dae3a74023f1d6bc270ef4abac
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/421469
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-08-09 14:11:25 +09:00 committed by Ben Walker
parent 3a08001dd4
commit 1366b62f70
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/iscsi/iscsi_subsystem.c
View File

@ -1453,6 +1453,20 @@ spdk_iscsi_auth_group_info_json(struct spdk_iscsi_auth_group *group,
spdk_json_write_object_end(w);
}
static void
spdk_iscsi_auth_group_config_json(struct spdk_iscsi_auth_group *group,
struct spdk_json_write_ctx *w)
{
spdk_json_write_object_begin(w);
spdk_json_write_named_string(w, "method", "add_iscsi_auth_group");
spdk_json_write_name(w, "params");
spdk_iscsi_auth_group_info_json(group, w);
spdk_json_write_object_end(w);
}
void
spdk_iscsi_auth_groups_info_json(struct spdk_json_write_ctx *w)
{
@ -1463,6 +1477,16 @@ spdk_iscsi_auth_groups_info_json(struct spdk_json_write_ctx *w)
}
}
static void
spdk_iscsi_auth_groups_config_json(struct spdk_json_write_ctx *w)
{
struct spdk_iscsi_auth_group *group;
TAILQ_FOREACH(group, &g_spdk_iscsi.auth_group_head, tailq) {
spdk_iscsi_auth_group_config_json(group, w);
}
}
static void
spdk_iscsi_opts_config_json(struct spdk_json_write_ctx *w)
{
@ -1484,6 +1508,7 @@ spdk_iscsi_config_json(struct spdk_json_write_ctx *w)
spdk_iscsi_portal_grps_config_json(w);
spdk_iscsi_init_grps_config_json(w);
spdk_iscsi_tgt_nodes_config_json(w);
spdk_iscsi_auth_groups_config_json(w);
spdk_json_write_array_end(w);
}