Commit 6b6dfea6 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

rpc: Rename get_spdk_version to spdk_get_version 



Change-Id: I4695c79760d176907ee1424babdc506f75ac17cf
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468903


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 3402bfbd

doc/jsonrpc.md

+2 −2
Original line number Diff line number Diff line
@@ -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"

}

~~

lib/rpc/rpc.c

+4 −3
Original line number Diff line number Diff line
@@ -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)

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -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,

scripts/rpc/__init__.py

+3 −2
Original line number Diff line number Diff line
@@ -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):