ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: Rename get_spdk_version to spdk_get_version

Browse Source 
Change-Id: I4695c79760d176907ee1424babdc506f75ac17cf
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468903
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Pawel Kaminski 2019-09-19 17:32:01 -04:00 committed by Jim Harris
parent 3402bfbd7c
commit 6b6dfea6c7
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/jsonrpc.md
View File

@ -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. Get the version info of the running SPDK application.
@ -5801,7 +5801,7 @@ Example request:
{ {
"jsonrpc": "2.0", "jsonrpc": "2.0",
"id": 1, "id": 1,
"method": "get_spdk_version" "method": "spdk_get_version"
} }
~~ ~~

7
lib/rpc/rpc.c
View File

@ -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) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(rpc_get_methods, get_rpc_methods)
static void 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; struct spdk_json_write_ctx *w;
if (params != NULL) { if (params != NULL) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, 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; 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_json_write_object_end(w);
spdk_jsonrpc_end_result(request, 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_STARTUP | SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(spdk_get_version, get_spdk_version)

9
scripts/rpc.py
View File

@ -62,11 +62,12 @@ if __name__ == "__main__":
p.add_argument('-i', '--include-aliases', help='include RPC aliases', action='store_true') p.add_argument('-i', '--include-aliases', help='include RPC aliases', action='store_true')
p.set_defaults(func=rpc_get_methods) p.set_defaults(func=rpc_get_methods)
def get_spdk_version(args): def spdk_get_version(args):
print_json(rpc.get_spdk_version(args.client)) print_json(rpc.spdk_get_version(args.client))
p = subparsers.add_parser('get_spdk_version', help='Get SPDK version') p = subparsers.add_parser('spdk_get_version', aliases=['get_spdk_version'],
p.set_defaults(func=get_spdk_version) help='Get SPDK version')
p.set_defaults(func=spdk_get_version)
def save_config(args): def save_config(args):
rpc.save_config(args.client, rpc.save_config(args.client,

5
scripts/rpc/__init__.py
View File

@ -48,9 +48,10 @@ def rpc_get_methods(client, current=None, include_aliases=None):
return client.call('rpc_get_methods', params) 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""" """Get SPDK version"""
return client.call('get_spdk_version') return client.call('spdk_get_version')
def _json_dump(config, fd, indent): def _json_dump(config, fd, indent):