Commit dd04b4de authored by Eugene Kobyak's avatar Eugene Kobyak Committed by Tomasz Zawadzki
Browse files

python/rpc: Fix bdev_rbd rpc's parameters. 



All python rpc parameters should reflect actual name of parameters in C
structures. This is required for future auto-generation Python rpc
functions.

Change-Id: I768a28c3629501eb3aa9ecc286bffdf0e1c3c86a
Signed-off-by: default avatarEugene Kobyak <eugene.kobyak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21788


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent d4e2f295

python/spdk/rpc/bdev.py

+8 −8
Original line number Diff line number Diff line
@@ -1173,12 +1173,12 @@ def bdev_zone_block_delete(client, name): 
    return client.call('bdev_zone_block_delete', params)





def bdev_rbd_register_cluster(client, name, user=None, config_param=None, config_file=None, key_file=None, core_mask=None):

def bdev_rbd_register_cluster(client, name, user_id=None, config_param=None, config_file=None, key_file=None, core_mask=None):

    """Create a Rados Cluster object of the Ceph RBD backend.



    Args:

        name: name of Rados Cluster

        user: Ceph user name (optional)

        user_id: Ceph user name (optional)

        config_param: map of config keys to values (optional)

        config_file: file path of Ceph configuration file (optional)

        key_file: file path of Ceph key file (optional)
@@ -1189,8 +1189,8 @@ def bdev_rbd_register_cluster(client, name, user=None, config_param=None, config 
    """

    params = {'name': name}



    if user is not None:

        params['user_id'] = user

    if user_id is not None:

        params['user_id'] = user_id

    if config_param is not None:

        params['config_param'] = config_param

    if config_file is not None:
@@ -1228,7 +1228,7 @@ def bdev_rbd_get_clusters_info(client, name): 
    return client.call('bdev_rbd_get_clusters_info', params)





def bdev_rbd_create(client, pool_name, rbd_name, block_size, name=None, user=None, config=None, cluster_name=None, uuid=None):

def bdev_rbd_create(client, pool_name, rbd_name, block_size, name=None, user_id=None, config=None, cluster_name=None, uuid=None):

    """Create a Ceph RBD block device.



    Args:
@@ -1236,7 +1236,7 @@ def bdev_rbd_create(client, pool_name, rbd_name, block_size, name=None, user=Non 
        rbd_name: Ceph RBD image name

        block_size: block size of RBD volume

        name: name of block device (optional)

        user: Ceph user name (optional)

        user_id: Ceph user name (optional)

        config: map of config keys to values (optional)

        cluster_name: Name to identify Rados cluster (optional)

        uuid: UUID of block device (optional)
@@ -1252,8 +1252,8 @@ def bdev_rbd_create(client, pool_name, rbd_name, block_size, name=None, user=Non 


    if name:

        params['name'] = name

    if user is not None:

        params['user_id'] = user

    if user_id is not None:

        params['user_id'] = user_id

    if config is not None:

        params['config'] = config

    if cluster_name is not None:

scripts/rpc.py

+2 −2
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ if __name__ == "__main__": 
                config_param[parts[0]] = parts[1]

        print_json(rpc.bdev.bdev_rbd_register_cluster(args.client,

                                                      name=args.name,

                                                      user=args.user,

                                                      user_id=args.user,

                                                      config_param=config_param,

                                                      config_file=args.config_file,

                                                      key_file=args.key_file,
@@ -1045,7 +1045,7 @@ if __name__ == "__main__": 
                config[parts[0]] = parts[1]

        print_json(rpc.bdev.bdev_rbd_create(args.client,

                                            name=args.name,

                                            user=args.user,

                                            user_id=args.user,

                                            config=config,

                                            pool_name=args.pool_name,

                                            rbd_name=args.rbd_name,