Commit 7df830a8 authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename destruct_split_vbdev to bdev_split_delete 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Ib1fe9c105b4dd45fd5488b74cefc2260a81fe284
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468095


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent a1bda4e1

doc/jsonrpc.md

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ Example response: 
    "remove_virtio_bdev",

    "bdev_aio_delete",

    "bdev_aio_create",

    "destruct_split_vbdev",

    "bdev_split_delete",

    "bdev_split_create",

    "bdev_error_inject_error",

    "bdev_error_delete",

module/bdev/split/vbdev_split_rpc.c

+10 −9
Original line number Diff line number Diff line
@@ -105,24 +105,24 @@ out: 
SPDK_RPC_REGISTER("bdev_split_create", spdk_rpc_bdev_split_create, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_split_create, construct_split_vbdev)



struct rpc_destruct_split {

struct rpc_delete_split {

	char *base_bdev;

};



static const struct spdk_json_object_decoder rpc_destruct_split_decoders[] = {

	{"base_bdev", offsetof(struct rpc_destruct_split, base_bdev), spdk_json_decode_string},

static const struct spdk_json_object_decoder rpc_delete_split_decoders[] = {

	{"base_bdev", offsetof(struct rpc_delete_split, base_bdev), spdk_json_decode_string},

};



static void

spdk_rpc_destruct_split_vbdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_split_delete(struct spdk_jsonrpc_request *request,

			   const struct spdk_json_val *params)

{

	struct rpc_destruct_split req = {};

	struct rpc_delete_split req = {};

	struct spdk_json_write_ctx *w;

	int rc;



	if (spdk_json_decode_object(params, rpc_destruct_split_decoders,

				    SPDK_COUNTOF(rpc_destruct_split_decoders),

	if (spdk_json_decode_object(params, rpc_delete_split_decoders,

				    SPDK_COUNTOF(rpc_delete_split_decoders),

				    &req)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
@@ -141,4 +141,5 @@ spdk_rpc_destruct_split_vbdev(struct spdk_jsonrpc_request *request, 
out:

	free(req.base_bdev);

}

SPDK_RPC_REGISTER("destruct_split_vbdev", spdk_rpc_destruct_split_vbdev, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_split_delete", spdk_rpc_bdev_split_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_split_delete, destruct_split_vbdev)

scripts/rpc.py

+6 −5
Original line number Diff line number Diff line
@@ -1376,13 +1376,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    exceed the base bdev size.""", type=int)

    p.set_defaults(func=bdev_split_create)



    def destruct_split_vbdev(args):

        rpc.bdev.destruct_split_vbdev(args.client,

    def bdev_split_delete(args):

        rpc.bdev.bdev_split_delete(args.client,

                                   base_bdev=args.base_bdev)



    p = subparsers.add_parser('destruct_split_vbdev', help="""Delete split config with all created splits.""")

    p = subparsers.add_parser('bdev_split_delete', aliases=['destruct_split_vbdev'],

                              help="""Delete split config with all created splits.""")

    p.add_argument('base_bdev', help='base bdev name')

    p.set_defaults(func=destruct_split_vbdev)

    p.set_defaults(func=bdev_split_delete)



    # ftl

    ftl_valid_limits = ('crit', 'high', 'low', 'start')

scripts/rpc/bdev.py

+4 −3
Original line number Diff line number Diff line
@@ -662,8 +662,9 @@ def bdev_split_create(client, base_bdev, split_count, split_size_mb=None): 
    return client.call('bdev_split_create', params)





def destruct_split_vbdev(client, base_bdev):

    """Destroy split block devices.

@deprecated_alias('destruct_split_vbdev')

def bdev_split_delete(client, base_bdev):

    """Delete split block devices.



    Args:

        base_bdev: name of previously split bdev
@@ -672,7 +673,7 @@ def destruct_split_vbdev(client, base_bdev): 
        'base_bdev': base_bdev,

    }



    return client.call('destruct_split_vbdev', params)

    return client.call('bdev_split_delete', params)





@deprecated_alias('construct_ftl_bdev')

scripts/spdkcli/ui_node.py

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class UINode(ConfigNode): 
                command in ["create", "delete", "delete_all", "add_initiator",

                            "allow_any_host", "bdev_split_create", "add_lun",

                            "iscsi_target_node_add_pg_ig_maps", "remove_target", "add_secret",

                            "destruct_split_bdev", "bdev_pmem_delete_pool",

                            "bdev_split_delete", "bdev_pmem_delete_pool",

                            "bdev_pmem_create_pool", "delete_secret_all",

                            "delete_initiator", "set_auth", "delete_secret",

                            "iscsi_target_node_remove_pg_ig_maps", "load_config",
@@ -408,14 +408,14 @@ class UISplitBdev(UIBdev): 
                                                     split_size_mb=split_size_mb)

        self.shell.log.info(ret_name)



    def ui_command_destruct_split_bdev(self, base_bdev):

        """Destroy split block devices associated with base bdev.

    def ui_command_bdev_split_delete(self, base_bdev):

        """Delete split block devices associated with base bdev.



        Args:

            base_bdev: name of previously split bdev

        """



        self.get_root().destruct_split_bdev(base_bdev=base_bdev)

        self.get_root().bdev_split_delete(base_bdev=base_bdev)





class UIPmemBdev(UIBdev):