Commit 164939aa authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Ben Walker
Browse files

RPC: rename rpc delete_rbd_bdev to bdev_rbd_delete 



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


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

doc/bdev.md

+2 −2
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ Example command 


This command will create a bdev that represents the 'foo' image from a pool called 'rbd'.



To remove a block device representation use the delete_rbd_bdev command.

To remove a block device representation use the bdev_rbd_delete command.



`rpc.py delete_rbd_bdev Rbd0`

`rpc.py bdev_rbd_delete Rbd0`



# Compression Virtual Bdev Module {#bdev_config_compress}

doc/jsonrpc.md

+2 −2
Original line number Diff line number Diff line
@@ -1680,7 +1680,7 @@ response: 
}

~~~



## delete_rbd_bdev {#rpc_delete_rbd_bdev}

## bdev_rbd_delete {#rpc_bdev_rbd_delete}



Delete @ref bdev_config_rbd bdev
@@ -1706,7 +1706,7 @@ Example request: 
    "name": "Rbd0"

  },

  "jsonrpc": "2.0",

  "method": "delete_rbd_bdev",

  "method": "bdev_rbd_delete",

  "id": 1

}

~~~

module/bdev/rbd/bdev_rbd_rpc.c

+13 −12
Original line number Diff line number Diff line
@@ -144,22 +144,22 @@ cleanup: 
SPDK_RPC_REGISTER("bdev_rbd_create", spdk_rpc_bdev_rbd_create, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_rbd_create, construct_rbd_bdev)



struct rpc_delete_rbd {

struct rpc_bdev_rbd_delete {

	char *name;

};



static void

free_rpc_delete_rbd(struct rpc_delete_rbd *req)

free_rpc_bdev_rbd_delete(struct rpc_bdev_rbd_delete *req)

{

	free(req->name);

}



static const struct spdk_json_object_decoder rpc_delete_rbd_decoders[] = {

	{"name", offsetof(struct rpc_delete_rbd, name), spdk_json_decode_string},

static const struct spdk_json_object_decoder rpc_bdev_rbd_delete_decoders[] = {

	{"name", offsetof(struct rpc_bdev_rbd_delete, name), spdk_json_decode_string},

};



static void

_spdk_rpc_delete_rbd_bdev_cb(void *cb_arg, int bdeverrno)

_spdk_rpc_bdev_rbd_delete_cb(void *cb_arg, int bdeverrno)

{

	struct spdk_jsonrpc_request *request = cb_arg;

	struct spdk_json_write_ctx *w;
@@ -170,14 +170,14 @@ _spdk_rpc_delete_rbd_bdev_cb(void *cb_arg, int bdeverrno) 
}



static void

spdk_rpc_delete_rbd_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_rbd_delete(struct spdk_jsonrpc_request *request,

			 const struct spdk_json_val *params)

{

	struct rpc_delete_rbd req = {NULL};

	struct rpc_bdev_rbd_delete req = {NULL};

	struct spdk_bdev *bdev;



	if (spdk_json_decode_object(params, rpc_delete_rbd_decoders,

				    SPDK_COUNTOF(rpc_delete_rbd_decoders),

	if (spdk_json_decode_object(params, rpc_bdev_rbd_delete_decoders,

				    SPDK_COUNTOF(rpc_bdev_rbd_delete_decoders),

				    &req)) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");
@@ -190,9 +190,10 @@ spdk_rpc_delete_rbd_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	spdk_bdev_rbd_delete(bdev, _spdk_rpc_delete_rbd_bdev_cb, request);

	spdk_bdev_rbd_delete(bdev, _spdk_rpc_bdev_rbd_delete_cb, request);



cleanup:

	free_rpc_delete_rbd(&req);

	free_rpc_bdev_rbd_delete(&req);

}

SPDK_RPC_REGISTER("delete_rbd_bdev", spdk_rpc_delete_rbd_bdev, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_rbd_delete", spdk_rpc_bdev_rbd_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_rbd_delete, delete_rbd_bdev)

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -439,13 +439,14 @@ if __name__ == "__main__": 
    p.add_argument('block_size', help='rbd block size', type=int)

    p.set_defaults(func=bdev_rbd_create)



    def delete_rbd_bdev(args):

        rpc.bdev.delete_rbd_bdev(args.client,

    def bdev_rbd_delete(args):

        rpc.bdev.bdev_rbd_delete(args.client,

                                 name=args.name)



    p = subparsers.add_parser('delete_rbd_bdev', help='Delete a rbd bdev')

    p = subparsers.add_parser('bdev_rbd_delete', aliases=['delete_rbd_bdev'],

                              help='Delete a rbd bdev')

    p.add_argument('name', help='rbd bdev name')

    p.set_defaults(func=delete_rbd_bdev)

    p.set_defaults(func=bdev_rbd_delete)



    def bdev_delay_create(args):

        print_json(rpc.bdev.bdev_delay_create(args.client,

scripts/rpc/bdev.py

+3 −2
Original line number Diff line number Diff line
@@ -463,14 +463,15 @@ def bdev_rbd_create(client, pool_name, rbd_name, block_size, name=None, user=Non 
    return client.call('bdev_rbd_create', params)





def delete_rbd_bdev(client, name):

@deprecated_alias('delete_rbd_bdev')

def bdev_rbd_delete(client, name):

    """Remove rbd bdev from the system.



    Args:

        name: name of rbd bdev to delete

    """

    params = {'name': name}

    return client.call('delete_rbd_bdev', params)

    return client.call('bdev_rbd_delete', params)





@deprecated_alias('construct_error_bdev')