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

bdev_malloc and bdev_null : remove support for deprecated RPC names 



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

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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 95c589e6

module/bdev/malloc/bdev_malloc_rpc.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

module/bdev/null/bdev_null_rpc.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

python/spdk/rpc/bdev.py

+0 −4
Original line number Diff line number Diff line
@@ -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.

scripts/rpc.py

+4 −8
Original line number Diff line number Diff line
@@ -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)

test/external_code/hello_world/bdev.json

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
            "block_size": 4096,

            "num_blocks": 32

          },

          "method": "construct_malloc_bdev"

          "method": "bdev_malloc_create"

        }

      ]

    }