Commit 0b3f378f authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename rpc get_lvol_stores to bdev_lvol_get_lvstores 



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


Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 9f5cbf4c

doc/bdev.md

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ This will create lvol store named `lvs` with cluster size 4096, build on top of 
`Malloc2` bdev. In response user will be provided with uuid which is unique lvol store

identifier.



User can get list of available lvol stores using `get_lvol_stores` RPC command (no

User can get list of available lvol stores using `bdev_lvol_get_lvstores` RPC command (no

parameters available).



Example response

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ Example response: 
    "bdev_malloc_create",

    "delete_ftl_bdev",

    "construct_ftl_bdev",

    "get_lvol_stores",

    "bdev_lvol_get_lvstores",

    "destroy_lvol_bdev",

    "resize_lvol_bdev",

    "set_read_only_lvol_bdev",
@@ -4852,7 +4852,7 @@ Example response: 
}

~~~



## get_lvol_stores {#rpc_get_lvol_stores}

## bdev_lvol_get_lvstores {#rpc_bdev_lvol_get_lvstores}



Get a list of logical volume stores.
@@ -4873,7 +4873,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "get_lvol_stores",

  "method": "bdev_lvol_get_lvstores",

  "id": 1,

  "params": {

    "lvs_name": "LVS0"

doc/lvol.md

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ destroy_lvol_store [-h] [-u UUID] [-l LVS_NAME] 
    using destroy_lvol_bdev rpc call.

    optional arguments:

    -h, --help  show help

get_lvol_stores [-h] [-u UUID] [-l LVS_NAME]

bdev_lvol_get_lvstores [-h] [-u UUID] [-l LVS_NAME]

    Display current logical volume store list

    optional arguments:

    -h, --help  show help

module/bdev/lvol/vbdev_lvol_rpc.c

+13 −12
Original line number Diff line number Diff line
@@ -985,21 +985,21 @@ cleanup: 


SPDK_RPC_REGISTER("destroy_lvol_bdev", spdk_rpc_destroy_lvol_bdev, SPDK_RPC_RUNTIME)



struct rpc_get_lvol_stores {

struct rpc_bdev_lvol_get_lvstores {

	char *uuid;

	char *lvs_name;

};



static void

free_rpc_get_lvol_stores(struct rpc_get_lvol_stores *req)

free_rpc_bdev_lvol_get_lvstores(struct rpc_bdev_lvol_get_lvstores *req)

{

	free(req->uuid);

	free(req->lvs_name);

}



static const struct spdk_json_object_decoder rpc_get_lvol_stores_decoders[] = {

	{"uuid", offsetof(struct rpc_get_lvol_stores, uuid), spdk_json_decode_string, true},

	{"lvs_name", offsetof(struct rpc_get_lvol_stores, lvs_name), spdk_json_decode_string, true},

static const struct spdk_json_object_decoder rpc_bdev_lvol_get_lvstores_decoders[] = {

	{"uuid", offsetof(struct rpc_bdev_lvol_get_lvstores, uuid), spdk_json_decode_string, true},

	{"lvs_name", offsetof(struct rpc_bdev_lvol_get_lvstores, lvs_name), spdk_json_decode_string, true},

};



static void
@@ -1035,18 +1035,18 @@ spdk_rpc_dump_lvol_store_info(struct spdk_json_write_ctx *w, struct lvol_store_b 
}



static void

spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_lvol_get_lvstores(struct spdk_jsonrpc_request *request,

				const struct spdk_json_val *params)

{

	struct rpc_get_lvol_stores req = {};

	struct rpc_bdev_lvol_get_lvstores req = {};

	struct spdk_json_write_ctx *w;

	struct lvol_store_bdev *lvs_bdev = NULL;

	struct spdk_lvol_store *lvs = NULL;

	int rc;



	if (params != NULL) {

		if (spdk_json_decode_object(params, rpc_get_lvol_stores_decoders,

					    SPDK_COUNTOF(rpc_get_lvol_stores_decoders),

		if (spdk_json_decode_object(params, rpc_bdev_lvol_get_lvstores_decoders,

					    SPDK_COUNTOF(rpc_bdev_lvol_get_lvstores_decoders),

					    &req)) {

			SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "spdk_json_decode_object failed\n");

			spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
@@ -1083,7 +1083,8 @@ spdk_rpc_get_lvol_stores(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);



cleanup:

	free_rpc_get_lvol_stores(&req);

	free_rpc_bdev_lvol_get_lvstores(&req);

}



SPDK_RPC_REGISTER("get_lvol_stores", spdk_rpc_get_lvol_stores, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_lvol_get_lvstores", spdk_rpc_bdev_lvol_get_lvstores, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_get_lvstores, get_lvol_stores)

scripts/rpc.py

+7 −6
Original line number Diff line number Diff line
@@ -1267,15 +1267,16 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('-l', '--lvs-name', help='lvol store name', required=False)

    p.set_defaults(func=destroy_lvol_store)



    def get_lvol_stores(args):

        print_dict(rpc.lvol.get_lvol_stores(args.client,

    def bdev_lvol_get_lvstores(args):

        print_dict(rpc.lvol.bdev_lvol_get_lvstores(args.client,

                                                   uuid=args.uuid,

                                                   lvs_name=args.lvs_name))



    p = subparsers.add_parser('get_lvol_stores', help='Display current logical volume store list')

    p = subparsers.add_parser('bdev_lvol_get_lvstores', aliases=['get_lvol_stores'],

                              help='Display current logical volume store list')

    p.add_argument('-u', '--uuid', help='lvol store UUID', required=False)

    p.add_argument('-l', '--lvs-name', help='lvol store name', required=False)

    p.set_defaults(func=get_lvol_stores)

    p.set_defaults(func=bdev_lvol_get_lvstores)



    def get_raid_bdevs(args):

        print_array(rpc.bdev.get_raid_bdevs(args.client,