From 95bfca6c8a70cf2d441b437e04cd5d2637e6b2ed Mon Sep 17 00:00:00 2001 From: Maciej Wawryk Date: Wed, 18 Sep 2019 12:36:40 +0200 Subject: [PATCH] RPC: rename set_log_print_level to log_set_print_level Signed-off-by: Maciej Wawryk Change-Id: I6d9a26274a213cbc99c36a4b85edaf02564bc262 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468686 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- doc/jsonrpc.md | 2 +- lib/log_rpc/log_rpc.c | 5 +++-- scripts/rpc.py | 9 +++++---- scripts/rpc/log.py | 5 +++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 6806ca3d3..832050d9a 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -253,7 +253,7 @@ Example response: "get_log_level", "set_log_level", "get_log_print_level", - "set_log_print_level", + "log_set_print_level", "get_iscsi_global_params", "iscsi_target_node_add_lun", "iscsi_get_connections", diff --git a/lib/log_rpc/log_rpc.c b/lib/log_rpc/log_rpc.c index dd9bab94d..fa1381033 100644 --- a/lib/log_rpc/log_rpc.c +++ b/lib/log_rpc/log_rpc.c @@ -99,7 +99,7 @@ _get_log_level_name(int level) } static void -spdk_rpc_set_log_print_level(struct spdk_jsonrpc_request *request, +spdk_rpc_log_set_print_level(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_log_level req = {}; @@ -133,8 +133,9 @@ spdk_rpc_set_log_print_level(struct spdk_jsonrpc_request *request, invalid: free_rpc_log_level(&req); } -SPDK_RPC_REGISTER("set_log_print_level", spdk_rpc_set_log_print_level, +SPDK_RPC_REGISTER("log_set_print_level", spdk_rpc_log_set_print_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_print_level, set_log_print_level) static void spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, diff --git a/scripts/rpc.py b/scripts/rpc.py index 023a519e9..be9bf834b 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1160,12 +1160,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p = subparsers.add_parser('get_log_level', help='get log level') p.set_defaults(func=get_log_level) - def set_log_print_level(args): - rpc.log.set_log_print_level(args.client, level=args.level) + def log_set_print_level(args): + rpc.log.log_set_print_level(args.client, level=args.level) - p = subparsers.add_parser('set_log_print_level', help='set log print level') + p = subparsers.add_parser('log_set_print_level', aliases=['set_log_print_level'], + help='set log print level') p.add_argument('level', help='log print level we want to set. (for example "DEBUG").') - p.set_defaults(func=set_log_print_level) + p.set_defaults(func=log_set_print_level) def get_log_print_level(args): print_dict(rpc.log.get_log_print_level(args.client)) diff --git a/scripts/rpc/log.py b/scripts/rpc/log.py index a7be567a1..c9427bf97 100644 --- a/scripts/rpc/log.py +++ b/scripts/rpc/log.py @@ -52,14 +52,15 @@ def get_log_level(client): return client.call('get_log_level') -def set_log_print_level(client, level): +@deprecated_alias('set_log_print_level') +def log_set_print_level(client, level): """Set log print level. Args: level: log print level we want to set. (for example "DEBUG") """ params = {'level': level} - return client.call('set_log_print_level', params) + return client.call('log_set_print_level', params) def get_log_print_level(client):