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

scripts/rpc.py: move printing into main rpc.py 



The modules in scripts/rpc/*.py should be a generic, reusable library;
the printing should be done by the command-line frontend (rpc.py)
instead of the library code.

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


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 c1961dae

scripts/rpc.py

+326 −81

File changed.

Preview size limit exceeded, changes collapsed.

scripts/rpc/__init__.py

+1 −2
Original line number Diff line number Diff line 
import app

import bdev

from client import print_dict

import iscsi

import log

import lvol
@@ -15,7 +14,7 @@ import sys 




def get_rpc_methods(args):

    print_dict(args.client.call('get_rpc_methods'))

    return args.client.call('get_rpc_methods')





def save_config(args):

scripts/rpc/app.py

+2 −5
Original line number Diff line number Diff line 
from client import print_dict, print_array, int_arg





def kill_instance(args):

    params = {'sig_name': args.sig_name}

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

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





def context_switch_monitor(args):
@@ -12,4 +9,4 @@ def context_switch_monitor(args): 
        params['enabled'] = True

    if args.disable:

        params['enabled'] = False

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

scripts/rpc/bdev.py

+12 −19
Original line number Diff line number Diff line 
from client import print_dict, print_array, int_arg





def construct_malloc_bdev(args):

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

    params = {'num_blocks': num_blocks, 'block_size': args.block_size}
@@ -8,8 +5,7 @@ def construct_malloc_bdev(args): 
        params['name'] = args.name

    if args.uuid:

        params['uuid'] = args.uuid

    print_array(args.client.call(

        'construct_malloc_bdev', params))

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





def construct_null_bdev(args):
@@ -18,8 +14,7 @@ def construct_null_bdev(args): 
              'block_size': args.block_size}

    if args.uuid:

        params['uuid'] = args.uuid

    print_array(args.client.call(

        'construct_null_bdev', params))

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





def construct_aio_bdev(args):
@@ -29,8 +24,7 @@ def construct_aio_bdev(args): 
    if args.block_size:

        params['block_size'] = args.block_size



    print_array(args.client.call(

        'construct_aio_bdev', params))

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





def construct_nvme_bdev(args):
@@ -47,7 +41,7 @@ def construct_nvme_bdev(args): 
    if args.subnqn:

        params['subnqn'] = args.subnqn



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

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





def construct_rbd_bdev(args):
@@ -60,13 +54,12 @@ def construct_rbd_bdev(args): 
    if args.name:

        params['name'] = args.name



    print_array(args.client.call(

        'construct_rbd_bdev', params))

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





def construct_error_bdev(args):

    params = {'base_name': args.base_name}

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

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





def construct_pmem_bdev(args):
@@ -74,26 +67,26 @@ def construct_pmem_bdev(args): 
        'pmem_file': args.pmem_file,

        'name': args.name

    }

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

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





def get_bdevs(args):

    params = {}

    if args.name:

        params['name'] = args.name

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

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





def get_bdevs_config(args):

    params = {}

    if args.name:

        params['name'] = args.name

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

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





def delete_bdev(args):

    params = {'name': args.bdev_name}

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

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





def bdev_inject_error(args):
@@ -104,7 +97,7 @@ def bdev_inject_error(args): 
        'num': args.num,

    }



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

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





def apply_firmware(args):
@@ -112,4 +105,4 @@ def apply_firmware(args): 
        'filename': args.filename,

        'bdev_name': args.bdev_name,

    }

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

scripts/rpc/iscsi.py

+17 −20
Original line number Diff line number Diff line 
from client import print_dict, print_array, int_arg





def get_portal_groups(args):

    print_dict(args.client.call('get_portal_groups'))

    return args.client.call('get_portal_groups')





def get_initiator_groups(args):

    print_dict(args.client.call('get_initiator_groups'))

    return args.client.call('get_initiator_groups')





def get_target_nodes(args):

    print_dict(args.client.call('get_target_nodes'))

    return args.client.call('get_target_nodes')





def construct_target_node(args):
@@ -44,7 +41,7 @@ def construct_target_node(args): 
        params['header_digest'] = args.header_digest

    if args.data_digest:

        params['data_digest'] = args.data_digest

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

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





def target_node_add_lun(args):
@@ -54,7 +51,7 @@ def target_node_add_lun(args): 
    }

    if args.lun_id:

        params['lun_id'] = args.lun_id

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

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





def delete_pg_ig_maps(args):
@@ -66,7 +63,7 @@ def delete_pg_ig_maps(args): 
        'name': args.name,

        'pg_ig_maps': pg_ig_maps,

    }

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

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





def add_pg_ig_maps(args):
@@ -78,7 +75,7 @@ def add_pg_ig_maps(args): 
        'name': args.name,

        'pg_ig_maps': pg_ig_maps,

    }

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

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





def add_portal_group(args):
@@ -96,7 +93,7 @@ def add_portal_group(args): 
            portals.append({'host': ip, 'port': port, 'cpumask': cpumask})



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

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

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





def add_initiator_group(args):
@@ -108,7 +105,7 @@ def add_initiator_group(args): 
        netmasks.append(n)



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

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

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





def add_initiators_to_initiator_group(args):
@@ -122,7 +119,7 @@ def add_initiators_to_initiator_group(args): 
            netmasks.append(n)



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

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

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





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



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

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

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





def delete_target_node(args):

    params = {'name': args.target_node_name}

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

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





def delete_portal_group(args):

    params = {'tag': args.tag}

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

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





def delete_initiator_group(args):

    params = {'tag': args.tag}

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

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





def get_iscsi_connections(args):

    print_dict(args.client.call('get_iscsi_connections'))

    return args.client.call('get_iscsi_connections')





def get_iscsi_global_params(args):

    print_dict(args.client.call('get_iscsi_global_params'))

    return args.client.call('get_iscsi_global_params')





def get_scsi_devices(args):

    print_dict(args.client.call('get_scsi_devices'))
 
    return args.client.call('get_scsi_devices')