Commit a54e7e58 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

rpc.py: make 'verbose' a client parameter 



Rather than requiring the 'verbose' flag as a parameter to
JSONRPCClient.call(), move it to the JSONRPCClient constructor so that
it can be set once.

This fixes the inconsistency between RPC method wrappers that passed
args.verbose and those that didn't; now, rpc.py -v works reliably for
all methods.

The JSONRPCClient.call() verbose parameter is maintained as well to
allow individual calls to be set to verbose if desired.

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


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatar <shuhei.matsumoto.xt@hitachi.com>
parent 7f0c2bf4

scripts/rpc.py

+1 −1
Original line number Diff line number Diff line
@@ -416,5 +416,5 @@ if __name__ == "__main__": 


    args = parser.parse_args()



    args.client = rpc.client.JSONRPCClient(args.server_addr, args.port)

    args.client = rpc.client.JSONRPCClient(args.server_addr, args.port, args.verbose)

    args.func(args)

scripts/rpc/app.py

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 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, verbose=args.verbose)

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



def context_switch_monitor(args):

    params = {}

scripts/rpc/bdev.py

+8 −8
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ def construct_malloc_bdev(args): 
    if args.name:

        params['name'] = args.name

    print_array(args.client.call(

        'construct_malloc_bdev', params, verbose=args.verbose))

        'construct_malloc_bdev', params))





def construct_null_bdev(args):
@@ -15,7 +15,7 @@ def construct_null_bdev(args): 
    params = {'name': args.name, 'num_blocks': num_blocks,

              'block_size': args.block_size}

    print_array(args.client.call(

        'construct_null_bdev', params, verbose=args.verbose))

        'construct_null_bdev', params))





def construct_aio_bdev(args):
@@ -26,7 +26,7 @@ def construct_aio_bdev(args): 
        params['block_size'] = args.block_size



    print_array(args.client.call(

        'construct_aio_bdev', params, verbose=args.verbose))

        'construct_aio_bdev', params))





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

        params['subnqn'] = args.subnqn



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

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





def construct_rbd_bdev(args):
@@ -53,12 +53,12 @@ def construct_rbd_bdev(args): 
        'block_size': args.block_size,

    }

    print_array(args.client.call(

        'construct_rbd_bdev', params, verbose=args.verbose))

        'construct_rbd_bdev', params))





def construct_error_bdev(args):

    params = {'base_name': args.base_name}

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

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





def construct_pmem_bdev(args):
@@ -78,7 +78,7 @@ def get_bdevs(args): 


def delete_bdev(args):

    params = {'name': args.bdev_name}

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

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





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

    }



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

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



def apply_firmware(args):

    params = {

scripts/rpc/client.py

+4 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ def int_arg(arg): 




class JSONRPCClient(object):

    def __init__(self, addr, port=None):

    def __init__(self, addr, port=None, verbose=False):

        self.verbose = verbose

        if addr.startswith('/'):

            self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)

            self.sock.connect(addr)
@@ -40,6 +41,8 @@ class JSONRPCClient(object): 
            req['params'] = params

        reqstr = json.dumps(req)



        verbose = verbose or self.verbose



        if verbose:

            print("request:")

            print(json.dumps(req, indent=2))

scripts/rpc/iscsi.py

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




def get_luns(args):

    print_dict(args.client.call('get_luns', verbose=args.verbose))

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





def get_portal_groups(args):

    print_dict(args.client.call('get_portal_groups', verbose=args.verbose))

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





def get_initiator_groups(args):

    print_dict(args.client.call('get_initiator_groups', verbose=args.verbose))

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





def get_target_nodes(args):

    print_dict(args.client.call('get_target_nodes', verbose=args.verbose))

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





def construct_target_node(args):
@@ -47,7 +47,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, verbose=args.verbose)

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





def target_node_add_lun(args):
@@ -105,7 +105,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, verbose=args.verbose)

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





def add_initiator_group(args):
@@ -117,26 +117,26 @@ def add_initiator_group(args): 
        netmasks.append(n)



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

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

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





def delete_target_node(args):

    params = {'name': args.target_node_name}

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

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





def delete_portal_group(args):

    params = {'tag': args.tag}

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

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





def delete_initiator_group(args):

    params = {'tag': args.tag}

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

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





def get_iscsi_connections(args):

    print_dict(args.client.call('get_iscsi_connections', verbose=args.verbose))

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





def get_iscsi_global_params(args):
@@ -144,4 +144,4 @@ def get_iscsi_global_params(args): 




def get_scsi_devices(args):

    print_dict(args.client.call('get_scsi_devices', verbose=args.verbose))
 
    print_dict(args.client.call('get_scsi_devices'))