diff --git a/module/bdev/malloc/bdev_malloc_rpc.c b/module/bdev/malloc/bdev_malloc_rpc.c index 88010c6b9..5ce35c2fd 100644 --- a/module/bdev/malloc/bdev_malloc_rpc.c +++ b/module/bdev/malloc/bdev_malloc_rpc.c @@ -115,7 +115,6 @@ cleanup: free_rpc_construct_malloc(&req); } SPDK_RPC_REGISTER("bdev_malloc_create", rpc_bdev_malloc_create, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_malloc_create, construct_malloc_bdev) struct rpc_delete_malloc { char *name; @@ -164,4 +163,3 @@ cleanup: free_rpc_delete_malloc(&req); } SPDK_RPC_REGISTER("bdev_malloc_delete", rpc_bdev_malloc_delete, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_malloc_delete, delete_malloc_bdev) diff --git a/module/bdev/null/bdev_null_rpc.c b/module/bdev/null/bdev_null_rpc.c index a4fab9d5f..f2da9c8dc 100644 --- a/module/bdev/null/bdev_null_rpc.c +++ b/module/bdev/null/bdev_null_rpc.c @@ -150,7 +150,6 @@ cleanup: free_rpc_construct_null(&req); } SPDK_RPC_REGISTER("bdev_null_create", rpc_bdev_null_create, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_null_create, construct_null_bdev) struct rpc_delete_null { char *name; @@ -202,7 +201,6 @@ cleanup: free_rpc_delete_null(&req); } SPDK_RPC_REGISTER("bdev_null_delete", rpc_bdev_null_delete, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_null_delete, delete_null_bdev) struct rpc_bdev_null_resize { char *name; diff --git a/python/spdk/rpc/bdev.py b/python/spdk/rpc/bdev.py index 0c54a071d..e7ae7c7e3 100644 --- a/python/spdk/rpc/bdev.py +++ b/python/spdk/rpc/bdev.py @@ -242,7 +242,6 @@ def bdev_ocf_set_seqcutoff(client, name, policy, threshold, promotion_count): return client.call('bdev_ocf_set_seqcutoff', params) -@deprecated_alias('construct_malloc_bdev') def bdev_malloc_create(client, num_blocks, block_size, name=None, uuid=None, optimal_io_boundary=None): """Construct a malloc block device. @@ -266,7 +265,6 @@ def bdev_malloc_create(client, num_blocks, block_size, name=None, uuid=None, opt return client.call('bdev_malloc_create', params) -@deprecated_alias('delete_malloc_bdev') def bdev_malloc_delete(client, name): """Delete malloc block device. @@ -277,7 +275,6 @@ def bdev_malloc_delete(client, name): return client.call('bdev_malloc_delete', params) -@deprecated_alias('construct_null_bdev') def bdev_null_create(client, num_blocks, block_size, name, uuid=None, md_size=None, dif_type=None, dif_is_head_of_md=None): """Construct a null block device. @@ -307,7 +304,6 @@ def bdev_null_create(client, num_blocks, block_size, name, uuid=None, md_size=No return client.call('bdev_null_create', params) -@deprecated_alias('delete_null_bdev') def bdev_null_delete(client, name): """Remove null bdev from the system. diff --git a/scripts/rpc.py b/scripts/rpc.py index 9b2c84e57..cb3233b6d 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -369,8 +369,7 @@ if __name__ == "__main__": name=args.name, uuid=args.uuid, optimal_io_boundary=args.optimal_io_boundary)) - p = subparsers.add_parser('bdev_malloc_create', aliases=['construct_malloc_bdev'], - help='Create a bdev with malloc backend') + p = subparsers.add_parser('bdev_malloc_create', help='Create a bdev with malloc backend') p.add_argument('-b', '--name', help="Name of the bdev") p.add_argument('-u', '--uuid', help="UUID of the bdev") p.add_argument( @@ -384,8 +383,7 @@ if __name__ == "__main__": rpc.bdev.bdev_malloc_delete(args.client, name=args.name) - p = subparsers.add_parser('bdev_malloc_delete', aliases=['delete_malloc_bdev'], - help='Delete a malloc disk') + p = subparsers.add_parser('bdev_malloc_delete', help='Delete a malloc disk') p.add_argument('name', help='malloc bdev name') p.set_defaults(func=bdev_malloc_delete) @@ -403,8 +401,7 @@ if __name__ == "__main__": dif_type=args.dif_type, dif_is_head_of_md=args.dif_is_head_of_md)) - p = subparsers.add_parser('bdev_null_create', aliases=['construct_null_bdev'], - help='Add a bdev with null backend') + p = subparsers.add_parser('bdev_null_create', help='Add a bdev with null backend') p.add_argument('name', help='Block device name') p.add_argument('-u', '--uuid', help='UUID of the bdev') p.add_argument('total_size', help='Size of null bdev in MB (int > 0). Includes only data blocks.', type=int) @@ -423,8 +420,7 @@ if __name__ == "__main__": rpc.bdev.bdev_null_delete(args.client, name=args.name) - p = subparsers.add_parser('bdev_null_delete', aliases=['delete_null_bdev'], - help='Delete a null bdev') + p = subparsers.add_parser('bdev_null_delete', help='Delete a null bdev') p.add_argument('name', help='null bdev name') p.set_defaults(func=bdev_null_delete) diff --git a/test/external_code/hello_world/bdev.json b/test/external_code/hello_world/bdev.json index bf582f198..abff431da 100644 --- a/test/external_code/hello_world/bdev.json +++ b/test/external_code/hello_world/bdev.json @@ -9,7 +9,7 @@ "block_size": 4096, "num_blocks": 32 }, - "method": "construct_malloc_bdev" + "method": "bdev_malloc_create" } ] } diff --git a/test/external_code/hello_world/bdev_external.json b/test/external_code/hello_world/bdev_external.json index dc84cd7a7..a22c23f87 100644 --- a/test/external_code/hello_world/bdev_external.json +++ b/test/external_code/hello_world/bdev_external.json @@ -9,7 +9,7 @@ "block_size": 4096, "num_blocks": 32 }, - "method": "construct_malloc_bdev" + "method": "bdev_malloc_create" }, { "params": { diff --git a/test/json_config/alias_rpc/alias_rpc.sh b/test/json_config/alias_rpc/alias_rpc.sh index 25e07fae4..81f8dd71e 100755 --- a/test/json_config/alias_rpc/alias_rpc.sh +++ b/test/json_config/alias_rpc/alias_rpc.sh @@ -13,8 +13,4 @@ waitforlisten $spdk_tgt_pid # Test deprecated rpcs in json $rootdir/scripts/rpc.py load_config -i < $testdir/conf.json -# Test deprecated rpcs in rpc.py -$rootdir/scripts/rpc.py delete_malloc_bdev "Malloc0" -$rootdir/scripts/rpc.py delete_malloc_bdev "Malloc1" - killprocess $spdk_tgt_pid diff --git a/test/json_config/alias_rpc/conf.json b/test/json_config/alias_rpc/conf.json index ba3e6b254..7352eb9f5 100644 --- a/test/json_config/alias_rpc/conf.json +++ b/test/json_config/alias_rpc/conf.json @@ -20,7 +20,7 @@ "block_size": 4096, "num_blocks": 32 }, - "method": "construct_malloc_bdev" + "method": "bdev_malloc_create" }, { "params": { @@ -28,7 +28,7 @@ "block_size": 4096, "num_blocks": 32 }, - "method": "construct_malloc_bdev" + "method": "bdev_malloc_create" } ] }, diff --git a/test/lvol/basic.sh b/test/lvol/basic.sh index dff4eb3c7..eb448fbfd 100755 --- a/test/lvol/basic.sh +++ b/test/lvol/basic.sh @@ -71,18 +71,18 @@ function test_construct_two_lvs_on_the_same_bdev() { # try to create two lvs with conflicting aliases function test_construct_lvs_conflict_alias() { # create first bdev and lvs - malloc1_name=$(rpc_cmd construct_malloc_bdev $MALLOC_SIZE_MB $MALLOC_BS) + malloc1_name=$(rpc_cmd bdev_malloc_create $MALLOC_SIZE_MB $MALLOC_BS) lvs1_uuid=$(rpc_cmd construct_lvol_store "$malloc1_name" lvs_test) # create second bdev and lvs with the same name as previously - malloc2_name=$(rpc_cmd construct_malloc_bdev $MALLOC_SIZE_MB $MALLOC_BS) + malloc2_name=$(rpc_cmd bdev_malloc_create $MALLOC_SIZE_MB $MALLOC_BS) rpc_cmd construct_lvol_store "$malloc2_name" lvs_test && false # clean up rpc_cmd destroy_lvol_store -u "$lvs1_uuid" rpc_cmd get_lvol_stores -u "$lvs1_uuid" && false - rpc_cmd delete_malloc_bdev "$malloc1_name" - rpc_cmd delete_malloc_bdev "$malloc2_name" + rpc_cmd bdev_malloc_delete "$malloc1_name" + rpc_cmd bdev_malloc_delete "$malloc2_name" check_leftover_devices }