Commit 90e4ae5d authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Ben Walker
Browse files

RPC: rename rpc rename_lvol_store to bdev_lvol_rename_lvstore 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
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>
parent 4c049618

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ Example response: 
    "bdev_lvol_snapshot",

    "bdev_lvol_create",

    "bdev_lvol_delete_lvstore",

    "rename_lvol_store",

    "bdev_lvol_rename_lvstore",

    "construct_lvol_store"

  ]

}
@@ -4901,7 +4901,7 @@ Example response: 
}

~~~



## rename_lvol_store {#rpc_rename_lvol_store}

## bdev_lvol_rename_lvstore {#rpc_bdev_lvol_rename_lvstore}



Rename a logical volume store.
@@ -4919,7 +4919,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "rename_lvol_store",

  "method": "bdev_lvol_rename_lvstore",

  "id": 1,

  "params": {

    "old_name": "LVS0",

doc/lvol.md

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ bdev_lvol_get_lvstores [-h] [-u UUID] [-l LVS_NAME] 
    -h, --help  show help

    -u UUID, --uuid UUID  show details of specified lvol store

    -l LVS_NAME, --lvs_name LVS_NAME  show details of specified lvol store

rename_lvol_store [-h] old_name new_name

bdev_lvol_rename_lvstore [-h] old_name new_name

    Change logical volume store name

    optional arguments:

    -h, --help  show this help message and exit

module/bdev/lvol/vbdev_lvol_rpc.c

+15 −14
Original line number Diff line number Diff line
@@ -170,25 +170,25 @@ cleanup: 
}

SPDK_RPC_REGISTER("construct_lvol_store", spdk_rpc_construct_lvol_store, SPDK_RPC_RUNTIME)



struct rpc_rename_lvol_store {

struct rpc_bdev_lvol_rename_lvstore {

	char *old_name;

	char *new_name;

};



static void

free_rpc_rename_lvol_store(struct rpc_rename_lvol_store *req)

free_rpc_bdev_lvol_rename_lvstore(struct rpc_bdev_lvol_rename_lvstore *req)

{

	free(req->old_name);

	free(req->new_name);

}



static const struct spdk_json_object_decoder rpc_rename_lvol_store_decoders[] = {

	{"old_name", offsetof(struct rpc_rename_lvol_store, old_name), spdk_json_decode_string},

	{"new_name", offsetof(struct rpc_rename_lvol_store, new_name), spdk_json_decode_string},

static const struct spdk_json_object_decoder rpc_bdev_lvol_rename_lvstore_decoders[] = {

	{"old_name", offsetof(struct rpc_bdev_lvol_rename_lvstore, old_name), spdk_json_decode_string},

	{"new_name", offsetof(struct rpc_bdev_lvol_rename_lvstore, new_name), spdk_json_decode_string},

};



static void

_spdk_rpc_rename_lvol_store_cb(void *cb_arg, int lvserrno)

_spdk_rpc_bdev_lvol_rename_lvstore_cb(void *cb_arg, int lvserrno)

{

	struct spdk_json_write_ctx *w;

	struct spdk_jsonrpc_request *request = cb_arg;
@@ -208,14 +208,14 @@ invalid: 
}



static void

spdk_rpc_rename_lvol_store(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_lvol_rename_lvstore(struct spdk_jsonrpc_request *request,

				  const struct spdk_json_val *params)

{

	struct rpc_rename_lvol_store req = {};

	struct rpc_bdev_lvol_rename_lvstore req = {};

	struct spdk_lvol_store *lvs;



	if (spdk_json_decode_object(params, rpc_rename_lvol_store_decoders,

				    SPDK_COUNTOF(rpc_rename_lvol_store_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_lvol_rename_lvstore_decoders,

				    SPDK_COUNTOF(rpc_bdev_lvol_rename_lvstore_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,
@@ -230,12 +230,13 @@ spdk_rpc_rename_lvol_store(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	vbdev_lvs_rename(lvs, req.new_name, _spdk_rpc_rename_lvol_store_cb, request);

	vbdev_lvs_rename(lvs, req.new_name, _spdk_rpc_bdev_lvol_rename_lvstore_cb, request);



cleanup:

	free_rpc_rename_lvol_store(&req);

	free_rpc_bdev_lvol_rename_lvstore(&req);

}

SPDK_RPC_REGISTER("rename_lvol_store", spdk_rpc_rename_lvol_store, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_lvol_rename_lvstore", spdk_rpc_bdev_lvol_rename_lvstore, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_rename_lvstore, rename_lvol_store)



struct rpc_bdev_lvol_delete_lvstore {

	char *uuid;

scripts/rpc.py

+7 −6
Original line number Diff line number Diff line
@@ -1167,15 +1167,16 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
        Available: none, unmap, write_zeroes""", required=False)

    p.set_defaults(func=construct_lvol_store)



    def rename_lvol_store(args):

        rpc.lvol.rename_lvol_store(args.client,

    def bdev_lvol_rename_lvstore(args):

        rpc.lvol.bdev_lvol_rename_lvstore(args.client,

                                          old_name=args.old_name,

                                          new_name=args.new_name)



    p = subparsers.add_parser('rename_lvol_store', help='Change logical volume store name')

    p = subparsers.add_parser('bdev_lvol_rename_lvstore', aliases=['rename_lvol_store'],

                              help='Change logical volume store name')

    p.add_argument('old_name', help='old name')

    p.add_argument('new_name', help='new name')

    p.set_defaults(func=rename_lvol_store)

    p.set_defaults(func=bdev_lvol_rename_lvstore)



    def bdev_lvol_create(args):

        print_json(rpc.lvol.bdev_lvol_create(args.client,

scripts/rpc/lvol.py

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ def construct_lvol_store(client, bdev_name, lvs_name, cluster_sz=None, clear_met 
    return client.call('construct_lvol_store', params)





def rename_lvol_store(client, old_name, new_name):

@deprecated_alias('rename_lvol_store')

def bdev_lvol_rename_lvstore(client, old_name, new_name):

    """Rename a logical volume store.



    Args:
@@ -32,7 +33,7 @@ def rename_lvol_store(client, old_name, new_name): 
        'old_name': old_name,

        'new_name': new_name

    }

    return client.call('rename_lvol_store', params)

    return client.call('bdev_lvol_rename_lvstore', params)





@deprecated_alias('construct_lvol_bdev')