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

some remaining rpc: remove support for deprecated RPC names

Browse Source 
These were deprecated in 2019, it's time to remove
support for them now.

Change-Id: I7d3804a84851753992af4a3a37b60dc6de0d22cb
Signed-off-by: wanghailiangx <hailiangx.e.wang@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12780
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
wanghailiangx 2022-05-23 06:30:06 -04:00 committed by Tomasz Zawadzki
parent f552937ef4
commit 31513614a7
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/event/app.c
View File

@ -1067,7 +1067,6 @@ rpc_framework_start_init(struct spdk_jsonrpc_request *request,
spdk_subsystem_init(rpc_framework_start_init_cpl, request); spdk_subsystem_init(rpc_framework_start_init_cpl, request);
} }
SPDK_RPC_REGISTER("framework_start_init", rpc_framework_start_init, SPDK_RPC_STARTUP) SPDK_RPC_REGISTER("framework_start_init", rpc_framework_start_init, SPDK_RPC_STARTUP)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(framework_start_init, start_subsystem_init)
struct subsystem_init_poller_ctx { struct subsystem_init_poller_ctx {
struct spdk_poller *init_poller; struct spdk_poller *init_poller;
@ -1109,4 +1108,3 @@ rpc_framework_wait_init(struct spdk_jsonrpc_request *request,
} }
SPDK_RPC_REGISTER("framework_wait_init", rpc_framework_wait_init, SPDK_RPC_REGISTER("framework_wait_init", rpc_framework_wait_init,
SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(framework_wait_init, wait_subsystem_init)

2
lib/rpc/rpc.c
View File

@ -368,7 +368,6 @@ rpc_get_methods(struct spdk_jsonrpc_request *request, const struct spdk_json_val
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
} }
SPDK_RPC_REGISTER("rpc_get_methods", rpc_get_methods, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("rpc_get_methods", rpc_get_methods, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(rpc_get_methods, get_rpc_methods)
static void static void
rpc_spdk_get_version(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) rpc_spdk_get_version(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params)
@ -400,4 +399,3 @@ rpc_spdk_get_version(struct spdk_jsonrpc_request *request, const struct spdk_jso
} }
SPDK_RPC_REGISTER("spdk_get_version", rpc_spdk_get_version, SPDK_RPC_REGISTER("spdk_get_version", 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)

4
python/spdk/rpc/__init__.py
View File

@ -28,19 +28,16 @@ from . import client as rpc_client
from .helpers import deprecated_alias from .helpers import deprecated_alias
@deprecated_alias('start_subsystem_init')
def framework_start_init(client): def framework_start_init(client):
"""Start initialization of subsystems""" """Start initialization of subsystems"""
return client.call('framework_start_init') return client.call('framework_start_init')
@deprecated_alias('wait_subsystem_init')
def framework_wait_init(client): def framework_wait_init(client):
"""Block until subsystems have been initialized""" """Block until subsystems have been initialized"""
return client.call('framework_wait_init') return client.call('framework_wait_init')
@deprecated_alias("get_rpc_methods")
def rpc_get_methods(client, current=None, include_aliases=None): def rpc_get_methods(client, current=None, include_aliases=None):
"""Get list of supported RPC methods. """Get list of supported RPC methods.
Args: Args:
@ -57,7 +54,6 @@ def rpc_get_methods(client, current=None, include_aliases=None):
return client.call('rpc_get_methods', params) return client.call('rpc_get_methods', params)
@deprecated_alias("get_spdk_version")
def spdk_get_version(client): def spdk_get_version(client):
"""Get SPDK version""" """Get SPDK version"""
return client.call('spdk_get_version') return client.call('spdk_get_version')

12
scripts/rpc.py
View File

@ -58,15 +58,13 @@ if __name__ == "__main__":
def framework_start_init(args): def framework_start_init(args):
rpc.framework_start_init(args.client) rpc.framework_start_init(args.client)
p = subparsers.add_parser('framework_start_init', aliases=['start_subsystem_init'], p = subparsers.add_parser('framework_start_init', help='Start initialization of subsystems')
help='Start initialization of subsystems')
p.set_defaults(func=framework_start_init) p.set_defaults(func=framework_start_init)
def framework_wait_init(args): def framework_wait_init(args):
rpc.framework_wait_init(args.client) rpc.framework_wait_init(args.client)
p = subparsers.add_parser('framework_wait_init', aliases=['wait_subsystem_init'], p = subparsers.add_parser('framework_wait_init', help='Block until subsystems have been initialized')
help='Block until subsystems have been initialized')
p.set_defaults(func=framework_wait_init) p.set_defaults(func=framework_wait_init)
def rpc_get_methods(args): def rpc_get_methods(args):
@ -74,8 +72,7 @@ if __name__ == "__main__":
current=args.current, current=args.current,
include_aliases=args.include_aliases)) include_aliases=args.include_aliases))
p = subparsers.add_parser('rpc_get_methods', aliases=['get_rpc_methods'], p = subparsers.add_parser('rpc_get_methods', help='Get list of supported RPC methods')
help='Get list of supported RPC methods')
p.add_argument('-c', '--current', help='Get list of RPC methods only callable in the current state.', action='store_true') p.add_argument('-c', '--current', help='Get list of RPC methods only callable in the current state.', action='store_true')
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)
@ -83,8 +80,7 @@ if __name__ == "__main__":
def spdk_get_version(args): def spdk_get_version(args):
print_json(rpc.spdk_get_version(args.client)) print_json(rpc.spdk_get_version(args.client))
p = subparsers.add_parser('spdk_get_version', aliases=['get_spdk_version'], p = subparsers.add_parser('spdk_get_version', help='Get SPDK version')
help='Get SPDK version')
p.set_defaults(func=spdk_get_version) p.set_defaults(func=spdk_get_version)
def save_config(args): def save_config(args):