diff --git a/module/bdev/iscsi/bdev_iscsi_rpc.c b/module/bdev/iscsi/bdev_iscsi_rpc.c index e5619ccaa..d714f6933 100644 --- a/module/bdev/iscsi/bdev_iscsi_rpc.c +++ b/module/bdev/iscsi/bdev_iscsi_rpc.c @@ -102,7 +102,6 @@ cleanup: free_rpc_bdev_iscsi_create(&req); } SPDK_RPC_REGISTER("bdev_iscsi_create", rpc_bdev_iscsi_create, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_iscsi_create, construct_iscsi_bdev) struct rpc_delete_iscsi { char *name; @@ -150,4 +149,3 @@ cleanup: free_rpc_delete_iscsi(&req); } SPDK_RPC_REGISTER("bdev_iscsi_delete", rpc_bdev_iscsi_delete, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_iscsi_delete, delete_iscsi_bdev) diff --git a/python/spdk/rpc/bdev.py b/python/spdk/rpc/bdev.py index e7ae7c7e3..4ebb5bf40 100644 --- a/python/spdk/rpc/bdev.py +++ b/python/spdk/rpc/bdev.py @@ -1107,7 +1107,6 @@ def bdev_error_delete(client, name): return client.call('bdev_error_delete', params) -@deprecated_alias('construct_iscsi_bdev') def bdev_iscsi_create(client, name, url, initiator_iqn): """Construct an iSCSI block device. @@ -1127,7 +1126,6 @@ def bdev_iscsi_create(client, name, url, initiator_iqn): return client.call('bdev_iscsi_create', params) -@deprecated_alias('delete_iscsi_bdev') def bdev_iscsi_delete(client, name): """Remove iSCSI bdev from the system. diff --git a/scripts/rpc.py b/scripts/rpc.py index 9d98dff16..af65e7f22 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1006,7 +1006,7 @@ if __name__ == "__main__": url=args.url, initiator_iqn=args.initiator_iqn)) - p = subparsers.add_parser('bdev_iscsi_create', aliases=['construct_iscsi_bdev'], + p = subparsers.add_parser('bdev_iscsi_create', help='Add bdev with iSCSI initiator backend') p.add_argument('-b', '--name', help="Name of the bdev", required=True) p.add_argument('-i', '--initiator-iqn', help="Initiator IQN", required=True) @@ -1017,8 +1017,7 @@ if __name__ == "__main__": rpc.bdev.bdev_iscsi_delete(args.client, name=args.name) - p = subparsers.add_parser('bdev_iscsi_delete', aliases=['delete_iscsi_bdev'], - help='Delete an iSCSI bdev') + p = subparsers.add_parser('bdev_iscsi_delete', help='Delete an iSCSI bdev') p.add_argument('name', help='iSCSI bdev name') p.set_defaults(func=bdev_iscsi_delete)