Commit 642f8b3d authored by Jaroslaw Chachulski's avatar Jaroslaw Chachulski Committed by Tomasz Zawadzki
Browse files

scripts/rpc: remove default values from bdev functions 



Removing default options from parser command to prevent overwrite by
argparse the defaults defined in the .c files.

Signed-off-by: default avatarJaroslaw Chachulski <jaroslawx.chachulski@intel.com>
Change-Id: I39026e0866f2a9aecda6588bb3f91ed87676ddd1
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13461


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent cd79f1a2

python/spdk/rpc/bdev.py

+7 −2
Original line number Diff line number Diff line
@@ -54,7 +54,10 @@ def bdev_compress_create(client, base_bdev_name, pm_path, lb_size): 
    Returns:

        Name of created virtual block device.

    """

    params = {'base_bdev_name': base_bdev_name, 'pm_path': pm_path, 'lb_size': lb_size}

    params = {'base_bdev_name': base_bdev_name, 'pm_path': pm_path}



    if lb_size:

        params['lb_size'] = lb_size



    return client.call('bdev_compress_create', params)
@@ -1391,9 +1394,11 @@ def bdev_error_inject_error(client, name, io_type, error_type, num=1): 
        'name': name,

        'io_type': io_type,

        'error_type': error_type,

        'num': num,

    }



    if num:

        params['num'] = num



    return client.call('bdev_error_inject_error', params)

scripts/rpc.py

+8 −8
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ if __name__ == "__main__": 
    p = subparsers.add_parser('bdev_compress_create', help='Add a compress vbdev')

    p.add_argument('-b', '--base-bdev-name', help="Name of the base bdev")

    p.add_argument('-p', '--pm-path', help="Path to persistent memory")

    p.add_argument('-l', '--lb-size', help="Compressed vol logical block size (optional, if used must be 512 or 4096)", type=int, default=0)

    p.add_argument('-l', '--lb-size', help="Compressed vol logical block size (optional, if used must be 512 or 4096)", type=int)

    p.set_defaults(func=bdev_compress_create)



    def bdev_compress_delete(args):
@@ -264,7 +264,7 @@ if __name__ == "__main__": 
    p.add_argument('name', help="Name of the crypto vbdev")

    p.add_argument('crypto_pmd', help="Name of the crypto device driver")

    p.add_argument('key', help="Key")

    p.add_argument('-c', '--cipher', help="cipher to use, AES_CBC or AES_XTS (QAT only)", default="AES_CBC")

    p.add_argument('-c', '--cipher', help="cipher to use, AES_CBC or AES_XTS (QAT only)")

    p.add_argument('-k2', '--key2', help="2nd key for cipher AET_XTS", default=None)

    p.set_defaults(func=bdev_crypto_create)
@@ -316,7 +316,7 @@ if __name__ == "__main__": 
        print_dict(rpc.bdev.bdev_ocf_get_bdevs(args.client,

                                               name=args.name))

    p = subparsers.add_parser('bdev_ocf_get_bdevs', help='Get list of OCF devices including unregistered ones')

    p.add_argument('name', nargs='?', default=None, help='name of OCF vbdev or name of cache device or name of core device (optional)')

    p.add_argument('name', nargs='?', help='name of OCF vbdev or name of cache device or name of core device (optional)')

    p.set_defaults(func=bdev_ocf_get_bdevs)



    def bdev_ocf_set_cache_mode(args):
@@ -394,7 +394,7 @@ if __name__ == "__main__": 
                                      'Should be a sum of block size and metadata size if --md-size is used.', type=int)

    p.add_argument('-m', '--md-size', type=int,

                   help='Metadata size for this bdev. Default=0.')

    p.add_argument('-t', '--dif-type', type=int, default=0, choices=[0, 1, 2, 3],

    p.add_argument('-t', '--dif-type', type=int, choices=[0, 1, 2, 3],

                   help='Protection information type. Parameter --md-size needs'

                        'to be set along --dif-type. Default=0 - no protection.')

    p.add_argument('-d', '--dif-is-head-of-md', action='store_true',
@@ -429,7 +429,7 @@ if __name__ == "__main__": 
    p = subparsers.add_parser('bdev_aio_create', help='Add a bdev with aio backend')

    p.add_argument('filename', help='Path to device or file (ex: /dev/sda)')

    p.add_argument('name', help='Block device name')

    p.add_argument('block_size', help='Block size for this bdev', type=int, nargs='?', default=0)

    p.add_argument('block_size', help='Block size for this bdev', type=int, nargs='?')

    p.set_defaults(func=bdev_aio_create)



    def bdev_aio_rescan(args):
@@ -457,7 +457,7 @@ if __name__ == "__main__": 
    p = subparsers.add_parser('bdev_uring_create', help='Create a bdev with io_uring backend')

    p.add_argument('filename', help='Path to device or file (ex: /dev/nvme0n1)')

    p.add_argument('name', help='bdev name')

    p.add_argument('block_size', help='Block size for this bdev', type=int, nargs='?', default=0)

    p.add_argument('block_size', help='Block size for this bdev', type=int, nargs='?')

    p.set_defaults(func=bdev_uring_create)



    def bdev_uring_delete(args):
@@ -519,7 +519,7 @@ if __name__ == "__main__": 
                   help='The number of requests allocated for each NVMe I/O queue. Default: 512', type=int)

    p.add_argument('-d', '--disable-delay-cmd-submit',

                   help='Disable delaying NVMe command submission, i.e. no batching of multiple commands',

                   action='store_false', dest='delay_cmd_submit', default=True)

                   action='store_false', dest='delay_cmd_submit')

    p.add_argument('-c', '--transport-retry-count',

                   help='the number of attempts per I/O in the transport layer when an I/O fails.', type=int)

    p.add_argument('-r', '--bdev-retry-count',
@@ -1123,7 +1123,7 @@ if __name__ == "__main__": 
    p.add_argument('io_type', help="""io_type: 'clear' 'read' 'write' 'unmap' 'flush' 'all'""")

    p.add_argument('error_type', help="""error_type: 'failure' 'pending'""")

    p.add_argument(

        '-n', '--num', help='the number of commands you want to fail', type=int, default=1)

        '-n', '--num', help='the number of commands you want to fail', type=int)

    p.set_defaults(func=bdev_error_inject_error)



    def bdev_nvme_apply_firmware(args):