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

RPC: rename rpc destroy_raid_bdev to bdev_raid_delete

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Iabe1df302f9960919d7e8d77f8beb4d64a29ad6e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467919
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Maciej Wawryk 2019-09-10 11:08:35 +02:00 committed by Jim Harris
parent f07315342c
commit 27d8ca2ce7
10 changed files with 99 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/bdev.md
View File

@ -487,7 +487,7 @@ Example commands
`rpc.py bdev_raid_get_bdevs` `rpc.py bdev_raid_get_bdevs`
`rpc.py destroy_raid_bdev Raid0` `rpc.py bdev_raid_delete Raid0`
# Passthru {#bdev_config_passthru} # Passthru {#bdev_config_passthru}

4
doc/jsonrpc.md
View File

@ -5377,7 +5377,7 @@ Example response:
} }
~~~ ~~~
## destroy_raid_bdev {#rpc_destroy_raid_bdev} ## bdev_raid_delete {#rpc_bdev_raid_delete}
Removes RAID bdev. Removes RAID bdev.
@ -5394,7 +5394,7 @@ Example request:
~~~ ~~~
{ {
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "destroy_raid_bdev", "method": "bdev_raid_delete",
"id": 1, "id": 1,
"params": { "params": {
"name": "Raid0" "name": "Raid0"

51
module/bdev/raid/bdev_raid_rpc.c
View File

@ -300,36 +300,36 @@ SPDK_RPC_REGISTER("bdev_raid_create", spdk_rpc_bdev_raid_create, SPDK_RPC_RUNTIM
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_raid_create, construct_raid_bdev) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_raid_create, construct_raid_bdev)
/* /*
* Input structure for RPC destroy_raid * Input structure for RPC deleting a raid bdev
*/ */
struct rpc_destroy_raid_bdev { struct rpc_bdev_raid_delete {
/* raid bdev name */ /* raid bdev name */
char *name; char *name;
}; };
/* /*
* brief: * brief:
* free_rpc_destroy_raid_bdev function is used to free RPC destroy_raid_bdev related parameters * free_rpc_bdev_raid_delete function is used to free RPC bdev_raid_delete related parameters
* params: * params:
* req - pointer to RPC request * req - pointer to RPC request
* params: * params:
* none * none
*/ */
static void static void
free_rpc_destroy_raid_bdev(struct rpc_destroy_raid_bdev *req) free_rpc_bdev_raid_delete(struct rpc_bdev_raid_delete *req)
{ {
free(req->name); free(req->name);
} }
/* /*
* Decoder object for RPC destroy_raid * Decoder object for RPC raid_bdev_delete
*/ */
static const struct spdk_json_object_decoder rpc_destroy_raid_bdev_decoders[] = { static const struct spdk_json_object_decoder rpc_bdev_raid_delete_decoders[] = {
{"name", offsetof(struct rpc_destroy_raid_bdev, name), spdk_json_decode_string}, {"name", offsetof(struct rpc_bdev_raid_delete, name), spdk_json_decode_string},
}; };
struct rpc_destroy_raid_bdev_ctx { struct rpc_bdev_raid_delete_ctx {
struct rpc_destroy_raid_bdev req; struct rpc_bdev_raid_delete req;
struct raid_bdev_config *raid_cfg; struct raid_bdev_config *raid_cfg;
struct spdk_jsonrpc_request *request; struct spdk_jsonrpc_request *request;
}; };
@ -338,20 +338,20 @@ struct rpc_destroy_raid_bdev_ctx {
* brief: * brief:
* params: * params:
* cb_arg - pointer to the callback context. * cb_arg - pointer to the callback context.
* rc - return code of the destruction of the raid bdev. * rc - return code of the deletion of the raid bdev.
* returns: * returns:
* none * none
*/ */
static void static void
destroy_raid_bdev_done(void *cb_arg, int rc) bdev_raid_delete_done(void *cb_arg, int rc)
{ {
struct rpc_destroy_raid_bdev_ctx *ctx = cb_arg; struct rpc_bdev_raid_delete_ctx *ctx = cb_arg;
struct raid_bdev_config *raid_cfg; struct raid_bdev_config *raid_cfg;
struct spdk_jsonrpc_request *request = ctx->request; struct spdk_jsonrpc_request *request = ctx->request;
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Failed to destroy raid bdev %s (%d): %s\n", SPDK_ERRLOG("Failed to delete raid bdev %s (%d): %s\n",
ctx->req.name, rc, spdk_strerror(-rc)); ctx->req.name, rc, spdk_strerror(-rc));
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
spdk_strerror(-rc)); spdk_strerror(-rc));
@ -367,14 +367,14 @@ destroy_raid_bdev_done(void *cb_arg, int rc)
spdk_json_write_bool(w, true); spdk_json_write_bool(w, true);
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
exit: exit:
free_rpc_destroy_raid_bdev(&ctx->req); free_rpc_bdev_raid_delete(&ctx->req);
free(ctx); free(ctx);
} }
/* /*
* brief: * brief:
* spdk_rpc_destroy_raid_bdev function is the RPC for destroy_raid. It takes raid * spdk_rpc_bdev_raid_delete function is the RPC for deleting a raid bdev. It takes raid
* name as input and destroy that raid bdev including freeing the base bdev * name as input and delete that raid bdev including freeing the base bdev
* resources. * resources.
* params: * params:
* requuest - pointer to json rpc request * requuest - pointer to json rpc request
@ -383,10 +383,10 @@ exit:
* none * none
*/ */
static void static void
spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request, spdk_rpc_bdev_raid_delete(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_destroy_raid_bdev_ctx *ctx; struct rpc_bdev_raid_delete_ctx *ctx;
ctx = calloc(1, sizeof(*ctx)); ctx = calloc(1, sizeof(*ctx));
if (!ctx) { if (!ctx) {
@ -394,8 +394,8 @@ spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request,
return; return;
} }
if (spdk_json_decode_object(params, rpc_destroy_raid_bdev_decoders, if (spdk_json_decode_object(params, rpc_bdev_raid_delete_decoders,
SPDK_COUNTOF(rpc_destroy_raid_bdev_decoders), SPDK_COUNTOF(rpc_bdev_raid_delete_decoders),
&ctx->req)) { &ctx->req)) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed"); "spdk_json_decode_object failed");
@ -412,13 +412,14 @@ spdk_rpc_destroy_raid_bdev(struct spdk_jsonrpc_request *request,
ctx->request = request; ctx->request = request;
/* Remove all the base bdevs from this raid bdev before destroying the raid bdev */ /* Remove all the base bdevs from this raid bdev before deleting the raid bdev */
raid_bdev_remove_base_devices(ctx->raid_cfg, destroy_raid_bdev_done, ctx); raid_bdev_remove_base_devices(ctx->raid_cfg, bdev_raid_delete_done, ctx);
return; return;
cleanup: cleanup:
free_rpc_destroy_raid_bdev(&ctx->req); free_rpc_bdev_raid_delete(&ctx->req);
free(ctx); free(ctx);
} }
SPDK_RPC_REGISTER("destroy_raid_bdev", spdk_rpc_destroy_raid_bdev, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("bdev_raid_delete", spdk_rpc_bdev_raid_delete, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_raid_delete, destroy_raid_bdev)

11
scripts/rpc.py
View File

@ -1354,12 +1354,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
p.add_argument('-b', '--base-bdevs', help='base bdevs name, whitespace separated list in quotes', required=True) p.add_argument('-b', '--base-bdevs', help='base bdevs name, whitespace separated list in quotes', required=True)
p.set_defaults(func=bdev_raid_create) p.set_defaults(func=bdev_raid_create)
def destroy_raid_bdev(args): def bdev_raid_delete(args):
rpc.bdev.destroy_raid_bdev(args.client, rpc.bdev.bdev_raid_delete(args.client,
name=args.name) name=args.name)
p = subparsers.add_parser('destroy_raid_bdev', help='Destroy existing raid bdev') p = subparsers.add_parser('bdev_raid_delete', aliases=['destroy_raid_bdev'],
help='Delete existing raid bdev')
p.add_argument('name', help='raid bdev name') p.add_argument('name', help='raid bdev name')
p.set_defaults(func=destroy_raid_bdev) p.set_defaults(func=bdev_raid_delete)
# split # split
def bdev_split_create(args): def bdev_split_create(args):

7
scripts/rpc/bdev.py
View File

@ -274,8 +274,9 @@ def bdev_raid_create(client, name, raid_level, base_bdevs, strip_size=None, stri
return client.call('bdev_raid_create', params) return client.call('bdev_raid_create', params)
def destroy_raid_bdev(client, name): @deprecated_alias('destroy_raid_bdev')
"""Destroy raid bdev def bdev_raid_delete(client, name):
"""Delete raid bdev
Args: Args:
name: raid bdev name name: raid bdev name
@ -284,7 +285,7 @@ def destroy_raid_bdev(client, name):
None None
""" """
params = {'name': name} params = {'name': name}
return client.call('destroy_raid_bdev', params) return client.call('bdev_raid_delete', params)
@deprecated_alias('construct_aio_bdev') @deprecated_alias('construct_aio_bdev')

2
scripts/spdkcli/ui_node.py
View File

@ -827,7 +827,7 @@ class UIRaidBdev(UIBdev):
UIBdev.__init__(self, "raid_volume", parent) UIBdev.__init__(self, "raid_volume", parent)
def delete(self, name): def delete(self, name):
self.get_root().destroy_raid_bdev(name=name) self.get_root().bdev_raid_delete(name=name)
def ui_command_create(self, name, raid_level, base_bdevs, strip_size_kb): def ui_command_create(self, name, raid_level, base_bdevs, strip_size_kb):
""" """

4
scripts/spdkcli/ui_root.py
View File

@ -254,8 +254,8 @@ class UIRoot(UINode):
rpc.bdev.bdev_raid_create(self.client, **kwargs) rpc.bdev.bdev_raid_create(self.client, **kwargs)
@verbose @verbose
def destroy_raid_bdev(self, **kwargs): def bdev_raid_delete(self, **kwargs):
rpc.bdev.destroy_raid_bdev(self.client, **kwargs) rpc.bdev.bdev_raid_delete(self.client, **kwargs)
@verbose @verbose
@is_method_available @is_method_available

2
test/iscsi_tgt/fio/fio.sh
View File

@ -120,7 +120,7 @@ fio_pid=$!
sleep 3 sleep 3
# Delete raid0 blockdev # Delete raid0 blockdev
$rpc_py destroy_raid_bdev 'raid0' $rpc_py bdev_raid_delete 'raid0'
# Delete all allocated malloc blockdevs # Delete all allocated malloc blockdevs
for malloc_bdev in $malloc_bdevs; do for malloc_bdev in $malloc_bdevs; do

2
test/nvmf/target/fio.sh
View File

@ -51,7 +51,7 @@ fio_pid=$!
sleep 3 sleep 3
$rpc_py destroy_raid_bdev "raid0" $rpc_py bdev_raid_delete "raid0"
for malloc_bdev in $malloc_bdevs; do for malloc_bdev in $malloc_bdevs; do
$rpc_py bdev_malloc_delete "$malloc_bdev" $rpc_py bdev_malloc_delete "$malloc_bdev"
done done

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

@ -1117,8 +1117,8 @@ free_test_req(struct rpc_bdev_raid_create *r)
} }
static void static void
create_destroy_req(struct rpc_destroy_raid_bdev *r, const char *raid_name, create_raid_bdev_delete_req(struct rpc_bdev_raid_delete *r, const char *raid_name,
uint8_t json_decode_obj_err) uint8_t json_decode_obj_err)
{ {
r->name = strdup(raid_name); r->name = strdup(raid_name);
SPDK_CU_ASSERT_FATAL(r->name != NULL); SPDK_CU_ASSERT_FATAL(r->name != NULL);
@ -1153,7 +1153,7 @@ static void
test_create_raid(void) test_create_raid(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete delete_req;
set_globals(); set_globals();
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
@ -1167,8 +1167,8 @@ test_create_raid(void)
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
free_test_req(&req); free_test_req(&req);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&delete_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
raid_bdev_exit(); raid_bdev_exit();
base_bdevs_cleanup(); base_bdevs_cleanup();
@ -1176,10 +1176,10 @@ test_create_raid(void)
} }
static void static void
test_destroy_raid(void) test_delete_raid(void)
{ {
struct rpc_bdev_raid_create construct_req; struct rpc_bdev_raid_create construct_req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete delete_req;
set_globals(); set_globals();
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
@ -1193,8 +1193,8 @@ test_destroy_raid(void)
verify_raid_bdev(&construct_req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&construct_req, true, RAID_BDEV_STATE_ONLINE);
free_test_req(&construct_req); free_test_req(&construct_req);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&delete_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1208,7 +1208,7 @@ static void
test_create_raid_invalid_args(void) test_create_raid_invalid_args(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev_config *raid_cfg; struct raid_bdev_config *raid_cfg;
set_globals(); set_globals();
@ -1291,20 +1291,20 @@ test_create_raid_invalid_args(void)
verify_raid_config_present("raid1", true); verify_raid_config_present("raid1", true);
verify_raid_bdev_present("raid1", true); verify_raid_bdev_present("raid1", true);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
create_destroy_req(&destroy_req, "raid2", 0); create_raid_bdev_delete_req(&destroy_req, "raid2", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
raid_bdev_exit(); raid_bdev_exit();
base_bdevs_cleanup(); base_bdevs_cleanup();
reset_globals(); reset_globals();
} }
static void static void
test_destroy_raid_invalid_args(void) test_delete_raid_invalid_args(void)
{ {
struct rpc_bdev_raid_create construct_req; struct rpc_bdev_raid_create construct_req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
set_globals(); set_globals();
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
@ -1318,19 +1318,19 @@ test_destroy_raid_invalid_args(void)
verify_raid_bdev(&construct_req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&construct_req, true, RAID_BDEV_STATE_ONLINE);
free_test_req(&construct_req); free_test_req(&construct_req);
create_destroy_req(&destroy_req, "raid2", 0); create_raid_bdev_delete_req(&destroy_req, "raid2", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 1); CU_ASSERT(g_rpc_err == 1);
create_destroy_req(&destroy_req, "raid1", 1); create_raid_bdev_delete_req(&destroy_req, "raid1", 1);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 1); CU_ASSERT(g_rpc_err == 1);
free(destroy_req.name); free(destroy_req.name);
verify_raid_config_present("raid1", true); verify_raid_config_present("raid1", true);
verify_raid_bdev_present("raid1", true); verify_raid_bdev_present("raid1", true);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1344,7 +1344,7 @@ static void
test_io_channel(void) test_io_channel(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev *pbdev; struct raid_bdev *pbdev;
struct raid_bdev_io_channel *ch_ctx; struct raid_bdev_io_channel *ch_ctx;
uint8_t i; uint8_t i;
@ -1377,8 +1377,8 @@ test_io_channel(void)
CU_ASSERT(ch_ctx->base_channel == NULL); CU_ASSERT(ch_ctx->base_channel == NULL);
free_test_req(&req); free_test_req(&req);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1393,7 +1393,7 @@ static void
test_write_io(void) test_write_io(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev *pbdev; struct raid_bdev *pbdev;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
struct raid_bdev_io_channel *ch_ctx; struct raid_bdev_io_channel *ch_ctx;
@ -1456,8 +1456,8 @@ test_write_io(void)
CU_ASSERT(ch_ctx->base_channel == NULL); CU_ASSERT(ch_ctx->base_channel == NULL);
free(ch); free(ch);
free(ch_b); free(ch_b);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1471,7 +1471,7 @@ static void
test_read_io(void) test_read_io(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev *pbdev; struct raid_bdev *pbdev;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
struct raid_bdev_io_channel *ch_ctx; struct raid_bdev_io_channel *ch_ctx;
@ -1535,8 +1535,8 @@ test_read_io(void)
CU_ASSERT(ch_ctx->base_channel == NULL); CU_ASSERT(ch_ctx->base_channel == NULL);
free(ch); free(ch);
free(ch_b); free(ch_b);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1625,7 +1625,7 @@ static void
test_unmap_io(void) test_unmap_io(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev *pbdev; struct raid_bdev *pbdev;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
struct raid_bdev_io_channel *ch_ctx; struct raid_bdev_io_channel *ch_ctx;
@ -1683,8 +1683,8 @@ test_unmap_io(void)
raid_bdev_destroy_cb(pbdev, ch_ctx); raid_bdev_destroy_cb(pbdev, ch_ctx);
CU_ASSERT(ch_ctx->base_channel == NULL); CU_ASSERT(ch_ctx->base_channel == NULL);
free(ch); free(ch);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1699,7 +1699,7 @@ static void
test_io_failure(void) test_io_failure(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev *pbdev; struct raid_bdev *pbdev;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
struct raid_bdev_io_channel *ch_ctx; struct raid_bdev_io_channel *ch_ctx;
@ -1771,8 +1771,8 @@ test_io_failure(void)
raid_bdev_destroy_cb(pbdev, ch_ctx); raid_bdev_destroy_cb(pbdev, ch_ctx);
CU_ASSERT(ch_ctx->base_channel == NULL); CU_ASSERT(ch_ctx->base_channel == NULL);
free(ch); free(ch);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1787,7 +1787,7 @@ static void
test_reset_io(void) test_reset_io(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev *pbdev; struct raid_bdev *pbdev;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
struct raid_bdev_io_channel *ch_ctx; struct raid_bdev_io_channel *ch_ctx;
@ -1839,8 +1839,8 @@ test_reset_io(void)
raid_bdev_destroy_cb(pbdev, ch_ctx); raid_bdev_destroy_cb(pbdev, ch_ctx);
CU_ASSERT(ch_ctx->base_channel == NULL); CU_ASSERT(ch_ctx->base_channel == NULL);
free(ch); free(ch);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -1855,7 +1855,7 @@ static void
test_multi_raid_no_io(void) test_multi_raid_no_io(void)
{ {
struct rpc_bdev_raid_create *construct_req; struct rpc_bdev_raid_create *construct_req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct rpc_bdev_raid_get_bdevs get_raids_req; struct rpc_bdev_raid_get_bdevs get_raids_req;
uint8_t i; uint8_t i;
char name[16]; char name[16];
@ -1925,8 +1925,8 @@ test_multi_raid_no_io(void)
for (i = 0; i < g_max_raids; i++) { for (i = 0; i < g_max_raids; i++) {
SPDK_CU_ASSERT_FATAL(construct_req[i].name != NULL); SPDK_CU_ASSERT_FATAL(construct_req[i].name != NULL);
snprintf(name, 16, "%s", construct_req[i].name); snprintf(name, 16, "%s", construct_req[i].name);
create_destroy_req(&destroy_req, name, 0); create_raid_bdev_delete_req(&destroy_req, name, 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present(name, false); verify_raid_config_present(name, false);
verify_raid_bdev_present(name, false); verify_raid_bdev_present(name, false);
@ -1945,7 +1945,7 @@ static void
test_multi_raid_with_io(void) test_multi_raid_with_io(void)
{ {
struct rpc_bdev_raid_create *construct_req; struct rpc_bdev_raid_create *construct_req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
uint8_t i, j; uint8_t i, j;
char name[16]; char name[16];
uint8_t bbdev_idx = 0; uint8_t bbdev_idx = 0;
@ -2032,8 +2032,8 @@ test_multi_raid_with_io(void)
raid_bdev_destroy_cb(pbdev, ch_ctx); raid_bdev_destroy_cb(pbdev, ch_ctx);
CU_ASSERT(ch_ctx->base_channel == NULL); CU_ASSERT(ch_ctx->base_channel == NULL);
snprintf(name, 16, "%s", construct_req[i].name); snprintf(name, 16, "%s", construct_req[i].name);
create_destroy_req(&destroy_req, name, 0); create_raid_bdev_delete_req(&destroy_req, name, 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present(name, false); verify_raid_config_present(name, false);
verify_raid_bdev_present(name, false); verify_raid_bdev_present(name, false);
@ -2062,7 +2062,7 @@ test_create_raid_from_config(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
bool can_claim; bool can_claim;
struct raid_bdev_config *raid_cfg; struct raid_bdev_config *raid_cfg;
uint8_t base_bdev_slot; uint8_t base_bdev_slot;
@ -2084,8 +2084,8 @@ test_create_raid_from_config(void)
verify_raid_config(&req, true); verify_raid_config(&req, true);
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -2166,7 +2166,7 @@ static void
test_raid_json_dump_info(void) test_raid_json_dump_info(void)
{ {
struct rpc_bdev_raid_create req; struct rpc_bdev_raid_create req;
struct rpc_destroy_raid_bdev destroy_req; struct rpc_bdev_raid_delete destroy_req;
struct raid_bdev *pbdev; struct raid_bdev *pbdev;
set_globals(); set_globals();
@ -2190,8 +2190,8 @@ test_raid_json_dump_info(void)
free_test_req(&req); free_test_req(&req);
create_destroy_req(&destroy_req, "raid1", 0); create_raid_bdev_delete_req(&destroy_req, "raid1", 0);
spdk_rpc_destroy_raid_bdev(NULL, NULL); spdk_rpc_bdev_raid_delete(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
verify_raid_config_present("raid1", false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
@ -2224,11 +2224,11 @@ int main(int argc, char **argv)
if ( if (
CU_add_test(suite, "test_create_raid", test_create_raid) == NULL || CU_add_test(suite, "test_create_raid", test_create_raid) == NULL ||
CU_add_test(suite, "test_destroy_raid", test_destroy_raid) == NULL || CU_add_test(suite, "test_delete_raid", test_delete_raid) == NULL ||
CU_add_test(suite, "test_create_raid_invalid_args", CU_add_test(suite, "test_create_raid_invalid_args",
test_create_raid_invalid_args) == NULL || test_create_raid_invalid_args) == NULL ||
CU_add_test(suite, "test_destroy_raid_invalid_args", CU_add_test(suite, "test_delete_raid_invalid_args",
test_destroy_raid_invalid_args) == NULL || test_delete_raid_invalid_args) == NULL ||
CU_add_test(suite, "test_io_channel", test_io_channel) == NULL || CU_add_test(suite, "test_io_channel", test_io_channel) == NULL ||
CU_add_test(suite, "test_reset_io", test_reset_io) == NULL || CU_add_test(suite, "test_reset_io", test_reset_io) == NULL ||
CU_add_test(suite, "test_write_io", test_write_io) == NULL || CU_add_test(suite, "test_write_io", test_write_io) == NULL ||