Commit 96dc91d6 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

scripts/rpc.py: pass client as separate parameter 



Split client out of the args object and pass it as the first parameter
to all RPC methods instead.  This is a step toward decoupling the
rpc/*.py interface from the argparse front end.

Change-Id: Ib030862e0c79112e5c9acdde295d68983126a987
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/405502


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 231087ae

scripts/rpc.py

+82 −82

File changed.

Preview size limit exceeded, changes collapsed.

scripts/rpc/__init__.py

+6 −6
Original line number Diff line number Diff line
@@ -14,19 +14,19 @@ from . import subsystem 
from . import vhost





def get_rpc_methods(args):

    return args.client.call('get_rpc_methods')

def get_rpc_methods(client):

    return client.call('get_rpc_methods')





def save_config(args):

def save_config(client, args):

    config = {

        'subsystems': []

    }



    for elem in args.client.call('get_subsystems'):

    for elem in client.call('get_subsystems'):

        cfg = {

            'subsystem': elem['subsystem'],

            'config': args.client.call('get_subsystem_config', {"name": elem['subsystem']})

            'config': client.call('get_subsystem_config', {"name": elem['subsystem']})

        }

        config['subsystems'].append(cfg)
@@ -59,4 +59,4 @@ def load_config(args): 
        if not config:

            continue

        for elem in subsystem['config']:

            args.client.call(elem['method'], elem['params'])
 
            client.call(elem['method'], elem['params'])

scripts/rpc/app.py

+4 −4
Original line number Diff line number Diff line 
def kill_instance(args):

def kill_instance(client, args):

    params = {'sig_name': args.sig_name}

    return args.client.call('kill_instance', params)

    return client.call('kill_instance', params)





def context_switch_monitor(args):

def context_switch_monitor(client, args):

    params = {}

    if args.enable:

        params['enabled'] = True

    if args.disable:

        params['enabled'] = False

    return args.client.call('context_switch_monitor', params)
 
    return client.call('context_switch_monitor', params)

scripts/rpc/bdev.py

+24 −24
Original line number Diff line number Diff line 
def construct_malloc_bdev(args):

def construct_malloc_bdev(client, args):

    num_blocks = (args.total_size * 1024 * 1024) / args.block_size

    params = {'num_blocks': num_blocks, 'block_size': args.block_size}

    if args.name:

        params['name'] = args.name

    if args.uuid:

        params['uuid'] = args.uuid

    return args.client.call('construct_malloc_bdev', params)

    return client.call('construct_malloc_bdev', params)





def construct_null_bdev(args):

def construct_null_bdev(client, args):

    num_blocks = (args.total_size * 1024 * 1024) / args.block_size

    params = {'name': args.name, 'num_blocks': num_blocks,

              'block_size': args.block_size}

    if args.uuid:

        params['uuid'] = args.uuid

    return args.client.call('construct_null_bdev', params)

    return client.call('construct_null_bdev', params)





def construct_aio_bdev(args):

def construct_aio_bdev(client, args):

    params = {'name': args.name,

              'filename': args.filename}



    if args.block_size:

        params['block_size'] = args.block_size



    return args.client.call('construct_aio_bdev', params)

    return client.call('construct_aio_bdev', params)





def construct_nvme_bdev(args):

def construct_nvme_bdev(client, args):

    params = {'name': args.name,

              'trtype': args.trtype,

              'traddr': args.traddr}
@@ -41,10 +41,10 @@ def construct_nvme_bdev(args): 
    if args.subnqn:

        params['subnqn'] = args.subnqn



    return args.client.call('construct_nvme_bdev', params)

    return client.call('construct_nvme_bdev', params)





def construct_rbd_bdev(args):

def construct_rbd_bdev(client, args):

    params = {

        'pool_name': args.pool_name,

        'rbd_name': args.rbd_name,
@@ -54,42 +54,42 @@ def construct_rbd_bdev(args): 
    if args.name:

        params['name'] = args.name



    return args.client.call('construct_rbd_bdev', params)

    return client.call('construct_rbd_bdev', params)





def construct_error_bdev(args):

def construct_error_bdev(client, args):

    params = {'base_name': args.base_name}

    return args.client.call('construct_error_bdev', params)

    return client.call('construct_error_bdev', params)





def construct_pmem_bdev(args):

def construct_pmem_bdev(client, args):

    params = {

        'pmem_file': args.pmem_file,

        'name': args.name

    }

    return args.client.call('construct_pmem_bdev', params)

    return client.call('construct_pmem_bdev', params)





def get_bdevs(args):

def get_bdevs(client, args):

    params = {}

    if args.name:

        params['name'] = args.name

    return args.client.call('get_bdevs', params)

    return client.call('get_bdevs', params)





def get_bdevs_config(args):

def get_bdevs_config(client, args):

    params = {}

    if args.name:

        params['name'] = args.name

    return args.client.call('get_bdevs_config', params)

    return client.call('get_bdevs_config', params)





def delete_bdev(args):

def delete_bdev(client, args):

    params = {'name': args.bdev_name}

    return args.client.call('delete_bdev', params)

    return client.call('delete_bdev', params)





def bdev_inject_error(args):

def bdev_inject_error(client, args):

    params = {

        'name': args.name,

        'io_type': args.io_type,
@@ -97,12 +97,12 @@ def bdev_inject_error(args): 
        'num': args.num,

    }



    return args.client.call('bdev_inject_error', params)

    return client.call('bdev_inject_error', params)





def apply_firmware(args):

def apply_firmware(client, args):

    params = {

        'filename': args.filename,

        'bdev_name': args.bdev_name,

    }

    return args.client.call('apply_nvme_firmware', params)
 
    return client.call('apply_nvme_firmware', params)

scripts/rpc/iscsi.py

+34 −34
Original line number Diff line number Diff line 
def get_portal_groups(args):

    return args.client.call('get_portal_groups')

def get_portal_groups(client, args):

    return client.call('get_portal_groups')





def get_initiator_groups(args):

    return args.client.call('get_initiator_groups')

def get_initiator_groups(client, args):

    return client.call('get_initiator_groups')





def get_target_nodes(args):

    return args.client.call('get_target_nodes')

def get_target_nodes(client, args):

    return client.call('get_target_nodes')





def construct_target_node(args):

def construct_target_node(client, args):

    luns = []

    for u in args.bdev_name_id_pairs.strip().split(" "):

        bdev_name, lun_id = u.split(":")
@@ -41,20 +41,20 @@ def construct_target_node(args): 
        params['header_digest'] = args.header_digest

    if args.data_digest:

        params['data_digest'] = args.data_digest

    return args.client.call('construct_target_node', params)

    return client.call('construct_target_node', params)





def target_node_add_lun(args):

def target_node_add_lun(client, args):

    params = {

        'name': args.name,

        'bdev_name': args.bdev_name,

    }

    if args.lun_id:

        params['lun_id'] = args.lun_id

    return args.client.call('target_node_add_lun', params)

    return client.call('target_node_add_lun', params)





def delete_pg_ig_maps(args):

def delete_pg_ig_maps(client, args):

    pg_ig_maps = []

    for u in args.pg_ig_mappings.strip().split(" "):

        pg, ig = u.split(":")
@@ -63,10 +63,10 @@ def delete_pg_ig_maps(args): 
        'name': args.name,

        'pg_ig_maps': pg_ig_maps,

    }

    return args.client.call('delete_pg_ig_maps', params)

    return client.call('delete_pg_ig_maps', params)





def add_pg_ig_maps(args):

def add_pg_ig_maps(client, args):

    pg_ig_maps = []

    for u in args.pg_ig_mappings.strip().split(" "):

        pg, ig = u.split(":")
@@ -75,10 +75,10 @@ def add_pg_ig_maps(args): 
        'name': args.name,

        'pg_ig_maps': pg_ig_maps,

    }

    return args.client.call('add_pg_ig_maps', params)

    return client.call('add_pg_ig_maps', params)





def add_portal_group(args):

def add_portal_group(client, args):

    # parse out portal list host1:port1 host2:port2

    portals = []

    for p in args.portal_list:
@@ -93,10 +93,10 @@ def add_portal_group(args): 
            portals.append({'host': ip, 'port': port, 'cpumask': cpumask})



    params = {'tag': args.tag, 'portals': portals}

    return args.client.call('add_portal_group', params)

    return client.call('add_portal_group', params)





def add_initiator_group(args):

def add_initiator_group(client, args):

    initiators = []

    netmasks = []

    for i in args.initiator_list.strip().split(' '):
@@ -105,10 +105,10 @@ def add_initiator_group(args): 
        netmasks.append(n)



    params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks}

    return args.client.call('add_initiator_group', params)

    return client.call('add_initiator_group', params)





def add_initiators_to_initiator_group(args):

def add_initiators_to_initiator_group(client, args):

    initiators = []

    netmasks = []

    if args.initiator_list:
@@ -119,10 +119,10 @@ def add_initiators_to_initiator_group(args): 
            netmasks.append(n)



    params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks}

    return args.client.call('add_initiators_to_initiator_group', params)

    return client.call('add_initiators_to_initiator_group', params)





def delete_initiators_from_initiator_group(args):

def delete_initiators_from_initiator_group(client, args):

    initiators = []

    netmasks = []

    if args.initiator_list:
@@ -133,31 +133,31 @@ def delete_initiators_from_initiator_group(args): 
            netmasks.append(n)



    params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks}

    return args.client.call('delete_initiators_from_initiator_group', params)

    return client.call('delete_initiators_from_initiator_group', params)





def delete_target_node(args):

def delete_target_node(client, args):

    params = {'name': args.target_node_name}

    return args.client.call('delete_target_node', params)

    return client.call('delete_target_node', params)





def delete_portal_group(args):

def delete_portal_group(client, args):

    params = {'tag': args.tag}

    return args.client.call('delete_portal_group', params)

    return client.call('delete_portal_group', params)





def delete_initiator_group(args):

def delete_initiator_group(client, args):

    params = {'tag': args.tag}

    return args.client.call('delete_initiator_group', params)

    return client.call('delete_initiator_group', params)





def get_iscsi_connections(args):

    return args.client.call('get_iscsi_connections')

def get_iscsi_connections(client, args):

    return client.call('get_iscsi_connections')





def get_iscsi_global_params(args):

    return args.client.call('get_iscsi_global_params')

def get_iscsi_global_params(client, args):

    return client.call('get_iscsi_global_params')





def get_scsi_devices(args):

    return args.client.call('get_scsi_devices')
 
def get_scsi_devices(client, args):

    return client.call('get_scsi_devices')