ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ut/bdev/raid: Factor out operation to create config for .INI config loading

Browse Source 
Create a helper function create_construct_config() and move
create_test_req() and initialization of related global variables
into the function.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ia675f67e8332247cce4585a2d287b8062d4e1359
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464478
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-08-08 09:57:49 +09:00 committed by Changpeng Liu
parent 0f9704a685
commit 309be937f0
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c
View File

@ -1103,6 +1103,15 @@ create_construct_req(struct rpc_construct_raid_bdev *r, const char *raid_name,
g_config_level_create = 0;
}
static void
create_construct_config(struct rpc_construct_raid_bdev *r, const char *raid_name,
uint8_t bbdev_start_idx, bool create_base_bdev)
{
create_test_req(r, raid_name, bbdev_start_idx, create_base_bdev);
g_config_level_create = 1;
}
static void
free_test_req(struct rpc_construct_raid_bdev *r)
{
@ -2180,12 +2189,8 @@ test_create_raid_from_config(void)
uint8_t base_bdev_slot;
set_globals();
create_test_req(&req, "raid1", 0, true);
g_rpc_req = &req;
g_rpc_req_size = sizeof(req);
g_config_level_create = 1;
create_construct_config(&req, "raid1", 0, true);
CU_ASSERT(raid_bdev_init() == 0);
g_config_level_create = 0;
verify_raid_config_present("raid1", true);
verify_raid_bdev_present("raid1", true);
@ -2222,11 +2227,8 @@ test_create_raid_from_config_invalid_params(void)
struct rpc_construct_raid_bdev req;
set_globals();
g_rpc_req = &req;
g_rpc_req_size = sizeof(req);
g_config_level_create = 1;
create_test_req(&req, "raid1", 0, true);
create_construct_config(&req, "raid1", 0, true);
free(req.name);
req.name = NULL;
CU_ASSERT(raid_bdev_init() != 0);
@ -2234,28 +2236,28 @@ test_create_raid_from_config_invalid_params(void)
verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false);
create_test_req(&req, "raid1", 0, false);
create_construct_config(&req, "raid1", 0, false);
req.strip_size_kb = 1234;
CU_ASSERT(raid_bdev_init() != 0);
free_test_req(&req);
verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false);
create_test_req(&req, "raid1", 0, false);
create_construct_config(&req, "raid1", 0, false);
req.raid_level = 1;
CU_ASSERT(raid_bdev_init() != 0);
free_test_req(&req);
verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false);
create_test_req(&req, "raid1", 0, false);
create_construct_config(&req, "raid1", 0, false);
req.raid_level = 1;
CU_ASSERT(raid_bdev_init() != 0);
free_test_req(&req);
verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false);
create_test_req(&req, "raid1", 0, false);
create_construct_config(&req, "raid1", 0, false);
req.base_bdevs.num_base_bdevs++;
CU_ASSERT(raid_bdev_init() != 0);
req.base_bdevs.num_base_bdevs--;
@ -2263,7 +2265,7 @@ test_create_raid_from_config_invalid_params(void)
verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false);
create_test_req(&req, "raid1", 0, false);
create_construct_config(&req, "raid1", 0, false);
req.base_bdevs.num_base_bdevs--;
CU_ASSERT(raid_bdev_init() != 0);
req.base_bdevs.num_base_bdevs++;
@ -2272,7 +2274,7 @@ test_create_raid_from_config_invalid_params(void)
verify_raid_bdev_present("raid1", false);
if (g_max_base_drives > 1) {
create_test_req(&req, "raid1", 0, false);
create_construct_config(&req, "raid1", 0, false);
snprintf(req.base_bdevs.base_bdevs[g_max_base_drives - 1], 15, "%s", "Nvme0n1");
CU_ASSERT(raid_bdev_init() != 0);
free_test_req(&req);