Commit 21aade7a authored by GangCao's avatar GangCao Committed by Daniel Verkamp
Browse files

bdev: update the get_bdevs RPC method with optional parameter 



Change-Id: I2a1c148deed1d6378eaf848d33b0f28cfeb1b65a
Signed-off-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-on: https://review.gerrithub.io/375274


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent a64e3767

lib/bdev/rpc/bdev_rpc.c

+98 −48
Original line number Diff line number Diff line
@@ -37,26 +37,9 @@ 
#include "spdk_internal/bdev.h"



static void

spdk_rpc_get_bdevs(struct spdk_jsonrpc_request *request,

		   const struct spdk_json_val *params)

spdk_rpc_dump_bdev_info(struct spdk_json_write_ctx *w,

			struct spdk_bdev *bdev)

{

	struct spdk_json_write_ctx *w;

	struct spdk_bdev *bdev;



	if (params != NULL) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "get_bdevs requires no parameters");

		return;

	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_array_begin(w);



	for (bdev = spdk_bdev_first(); bdev != NULL; bdev = spdk_bdev_next(bdev)) {

	spdk_json_write_object_begin(w);



	spdk_json_write_name(w, "name");
@@ -101,9 +84,76 @@ spdk_rpc_get_bdevs(struct spdk_jsonrpc_request *request, 


	spdk_json_write_object_end(w);

}



struct rpc_get_bdevs {

	char *name;

};



static void

free_rpc_get_bdevs(struct rpc_get_bdevs *r)

{

	free(r->name);

}



static const struct spdk_json_object_decoder rpc_get_bdevs_decoders[] = {

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

};



static void

spdk_rpc_get_bdevs(struct spdk_jsonrpc_request *request,

		   const struct spdk_json_val *params)

{

	struct rpc_get_bdevs req = {};

	struct spdk_json_write_ctx *w;

	struct spdk_bdev *bdev = NULL;



	if (params != NULL) {

		if (spdk_json_decode_object(params, rpc_get_bdevs_decoders,

					    sizeof(rpc_get_bdevs_decoders) / sizeof(*rpc_get_bdevs_decoders),

					    &req)) {

			SPDK_ERRLOG("spdk_json_decode_object failed\n");

			goto invalid;

		} else {

			if (req.name == NULL) {

				SPDK_ERRLOG("missing name param\n");

				goto invalid;

			}



			bdev = spdk_bdev_get_by_name(req.name);

			if (bdev == NULL) {

				SPDK_ERRLOG("bdev '%s' does not exist\n", req.name);

				goto invalid;

			}



			free_rpc_get_bdevs(&req);

		}

	}



	w = spdk_jsonrpc_begin_result(request);

	if (w == NULL) {

		return;

	}



	spdk_json_write_array_begin(w);



	if (bdev != NULL) {

		spdk_rpc_dump_bdev_info(w, bdev);

	} else {

		for (bdev = spdk_bdev_first(); bdev != NULL; bdev = spdk_bdev_next(bdev)) {

			spdk_rpc_dump_bdev_info(w, bdev);

		}

	}



	spdk_json_write_array_end(w);



	spdk_jsonrpc_end_result(request, w);



	return;



invalid:

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");



	free_rpc_get_bdevs(&req);

}

SPDK_RPC_REGISTER("get_bdevs", spdk_rpc_get_bdevs)

scripts/rpc.py

+7 −2
Original line number Diff line number Diff line
@@ -377,10 +377,15 @@ def get_interfaces(args): 
p = subparsers.add_parser('get_interfaces', help='Display current interface list')

p.set_defaults(func=get_interfaces)





def get_bdevs(args):

    print_dict(jsonrpc_call('get_bdevs'))

    params = {}

    if args.name:

        params['name'] = args.name

    print_dict(jsonrpc_call('get_bdevs', params))



p = subparsers.add_parser('get_bdevs', help='Display current blockdev list')

p = subparsers.add_parser('get_bdevs', help='Display current blockdev list or required blockdev')

p.add_argument('-b', '--name', help="Name of the Blockdev. Example: Nvme0n1", required=False)

p.set_defaults(func=get_bdevs)