Commit 31513614 authored by wanghailiangx's avatar wanghailiangx Committed by Tomasz Zawadzki
Browse files

some remaining rpc: remove support for deprecated RPC names 



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

Change-Id: I7d3804a84851753992af4a3a37b60dc6de0d22cb
Signed-off-by: default avatarwanghailiangx <hailiangx.e.wang@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12780


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent f552937e

lib/event/app.c

+0 −2
Original line number Diff line number Diff line
@@ -1067,7 +1067,6 @@ rpc_framework_start_init(struct spdk_jsonrpc_request *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_ALIAS_DEPRECATED(framework_start_init, start_subsystem_init)



struct subsystem_init_poller_ctx {

	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_STARTUP | SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(framework_wait_init, wait_subsystem_init)

lib/rpc/rpc.c

+0 −2
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ rpc_get_methods(struct spdk_jsonrpc_request *request, const struct spdk_json_val 
	spdk_jsonrpc_end_result(request, w);

}

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

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_STARTUP | SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(spdk_get_version, get_spdk_version)

python/spdk/rpc/__init__.py

+0 −4
Original line number Diff line number Diff line
@@ -28,19 +28,16 @@ from . import client as rpc_client 
from .helpers import deprecated_alias





@deprecated_alias('start_subsystem_init')

def framework_start_init(client):

    """Start initialization of subsystems"""

    return client.call('framework_start_init')





@deprecated_alias('wait_subsystem_init')

def framework_wait_init(client):

    """Block until subsystems have been initialized"""

    return client.call('framework_wait_init')





@deprecated_alias("get_rpc_methods")

def rpc_get_methods(client, current=None, include_aliases=None):

    """Get list of supported RPC methods.

    Args:
@@ -57,7 +54,6 @@ def rpc_get_methods(client, current=None, include_aliases=None): 
    return client.call('rpc_get_methods', params)





@deprecated_alias("get_spdk_version")

def spdk_get_version(client):

    """Get SPDK version"""

    return client.call('spdk_get_version')

scripts/rpc.py

+4 −8
Original line number Diff line number Diff line
@@ -58,15 +58,13 @@ if __name__ == "__main__": 
    def framework_start_init(args):

        rpc.framework_start_init(args.client)



    p = subparsers.add_parser('framework_start_init', aliases=['start_subsystem_init'],

                              help='Start initialization of subsystems')

    p = subparsers.add_parser('framework_start_init', help='Start initialization of subsystems')

    p.set_defaults(func=framework_start_init)



    def framework_wait_init(args):

        rpc.framework_wait_init(args.client)



    p = subparsers.add_parser('framework_wait_init', aliases=['wait_subsystem_init'],

                              help='Block until subsystems have been initialized')

    p = subparsers.add_parser('framework_wait_init', help='Block until subsystems have been initialized')

    p.set_defaults(func=framework_wait_init)



    def rpc_get_methods(args):
@@ -74,8 +72,7 @@ if __name__ == "__main__": 
                                       current=args.current,

                                       include_aliases=args.include_aliases))



    p = subparsers.add_parser('rpc_get_methods', aliases=['get_rpc_methods'],

                              help='Get list of supported RPC methods')

    p = subparsers.add_parser('rpc_get_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('-i', '--include-aliases', help='include RPC aliases', action='store_true')

    p.set_defaults(func=rpc_get_methods)
@@ -83,8 +80,7 @@ if __name__ == "__main__": 
    def spdk_get_version(args):

        print_json(rpc.spdk_get_version(args.client))



    p = subparsers.add_parser('spdk_get_version', aliases=['get_spdk_version'],

                              help='Get SPDK version')

    p = subparsers.add_parser('spdk_get_version', help='Get SPDK version')

    p.set_defaults(func=spdk_get_version)



    def save_config(args):