From 1366b62f70649ac58242a94b20145d17fe876dd6 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 9 Aug 2018 14:11:25 +0900 Subject: [PATCH] iscsi: Add CHAP authentication group configuration to JSON config dump 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 Reviewed-on: https://review.gerrithub.io/421469 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Pawel Wodkowski Reviewed-by: Jim Harris --- lib/iscsi/iscsi_subsystem.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c index 10389cbc83..224f8977a1 100644 --- a/lib/iscsi/iscsi_subsystem.c +++ b/lib/iscsi/iscsi_subsystem.c @@ -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); }