From 6b6dfea6c704a049e553024aa7e44ae916948e20 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Thu, 19 Sep 2019 17:32:01 -0400 Subject: [PATCH] rpc: Rename get_spdk_version to spdk_get_version Change-Id: I4695c79760d176907ee1424babdc506f75ac17cf Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468903 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Paul Luse Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- doc/jsonrpc.md | 4 ++-- lib/rpc/rpc.c | 7 ++++--- scripts/rpc.py | 9 +++++---- scripts/rpc/__init__.py | 5 +++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index af2570d4c..c0b298ab8 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -5782,7 +5782,7 @@ Example response: } ~~~ -## get_spdk_version {#rpc_get_spdk_version} +## spdk_get_version {#rpc_spdk_get_version} Get the version info of the running SPDK application. @@ -5801,7 +5801,7 @@ Example request: { "jsonrpc": "2.0", "id": 1, - "method": "get_spdk_version" + "method": "spdk_get_version" } ~~ diff --git a/lib/rpc/rpc.c b/lib/rpc/rpc.c index 2f323eddc..1fac2b5e5 100644 --- a/lib/rpc/rpc.c +++ b/lib/rpc/rpc.c @@ -386,13 +386,13 @@ SPDK_RPC_REGISTER("rpc_get_methods", spdk_rpc_get_methods, SPDK_RPC_STARTUP | SP SPDK_RPC_REGISTER_ALIAS_DEPRECATED(rpc_get_methods, get_rpc_methods) static void -spdk_rpc_get_spdk_version(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) +spdk_rpc_spdk_get_version(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_json_write_ctx *w; if (params != NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, - "get_spdk_version method requires no parameters"); + "spdk_get_version method requires no parameters"); return; } @@ -410,5 +410,6 @@ spdk_rpc_get_spdk_version(struct spdk_jsonrpc_request *request, const struct spd spdk_json_write_object_end(w); spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("get_spdk_version", spdk_rpc_get_spdk_version, +SPDK_RPC_REGISTER("spdk_get_version", spdk_rpc_spdk_get_version, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(spdk_get_version, get_spdk_version) diff --git a/scripts/rpc.py b/scripts/rpc.py index ef90c1d40..776354c11 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -62,11 +62,12 @@ if __name__ == "__main__": p.add_argument('-i', '--include-aliases', help='include RPC aliases', action='store_true') p.set_defaults(func=rpc_get_methods) - def get_spdk_version(args): - print_json(rpc.get_spdk_version(args.client)) + def spdk_get_version(args): + print_json(rpc.spdk_get_version(args.client)) - p = subparsers.add_parser('get_spdk_version', help='Get SPDK version') - p.set_defaults(func=get_spdk_version) + p = subparsers.add_parser('spdk_get_version', aliases=['get_spdk_version'], + help='Get SPDK version') + p.set_defaults(func=spdk_get_version) def save_config(args): rpc.save_config(args.client, diff --git a/scripts/rpc/__init__.py b/scripts/rpc/__init__.py index 25a6d7f85..fadfd6ead 100644 --- a/scripts/rpc/__init__.py +++ b/scripts/rpc/__init__.py @@ -48,9 +48,10 @@ def rpc_get_methods(client, current=None, include_aliases=None): return client.call('rpc_get_methods', params) -def get_spdk_version(client): +@deprecated_alias("get_spdk_version") +def spdk_get_version(client): """Get SPDK version""" - return client.call('get_spdk_version') + return client.call('spdk_get_version') def _json_dump(config, fd, indent):