Commit 5ab0f37f authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

rpc: pass params as **kwargs in vhost_create_blk_controller 



This will make it possible for out-of-tree virtio-blk transports to pass
transport-specific options when creating controllers.

Change-Id: I862f0f8096aadb5e47bbe4c1c418aaf06691e1ac
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12818


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent e661c8e8

python/spdk/rpc/vhost.py

+4 −16
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ def vhost_scsi_controller_remove_target(client, ctrlr, scsi_target_num): 
    return client.call('vhost_scsi_controller_remove_target', params)





def vhost_create_blk_controller(

        client, ctrlr, dev_name, cpumask=None, transport=None, readonly=None, packed_ring=None, packed_ring_recovery=None):

def vhost_create_blk_controller(client, **params):

    """Create vhost BLK controller.

    Args:

        ctrlr: controller name
@@ -82,20 +81,9 @@ def vhost_create_blk_controller( 
        packed_ring: support controller packed_ring

        packed_ring_recovery: enable packed ring live recovery

    """

    params = {

        'ctrlr': ctrlr,

        'dev_name': dev_name,

    }

    if cpumask:

        params['cpumask'] = cpumask

    if transport:

        params['transport'] = transport

    if readonly:

        params['readonly'] = readonly

    if packed_ring:

        params['packed_ring'] = packed_ring

    if packed_ring_recovery:

        params['packed_ring_recovery'] = packed_ring_recovery

    strip_globals(params)

    remove_null(params)



    return client.call('vhost_create_blk_controller', params)

scripts/rpc.py

+1 −8
Original line number Diff line number Diff line
@@ -2453,14 +2453,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.set_defaults(func=vhost_scsi_controller_remove_target)



    def vhost_create_blk_controller(args):

        rpc.vhost.vhost_create_blk_controller(args.client,

                                              ctrlr=args.ctrlr,

                                              dev_name=args.dev_name,

                                              cpumask=args.cpumask,

                                              transport=args.transport,

                                              readonly=args.readonly,

                                              packed_ring=args.packed_ring,

                                              packed_ring_recovery=args.packed_ring_recovery)

        rpc.vhost.vhost_create_blk_controller(**vars(args))



    p = subparsers.add_parser('vhost_create_blk_controller', help='Add a new vhost block controller')

    p.add_argument('ctrlr', help='controller name')