ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
e2a2b637c9
Spdk/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c

703 lines
18 KiB
C
Raw Normal View History

iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
/*-
* BSD LICENSE
*
* Copyright (c) Intel Corporation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "spdk/stdinc.h"
iscsi&rpc: Add new initiator information to an existing initiator group Adding new initiator to an existing initiator group to allow login will be usual. This patch support the following JSON-RPC commands: - add_initiators_to_initiator_group - delete_initiators_from_initiator_group Both initiator's name and netmask are optional but already added name or netmask cannot be added. Test code is added too. Change-Id: Ic101210b9d00c2b36e37ece23fcba8cfe8e44eb8 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/398361 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-06 23:22:00 +00:00
#include "spdk_cunit.h"
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
#include "CUnit/Basic.h"
#include "iscsi/init_grp.c"
iscsi: Add JSON config/info dump for initiator group. Support JSON config/info dump for initiator group. These are added to init_grp.c. Text config dump is moved to init_grp.c too. Add accesses to g_spdk_iscsi.ig_head are consolidated into init_grp.c to extract ig_head from g_spdk_iscsi. Change-Id: I88131d248ed13e42e4da56aed8ae0edc01a65715 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/407849 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-05-09 22:55:12 +00:00
#include "unit/lib/json_mock.c"
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
log: rename SPDK_TRACE_* to SPDK_LOG_* Disambiguate the log components from the trace functionality (include/spdk/trace.h). The internal spdk_trace_flag structure and related functions will be renamed in a later commit - this is just a find and replace on SPDK_TRACE_* and SPDK_LOG_REGISTER_TRACE_FLAG(). Change-Id: I617bd5a9fbe35ffb44ae6020b292658c094a0ad6 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/376421 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2017-08-30 18:06:33 +00:00
SPDK_LOG_REGISTER_COMPONENT("iscsi", SPDK_LOG_ISCSI)
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
struct spdk_iscsi_globals g_spdk_iscsi;
const char *config_file;
static int
test_setup(void)
{
TAILQ_INIT(&g_spdk_iscsi.ig_head);
return 0;
}
static void
create_from_config_file_cases(void)
{
struct spdk_conf *config;
struct spdk_conf_section *sp;
char section_name[64];
int section_index;
int rc;
config = spdk_conf_allocate();
rc = spdk_conf_read(config, config_file);
CU_ASSERT(rc == 0);
section_index = 0;
while (true) {
snprintf(section_name, sizeof(section_name), "IG_Valid%d", section_index);
sp = spdk_conf_find_section(config, section_name);
if (sp == NULL) {
break;
}
iscsi: Change function names of iSCSI subsystem configuration Portal, portal group, initiator group, and target node don't use fixed size array anymore. To use the same naming rule in iSCSI subsystem and in SPDK is helpful to understand and maintain. Current naming rule is not bad but to use unified and compact name is prioritized at this time. This patch changes function names as follows: - spdk_iscsi_init_tgt_nodes() -> spdk_iscsi_parse_tgt_nodes() - spdk_cf_add_iscsi_tgt_node() -> spdk_iscsi_parse_tgt_node() - spdk_iscsi_portal_grp_array_create() -> spdk_iscsi_parse_portal_grps() - spdk_iscsi_portal_grp_create_from_configfile() -> spdk_iscsi_parse_portal_grp() - spdk_iscsi_portal_create_from_configline() -> spdk_iscsi_parse_portal() - spdk_iscsi_portal_grp_array_destroy() -> spdk_iscsi_portal_grps_destroy() - spdk_iscsi_init_grp_array_create() -> spdk_iscsi_parse_init_grps() - spdk_iscsi_init_grp_create_from_configfile() -> spdk_iscsi_parse_init_grp() - spdk_iscsi_init_grp_array_destroy() -> spdk_iscsi_init_grps_destroy() For example "parse" is already used to explain the operation in portal_grp.c. Hence using "parse" is familiar and not strange in iSCSI. Change-Id: Ieff952069d39bd96b7afa1586bfff927968accc2 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/403149 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-03-08 23:25:34 +00:00
rc = spdk_iscsi_parse_init_grp(sp);
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
CU_ASSERT(rc == 0);
iscsi: Change function names of iSCSI subsystem configuration Portal, portal group, initiator group, and target node don't use fixed size array anymore. To use the same naming rule in iSCSI subsystem and in SPDK is helpful to understand and maintain. Current naming rule is not bad but to use unified and compact name is prioritized at this time. This patch changes function names as follows: - spdk_iscsi_init_tgt_nodes() -> spdk_iscsi_parse_tgt_nodes() - spdk_cf_add_iscsi_tgt_node() -> spdk_iscsi_parse_tgt_node() - spdk_iscsi_portal_grp_array_create() -> spdk_iscsi_parse_portal_grps() - spdk_iscsi_portal_grp_create_from_configfile() -> spdk_iscsi_parse_portal_grp() - spdk_iscsi_portal_create_from_configline() -> spdk_iscsi_parse_portal() - spdk_iscsi_portal_grp_array_destroy() -> spdk_iscsi_portal_grps_destroy() - spdk_iscsi_init_grp_array_create() -> spdk_iscsi_parse_init_grps() - spdk_iscsi_init_grp_create_from_configfile() -> spdk_iscsi_parse_init_grp() - spdk_iscsi_init_grp_array_destroy() -> spdk_iscsi_init_grps_destroy() For example "parse" is already used to explain the operation in portal_grp.c. Hence using "parse" is familiar and not strange in iSCSI. Change-Id: Ieff952069d39bd96b7afa1586bfff927968accc2 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/403149 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-03-08 23:25:34 +00:00
spdk_iscsi_init_grps_destroy();
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
section_index++;
}
section_index = 0;
while (true) {
snprintf(section_name, sizeof(section_name), "IG_Invalid%d", section_index);
sp = spdk_conf_find_section(config, section_name);
if (sp == NULL) {
break;
}
iscsi: Change function names of iSCSI subsystem configuration Portal, portal group, initiator group, and target node don't use fixed size array anymore. To use the same naming rule in iSCSI subsystem and in SPDK is helpful to understand and maintain. Current naming rule is not bad but to use unified and compact name is prioritized at this time. This patch changes function names as follows: - spdk_iscsi_init_tgt_nodes() -> spdk_iscsi_parse_tgt_nodes() - spdk_cf_add_iscsi_tgt_node() -> spdk_iscsi_parse_tgt_node() - spdk_iscsi_portal_grp_array_create() -> spdk_iscsi_parse_portal_grps() - spdk_iscsi_portal_grp_create_from_configfile() -> spdk_iscsi_parse_portal_grp() - spdk_iscsi_portal_create_from_configline() -> spdk_iscsi_parse_portal() - spdk_iscsi_portal_grp_array_destroy() -> spdk_iscsi_portal_grps_destroy() - spdk_iscsi_init_grp_array_create() -> spdk_iscsi_parse_init_grps() - spdk_iscsi_init_grp_create_from_configfile() -> spdk_iscsi_parse_init_grp() - spdk_iscsi_init_grp_array_destroy() -> spdk_iscsi_init_grps_destroy() For example "parse" is already used to explain the operation in portal_grp.c. Hence using "parse" is familiar and not strange in iSCSI. Change-Id: Ieff952069d39bd96b7afa1586bfff927968accc2 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/403149 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-03-08 23:25:34 +00:00
rc = spdk_iscsi_parse_init_grp(sp);
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
CU_ASSERT(rc != 0);
iscsi: Change function names of iSCSI subsystem configuration Portal, portal group, initiator group, and target node don't use fixed size array anymore. To use the same naming rule in iSCSI subsystem and in SPDK is helpful to understand and maintain. Current naming rule is not bad but to use unified and compact name is prioritized at this time. This patch changes function names as follows: - spdk_iscsi_init_tgt_nodes() -> spdk_iscsi_parse_tgt_nodes() - spdk_cf_add_iscsi_tgt_node() -> spdk_iscsi_parse_tgt_node() - spdk_iscsi_portal_grp_array_create() -> spdk_iscsi_parse_portal_grps() - spdk_iscsi_portal_grp_create_from_configfile() -> spdk_iscsi_parse_portal_grp() - spdk_iscsi_portal_create_from_configline() -> spdk_iscsi_parse_portal() - spdk_iscsi_portal_grp_array_destroy() -> spdk_iscsi_portal_grps_destroy() - spdk_iscsi_init_grp_array_create() -> spdk_iscsi_parse_init_grps() - spdk_iscsi_init_grp_create_from_configfile() -> spdk_iscsi_parse_init_grp() - spdk_iscsi_init_grp_array_destroy() -> spdk_iscsi_init_grps_destroy() For example "parse" is already used to explain the operation in portal_grp.c. Hence using "parse" is familiar and not strange in iSCSI. Change-Id: Ieff952069d39bd96b7afa1586bfff927968accc2 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/403149 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-03-08 23:25:34 +00:00
spdk_iscsi_init_grps_destroy();
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
section_index++;
}
spdk_conf_free(config);
}
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
static void
create_initiator_group_success_case(void)
{
struct spdk_iscsi_init_grp *ig;
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
spdk_iscsi_init_grp_destroy(ig);
}
static void
find_initiator_group_success_case(void)
{
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
struct spdk_iscsi_init_grp *ig, *tmp;
int rc;
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
rc = spdk_iscsi_init_grp_register(ig);
CU_ASSERT(rc == 0);
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
ig = spdk_iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig != NULL);
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
tmp = spdk_iscsi_init_grp_unregister(1);
CU_ASSERT(ig == tmp);
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
spdk_iscsi_init_grp_destroy(ig);
ig = spdk_iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig == NULL);
}
static void
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
register_initiator_group_twice_case(void)
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
{
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
struct spdk_iscsi_init_grp *ig, *tmp;
int rc;
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
rc = spdk_iscsi_init_grp_register(ig);
CU_ASSERT(rc == 0);
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
rc = spdk_iscsi_init_grp_register(ig);
CU_ASSERT(rc != 0);
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
ig = spdk_iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig != NULL);
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
tmp = spdk_iscsi_init_grp_unregister(1);
CU_ASSERT(tmp == ig);
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
spdk_iscsi_init_grp_destroy(ig);
ig = spdk_iscsi_init_grp_find_by_tag(1);
CU_ASSERT(ig == NULL);
}
static void
add_initiator_name_success_case(void)
{
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_name *iname;
char *name1 = "iqn.2017-10.spdk.io:0001";
char *name2 = "iqn.2017-10.spdk.io:0002";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
/* add two different names to the empty name list */
rc = spdk_iscsi_init_grp_add_initiator(ig, name1);
CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_add_initiator(ig, name2);
CU_ASSERT(rc == 0);
/* check if two names are added correctly. */
iname = spdk_iscsi_init_grp_find_initiator(ig, name1);
CU_ASSERT(iname != NULL);
iname = spdk_iscsi_init_grp_find_initiator(ig, name2);
CU_ASSERT(iname != NULL);
/* restore the initial state */
rc = spdk_iscsi_init_grp_delete_initiator(ig, name1);
CU_ASSERT(rc == 0);
iname = spdk_iscsi_init_grp_find_initiator(ig, name1);
CU_ASSERT(iname == NULL);
rc = spdk_iscsi_init_grp_delete_initiator(ig, name2);
CU_ASSERT(rc == 0);
iname = spdk_iscsi_init_grp_find_initiator(ig, name2);
CU_ASSERT(iname == NULL);
spdk_iscsi_init_grp_destroy(ig);
}
static void
add_initiator_name_fail_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_name *iname;
char *name1 = "iqn.2017-10.spdk.io:0001";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
/* add an name to the full name list */
ig->ninitiators = MAX_INITIATOR;
rc = spdk_iscsi_init_grp_add_initiator(ig, name1);
CU_ASSERT(rc != 0);
ig->ninitiators = 0;
/* add the same name to the name list twice */
rc = spdk_iscsi_init_grp_add_initiator(ig, name1);
CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_add_initiator(ig, name1);
CU_ASSERT(rc != 0);
/* restore the initial state */
rc = spdk_iscsi_init_grp_delete_initiator(ig, name1);
CU_ASSERT(rc == 0);
iname = spdk_iscsi_init_grp_find_initiator(ig, name1);
CU_ASSERT(iname == NULL);
spdk_iscsi_init_grp_destroy(ig);
}
static void
delete_all_initiator_names_success_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_name *iname;
char *name1 = "iqn.2017-10.spdk.io:0001";
char *name2 = "iqn.2017-10.spdk.io:0002";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
/* add two different names to the empty name list */
rc = spdk_iscsi_init_grp_add_initiator(ig, name1);
CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_add_initiator(ig, name2);
CU_ASSERT(rc == 0);
/* delete all initiator names */
spdk_iscsi_init_grp_delete_all_initiators(ig);
/* check if two names are deleted correctly. */
iname = spdk_iscsi_init_grp_find_initiator(ig, name1);
CU_ASSERT(iname == NULL);
iname = spdk_iscsi_init_grp_find_initiator(ig, name2);
CU_ASSERT(iname == NULL);
/* restore the initial state */
spdk_iscsi_init_grp_destroy(ig);
}
static void
add_netmask_success_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_netmask *imask;
char *netmask1 = "192.168.2.0";
char *netmask2 = "192.168.2.1";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
/* add two different netmasks to the empty netmask list */
rc = spdk_iscsi_init_grp_add_netmask(ig, netmask1);
CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_add_netmask(ig, netmask2);
CU_ASSERT(rc == 0);
/* check if two netmasks are added correctly. */
imask = spdk_iscsi_init_grp_find_netmask(ig, netmask1);
CU_ASSERT(imask != NULL);
imask = spdk_iscsi_init_grp_find_netmask(ig, netmask2);
CU_ASSERT(imask != NULL);
/* restore the initial state */
rc = spdk_iscsi_init_grp_delete_netmask(ig, netmask1);
CU_ASSERT(rc == 0);
imask = spdk_iscsi_init_grp_find_netmask(ig, netmask1);
CU_ASSERT(imask == NULL);
rc = spdk_iscsi_init_grp_delete_netmask(ig, netmask2);
CU_ASSERT(rc == 0);
imask = spdk_iscsi_init_grp_find_netmask(ig, netmask2);
CU_ASSERT(imask == NULL);
spdk_iscsi_init_grp_destroy(ig);
}
static void
add_netmask_fail_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_netmask *imask;
char *netmask1 = "192.168.2.0";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
/* add an netmask to the full netmask list */
ig->nnetmasks = MAX_NETMASK;
rc = spdk_iscsi_init_grp_add_netmask(ig, netmask1);
CU_ASSERT(rc != 0);
ig->nnetmasks = 0;
/* add the same netmask to the netmask list twice */
rc = spdk_iscsi_init_grp_add_netmask(ig, netmask1);
CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_add_netmask(ig, netmask1);
CU_ASSERT(rc != 0);
/* restore the initial state */
rc = spdk_iscsi_init_grp_delete_netmask(ig, netmask1);
CU_ASSERT(rc == 0);
imask = spdk_iscsi_init_grp_find_netmask(ig, netmask1);
CU_ASSERT(imask == NULL);
spdk_iscsi_init_grp_destroy(ig);
}
static void
delete_all_netmasks_success_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_netmask *imask;
char *netmask1 = "192.168.2.0";
char *netmask2 = "192.168.2.1";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
/* add two different netmasks to the empty netmask list */
rc = spdk_iscsi_init_grp_add_netmask(ig, netmask1);
CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_add_netmask(ig, netmask2);
CU_ASSERT(rc == 0);
/* delete all netmasks */
spdk_iscsi_init_grp_delete_all_netmasks(ig);
/* check if two netmasks are deleted correctly. */
imask = spdk_iscsi_init_grp_find_netmask(ig, netmask1);
CU_ASSERT(imask == NULL);
imask = spdk_iscsi_init_grp_find_netmask(ig, netmask2);
CU_ASSERT(imask == NULL);
/* restore the initial state */
spdk_iscsi_init_grp_destroy(ig);
}
iscsi: Replace "ALL" by "ANY" for access control In the accessibility control of iSCSI target, "ALL" is used to allow ANY IP address-port pair or iSCSI name of initiators. However iSCSI targets cannot know ALL initiators beforehand. Hence "ANY" will be better than "ALL" and will avoid misunderstanding. Comments and iscsi_tgt test code are also changed and UT code is added. Change-Id: Id004d819df6e9ee89f6c1db2e4b4c149be062733 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/385168 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-29 05:51:23 +00:00
static void
initiator_name_overwrite_all_to_any_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_name *iname;
char *all = "ALL";
char *any = "ANY";
char *all_not = "!ALL";
char *any_not = "!ANY";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
rc = spdk_iscsi_init_grp_add_initiator(ig, all);
CU_ASSERT(rc == 0);
iname = spdk_iscsi_init_grp_find_initiator(ig, all);
CU_ASSERT(iname == NULL);
iname = spdk_iscsi_init_grp_find_initiator(ig, any);
CU_ASSERT(iname != NULL);
rc = spdk_iscsi_init_grp_delete_initiator(ig, any);
CU_ASSERT(rc == 0);
rc = spdk_iscsi_init_grp_add_initiator(ig, all_not);
CU_ASSERT(rc == 0);
iname = spdk_iscsi_init_grp_find_initiator(ig, all_not);
CU_ASSERT(iname == NULL);
iname = spdk_iscsi_init_grp_find_initiator(ig, any_not);
CU_ASSERT(iname != NULL);
rc = spdk_iscsi_init_grp_delete_initiator(ig, any_not);
CU_ASSERT(rc == 0);
spdk_iscsi_init_grp_destroy(ig);
}
static void
netmask_overwrite_all_to_any_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_netmask *imask;
char *all = "ALL";
char *any = "ANY";
ig = spdk_iscsi_init_grp_create(1);
CU_ASSERT(ig != NULL);
rc = spdk_iscsi_init_grp_add_netmask(ig, all);
CU_ASSERT(rc == 0);
imask = spdk_iscsi_init_grp_find_netmask(ig, all);
CU_ASSERT(imask == NULL);
imask = spdk_iscsi_init_grp_find_netmask(ig, any);
CU_ASSERT(imask != NULL);
rc = spdk_iscsi_init_grp_delete_netmask(ig, any);
CU_ASSERT(rc == 0);
spdk_iscsi_init_grp_destroy(ig);
}
iscsi&rpc: Add new initiator information to an existing initiator group Adding new initiator to an existing initiator group to allow login will be usual. This patch support the following JSON-RPC commands: - add_initiators_to_initiator_group - delete_initiators_from_initiator_group Both initiator's name and netmask are optional but already added name or netmask cannot be added. Test code is added too. Change-Id: Ic101210b9d00c2b36e37ece23fcba8cfe8e44eb8 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/398361 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-06 23:22:00 +00:00
static void
add_delete_initiator_names_case(void)
{
int rc, i;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_name *iname;
char *names[3] = {"iqn.2018-02.spdk.io:0001", "iqn.2018-02.spdk.io:0002", "iqn.2018-02.spdk.io:0003"};
ig = spdk_iscsi_init_grp_create(1);
SPDK_CU_ASSERT_FATAL(ig != NULL);
rc = spdk_iscsi_init_grp_add_initiators(ig, 3, names);
CU_ASSERT(rc == 0);
for (i = 0; i < 3; i++) {
iname = spdk_iscsi_init_grp_find_initiator(ig, names[i]);
CU_ASSERT(iname != NULL);
}
rc = spdk_iscsi_init_grp_delete_initiators(ig, 3, names);
CU_ASSERT(rc == 0);
if (ig != NULL) {
CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head));
}
spdk_iscsi_init_grp_destroy(ig);
}
static void
add_duplicated_initiator_names_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
char *names[3] = {"iqn.2018-02.spdk.io:0001", "iqn.2018-02.spdk.io:0002", "iqn.2018-02.spdk.io:0001"};
ig = spdk_iscsi_init_grp_create(1);
SPDK_CU_ASSERT_FATAL(ig != NULL);
rc = spdk_iscsi_init_grp_add_initiators(ig, 3, names);
CU_ASSERT(rc != 0);
if (ig != NULL) {
CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head));
}
spdk_iscsi_init_grp_destroy(ig);
}
static void
delete_nonexisting_initiator_names_case(void)
{
int rc, i;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_name *iname;
char *names1[3] = {"iqn.2018-02.spdk.io:0001", "iqn.2018-02.spdk.io:0002", "iqn.2018-02.spdk.io:0003"};
char *names2[3] = {"iqn.2018-02.spdk.io:0001", "iqn.2018-02.spdk.io:0002", "iqn.2018-02.spdk.io:0004"};
ig = spdk_iscsi_init_grp_create(1);
SPDK_CU_ASSERT_FATAL(ig != NULL);
rc = spdk_iscsi_init_grp_add_initiators(ig, 3, names1);
CU_ASSERT(rc == 0);
for (i = 0; i < 3; i++) {
iname = spdk_iscsi_init_grp_find_initiator(ig, names1[i]);
CU_ASSERT(iname != NULL);
}
rc = spdk_iscsi_init_grp_delete_initiators(ig, 3, names2);
CU_ASSERT(rc != 0);
for (i = 0; i < 3; i++) {
iname = spdk_iscsi_init_grp_find_initiator(ig, names1[i]);
CU_ASSERT(iname != NULL);
}
rc = spdk_iscsi_init_grp_delete_initiators(ig, 3, names1);
CU_ASSERT(rc == 0);
if (ig != NULL) {
CU_ASSERT(TAILQ_EMPTY(&ig->initiator_head));
}
spdk_iscsi_init_grp_destroy(ig);
}
static void
add_delete_netmasks_case(void)
{
int rc, i;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_netmask *netmask;
char *netmasks[3] = {"192.168.2.0", "192.168.2.1", "192.168.2.2"};
ig = spdk_iscsi_init_grp_create(1);
SPDK_CU_ASSERT_FATAL(ig != NULL);
rc = spdk_iscsi_init_grp_add_netmasks(ig, 3, netmasks);
CU_ASSERT(rc == 0);
for (i = 0; i < 3; i++) {
netmask = spdk_iscsi_init_grp_find_netmask(ig, netmasks[i]);
CU_ASSERT(netmask != NULL);
}
rc = spdk_iscsi_init_grp_delete_netmasks(ig, 3, netmasks);
CU_ASSERT(rc == 0);
if (ig != NULL) {
CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head));
}
spdk_iscsi_init_grp_destroy(ig);
}
static void
add_duplicated_netmasks_case(void)
{
int rc;
struct spdk_iscsi_init_grp *ig;
char *netmasks[3] = {"192.168.2.0", "192.168.2.1", "192.168.2.0"};
ig = spdk_iscsi_init_grp_create(1);
SPDK_CU_ASSERT_FATAL(ig != NULL);
rc = spdk_iscsi_init_grp_add_netmasks(ig, 3, netmasks);
CU_ASSERT(rc != 0);
if (ig != NULL) {
CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head));
}
spdk_iscsi_init_grp_destroy(ig);
}
static void
delete_nonexisting_netmasks_case(void)
{
int rc, i;
struct spdk_iscsi_init_grp *ig;
struct spdk_iscsi_initiator_netmask *netmask;
char *netmasks1[3] = {"192.168.2.0", "192.168.2.1", "192.168.2.2"};
char *netmasks2[3] = {"192.168.2.0", "192.168.2.1", "192.168.2.3"};
ig = spdk_iscsi_init_grp_create(1);
SPDK_CU_ASSERT_FATAL(ig != NULL);
rc = spdk_iscsi_init_grp_add_netmasks(ig, 3, netmasks1);
CU_ASSERT(rc == 0);
for (i = 0; i < 3; i++) {
netmask = spdk_iscsi_init_grp_find_netmask(ig, netmasks1[i]);
CU_ASSERT(netmask != NULL);
}
rc = spdk_iscsi_init_grp_delete_netmasks(ig, 3, netmasks2);
CU_ASSERT(rc != 0);
for (i = 0; i < 3; i++) {
netmask = spdk_iscsi_init_grp_find_netmask(ig, netmasks1[i]);
CU_ASSERT(netmask != NULL);
}
rc = spdk_iscsi_init_grp_delete_netmasks(ig, 3, netmasks1);
CU_ASSERT(rc == 0);
if (ig != NULL) {
CU_ASSERT(TAILQ_EMPTY(&ig->netmask_head));
}
spdk_iscsi_init_grp_destroy(ig);
}
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
int
main(int argc, char **argv)
{
CU_pSuite suite = NULL;
unsigned int num_failures;
if (argc < 2) {
fprintf(stderr, "usage: %s <config file>\n", argv[0]);
exit(1);
}
if (CU_initialize_registry() != CUE_SUCCESS) {
return CU_get_error();
}
config_file = argv[1];
suite = CU_add_suite("init_grp_suite", test_setup, NULL);
if (suite == NULL) {
CU_cleanup_registry();
return CU_get_error();
}
if (
CU_add_test(suite, "create from config file cases",
create_from_config_file_cases) == NULL
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
|| CU_add_test(suite, "create initiator group success case",
create_initiator_group_success_case) == NULL
|| CU_add_test(suite, "find initiator group success case",
find_initiator_group_success_case) == NULL
iscsi: Consolidating checking uniqueness of IG into register/unregister Checking uniqueness of initiator group is done without mutex and before register/unregister. This is not thread-safe. This patch is a preparation to dynamic addition of initiator information to existing initiator groups. Change-Id: I44f48c857210522eee70d14bc3735ec73b0c5c6f Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/397032 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-05 04:02:25 +00:00
|| CU_add_test(suite, "register initiator group twice case",
register_initiator_group_twice_case) == NULL
iscsi: manage IG's name and mask by linked list To add initiators to an existing target, manage name and netmask of initiator group by linked list. It is not easy for array to detect duplication and change configuration. Change-Id: Id9e77740e24ac309a33d8de1be37663681160d94 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/379932 Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ziye Yang <optimistyzy@gmail.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-11-15 00:14:27 +00:00
|| CU_add_test(suite, "add initiator name success case",
add_initiator_name_success_case) == NULL
|| CU_add_test(suite, "add initiator name fail case",
add_initiator_name_fail_case) == NULL
|| CU_add_test(suite, "delete all initiator names success case",
delete_all_initiator_names_success_case) == NULL
|| CU_add_test(suite, "add initiator netmask success case",
add_netmask_success_case) == NULL
|| CU_add_test(suite, "add initiator netmask fail case",
add_netmask_fail_case) == NULL
|| CU_add_test(suite, "delete all initiator netmasks success case",
delete_all_netmasks_success_case) == NULL
iscsi: Replace "ALL" by "ANY" for access control In the accessibility control of iSCSI target, "ALL" is used to allow ANY IP address-port pair or iSCSI name of initiators. However iSCSI targets cannot know ALL initiators beforehand. Hence "ANY" will be better than "ALL" and will avoid misunderstanding. Comments and iscsi_tgt test code are also changed and UT code is added. Change-Id: Id004d819df6e9ee89f6c1db2e4b4c149be062733 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/385168 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-29 05:51:23 +00:00
|| CU_add_test(suite, "overwrite all to any for name case",
initiator_name_overwrite_all_to_any_case) == NULL
|| CU_add_test(suite, "overwrite all to any for netmask case",
netmask_overwrite_all_to_any_case) == NULL
iscsi&rpc: Add new initiator information to an existing initiator group Adding new initiator to an existing initiator group to allow login will be usual. This patch support the following JSON-RPC commands: - add_initiators_to_initiator_group - delete_initiators_from_initiator_group Both initiator's name and netmask are optional but already added name or netmask cannot be added. Test code is added too. Change-Id: Ic101210b9d00c2b36e37ece23fcba8cfe8e44eb8 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/398361 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2018-02-06 23:22:00 +00:00
|| CU_add_test(suite, "add/delete initiator names case",
add_delete_initiator_names_case) == NULL
|| CU_add_test(suite, "add duplicated initiator names case",
add_duplicated_initiator_names_case) == NULL
|| CU_add_test(suite, "delete nonexisting initiator names case",
delete_nonexisting_initiator_names_case) == NULL
|| CU_add_test(suite, "add/delete netmasks case",
add_delete_netmasks_case) == NULL
|| CU_add_test(suite, "add duplicated netmasks case",
add_duplicated_netmasks_case) == NULL
|| CU_add_test(suite, "delete nonexisting netmasks case",
delete_nonexisting_netmasks_case) == NULL
iscsi and ut/iscsi: return code to fail of IG creation spdk_iscsi_init_grp_create_from_configfile() returns 0 even if creating an initiator group (IG) is failed due to empty netmask or initiator name. This will be unexpected behavior for end users. Hence change the return code from 0 to -ENVAL for this failure. Besides do the following. Change other error return codes in the function by using errno too. Current IG don't have any UT code in repository. UT code to confirm this fix is also submitted. Change-Id: Ic918feb5c6a3e772b325664d881b2673b553a217 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/384408 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-11-15 00:10:00 +00:00
) {
CU_cleanup_registry();
return CU_get_error();
}
CU_basic_set_mode(CU_BRM_VERBOSE);
CU_basic_run_tests();
num_failures = CU_get_number_of_failures();
CU_cleanup_registry();
return num_failures;
}
Reference in New Issue Copy Permalink