diff --git a/lib/init/subsystem_rpc.c b/lib/init/subsystem_rpc.c index 22b09aa99..69a585723 100644 --- a/lib/init/subsystem_rpc.c +++ b/lib/init/subsystem_rpc.c @@ -79,7 +79,6 @@ rpc_framework_get_subsystems(struct spdk_jsonrpc_request *request, } SPDK_RPC_REGISTER("framework_get_subsystems", rpc_framework_get_subsystems, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(framework_get_subsystems, get_subsystems) struct rpc_framework_get_config_ctx { char *name; @@ -119,7 +118,6 @@ rpc_framework_get_config(struct spdk_jsonrpc_request *request, } SPDK_RPC_REGISTER("framework_get_config", rpc_framework_get_config, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(framework_get_config, get_subsystem_config) static void dump_pci_device(void *ctx, struct spdk_pci_device *dev) diff --git a/python/spdk/rpc/subsystem.py b/python/spdk/rpc/subsystem.py index fe948913c..5717ce554 100644 --- a/python/spdk/rpc/subsystem.py +++ b/python/spdk/rpc/subsystem.py @@ -1,12 +1,10 @@ from .helpers import deprecated_alias -@deprecated_alias('get_subsystems') def framework_get_subsystems(client): return client.call('framework_get_subsystems') -@deprecated_alias('get_subsystem_config') def framework_get_config(client, name): params = {'name': name} return client.call('framework_get_config', params) diff --git a/scripts/rpc.py b/scripts/rpc.py index cdada89ee..d91a12e64 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -2392,7 +2392,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def framework_get_subsystems(args): print_dict(rpc.subsystem.framework_get_subsystems(args.client)) - p = subparsers.add_parser('framework_get_subsystems', aliases=['get_subsystems'], + p = subparsers.add_parser('framework_get_subsystems', help="""Print subsystems array in initialization order. Each subsystem entry contain (unsorted) array of subsystems it depends on.""") p.set_defaults(func=framework_get_subsystems) @@ -2400,8 +2400,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def framework_get_config(args): print_dict(rpc.subsystem.framework_get_config(args.client, args.name)) - p = subparsers.add_parser('framework_get_config', aliases=['get_subsystem_config'], - help="""Print subsystem configuration""") + p = subparsers.add_parser('framework_get_config', help="""Print subsystem configuration""") p.add_argument('name', help='Name of subsystem to query') p.set_defaults(func=framework_get_config)