ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/rpc.py: pass client as separate parameter

Browse Source 
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: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/405502
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2018-03-27 14:31:52 -07:00 committed by Jim Harris
parent 231087ae4b
commit 96dc91d608
13 changed files with 246 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
scripts/rpc.py
View File

@ -31,13 +31,13 @@ if __name__ == "__main__":
subparsers = parser.add_subparsers(help='RPC methods') subparsers = parser.add_subparsers(help='RPC methods')
def get_rpc_methods(args): def get_rpc_methods(args):
print_dict(rpc.get_rpc_methods(args)) print_dict(rpc.get_rpc_methods(args.client, args))
p = subparsers.add_parser('get_rpc_methods', help='Get list of supported RPC methods') p = subparsers.add_parser('get_rpc_methods', help='Get list of supported RPC methods')
p.set_defaults(func=get_rpc_methods) p.set_defaults(func=get_rpc_methods)
def save_config(args): def save_config(args):
rpc.save_config(args) rpc.save_config(args.client, args)
p = subparsers.add_parser('save_config', help="""Write current (live) configuration of SPDK subsystems and targets. p = subparsers.add_parser('save_config', help="""Write current (live) configuration of SPDK subsystems and targets.
If no filename is given write configuration to stdout.""") If no filename is given write configuration to stdout.""")
@ -47,7 +47,7 @@ if __name__ == "__main__":
p.set_defaults(func=save_config) p.set_defaults(func=save_config)
def load_config(args): def load_config(args):
rpc.load_config(args) rpc.load_config(args.client, args)
p = subparsers.add_parser('load_config', help="""Configure SPDK subsystems and tagets using JSON RPC. If no file is p = subparsers.add_parser('load_config', help="""Configure SPDK subsystems and tagets using JSON RPC. If no file is
provided or file is '-' read configuration from stdin.""") provided or file is '-' read configuration from stdin.""")
@ -56,14 +56,14 @@ if __name__ == "__main__":
# app # app
def kill_instance(args): def kill_instance(args):
rpc.app.kill_instance(args) rpc.app.kill_instance(args.client, args)
p = subparsers.add_parser('kill_instance', help='Send signal to instance') p = subparsers.add_parser('kill_instance', help='Send signal to instance')
p.add_argument('sig_name', help='signal will be sent to server.') p.add_argument('sig_name', help='signal will be sent to server.')
p.set_defaults(func=kill_instance) p.set_defaults(func=kill_instance)
def context_switch_monitor(args): def context_switch_monitor(args):
print_dict(rpc.app.context_switch_monitor(args)) print_dict(rpc.app.context_switch_monitor(args.client, args))
p = subparsers.add_parser('context_switch_monitor', help='Control whether the context switch monitor is enabled') p = subparsers.add_parser('context_switch_monitor', help='Control whether the context switch monitor is enabled')
p.add_argument('-e', '--enable', action='store_true', help='Enable context switch monitoring') p.add_argument('-e', '--enable', action='store_true', help='Enable context switch monitoring')
@ -72,7 +72,7 @@ if __name__ == "__main__":
# bdev # bdev
def construct_malloc_bdev(args): def construct_malloc_bdev(args):
print_array(rpc.bdev.construct_malloc_bdev(args)) print_array(rpc.bdev.construct_malloc_bdev(args.client, args))
p = subparsers.add_parser('construct_malloc_bdev', p = subparsers.add_parser('construct_malloc_bdev',
help='Add a bdev with malloc backend') help='Add a bdev with malloc backend')
@ -84,7 +84,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_malloc_bdev) p.set_defaults(func=construct_malloc_bdev)
def construct_null_bdev(args): def construct_null_bdev(args):
print_array(rpc.bdev.construct_null_bdev(args)) print_array(rpc.bdev.construct_null_bdev(args.client, args))
p = subparsers.add_parser('construct_null_bdev', p = subparsers.add_parser('construct_null_bdev',
help='Add a bdev with null backend') help='Add a bdev with null backend')
@ -96,7 +96,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_null_bdev) p.set_defaults(func=construct_null_bdev)
def construct_aio_bdev(args): def construct_aio_bdev(args):
print_array(rpc.bdev.construct_aio_bdev(args)) print_array(rpc.bdev.construct_aio_bdev(args.client, args))
p = subparsers.add_parser('construct_aio_bdev', p = subparsers.add_parser('construct_aio_bdev',
help='Add a bdev with aio backend') help='Add a bdev with aio backend')
@ -106,7 +106,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_aio_bdev) p.set_defaults(func=construct_aio_bdev)
def construct_nvme_bdev(args): def construct_nvme_bdev(args):
print_array(rpc.bdev.construct_nvme_bdev(args)) print_array(rpc.bdev.construct_nvme_bdev(args.client, args))
p = subparsers.add_parser('construct_nvme_bdev', p = subparsers.add_parser('construct_nvme_bdev',
help='Add bdev with nvme backend') help='Add bdev with nvme backend')
@ -123,7 +123,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_nvme_bdev) p.set_defaults(func=construct_nvme_bdev)
def construct_rbd_bdev(args): def construct_rbd_bdev(args):
print_array(rpc.bdev.construct_rbd_bdev(args)) print_array(rpc.bdev.construct_rbd_bdev(args.client, args))
p = subparsers.add_parser('construct_rbd_bdev', p = subparsers.add_parser('construct_rbd_bdev',
help='Add a bdev with ceph rbd backend') help='Add a bdev with ceph rbd backend')
@ -134,7 +134,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_rbd_bdev) p.set_defaults(func=construct_rbd_bdev)
def construct_error_bdev(args): def construct_error_bdev(args):
rpc.bdev.construct_error_bdev(args) rpc.bdev.construct_error_bdev(args.client, args)
p = subparsers.add_parser('construct_error_bdev', p = subparsers.add_parser('construct_error_bdev',
help='Add bdev with error injection backend') help='Add bdev with error injection backend')
@ -142,7 +142,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_error_bdev) p.set_defaults(func=construct_error_bdev)
def construct_pmem_bdev(args): def construct_pmem_bdev(args):
print_array(rpc.bdev.construct_pmem_bdev(args)) print_array(rpc.bdev.construct_pmem_bdev(args.client, args))
p = subparsers.add_parser('construct_pmem_bdev', help='Add a bdev with pmem backend') p = subparsers.add_parser('construct_pmem_bdev', help='Add a bdev with pmem backend')
p.add_argument('pmem_file', help='Path to pmemblk pool file') p.add_argument('pmem_file', help='Path to pmemblk pool file')
@ -150,7 +150,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_pmem_bdev) p.set_defaults(func=construct_pmem_bdev)
def get_bdevs(args): def get_bdevs(args):
print_dict(rpc.bdev.get_bdevs(args)) print_dict(rpc.bdev.get_bdevs(args.client, args))
p = subparsers.add_parser( p = subparsers.add_parser(
'get_bdevs', help='Display current blockdev list or required blockdev') 'get_bdevs', help='Display current blockdev list or required blockdev')
@ -158,10 +158,10 @@ if __name__ == "__main__":
p.set_defaults(func=get_bdevs) p.set_defaults(func=get_bdevs)
def delete_bdev(args): def delete_bdev(args):
rpc.bdev.delete_bdev(args) rpc.bdev.delete_bdev(args.client, args)
def get_bdevs_config(args): def get_bdevs_config(args):
print_dict(rpc.bdev.get_bdevs_config(args)) print_dict(rpc.bdev.get_bdevs_config(args.client, args))
p = subparsers.add_parser( p = subparsers.add_parser(
'get_bdevs_config', help='Display current (live) blockdev configuration list or required blockdev') 'get_bdevs_config', help='Display current (live) blockdev configuration list or required blockdev')
@ -174,7 +174,7 @@ if __name__ == "__main__":
p.set_defaults(func=delete_bdev) p.set_defaults(func=delete_bdev)
def bdev_inject_error(args): def bdev_inject_error(args):
rpc.bdev.bdev_inject_error(args) rpc.bdev.bdev_inject_error(args.client, args)
p = subparsers.add_parser('bdev_inject_error', help='bdev inject error') p = subparsers.add_parser('bdev_inject_error', help='bdev inject error')
p.add_argument('name', help="""the name of the error injection bdev""") p.add_argument('name', help="""the name of the error injection bdev""")
@ -185,7 +185,7 @@ if __name__ == "__main__":
p.set_defaults(func=bdev_inject_error) p.set_defaults(func=bdev_inject_error)
def apply_firmware(args): def apply_firmware(args):
print_dict(rpc.bdev.apply_firmware(args)) print_dict(rpc.bdev.apply_firmware(args.client, args))
p = subparsers.add_parser('apply_firmware', help='Download and commit firmware to NVMe device') p = subparsers.add_parser('apply_firmware', help='Download and commit firmware to NVMe device')
p.add_argument('filename', help='filename of the firmware to download') p.add_argument('filename', help='filename of the firmware to download')
@ -194,27 +194,27 @@ if __name__ == "__main__":
# iSCSI # iSCSI
def get_portal_groups(args): def get_portal_groups(args):
print_dict(rpc.iscsi.get_portal_groups(args)) print_dict(rpc.iscsi.get_portal_groups(args.client, args))
p = subparsers.add_parser( p = subparsers.add_parser(
'get_portal_groups', help='Display current portal group configuration') 'get_portal_groups', help='Display current portal group configuration')
p.set_defaults(func=get_portal_groups) p.set_defaults(func=get_portal_groups)
def get_initiator_groups(args): def get_initiator_groups(args):
print_dict(rpc.iscsi.get_initiator_groups(args)) print_dict(rpc.iscsi.get_initiator_groups(args.client, args))
p = subparsers.add_parser('get_initiator_groups', p = subparsers.add_parser('get_initiator_groups',
help='Display current initiator group configuration') help='Display current initiator group configuration')
p.set_defaults(func=get_initiator_groups) p.set_defaults(func=get_initiator_groups)
def get_target_nodes(args): def get_target_nodes(args):
print_dict(rpc.iscsi.get_target_nodes(args)) print_dict(rpc.iscsi.get_target_nodes(args.client, args))
p = subparsers.add_parser('get_target_nodes', help='Display target nodes') p = subparsers.add_parser('get_target_nodes', help='Display target nodes')
p.set_defaults(func=get_target_nodes) p.set_defaults(func=get_target_nodes)
def construct_target_node(args): def construct_target_node(args):
rpc.iscsi.construct_target_node(args) rpc.iscsi.construct_target_node(args.client, args)
p = subparsers.add_parser('construct_target_node', p = subparsers.add_parser('construct_target_node',
help='Add a target node') help='Add a target node')
@ -247,7 +247,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_target_node) p.set_defaults(func=construct_target_node)
def target_node_add_lun(args): def target_node_add_lun(args):
rpc.iscsi.target_node_add_lun(args) rpc.iscsi.target_node_add_lun(args.client, args)
p = subparsers.add_parser('target_node_add_lun', help='Add LUN to the target node') p = subparsers.add_parser('target_node_add_lun', help='Add LUN to the target node')
p.add_argument('name', help='Target node name (ASCII)') p.add_argument('name', help='Target node name (ASCII)')
@ -258,7 +258,7 @@ if __name__ == "__main__":
p.set_defaults(func=target_node_add_lun) p.set_defaults(func=target_node_add_lun)
def add_pg_ig_maps(args): def add_pg_ig_maps(args):
rpc.iscsi.add_pg_ig_maps(args) rpc.iscsi.add_pg_ig_maps(args.client, args)
p = subparsers.add_parser('add_pg_ig_maps', help='Add PG-IG maps to the target node') p = subparsers.add_parser('add_pg_ig_maps', help='Add PG-IG maps to the target node')
p.add_argument('name', help='Target node name (ASCII)') p.add_argument('name', help='Target node name (ASCII)')
@ -270,7 +270,7 @@ if __name__ == "__main__":
p.set_defaults(func=add_pg_ig_maps) p.set_defaults(func=add_pg_ig_maps)
def delete_pg_ig_maps(args): def delete_pg_ig_maps(args):
rpc.iscsi.delete_pg_ig_maps(args) rpc.iscsi.delete_pg_ig_maps(args.client, args)
p = subparsers.add_parser('delete_pg_ig_maps', help='Delete PG-IG maps from the target node') p = subparsers.add_parser('delete_pg_ig_maps', help='Delete PG-IG maps from the target node')
p.add_argument('name', help='Target node name (ASCII)') p.add_argument('name', help='Target node name (ASCII)')
@ -282,7 +282,7 @@ if __name__ == "__main__":
p.set_defaults(func=delete_pg_ig_maps) p.set_defaults(func=delete_pg_ig_maps)
def add_portal_group(args): def add_portal_group(args):
rpc.iscsi.add_portal_group(args) rpc.iscsi.add_portal_group(args.client, args)
p = subparsers.add_parser('add_portal_group', help='Add a portal group') p = subparsers.add_parser('add_portal_group', help='Add a portal group')
p.add_argument( p.add_argument(
@ -293,7 +293,7 @@ if __name__ == "__main__":
p.set_defaults(func=add_portal_group) p.set_defaults(func=add_portal_group)
def add_initiator_group(args): def add_initiator_group(args):
rpc.iscsi.add_initiator_group(args) rpc.iscsi.add_initiator_group(args.client, args)
p = subparsers.add_parser('add_initiator_group', p = subparsers.add_parser('add_initiator_group',
help='Add an initiator group') help='Add an initiator group')
@ -306,7 +306,7 @@ if __name__ == "__main__":
p.set_defaults(func=add_initiator_group) p.set_defaults(func=add_initiator_group)
def add_initiators_to_initiator_group(args): def add_initiators_to_initiator_group(args):
rpc.iscsi.add_initiators_to_initiator_group(args) rpc.iscsi.add_initiators_to_initiator_group(args.client, args)
p = subparsers.add_parser('add_initiators_to_initiator_group', p = subparsers.add_parser('add_initiators_to_initiator_group',
help='Add initiators to an existing initiator group') help='Add initiators to an existing initiator group')
@ -319,7 +319,7 @@ if __name__ == "__main__":
p.set_defaults(func=add_initiators_to_initiator_group) p.set_defaults(func=add_initiators_to_initiator_group)
def delete_initiators_from_initiator_group(args): def delete_initiators_from_initiator_group(args):
rpc.iscsi.delete_initiators_from_initiator_group(args) rpc.iscsi.delete_initiators_from_initiator_group(args.client, args)
p = subparsers.add_parser('delete_initiators_from_initiator_group', p = subparsers.add_parser('delete_initiators_from_initiator_group',
help='Delete initiators from an existing initiator group') help='Delete initiators from an existing initiator group')
@ -332,7 +332,7 @@ if __name__ == "__main__":
p.set_defaults(func=delete_initiators_from_initiator_group) p.set_defaults(func=delete_initiators_from_initiator_group)
def delete_target_node(args): def delete_target_node(args):
rpc.iscsi.delete_target_node(args) rpc.iscsi.delete_target_node(args.client, args)
p = subparsers.add_parser('delete_target_node', p = subparsers.add_parser('delete_target_node',
help='Delete a target node') help='Delete a target node')
@ -341,7 +341,7 @@ if __name__ == "__main__":
p.set_defaults(func=delete_target_node) p.set_defaults(func=delete_target_node)
def delete_portal_group(args): def delete_portal_group(args):
rpc.iscsi.delete_portal_group(args) rpc.iscsi.delete_portal_group(args.client, args)
p = subparsers.add_parser('delete_portal_group', p = subparsers.add_parser('delete_portal_group',
help='Delete a portal group') help='Delete a portal group')
@ -350,7 +350,7 @@ if __name__ == "__main__":
p.set_defaults(func=delete_portal_group) p.set_defaults(func=delete_portal_group)
def delete_initiator_group(args): def delete_initiator_group(args):
rpc.iscsi.delete_initiator_group(args) rpc.iscsi.delete_initiator_group(args.client, args)
p = subparsers.add_parser('delete_initiator_group', p = subparsers.add_parser('delete_initiator_group',
help='Delete an initiator group') help='Delete an initiator group')
@ -359,27 +359,27 @@ if __name__ == "__main__":
p.set_defaults(func=delete_initiator_group) p.set_defaults(func=delete_initiator_group)
def get_iscsi_connections(args): def get_iscsi_connections(args):
print_dict(rpc.iscsi.get_iscsi_connections(args)) print_dict(rpc.iscsi.get_iscsi_connections(args.client, args))
p = subparsers.add_parser('get_iscsi_connections', p = subparsers.add_parser('get_iscsi_connections',
help='Display iSCSI connections') help='Display iSCSI connections')
p.set_defaults(func=get_iscsi_connections) p.set_defaults(func=get_iscsi_connections)
def get_iscsi_global_params(args): def get_iscsi_global_params(args):
print_dict(rpc.iscsi.get_iscsi_global_params(args)) print_dict(rpc.iscsi.get_iscsi_global_params(args.client, args))
p = subparsers.add_parser('get_iscsi_global_params', help='Display iSCSI global parameters') p = subparsers.add_parser('get_iscsi_global_params', help='Display iSCSI global parameters')
p.set_defaults(func=get_iscsi_global_params) p.set_defaults(func=get_iscsi_global_params)
def get_scsi_devices(args): def get_scsi_devices(args):
print_dict(rpc.iscsi.get_scsi_devices(args)) print_dict(rpc.iscsi.get_scsi_devices(args.client, args))
p = subparsers.add_parser('get_scsi_devices', help='Display SCSI devices') p = subparsers.add_parser('get_scsi_devices', help='Display SCSI devices')
p.set_defaults(func=get_scsi_devices) p.set_defaults(func=get_scsi_devices)
# log # log
def set_trace_flag(args): def set_trace_flag(args):
rpc.log.set_trace_flag(args) rpc.log.set_trace_flag(args.client, args)
p = subparsers.add_parser('set_trace_flag', help='set trace flag') p = subparsers.add_parser('set_trace_flag', help='set trace flag')
p.add_argument( p.add_argument(
@ -387,7 +387,7 @@ if __name__ == "__main__":
p.set_defaults(func=set_trace_flag) p.set_defaults(func=set_trace_flag)
def clear_trace_flag(args): def clear_trace_flag(args):
rpc.log.clear_trace_flag(args) rpc.log.clear_trace_flag(args.client, args)
p = subparsers.add_parser('clear_trace_flag', help='clear trace flag') p = subparsers.add_parser('clear_trace_flag', help='clear trace flag')
p.add_argument( p.add_argument(
@ -395,40 +395,40 @@ if __name__ == "__main__":
p.set_defaults(func=clear_trace_flag) p.set_defaults(func=clear_trace_flag)
def get_trace_flags(args): def get_trace_flags(args):
print_dict(rpc.log.get_trace_flags(args)) print_dict(rpc.log.get_trace_flags(args.client, args))
p = subparsers.add_parser('get_trace_flags', help='get trace flags') p = subparsers.add_parser('get_trace_flags', help='get trace flags')
p.set_defaults(func=get_trace_flags) p.set_defaults(func=get_trace_flags)
def set_log_level(args): def set_log_level(args):
rpc.log.set_log_level(args) rpc.log.set_log_level(args.client, args)
p = subparsers.add_parser('set_log_level', help='set log level') p = subparsers.add_parser('set_log_level', help='set log level')
p.add_argument('level', help='log level we want to set. (for example "DEBUG").') p.add_argument('level', help='log level we want to set. (for example "DEBUG").')
p.set_defaults(func=set_log_level) p.set_defaults(func=set_log_level)
def get_log_level(args): def get_log_level(args):
print_dict(rpc.log.get_log_level(args)) print_dict(rpc.log.get_log_level(args.client, args))
p = subparsers.add_parser('get_log_level', help='get log level') p = subparsers.add_parser('get_log_level', help='get log level')
p.set_defaults(func=get_log_level) p.set_defaults(func=get_log_level)
def set_log_print_level(args): def set_log_print_level(args):
rpc.log.set_log_print_level(args) rpc.log.set_log_print_level(args.client, args)
p = subparsers.add_parser('set_log_print_level', help='set log print level') p = subparsers.add_parser('set_log_print_level', help='set log print level')
p.add_argument('level', help='log print level we want to set. (for example "DEBUG").') p.add_argument('level', help='log print level we want to set. (for example "DEBUG").')
p.set_defaults(func=set_log_print_level) p.set_defaults(func=set_log_print_level)
def get_log_print_level(args): def get_log_print_level(args):
print_dict(rpc.log.get_log_print_level(args)) print_dict(rpc.log.get_log_print_level(args.client, args))
p = subparsers.add_parser('get_log_print_level', help='get log print level') p = subparsers.add_parser('get_log_print_level', help='get log print level')
p.set_defaults(func=get_log_print_level) p.set_defaults(func=get_log_print_level)
# lvol # lvol
def construct_lvol_store(args): def construct_lvol_store(args):
print_array(rpc.lvol.construct_lvol_store(args)) print_array(rpc.lvol.construct_lvol_store(args.client, args))
p = subparsers.add_parser('construct_lvol_store', help='Add logical volume store on base bdev') p = subparsers.add_parser('construct_lvol_store', help='Add logical volume store on base bdev')
p.add_argument('bdev_name', help='base bdev name') p.add_argument('bdev_name', help='base bdev name')
@ -437,7 +437,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_lvol_store) p.set_defaults(func=construct_lvol_store)
def rename_lvol_store(args): def rename_lvol_store(args):
rpc.lvol.rename_lvol_store(args) rpc.lvol.rename_lvol_store(args.client, args)
p = subparsers.add_parser('rename_lvol_store', help='Change logical volume store name') p = subparsers.add_parser('rename_lvol_store', help='Change logical volume store name')
p.add_argument('old_name', help='old name') p.add_argument('old_name', help='old name')
@ -445,7 +445,7 @@ if __name__ == "__main__":
p.set_defaults(func=rename_lvol_store) p.set_defaults(func=rename_lvol_store)
def construct_lvol_bdev(args): def construct_lvol_bdev(args):
print_array(rpc.lvol.construct_lvol_bdev(args)) print_array(rpc.lvol.construct_lvol_bdev(args.client, args))
p = subparsers.add_parser('construct_lvol_bdev', help='Add a bdev with an logical volume backend') p = subparsers.add_parser('construct_lvol_bdev', help='Add a bdev with an logical volume backend')
p.add_argument('-u', '--uuid', help='lvol store UUID', required=False) p.add_argument('-u', '--uuid', help='lvol store UUID', required=False)
@ -456,7 +456,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_lvol_bdev) p.set_defaults(func=construct_lvol_bdev)
def rename_lvol_bdev(args): def rename_lvol_bdev(args):
rpc.lvol.rename_lvol_bdev(args) rpc.lvol.rename_lvol_bdev(args.client, args)
p = subparsers.add_parser('rename_lvol_bdev', help='Change lvol bdev name') p = subparsers.add_parser('rename_lvol_bdev', help='Change lvol bdev name')
p.add_argument('old_name', help='lvol bdev name') p.add_argument('old_name', help='lvol bdev name')
@ -465,7 +465,7 @@ if __name__ == "__main__":
# Logical volume resize feature is disabled, as it is currently work in progress # Logical volume resize feature is disabled, as it is currently work in progress
# def resize_lvol_bdev(args): # def resize_lvol_bdev(args):
# rpc.lvol.resize_bdev(args) # rpc.lvol.resize_bdev(args.client, args)
# #
# p = subparsers.add_parser('resize_lvol_bdev', help='Resize existing lvol bdev') # p = subparsers.add_parser('resize_lvol_bdev', help='Resize existing lvol bdev')
# p.add_argument('name', help='lvol bdev name') # p.add_argument('name', help='lvol bdev name')
@ -473,7 +473,7 @@ if __name__ == "__main__":
# p.set_defaults(func=resize_lvol_bdev) # p.set_defaults(func=resize_lvol_bdev)
def destroy_lvol_store(args): def destroy_lvol_store(args):
rpc.lvol.destroy_lvol_store(args) rpc.lvol.destroy_lvol_store(args.client, args)
p = subparsers.add_parser('destroy_lvol_store', help='Destroy an logical volume store') p = subparsers.add_parser('destroy_lvol_store', help='Destroy an logical volume store')
p.add_argument('-u', '--uuid', help='lvol store UUID', required=False) p.add_argument('-u', '--uuid', help='lvol store UUID', required=False)
@ -481,7 +481,7 @@ if __name__ == "__main__":
p.set_defaults(func=destroy_lvol_store) p.set_defaults(func=destroy_lvol_store)
def get_lvol_stores(args): def get_lvol_stores(args):
print_dict(rpc.lvol.get_lvol_stores(args)) print_dict(rpc.lvol.get_lvol_stores(args.client, args))
p = subparsers.add_parser('get_lvol_stores', help='Display current logical volume store list') p = subparsers.add_parser('get_lvol_stores', help='Display current logical volume store list')
p.add_argument('-u', '--uuid', help='lvol store UUID', required=False) p.add_argument('-u', '--uuid', help='lvol store UUID', required=False)
@ -490,7 +490,7 @@ if __name__ == "__main__":
# nbd # nbd
def start_nbd_disk(args): def start_nbd_disk(args):
rpc.nbd.start_nbd_disk(args) rpc.nbd.start_nbd_disk(args.client, args)
p = subparsers.add_parser('start_nbd_disk', help='Export a bdev as a nbd disk') p = subparsers.add_parser('start_nbd_disk', help='Export a bdev as a nbd disk')
p.add_argument('bdev_name', help='Blockdev name to be exported. Example: Malloc0.') p.add_argument('bdev_name', help='Blockdev name to be exported. Example: Malloc0.')
@ -498,14 +498,14 @@ if __name__ == "__main__":
p.set_defaults(func=start_nbd_disk) p.set_defaults(func=start_nbd_disk)
def stop_nbd_disk(args): def stop_nbd_disk(args):
rpc.nbd.stop_nbd_disk(args) rpc.nbd.stop_nbd_disk(args.client, args)
p = subparsers.add_parser('stop_nbd_disk', help='Stop a nbd disk') p = subparsers.add_parser('stop_nbd_disk', help='Stop a nbd disk')
p.add_argument('nbd_device', help='Nbd device name to be stopped. Example: /dev/nbd0.') p.add_argument('nbd_device', help='Nbd device name to be stopped. Example: /dev/nbd0.')
p.set_defaults(func=stop_nbd_disk) p.set_defaults(func=stop_nbd_disk)
def get_nbd_disks(args): def get_nbd_disks(args):
print_dict(rpc.nbd.get_nbd_disks(args)) print_dict(rpc.nbd.get_nbd_disks(args.client, args))
p = subparsers.add_parser('get_nbd_disks', help='Display full or specified nbd device list') p = subparsers.add_parser('get_nbd_disks', help='Display full or specified nbd device list')
p.add_argument('-n', '--nbd_device', help="Path of the nbd device. Example: /dev/nbd0", required=False) p.add_argument('-n', '--nbd_device', help="Path of the nbd device. Example: /dev/nbd0", required=False)
@ -513,7 +513,7 @@ if __name__ == "__main__":
# net # net
def add_ip_address(args): def add_ip_address(args):
rpc.net.add_ip_address(args) rpc.net.add_ip_address(args.client, args)
p = subparsers.add_parser('add_ip_address', help='Add IP address') p = subparsers.add_parser('add_ip_address', help='Add IP address')
p.add_argument('ifc_index', help='ifc index of the nic device.', type=int) p.add_argument('ifc_index', help='ifc index of the nic device.', type=int)
@ -521,7 +521,7 @@ if __name__ == "__main__":
p.set_defaults(func=add_ip_address) p.set_defaults(func=add_ip_address)
def delete_ip_address(args): def delete_ip_address(args):
rpc.net.delete_ip_address(args) rpc.net.delete_ip_address(args.client, args)
p = subparsers.add_parser('delete_ip_address', help='Delete IP address') p = subparsers.add_parser('delete_ip_address', help='Delete IP address')
p.add_argument('ifc_index', help='ifc index of the nic device.', type=int) p.add_argument('ifc_index', help='ifc index of the nic device.', type=int)
@ -529,7 +529,7 @@ if __name__ == "__main__":
p.set_defaults(func=delete_ip_address) p.set_defaults(func=delete_ip_address)
def get_interfaces(args): def get_interfaces(args):
print_dict(rpc.net.get_interfaces(args)) print_dict(rpc.net.get_interfaces(args.client, args))
p = subparsers.add_parser( p = subparsers.add_parser(
'get_interfaces', help='Display current interface list') 'get_interfaces', help='Display current interface list')
@ -537,14 +537,14 @@ if __name__ == "__main__":
# NVMe-oF # NVMe-oF
def get_nvmf_subsystems(args): def get_nvmf_subsystems(args):
print_dict(rpc.nvmf.get_nvmf_subsystems(args)) print_dict(rpc.nvmf.get_nvmf_subsystems(args.client, args))
p = subparsers.add_parser('get_nvmf_subsystems', p = subparsers.add_parser('get_nvmf_subsystems',
help='Display nvmf subsystems') help='Display nvmf subsystems')
p.set_defaults(func=get_nvmf_subsystems) p.set_defaults(func=get_nvmf_subsystems)
def construct_nvmf_subsystem(args): def construct_nvmf_subsystem(args):
rpc.nvmf.construct_nvmf_subsystem(args) rpc.nvmf.construct_nvmf_subsystem(args.client, args)
p = subparsers.add_parser('construct_nvmf_subsystem', help='Add a nvmf subsystem') p = subparsers.add_parser('construct_nvmf_subsystem', help='Add a nvmf subsystem')
p.add_argument('nqn', help='Target nqn(ASCII)') p.add_argument('nqn', help='Target nqn(ASCII)')
@ -565,7 +565,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_nvmf_subsystem) p.set_defaults(func=construct_nvmf_subsystem)
def delete_nvmf_subsystem(args): def delete_nvmf_subsystem(args):
rpc.nvmf.delete_nvmf_subsystem(args) rpc.nvmf.delete_nvmf_subsystem(args.client, args)
p = subparsers.add_parser('delete_nvmf_subsystem', p = subparsers.add_parser('delete_nvmf_subsystem',
help='Delete a nvmf subsystem') help='Delete a nvmf subsystem')
@ -574,7 +574,7 @@ if __name__ == "__main__":
p.set_defaults(func=delete_nvmf_subsystem) p.set_defaults(func=delete_nvmf_subsystem)
def nvmf_subsystem_add_listener(args): def nvmf_subsystem_add_listener(args):
rpc.nvmf.nvmf_subsystem_add_listener(args) rpc.nvmf.nvmf_subsystem_add_listener(args.client, args)
p = subparsers.add_parser('nvmf_subsystem_add_listener', help='Add a listener to an NVMe-oF subsystem') p = subparsers.add_parser('nvmf_subsystem_add_listener', help='Add a listener to an NVMe-oF subsystem')
p.add_argument('nqn', help='NVMe-oF subsystem NQN') p.add_argument('nqn', help='NVMe-oF subsystem NQN')
@ -585,7 +585,7 @@ if __name__ == "__main__":
p.set_defaults(func=nvmf_subsystem_add_listener) p.set_defaults(func=nvmf_subsystem_add_listener)
def nvmf_subsystem_remove_listener(args): def nvmf_subsystem_remove_listener(args):
rpc.nvmf.nvmf_subsystem_remove_listener(args) rpc.nvmf.nvmf_subsystem_remove_listener(args.client, args)
p = subparsers.add_parser('nvmf_subsystem_remove_listener', help='Remove a listener from an NVMe-oF subsystem') p = subparsers.add_parser('nvmf_subsystem_remove_listener', help='Remove a listener from an NVMe-oF subsystem')
p.add_argument('nqn', help='NVMe-oF subsystem NQN') p.add_argument('nqn', help='NVMe-oF subsystem NQN')
@ -596,7 +596,7 @@ if __name__ == "__main__":
p.set_defaults(func=nvmf_subsystem_remove_listener) p.set_defaults(func=nvmf_subsystem_remove_listener)
def nvmf_subsystem_add_ns(args): def nvmf_subsystem_add_ns(args):
rpc.nvmf.nvmf_subsystem_add_ns(args) rpc.nvmf.nvmf_subsystem_add_ns(args.client, args)
p = subparsers.add_parser('nvmf_subsystem_add_ns', help='Add a namespace to an NVMe-oF subsystem') p = subparsers.add_parser('nvmf_subsystem_add_ns', help='Add a namespace to an NVMe-oF subsystem')
p.add_argument('nqn', help='NVMe-oF subsystem NQN') p.add_argument('nqn', help='NVMe-oF subsystem NQN')
@ -607,7 +607,7 @@ if __name__ == "__main__":
p.set_defaults(func=nvmf_subsystem_add_ns) p.set_defaults(func=nvmf_subsystem_add_ns)
def nvmf_subsystem_remove_ns(args): def nvmf_subsystem_remove_ns(args):
rpc.nvmf.nvmf_subsystem_remove_ns(args) rpc.nvmf.nvmf_subsystem_remove_ns(args.client, args)
p = subparsers.add_parser('nvmf_subsystem_remove_ns', help='Remove a namespace to an NVMe-oF subsystem') p = subparsers.add_parser('nvmf_subsystem_remove_ns', help='Remove a namespace to an NVMe-oF subsystem')
p.add_argument('nqn', help='NVMe-oF subsystem NQN') p.add_argument('nqn', help='NVMe-oF subsystem NQN')
@ -615,7 +615,7 @@ if __name__ == "__main__":
p.set_defaults(func=nvmf_subsystem_remove_ns) p.set_defaults(func=nvmf_subsystem_remove_ns)
def nvmf_subsystem_add_host(args): def nvmf_subsystem_add_host(args):
rpc.nvmf.nvmf_subsystem_add_host(args) rpc.nvmf.nvmf_subsystem_add_host(args.client, args)
p = subparsers.add_parser('nvmf_subsystem_add_host', help='Add a host to an NVMe-oF subsystem') p = subparsers.add_parser('nvmf_subsystem_add_host', help='Add a host to an NVMe-oF subsystem')
p.add_argument('nqn', help='NVMe-oF subsystem NQN') p.add_argument('nqn', help='NVMe-oF subsystem NQN')
@ -623,7 +623,7 @@ if __name__ == "__main__":
p.set_defaults(func=nvmf_subsystem_add_host) p.set_defaults(func=nvmf_subsystem_add_host)
def nvmf_subsystem_remove_host(args): def nvmf_subsystem_remove_host(args):
rpc.nvmf.nvmf_subsystem_remove_host(args) rpc.nvmf.nvmf_subsystem_remove_host(args.client, args)
p = subparsers.add_parser('nvmf_subsystem_remove_host', help='Remove a host from an NVMe-oF subsystem') p = subparsers.add_parser('nvmf_subsystem_remove_host', help='Remove a host from an NVMe-oF subsystem')
p.add_argument('nqn', help='NVMe-oF subsystem NQN') p.add_argument('nqn', help='NVMe-oF subsystem NQN')
@ -631,7 +631,7 @@ if __name__ == "__main__":
p.set_defaults(func=nvmf_subsystem_remove_host) p.set_defaults(func=nvmf_subsystem_remove_host)
def nvmf_subsystem_allow_any_host(args): def nvmf_subsystem_allow_any_host(args):
rpc.nvmf.nvmf_subsystem_allow_any_host(args) rpc.nvmf.nvmf_subsystem_allow_any_host(args.client, args)
p = subparsers.add_parser('nvmf_subsystem_allow_any_host', help='Allow any host to connect to the subsystem') p = subparsers.add_parser('nvmf_subsystem_allow_any_host', help='Allow any host to connect to the subsystem')
p.add_argument('nqn', help='NVMe-oF subsystem NQN') p.add_argument('nqn', help='NVMe-oF subsystem NQN')
@ -641,7 +641,7 @@ if __name__ == "__main__":
# pmem # pmem
def create_pmem_pool(args): def create_pmem_pool(args):
rpc.pmem.create_pmem_pool(args) rpc.pmem.create_pmem_pool(args.client, args)
p = subparsers.add_parser('create_pmem_pool', help='Create pmem pool') p = subparsers.add_parser('create_pmem_pool', help='Create pmem pool')
p.add_argument('pmem_file', help='Path to pmemblk pool file') p.add_argument('pmem_file', help='Path to pmemblk pool file')
@ -650,14 +650,14 @@ if __name__ == "__main__":
p.set_defaults(func=create_pmem_pool) p.set_defaults(func=create_pmem_pool)
def pmem_pool_info(args): def pmem_pool_info(args):
print_dict(rpc.pmem.pmem_pool_info(args)) print_dict(rpc.pmem.pmem_pool_info(args.client, args))
p = subparsers.add_parser('pmem_pool_info', help='Display pmem pool info and check consistency') p = subparsers.add_parser('pmem_pool_info', help='Display pmem pool info and check consistency')
p.add_argument('pmem_file', help='Path to pmemblk pool file') p.add_argument('pmem_file', help='Path to pmemblk pool file')
p.set_defaults(func=pmem_pool_info) p.set_defaults(func=pmem_pool_info)
def delete_pmem_pool(args): def delete_pmem_pool(args):
rpc.pmem.delete_pmem_pool(args) rpc.pmem.delete_pmem_pool(args.client, args)
p = subparsers.add_parser('delete_pmem_pool', help='Delete pmem pool') p = subparsers.add_parser('delete_pmem_pool', help='Delete pmem pool')
p.add_argument('pmem_file', help='Path to pmemblk pool file') p.add_argument('pmem_file', help='Path to pmemblk pool file')
@ -665,14 +665,14 @@ if __name__ == "__main__":
# subsystem # subsystem
def get_subsystems(args): def get_subsystems(args):
print_dict(rpc.subsystem.get_subsystems(args)) print_dict(rpc.subsystem.get_subsystems(args.client, args))
p = subparsers.add_parser('get_subsystems', help=""""Print subsystems array in initialization order. Each subsystem p = subparsers.add_parser('get_subsystems', help=""""Print subsystems array in initialization order. Each subsystem
entry contain (unsorted) array of subsystems it depends on.""") entry contain (unsorted) array of subsystems it depends on.""")
p.set_defaults(func=get_subsystems) p.set_defaults(func=get_subsystems)
def get_subsystem_config(args): def get_subsystem_config(args):
print_dict(rpc.subsystem.get_subsystem_config(args)) print_dict(rpc.subsystem.get_subsystem_config(args.client, args))
p = subparsers.add_parser('get_subsystem_config', help=""""Print subsystem configuration""") p = subparsers.add_parser('get_subsystem_config', help=""""Print subsystem configuration""")
p.add_argument('name', help='Name of subsystem to query') p.add_argument('name', help='Name of subsystem to query')
@ -680,7 +680,7 @@ if __name__ == "__main__":
# vhost # vhost
def set_vhost_controller_coalescing(args): def set_vhost_controller_coalescing(args):
rpc.vhost.set_vhost_controller_coalescing(args) rpc.vhost.set_vhost_controller_coalescing(args.client, args)
p = subparsers.add_parser('set_vhost_controller_coalescing', help='Set vhost controller coalescing') p = subparsers.add_parser('set_vhost_controller_coalescing', help='Set vhost controller coalescing')
p.add_argument('ctrlr', help='controller name') p.add_argument('ctrlr', help='controller name')
@ -689,7 +689,7 @@ if __name__ == "__main__":
p.set_defaults(func=set_vhost_controller_coalescing) p.set_defaults(func=set_vhost_controller_coalescing)
def construct_vhost_scsi_controller(args): def construct_vhost_scsi_controller(args):
rpc.vhost.construct_vhost_scsi_controller(args) rpc.vhost.construct_vhost_scsi_controller(args.client, args)
p = subparsers.add_parser( p = subparsers.add_parser(
'construct_vhost_scsi_controller', help='Add new vhost controller') 'construct_vhost_scsi_controller', help='Add new vhost controller')
@ -698,7 +698,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_vhost_scsi_controller) p.set_defaults(func=construct_vhost_scsi_controller)
def add_vhost_scsi_lun(args): def add_vhost_scsi_lun(args):
rpc.vhost.add_vhost_scsi_lun(args) rpc.vhost.add_vhost_scsi_lun(args.client, args)
p = subparsers.add_parser('add_vhost_scsi_lun', p = subparsers.add_parser('add_vhost_scsi_lun',
help='Add lun to vhost controller') help='Add lun to vhost controller')
@ -708,7 +708,7 @@ if __name__ == "__main__":
p.set_defaults(func=add_vhost_scsi_lun) p.set_defaults(func=add_vhost_scsi_lun)
def remove_vhost_scsi_target(args): def remove_vhost_scsi_target(args):
rpc.vhost.remove_vhost_scsi_target(args) rpc.vhost.remove_vhost_scsi_target(args.client, args)
p = subparsers.add_parser('remove_vhost_scsi_target', help='Remove target from vhost controller') p = subparsers.add_parser('remove_vhost_scsi_target', help='Remove target from vhost controller')
p.add_argument('ctrlr', help='controller name to remove target from') p.add_argument('ctrlr', help='controller name to remove target from')
@ -716,7 +716,7 @@ if __name__ == "__main__":
p.set_defaults(func=remove_vhost_scsi_target) p.set_defaults(func=remove_vhost_scsi_target)
def construct_vhost_blk_controller(args): def construct_vhost_blk_controller(args):
rpc.vhost.construct_vhost_blk_controller(args) rpc.vhost.construct_vhost_blk_controller(args.client, args)
p = subparsers.add_parser('construct_vhost_blk_controller', help='Add a new vhost block controller') p = subparsers.add_parser('construct_vhost_blk_controller', help='Add a new vhost block controller')
p.add_argument('ctrlr', help='controller name') p.add_argument('ctrlr', help='controller name')
@ -726,20 +726,20 @@ if __name__ == "__main__":
p.set_defaults(func=construct_vhost_blk_controller) p.set_defaults(func=construct_vhost_blk_controller)
def get_vhost_controllers(args): def get_vhost_controllers(args):
print_dict(rpc.vhost.get_vhost_controllers(args)) print_dict(rpc.vhost.get_vhost_controllers(args.client, args))
p = subparsers.add_parser('get_vhost_controllers', help='List vhost controllers') p = subparsers.add_parser('get_vhost_controllers', help='List vhost controllers')
p.set_defaults(func=get_vhost_controllers) p.set_defaults(func=get_vhost_controllers)
def remove_vhost_controller(args): def remove_vhost_controller(args):
rpc.vhost.remove_vhost_controller(args) rpc.vhost.remove_vhost_controller(args.client, args)
p = subparsers.add_parser('remove_vhost_controller', help='Remove a vhost controller') p = subparsers.add_parser('remove_vhost_controller', help='Remove a vhost controller')
p.add_argument('ctrlr', help='controller name') p.add_argument('ctrlr', help='controller name')
p.set_defaults(func=remove_vhost_controller) p.set_defaults(func=remove_vhost_controller)
def construct_virtio_user_scsi_bdev(args): def construct_virtio_user_scsi_bdev(args):
print_dict(rpc.vhost.construct_virtio_user_scsi_bdev(args)) print_dict(rpc.vhost.construct_virtio_user_scsi_bdev(args.client, args))
p = subparsers.add_parser('construct_virtio_user_scsi_bdev', help="""Connect to virtio user scsi device. p = subparsers.add_parser('construct_virtio_user_scsi_bdev', help="""Connect to virtio user scsi device.
This imply scan and add bdevs offered by remote side. This imply scan and add bdevs offered by remote side.
@ -752,7 +752,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_virtio_user_scsi_bdev) p.set_defaults(func=construct_virtio_user_scsi_bdev)
def construct_virtio_pci_scsi_bdev(args): def construct_virtio_pci_scsi_bdev(args):
print_dict(rpc.vhost.construct_virtio_pci_scsi_bdev(args)) print_dict(rpc.vhost.construct_virtio_pci_scsi_bdev(args.client, args))
p = subparsers.add_parser('construct_virtio_pci_scsi_bdev', help="""Create a Virtio p = subparsers.add_parser('construct_virtio_pci_scsi_bdev', help="""Create a Virtio
SCSI device from a virtio-pci device.""") SCSI device from a virtio-pci device.""")
@ -763,13 +763,13 @@ if __name__ == "__main__":
p.set_defaults(func=construct_virtio_pci_scsi_bdev) p.set_defaults(func=construct_virtio_pci_scsi_bdev)
def get_virtio_scsi_devs(args): def get_virtio_scsi_devs(args):
print_dict(rpc.vhost.get_virtio_scsi_devs(args)) print_dict(rpc.vhost.get_virtio_scsi_devs(args.client, args))
p = subparsers.add_parser('get_virtio_scsi_devs', help='List all Virtio-SCSI devices.') p = subparsers.add_parser('get_virtio_scsi_devs', help='List all Virtio-SCSI devices.')
p.set_defaults(func=get_virtio_scsi_devs) p.set_defaults(func=get_virtio_scsi_devs)
def remove_virtio_scsi_bdev(args): def remove_virtio_scsi_bdev(args):
rpc.vhost.remove_virtio_scsi_bdev(args) rpc.vhost.remove_virtio_scsi_bdev(args.client, args)
p = subparsers.add_parser('remove_virtio_scsi_bdev', help="""Remove a Virtio-SCSI device p = subparsers.add_parser('remove_virtio_scsi_bdev', help="""Remove a Virtio-SCSI device
This will delete all bdevs exposed by this device""") This will delete all bdevs exposed by this device""")
@ -777,7 +777,7 @@ if __name__ == "__main__":
p.set_defaults(func=remove_virtio_scsi_bdev) p.set_defaults(func=remove_virtio_scsi_bdev)
def construct_virtio_user_blk_bdev(args): def construct_virtio_user_blk_bdev(args):
print_dict(rpc.vhost.construct_virtio_user_blk_bdev(args)) print_dict(rpc.vhost.construct_virtio_user_blk_bdev(args.client, args))
p = subparsers.add_parser('construct_virtio_user_blk_bdev', help='Connect to a virtio user blk device.') p = subparsers.add_parser('construct_virtio_user_blk_bdev', help='Connect to a virtio user blk device.')
p.add_argument('path', help='Path to Virtio BLK socket') p.add_argument('path', help='Path to Virtio BLK socket')
@ -787,7 +787,7 @@ if __name__ == "__main__":
p.set_defaults(func=construct_virtio_user_blk_bdev) p.set_defaults(func=construct_virtio_user_blk_bdev)
def construct_virtio_pci_blk_bdev(args): def construct_virtio_pci_blk_bdev(args):
print_dict(rpc.vhost.construct_virtio_pci_blk_bdev(args)) print_dict(rpc.vhost.construct_virtio_pci_blk_bdev(args.client, args))
p = subparsers.add_parser('construct_virtio_pci_blk_bdev', help='Create a Virtio Blk device from a virtio-pci device.') p = subparsers.add_parser('construct_virtio_pci_blk_bdev', help='Create a Virtio Blk device from a virtio-pci device.')
p.add_argument('pci_address', help="""PCI address in domain:bus:device.function format or p.add_argument('pci_address', help="""PCI address in domain:bus:device.function format or

12
scripts/rpc/__init__.py
View File

@ -14,19 +14,19 @@ from . import subsystem
from . import vhost from . import vhost
def get_rpc_methods(args): def get_rpc_methods(client):
return args.client.call('get_rpc_methods') return client.call('get_rpc_methods')
def save_config(args): def save_config(client, args):
config = { config = {
'subsystems': [] 'subsystems': []
} }
for elem in args.client.call('get_subsystems'): for elem in client.call('get_subsystems'):
cfg = { cfg = {
'subsystem': elem['subsystem'], '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) config['subsystems'].append(cfg)
@ -59,4 +59,4 @@ def load_config(args):
if not config: if not config:
continue continue
for elem in subsystem['config']: for elem in subsystem['config']:
args.client.call(elem['method'], elem['params']) client.call(elem['method'], elem['params'])

8
scripts/rpc/app.py
View File

@ -1,12 +1,12 @@
def kill_instance(args): def kill_instance(client, args):
params = {'sig_name': args.sig_name} 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 = {} params = {}
if args.enable: if args.enable:
params['enabled'] = True params['enabled'] = True
if args.disable: if args.disable:
params['enabled'] = False params['enabled'] = False
return args.client.call('context_switch_monitor', params) return client.call('context_switch_monitor', params)

48
scripts/rpc/bdev.py
View File

@ -1,33 +1,33 @@
def construct_malloc_bdev(args): def construct_malloc_bdev(client, args):
num_blocks = (args.total_size * 1024 * 1024) / args.block_size num_blocks = (args.total_size * 1024 * 1024) / args.block_size
params = {'num_blocks': num_blocks, 'block_size': args.block_size} params = {'num_blocks': num_blocks, 'block_size': args.block_size}
if args.name: if args.name:
params['name'] = args.name params['name'] = args.name
if args.uuid: if args.uuid:
params['uuid'] = 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 num_blocks = (args.total_size * 1024 * 1024) / args.block_size
params = {'name': args.name, 'num_blocks': num_blocks, params = {'name': args.name, 'num_blocks': num_blocks,
'block_size': args.block_size} 'block_size': args.block_size}
if args.uuid: if args.uuid:
params['uuid'] = 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, params = {'name': args.name,
'filename': args.filename} 'filename': args.filename}
if args.block_size: if args.block_size:
params['block_size'] = 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, params = {'name': args.name,
'trtype': args.trtype, 'trtype': args.trtype,
'traddr': args.traddr} 'traddr': args.traddr}
@ -41,10 +41,10 @@ def construct_nvme_bdev(args):
if args.subnqn: if args.subnqn:
params['subnqn'] = 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 = { params = {
'pool_name': args.pool_name, 'pool_name': args.pool_name,
'rbd_name': args.rbd_name, 'rbd_name': args.rbd_name,
@ -54,42 +54,42 @@ def construct_rbd_bdev(args):
if args.name: if args.name:
params['name'] = 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} 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 = { params = {
'pmem_file': args.pmem_file, 'pmem_file': args.pmem_file,
'name': args.name '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 = {} params = {}
if args.name: if args.name:
params['name'] = 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 = {} params = {}
if args.name: if args.name:
params['name'] = 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} 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 = { params = {
'name': args.name, 'name': args.name,
'io_type': args.io_type, 'io_type': args.io_type,
@ -97,12 +97,12 @@ def bdev_inject_error(args):
'num': args.num, '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 = { params = {
'filename': args.filename, 'filename': args.filename,
'bdev_name': args.bdev_name, 'bdev_name': args.bdev_name,
} }
return args.client.call('apply_nvme_firmware', params) return client.call('apply_nvme_firmware', params)

68
scripts/rpc/iscsi.py
View File

@ -1,16 +1,16 @@
def get_portal_groups(args): def get_portal_groups(client, args):
return args.client.call('get_portal_groups') return client.call('get_portal_groups')
def get_initiator_groups(args): def get_initiator_groups(client, args):
return args.client.call('get_initiator_groups') return client.call('get_initiator_groups')
def get_target_nodes(args): def get_target_nodes(client, args):
return args.client.call('get_target_nodes') return client.call('get_target_nodes')
def construct_target_node(args): def construct_target_node(client, args):
luns = [] luns = []
for u in args.bdev_name_id_pairs.strip().split(" "): for u in args.bdev_name_id_pairs.strip().split(" "):
bdev_name, lun_id = u.split(":") bdev_name, lun_id = u.split(":")
@ -41,20 +41,20 @@ def construct_target_node(args):
params['header_digest'] = args.header_digest params['header_digest'] = args.header_digest
if args.data_digest: if args.data_digest:
params['data_digest'] = 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 = { params = {
'name': args.name, 'name': args.name,
'bdev_name': args.bdev_name, 'bdev_name': args.bdev_name,
} }
if args.lun_id: if args.lun_id:
params['lun_id'] = 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 = [] pg_ig_maps = []
for u in args.pg_ig_mappings.strip().split(" "): for u in args.pg_ig_mappings.strip().split(" "):
pg, ig = u.split(":") pg, ig = u.split(":")
@ -63,10 +63,10 @@ def delete_pg_ig_maps(args):
'name': args.name, 'name': args.name,
'pg_ig_maps': pg_ig_maps, '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 = [] pg_ig_maps = []
for u in args.pg_ig_mappings.strip().split(" "): for u in args.pg_ig_mappings.strip().split(" "):
pg, ig = u.split(":") pg, ig = u.split(":")
@ -75,10 +75,10 @@ def add_pg_ig_maps(args):
'name': args.name, 'name': args.name,
'pg_ig_maps': pg_ig_maps, '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 # parse out portal list host1:port1 host2:port2
portals = [] portals = []
for p in args.portal_list: for p in args.portal_list:
@ -93,10 +93,10 @@ def add_portal_group(args):
portals.append({'host': ip, 'port': port, 'cpumask': cpumask}) portals.append({'host': ip, 'port': port, 'cpumask': cpumask})
params = {'tag': args.tag, 'portals': portals} 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 = [] initiators = []
netmasks = [] netmasks = []
for i in args.initiator_list.strip().split(' '): for i in args.initiator_list.strip().split(' '):
@ -105,10 +105,10 @@ def add_initiator_group(args):
netmasks.append(n) netmasks.append(n)
params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks} 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 = [] initiators = []
netmasks = [] netmasks = []
if args.initiator_list: if args.initiator_list:
@ -119,10 +119,10 @@ def add_initiators_to_initiator_group(args):
netmasks.append(n) netmasks.append(n)
params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks} 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 = [] initiators = []
netmasks = [] netmasks = []
if args.initiator_list: if args.initiator_list:
@ -133,31 +133,31 @@ def delete_initiators_from_initiator_group(args):
netmasks.append(n) netmasks.append(n)
params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks} 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} 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} 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} params = {'tag': args.tag}
return args.client.call('delete_initiator_group', params) return client.call('delete_initiator_group', params)
def get_iscsi_connections(args): def get_iscsi_connections(client, args):
return args.client.call('get_iscsi_connections') return client.call('get_iscsi_connections')
def get_iscsi_global_params(args): def get_iscsi_global_params(client, args):
return args.client.call('get_iscsi_global_params') return client.call('get_iscsi_global_params')
def get_scsi_devices(args): def get_scsi_devices(client, args):
return args.client.call('get_scsi_devices') return client.call('get_scsi_devices')

28
scripts/rpc/log.py
View File

@ -1,30 +1,30 @@
def set_trace_flag(args): def set_trace_flag(client, args):
params = {'flag': args.flag} params = {'flag': args.flag}
return args.client.call('set_trace_flag', params) return client.call('set_trace_flag', params)
def clear_trace_flag(args): def clear_trace_flag(client, args):
params = {'flag': args.flag} params = {'flag': args.flag}
return args.client.call('clear_trace_flag', params) return client.call('clear_trace_flag', params)
def get_trace_flags(args): def get_trace_flags(client, args):
return args.client.call('get_trace_flags') return client.call('get_trace_flags')
def set_log_level(args): def set_log_level(client, args):
params = {'level': args.level} params = {'level': args.level}
return args.client.call('set_log_level', params) return client.call('set_log_level', params)
def get_log_level(args): def get_log_level(client, args):
return args.client.call('get_log_level') return client.call('get_log_level')
def set_log_print_level(args): def set_log_print_level(client, args):
params = {'level': args.level} params = {'level': args.level}
return args.client.call('set_log_print_level', params) return client.call('set_log_print_level', params)
def get_log_print_level(args): def get_log_print_level(client, args):
return args.client.call('get_log_print_level') return client.call('get_log_print_level')

28
scripts/rpc/lvol.py
View File

@ -1,19 +1,19 @@
def construct_lvol_store(args): def construct_lvol_store(client, args):
params = {'bdev_name': args.bdev_name, 'lvs_name': args.lvs_name} params = {'bdev_name': args.bdev_name, 'lvs_name': args.lvs_name}
if args.cluster_sz: if args.cluster_sz:
params['cluster_sz'] = args.cluster_sz params['cluster_sz'] = args.cluster_sz
return args.client.call('construct_lvol_store', params) return client.call('construct_lvol_store', params)
def rename_lvol_store(args): def rename_lvol_store(client, args):
params = { params = {
'old_name': args.old_name, 'old_name': args.old_name,
'new_name': args.new_name 'new_name': args.new_name
} }
return args.client.call('rename_lvol_store', params) return client.call('rename_lvol_store', params)
def construct_lvol_bdev(args): def construct_lvol_bdev(client, args):
num_bytes = (args.size * 1024 * 1024) num_bytes = (args.size * 1024 * 1024)
params = {'lvol_name': args.lvol_name, 'size': num_bytes} params = {'lvol_name': args.lvol_name, 'size': num_bytes}
if args.thin_provision: if args.thin_provision:
@ -25,28 +25,28 @@ def construct_lvol_bdev(args):
params['uuid'] = args.uuid params['uuid'] = args.uuid
if args.lvs_name: if args.lvs_name:
params['lvs_name'] = args.lvs_name params['lvs_name'] = args.lvs_name
return args.client.call('construct_lvol_bdev', params) return client.call('construct_lvol_bdev', params)
def rename_lvol_bdev(args): def rename_lvol_bdev(client, args):
params = { params = {
'old_name': args.old_name, 'old_name': args.old_name,
'new_name': args.new_name 'new_name': args.new_name
} }
return args.client.call('rename_lvol_bdev', params) return client.call('rename_lvol_bdev', params)
# Logical volume resize feature is disabled, as it is currently work in progress # Logical volume resize feature is disabled, as it is currently work in progress
# #
# def resize_lvol_bdev(args): # def resize_lvol_bdev(client, args):
# params = { # params = {
# 'name': args.name, # 'name': args.name,
# 'size': args.size, # 'size': args.size,
# } # }
# return args.client.call('resize_lvol_bdev', params) # return client.call('resize_lvol_bdev', params)
def destroy_lvol_store(args): def destroy_lvol_store(client, args):
params = {} params = {}
if (args.uuid and args.lvs_name) or (not args.uuid and not args.lvs_name): if (args.uuid and args.lvs_name) or (not args.uuid and not args.lvs_name):
print("You need to specify either uuid or name of lvolstore") print("You need to specify either uuid or name of lvolstore")
@ -55,10 +55,10 @@ def destroy_lvol_store(args):
params['uuid'] = args.uuid params['uuid'] = args.uuid
if args.lvs_name: if args.lvs_name:
params['lvs_name'] = args.lvs_name params['lvs_name'] = args.lvs_name
return args.client.call('destroy_lvol_store', params) return client.call('destroy_lvol_store', params)
def get_lvol_stores(args): def get_lvol_stores(client, args):
params = {} params = {}
if (args.uuid and args.lvs_name): if (args.uuid and args.lvs_name):
print("You can only specify either uuid or name of lvolstore") print("You can only specify either uuid or name of lvolstore")
@ -66,4 +66,4 @@ def get_lvol_stores(args):
params['uuid'] = args.uuid params['uuid'] = args.uuid
if args.lvs_name: if args.lvs_name:
params['lvs_name'] = args.lvs_name params['lvs_name'] = args.lvs_name
return args.client.call('get_lvol_stores', params) return client.call('get_lvol_stores', params)

12
scripts/rpc/nbd.py
View File

@ -1,18 +1,18 @@
def start_nbd_disk(args): def start_nbd_disk(client, args):
params = { params = {
'bdev_name': args.bdev_name, 'bdev_name': args.bdev_name,
'nbd_device': args.nbd_device 'nbd_device': args.nbd_device
} }
return args.client.call('start_nbd_disk', params) return client.call('start_nbd_disk', params)
def stop_nbd_disk(args): def stop_nbd_disk(client, args):
params = {'nbd_device': args.nbd_device} params = {'nbd_device': args.nbd_device}
return args.client.call('stop_nbd_disk', params) return client.call('stop_nbd_disk', params)
def get_nbd_disks(args): def get_nbd_disks(client, args):
params = {} params = {}
if args.nbd_device: if args.nbd_device:
params['nbd_device'] = args.nbd_device params['nbd_device'] = args.nbd_device
return args.client.call('get_nbd_disks', params) return client.call('get_nbd_disks', params)

12
scripts/rpc/net.py
View File

@ -1,12 +1,12 @@
def add_ip_address(args): def add_ip_address(client, args):
params = {'ifc_index': args.ifc_index, 'ip_address': args.ip_addr} params = {'ifc_index': args.ifc_index, 'ip_address': args.ip_addr}
return args.client.call('add_ip_address', params) return client.call('add_ip_address', params)
def delete_ip_address(args): def delete_ip_address(client, args):
params = {'ifc_index': args.ifc_index, 'ip_address': args.ip_addr} params = {'ifc_index': args.ifc_index, 'ip_address': args.ip_addr}
return args.client.call('delete_ip_address', params) return client.call('delete_ip_address', params)
def get_interfaces(args): def get_interfaces(client, args):
return args.client.call('get_interfaces') return client.call('get_interfaces')

40
scripts/rpc/nvmf.py
View File

@ -1,8 +1,8 @@
def get_nvmf_subsystems(args): def get_nvmf_subsystems(client, args):
return args.client.call('get_nvmf_subsystems') return client.call('get_nvmf_subsystems')
def construct_nvmf_subsystem(args): def construct_nvmf_subsystem(client, args):
params = { params = {
'nqn': args.nqn, 'nqn': args.nqn,
'serial_number': args.serial_number, 'serial_number': args.serial_number,
@ -38,10 +38,10 @@ def construct_nvmf_subsystem(args):
namespaces.append(ns_params) namespaces.append(ns_params)
params['namespaces'] = namespaces params['namespaces'] = namespaces
return args.client.call('construct_nvmf_subsystem', params) return client.call('construct_nvmf_subsystem', params)
def nvmf_subsystem_add_listener(args): def nvmf_subsystem_add_listener(client, args):
listen_address = {'trtype': args.trtype, listen_address = {'trtype': args.trtype,
'traddr': args.traddr, 'traddr': args.traddr,
'trsvcid': args.trsvcid} 'trsvcid': args.trsvcid}
@ -52,10 +52,10 @@ def nvmf_subsystem_add_listener(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'listen_address': listen_address} 'listen_address': listen_address}
return args.client.call('nvmf_subsystem_add_listener', params) return client.call('nvmf_subsystem_add_listener', params)
def nvmf_subsystem_remove_listener(args): def nvmf_subsystem_remove_listener(client, args):
listen_address = {'trtype': args.trtype, listen_address = {'trtype': args.trtype,
'traddr': args.traddr, 'traddr': args.traddr,
'trsvcid': args.trsvcid} 'trsvcid': args.trsvcid}
@ -66,10 +66,10 @@ def nvmf_subsystem_remove_listener(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'listen_address': listen_address} 'listen_address': listen_address}
return args.client.call('nvmf_subsystem_remove_listener', params) return client.call('nvmf_subsystem_remove_listener', params)
def nvmf_subsystem_add_ns(args): def nvmf_subsystem_add_ns(client, args):
ns = {'bdev_name': args.bdev_name} ns = {'bdev_name': args.bdev_name}
if args.nsid: if args.nsid:
@ -84,38 +84,38 @@ def nvmf_subsystem_add_ns(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'namespace': ns} 'namespace': ns}
return args.client.call('nvmf_subsystem_add_ns', params) return client.call('nvmf_subsystem_add_ns', params)
def nvmf_subsystem_remove_ns(args): def nvmf_subsystem_remove_ns(client, args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'nsid': args.nsid} 'nsid': args.nsid}
return args.client.call('nvmf_subsystem_remove_ns', params) return client.call('nvmf_subsystem_remove_ns', params)
def nvmf_subsystem_add_host(args): def nvmf_subsystem_add_host(client, args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'host': args.host} 'host': args.host}
return args.client.call('nvmf_subsystem_add_host', params) return client.call('nvmf_subsystem_add_host', params)
def nvmf_subsystem_remove_host(args): def nvmf_subsystem_remove_host(client, args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'host': args.host} 'host': args.host}
return args.client.call('nvmf_subsystem_remove_host', params) return client.call('nvmf_subsystem_remove_host', params)
def nvmf_subsystem_allow_any_host(args): def nvmf_subsystem_allow_any_host(client, args):
params = {'nqn': args.nqn} params = {'nqn': args.nqn}
params['allow_any_host'] = False if args.disable else True params['allow_any_host'] = False if args.disable else True
return args.client.call('nvmf_subsystem_allow_any_host', params) return client.call('nvmf_subsystem_allow_any_host', params)
def delete_nvmf_subsystem(args): def delete_nvmf_subsystem(client, args):
params = {'nqn': args.subsystem_nqn} params = {'nqn': args.subsystem_nqn}
return args.client.call('delete_nvmf_subsystem', params) return client.call('delete_nvmf_subsystem', params)

12
scripts/rpc/pmem.py
View File

@ -1,16 +1,16 @@
def create_pmem_pool(args): def create_pmem_pool(client, args):
num_blocks = (args.total_size * 1024 * 1024) / args.block_size num_blocks = (args.total_size * 1024 * 1024) / args.block_size
params = {'pmem_file': args.pmem_file, params = {'pmem_file': args.pmem_file,
'num_blocks': num_blocks, 'num_blocks': num_blocks,
'block_size': args.block_size} 'block_size': args.block_size}
return args.client.call('create_pmem_pool', params) return client.call('create_pmem_pool', params)
def pmem_pool_info(args): def pmem_pool_info(client, args):
params = {'pmem_file': args.pmem_file} params = {'pmem_file': args.pmem_file}
return args.client.call('pmem_pool_info', params) return client.call('pmem_pool_info', params)
def delete_pmem_pool(args): def delete_pmem_pool(client, args):
params = {'pmem_file': args.pmem_file} params = {'pmem_file': args.pmem_file}
return args.client.call('delete_pmem_pool', params) return client.call('delete_pmem_pool', params)

8
scripts/rpc/subsystem.py
View File

@ -1,7 +1,7 @@
def get_subsystems(args): def get_subsystems(client, args):
return args.client.call('get_subsystems') return client.call('get_subsystems')
def get_subsystem_config(args): def get_subsystem_config(client, args):
params = {'name': args.name} params = {'name': args.name}
return args.client.call('get_subsystem_config', params) return client.call('get_subsystem_config', params)

52
scripts/rpc/vhost.py
View File

@ -1,39 +1,39 @@
def set_vhost_controller_coalescing(args): def set_vhost_controller_coalescing(client, args):
params = { params = {
'ctrlr': args.ctrlr, 'ctrlr': args.ctrlr,
'delay_base_us': args.delay_base_us, 'delay_base_us': args.delay_base_us,
'iops_threshold': args.iops_threshold, 'iops_threshold': args.iops_threshold,
} }
return args.client.call('set_vhost_controller_coalescing', params) return client.call('set_vhost_controller_coalescing', params)
def construct_vhost_scsi_controller(args): def construct_vhost_scsi_controller(client, args):
params = {'ctrlr': args.ctrlr} params = {'ctrlr': args.ctrlr}
if args.cpumask: if args.cpumask:
params['cpumask'] = args.cpumask params['cpumask'] = args.cpumask
return args.client.call('construct_vhost_scsi_controller', params) return client.call('construct_vhost_scsi_controller', params)
def add_vhost_scsi_lun(args): def add_vhost_scsi_lun(client, args):
params = { params = {
'ctrlr': args.ctrlr, 'ctrlr': args.ctrlr,
'bdev_name': args.bdev_name, 'bdev_name': args.bdev_name,
'scsi_target_num': args.scsi_target_num 'scsi_target_num': args.scsi_target_num
} }
return args.client.call('add_vhost_scsi_lun', params) return client.call('add_vhost_scsi_lun', params)
def remove_vhost_scsi_target(args): def remove_vhost_scsi_target(client, args):
params = { params = {
'ctrlr': args.ctrlr, 'ctrlr': args.ctrlr,
'scsi_target_num': args.scsi_target_num 'scsi_target_num': args.scsi_target_num
} }
return args.client.call('remove_vhost_scsi_target', params) return client.call('remove_vhost_scsi_target', params)
def construct_vhost_blk_controller(args): def construct_vhost_blk_controller(client, args):
params = { params = {
'ctrlr': args.ctrlr, 'ctrlr': args.ctrlr,
'dev_name': args.dev_name, 'dev_name': args.dev_name,
@ -42,19 +42,19 @@ def construct_vhost_blk_controller(args):
params['cpumask'] = args.cpumask params['cpumask'] = args.cpumask
if args.readonly: if args.readonly:
params['readonly'] = args.readonly params['readonly'] = args.readonly
return args.client.call('construct_vhost_blk_controller', params) return client.call('construct_vhost_blk_controller', params)
def get_vhost_controllers(args): def get_vhost_controllers(client, args):
return args.client.call('get_vhost_controllers') return client.call('get_vhost_controllers')
def remove_vhost_controller(args): def remove_vhost_controller(client, args):
params = {'ctrlr': args.ctrlr} params = {'ctrlr': args.ctrlr}
return args.client.call('remove_vhost_controller', params) return client.call('remove_vhost_controller', params)
def construct_virtio_user_scsi_bdev(args): def construct_virtio_user_scsi_bdev(client, args):
params = { params = {
'path': args.path, 'path': args.path,
'name': args.name, 'name': args.name,
@ -63,27 +63,27 @@ def construct_virtio_user_scsi_bdev(args):
params['vq_count'] = args.vq_count params['vq_count'] = args.vq_count
if args.vq_size: if args.vq_size:
params['vq_size'] = args.vq_size params['vq_size'] = args.vq_size
return args.client.call('construct_virtio_user_scsi_bdev', params) return client.call('construct_virtio_user_scsi_bdev', params)
def construct_virtio_pci_scsi_bdev(args): def construct_virtio_pci_scsi_bdev(client, args):
params = { params = {
'pci_address': args.pci_address, 'pci_address': args.pci_address,
'name': args.name, 'name': args.name,
} }
return args.client.call('construct_virtio_pci_scsi_bdev', params) return client.call('construct_virtio_pci_scsi_bdev', params)
def remove_virtio_scsi_bdev(args): def remove_virtio_scsi_bdev(client, args):
params = {'name': args.name} params = {'name': args.name}
return args.client.call('remove_virtio_scsi_bdev', params) return client.call('remove_virtio_scsi_bdev', params)
def get_virtio_scsi_devs(args): def get_virtio_scsi_devs(client, args):
return args.client.call('get_virtio_scsi_devs') return client.call('get_virtio_scsi_devs')
def construct_virtio_user_blk_bdev(args): def construct_virtio_user_blk_bdev(client, args):
params = { params = {
'path': args.path, 'path': args.path,
'name': args.name, 'name': args.name,
@ -92,12 +92,12 @@ def construct_virtio_user_blk_bdev(args):
params['vq_count'] = args.vq_count params['vq_count'] = args.vq_count
if args.vq_size: if args.vq_size:
params['vq_size'] = args.vq_size params['vq_size'] = args.vq_size
return args.client.call('construct_virtio_user_blk_bdev', params) return client.call('construct_virtio_user_blk_bdev', params)
def construct_virtio_pci_blk_bdev(args): def construct_virtio_pci_blk_bdev(client, args):
params = { params = {
'pci_address': args.pci_address, 'pci_address': args.pci_address,
'name': args.name, 'name': args.name,
} }
return args.client.call('construct_virtio_pci_blk_bdev', params) return client.call('construct_virtio_pci_blk_bdev', params)