From 10ba9348459cc7222973aa7a1f3316ce2240f5c9 Mon Sep 17 00:00:00 2001 From: wanghailiangx Date: Sat, 7 May 2022 04:52:24 -0400 Subject: [PATCH] nbd: remove support for deprecated RPC names These were deprecated in 2019, it's time to remove support for them now. Change-Id: I6931e80c836b568dec8989dad2a7be4e112c42b4 Signed-off-by: wanghailiangx Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12577 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris --- lib/nbd/nbd_rpc.c | 3 --- python/spdk/rpc/nbd.py | 3 --- scripts/rpc.py | 6 +++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/nbd/nbd_rpc.c b/lib/nbd/nbd_rpc.c index 08e053487..e52eea3df 100644 --- a/lib/nbd/nbd_rpc.c +++ b/lib/nbd/nbd_rpc.c @@ -233,7 +233,6 @@ invalid: } SPDK_RPC_REGISTER("nbd_start_disk", rpc_nbd_start_disk, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nbd_start_disk, start_nbd_disk) struct rpc_nbd_stop_disk { char *nbd_device; @@ -337,7 +336,6 @@ out: } SPDK_RPC_REGISTER("nbd_stop_disk", rpc_nbd_stop_disk, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nbd_stop_disk, stop_nbd_disk) static void rpc_dump_nbd_info(struct spdk_json_write_ctx *w, @@ -417,4 +415,3 @@ invalid: free_rpc_nbd_get_disks(&req); } SPDK_RPC_REGISTER("nbd_get_disks", rpc_nbd_get_disks, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nbd_get_disks, get_nbd_disks) diff --git a/python/spdk/rpc/nbd.py b/python/spdk/rpc/nbd.py index 55e57d11e..10b74f6ea 100644 --- a/python/spdk/rpc/nbd.py +++ b/python/spdk/rpc/nbd.py @@ -1,7 +1,6 @@ from .helpers import deprecated_alias -@deprecated_alias('start_nbd_disk') def nbd_start_disk(client, bdev_name, nbd_device): params = { 'bdev_name': bdev_name @@ -11,13 +10,11 @@ def nbd_start_disk(client, bdev_name, nbd_device): return client.call('nbd_start_disk', params) -@deprecated_alias('stop_nbd_disk') def nbd_stop_disk(client, nbd_device): params = {'nbd_device': nbd_device} return client.call('nbd_stop_disk', params) -@deprecated_alias('get_nbd_disks') def nbd_get_disks(client, nbd_device=None): params = {} if nbd_device: diff --git a/scripts/rpc.py b/scripts/rpc.py index e895d6f0f..bd857abcd 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -2082,7 +2082,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse bdev_name=args.bdev_name, nbd_device=args.nbd_device)) - p = subparsers.add_parser('nbd_start_disk', aliases=['start_nbd_disk'], + p = subparsers.add_parser('nbd_start_disk', help='Export a bdev as an nbd disk') p.add_argument('bdev_name', help='Blockdev name to be exported. Example: Malloc0.') p.add_argument('nbd_device', help='Nbd device name to be assigned. Example: /dev/nbd0.', nargs='?') @@ -2092,7 +2092,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse rpc.nbd.nbd_stop_disk(args.client, nbd_device=args.nbd_device) - p = subparsers.add_parser('nbd_stop_disk', aliases=['stop_nbd_disk'], + p = subparsers.add_parser('nbd_stop_disk', help='Stop an nbd disk') p.add_argument('nbd_device', help='Nbd device name to be stopped. Example: /dev/nbd0.') p.set_defaults(func=nbd_stop_disk) @@ -2101,7 +2101,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse print_dict(rpc.nbd.nbd_get_disks(args.client, nbd_device=args.nbd_device)) - p = subparsers.add_parser('nbd_get_disks', aliases=['get_nbd_disks'], + p = subparsers.add_parser('nbd_get_disks', help='Display full or specified nbd device list') p.add_argument('-n', '--nbd-device', help="Path of the nbd device. Example: /dev/nbd0", required=False) p.set_defaults(func=nbd_get_disks)