RPC: rename rcp rename_lvol_bdev to bdev_lvol_rename (0ce883ce) · Commits · Public Repositories / spdk

doc/jsonrpc.md

+3 −3

Original line number	Diff line number	Diff line
		@@ -305,7 +305,7 @@ Example response:
		"set_read_only_lvol_bdev",
		"decouple_parent_lvol_bdev",
		"inflate_lvol_bdev",
		"rename_lvol_bdev",
		"bdev_lvol_rename",
		"bdev_lvol_clone",
		"snapshot_lvol_bdev",
		"construct_lvol_bdev",
		@@ -5067,7 +5067,7 @@ Example response:
		}
		~~~

		## rename_lvol_bdev {#rpc_rename_lvol_bdev}
		## bdev_lvol_rename {#rpc_bdev_lvol_rename}

		Rename a logical volume. New name will rename only the alias of the logical volume.

		@@ -5085,7 +5085,7 @@ Example request:
		~~~
		{
		"jsonrpc": "2.0",
		"method": "rename_lvol_bdev",
		"method": "bdev_lvol_rename",
		"id": 1,
		"params": {
		"old_name": "067df606-6dbc-4143-a499-0d05855cb3b8",

doc/lvol.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ bdev_lvol_clone [-h] snapshot_name clone_name
		Create a clone with clone_name of a given lvol snapshot.
		optional arguments:
		-h, --help show help
		rename_lvol_bdev [-h] old_name new_name
		bdev_lvol_rename [-h] old_name new_name
		Change lvol bdev name
		optional arguments:
		-h, --help show help

module/bdev/lvol/vbdev_lvol_rpc.c

+14 −13

Original line number	Diff line number	Diff line
		@@ -562,25 +562,25 @@ cleanup:
		SPDK_RPC_REGISTER("bdev_lvol_clone", spdk_rpc_bdev_lvol_clone, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_clone, clone_lvol_bdev)

		struct rpc_rename_lvol_bdev {
		struct rpc_bdev_lvol_rename {
		char *old_name;
		char *new_name;
		};

		static void
		free_rpc_rename_lvol_bdev(struct rpc_rename_lvol_bdev *req)
		free_rpc_bdev_lvol_rename(struct rpc_bdev_lvol_rename *req)
		{
		free(req->old_name);
		free(req->new_name);
		}

		static const struct spdk_json_object_decoder rpc_rename_lvol_bdev_decoders[] = {
		{"old_name", offsetof(struct rpc_rename_lvol_bdev, old_name), spdk_json_decode_string},
		{"new_name", offsetof(struct rpc_rename_lvol_bdev, new_name), spdk_json_decode_string},
		static const struct spdk_json_object_decoder rpc_bdev_lvol_rename_decoders[] = {
		{"old_name", offsetof(struct rpc_bdev_lvol_rename, old_name), spdk_json_decode_string},
		{"new_name", offsetof(struct rpc_bdev_lvol_rename, new_name), spdk_json_decode_string},
		};

		static void
		_spdk_rpc_rename_lvol_bdev_cb(void *cb_arg, int lvolerrno)
		_spdk_rpc_bdev_lvol_rename_cb(void *cb_arg, int lvolerrno)
		{
		struct spdk_json_write_ctx *w;
		struct spdk_jsonrpc_request *request = cb_arg;
		@@ -600,17 +600,17 @@ invalid:
		}

		static void
		spdk_rpc_rename_lvol_bdev(struct spdk_jsonrpc_request *request,
		spdk_rpc_bdev_lvol_rename(struct spdk_jsonrpc_request *request,
		const struct spdk_json_val *params)
		{
		struct rpc_rename_lvol_bdev req = {};
		struct rpc_bdev_lvol_rename req = {};
		struct spdk_bdev *bdev;
		struct spdk_lvol *lvol;

		SPDK_INFOLOG(SPDK_LOG_LVOL_RPC, "Renaming lvol\n");

		if (spdk_json_decode_object(params, rpc_rename_lvol_bdev_decoders,
		SPDK_COUNTOF(rpc_rename_lvol_bdev_decoders),
		if (spdk_json_decode_object(params, rpc_bdev_lvol_rename_decoders,
		SPDK_COUNTOF(rpc_bdev_lvol_rename_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,
		@@ -632,13 +632,14 @@ spdk_rpc_rename_lvol_bdev(struct spdk_jsonrpc_request *request,
		goto cleanup;
		}

		vbdev_lvol_rename(lvol, req.new_name, _spdk_rpc_rename_lvol_bdev_cb, request);
		vbdev_lvol_rename(lvol, req.new_name, _spdk_rpc_bdev_lvol_rename_cb, request);

		cleanup:
		free_rpc_rename_lvol_bdev(&req);
		free_rpc_bdev_lvol_rename(&req);
		}

		SPDK_RPC_REGISTER("rename_lvol_bdev", spdk_rpc_rename_lvol_bdev, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER("bdev_lvol_rename", spdk_rpc_bdev_lvol_rename, SPDK_RPC_RUNTIME)
		SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_lvol_rename, rename_lvol_bdev)

		struct rpc_inflate_lvol_bdev {
		char *name;

scripts/rpc.py

+5 −4

Original line number	Diff line number	Diff line
		@@ -1195,15 +1195,16 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
		p.add_argument('clone_name', help='lvol clone name')
		p.set_defaults(func=bdev_lvol_clone)

		def rename_lvol_bdev(args):
		rpc.lvol.rename_lvol_bdev(args.client,
		def bdev_lvol_rename(args):
		rpc.lvol.bdev_lvol_rename(args.client,
		old_name=args.old_name,
		new_name=args.new_name)

		p = subparsers.add_parser('rename_lvol_bdev', help='Change lvol bdev name')
		p = subparsers.add_parser('bdev_lvol_rename', aliases=['rename_lvol_bdev'],
		help='Change lvol bdev name')
		p.add_argument('old_name', help='lvol bdev name')
		p.add_argument('new_name', help='new lvol name')
		p.set_defaults(func=rename_lvol_bdev)
		p.set_defaults(func=bdev_lvol_rename)

		def inflate_lvol_bdev(args):
		rpc.lvol.inflate_lvol_bdev(args.client,

scripts/rpc/lvol.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,8 @@ def bdev_lvol_clone(client, snapshot_name, clone_name):
		return client.call('bdev_lvol_clone', params)


		def rename_lvol_bdev(client, old_name, new_name):
		@deprecated_alias('rename_lvol_bdev')
		def bdev_lvol_rename(client, old_name, new_name):
		"""Rename a logical volume.

		Args:
		@@ -111,7 +112,7 @@ def rename_lvol_bdev(client, old_name, new_name):
		'old_name': old_name,
		'new_name': new_name
		}
		return client.call('rename_lvol_bdev', params)
		return client.call('bdev_lvol_rename', params)


		def resize_lvol_bdev(client, name, size):