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

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

Browse Source 
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: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/404426
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-19 15:24:32 -07:00 committed by Jim Harris
parent c1961daedb
commit df897ed490
13 changed files with 405 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

407
scripts/rpc.py
View File

@ -1,5 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
from rpc.client import print_dict, print_array, int_arg
import argparse import argparse
import rpc import rpc
@ -18,32 +20,50 @@ if __name__ == "__main__":
help='Verbose mode', action='store_true') help='Verbose mode', action='store_true')
subparsers = parser.add_subparsers(help='RPC methods') subparsers = parser.add_subparsers(help='RPC methods')
def get_rpc_methods(args):
print_dict(rpc.get_rpc_methods(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=rpc.get_rpc_methods) p.set_defaults(func=get_rpc_methods)
def save_config(args):
rpc.save_config(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.""")
p.add_argument('-f', '--filename', help="""File where to save JSON configuration to.""") p.add_argument('-f', '--filename', help="""File where to save JSON configuration to.""")
p.add_argument('-i', '--indent', help="""Indent level. Value less than 0 mean compact mode. If filename is not given default p.add_argument('-i', '--indent', help="""Indent level. Value less than 0 mean compact mode. If filename is not given default
indent level is 2. If writing to file of filename is '-' then default is compact mode.""", type=int, default=2) indent level is 2. If writing to file of filename is '-' then default is compact mode.""", type=int, default=2)
p.set_defaults(func=rpc.save_config) p.set_defaults(func=save_config)
def load_config(args):
rpc.load_config(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.""")
p.add_argument('--filename', help="""JSON Configuration file.""") p.add_argument('--filename', help="""JSON Configuration file.""")
p.set_defaults(func=rpc.load_config) p.set_defaults(func=load_config)
# app # app
def kill_instance(args):
rpc.app.kill_instance(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=rpc.app.kill_instance) p.set_defaults(func=kill_instance)
def context_switch_monitor(args):
print_dict(rpc.app.context_switch_monitor(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')
p.add_argument('-d', '--disable', action='store_true', help='Disable context switch monitoring') p.add_argument('-d', '--disable', action='store_true', help='Disable context switch monitoring')
p.set_defaults(func=rpc.app.context_switch_monitor) p.set_defaults(func=context_switch_monitor)
# bdev # bdev
def construct_malloc_bdev(args):
print_array(rpc.bdev.construct_malloc_bdev(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')
p.add_argument('-b', '--name', help="Name of the bdev") p.add_argument('-b', '--name', help="Name of the bdev")
@ -51,7 +71,10 @@ if __name__ == "__main__":
p.add_argument( p.add_argument(
'total_size', help='Size of malloc bdev in MB (int > 0)', type=int) 'total_size', help='Size of malloc bdev in MB (int > 0)', type=int)
p.add_argument('block_size', help='Block size for this bdev', type=int) p.add_argument('block_size', help='Block size for this bdev', type=int)
p.set_defaults(func=rpc.bdev.construct_malloc_bdev) p.set_defaults(func=construct_malloc_bdev)
def construct_null_bdev(args):
print_array(rpc.bdev.construct_null_bdev(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')
@ -60,14 +83,20 @@ if __name__ == "__main__":
p.add_argument( p.add_argument(
'total_size', help='Size of null bdev in MB (int > 0)', type=int) 'total_size', help='Size of null bdev in MB (int > 0)', type=int)
p.add_argument('block_size', help='Block size for this bdev', type=int) p.add_argument('block_size', help='Block size for this bdev', type=int)
p.set_defaults(func=rpc.bdev.construct_null_bdev) p.set_defaults(func=construct_null_bdev)
def construct_aio_bdev(args):
print_array(rpc.bdev.construct_aio_bdev(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')
p.add_argument('filename', help='Path to device or file (ex: /dev/sda)') p.add_argument('filename', help='Path to device or file (ex: /dev/sda)')
p.add_argument('name', help='Block device name') p.add_argument('name', help='Block device name')
p.add_argument('block_size', help='Block size for this bdev', type=int, default=argparse.SUPPRESS) p.add_argument('block_size', help='Block size for this bdev', type=int, default=argparse.SUPPRESS)
p.set_defaults(func=rpc.bdev.construct_aio_bdev) p.set_defaults(func=construct_aio_bdev)
def construct_nvme_bdev(args):
print_array(rpc.bdev.construct_nvme_bdev(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')
@ -81,7 +110,10 @@ if __name__ == "__main__":
p.add_argument('-s', '--trsvcid', p.add_argument('-s', '--trsvcid',
help='NVMe-oF target trsvcid: e.g., a port number') help='NVMe-oF target trsvcid: e.g., a port number')
p.add_argument('-n', '--subnqn', help='NVMe-oF target subnqn') p.add_argument('-n', '--subnqn', help='NVMe-oF target subnqn')
p.set_defaults(func=rpc.bdev.construct_nvme_bdev) p.set_defaults(func=construct_nvme_bdev)
def construct_rbd_bdev(args):
print_array(rpc.bdev.construct_rbd_bdev(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')
@ -89,32 +121,50 @@ if __name__ == "__main__":
p.add_argument('pool_name', help='rbd pool name') p.add_argument('pool_name', help='rbd pool name')
p.add_argument('rbd_name', help='rbd image name') p.add_argument('rbd_name', help='rbd image name')
p.add_argument('block_size', help='rbd block size', type=int) p.add_argument('block_size', help='rbd block size', type=int)
p.set_defaults(func=rpc.bdev.construct_rbd_bdev) p.set_defaults(func=construct_rbd_bdev)
def construct_error_bdev(args):
rpc.bdev.construct_error_bdev(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')
p.add_argument('base_name', help='base bdev name') p.add_argument('base_name', help='base bdev name')
p.set_defaults(func=rpc.bdev.construct_error_bdev) p.set_defaults(func=construct_error_bdev)
def construct_pmem_bdev(args):
print_array(rpc.bdev.construct_pmem_bdev(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')
p.add_argument('-n', '--name', help='Block device name', required=True) p.add_argument('-n', '--name', help='Block device name', required=True)
p.set_defaults(func=rpc.bdev.construct_pmem_bdev) p.set_defaults(func=construct_pmem_bdev)
def get_bdevs(args):
print_dict(rpc.bdev.get_bdevs(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')
p.add_argument('-b', '--name', help="Name of the Blockdev. Example: Nvme0n1", required=False) p.add_argument('-b', '--name', help="Name of the Blockdev. Example: Nvme0n1", required=False)
p.set_defaults(func=rpc.bdev.get_bdevs) p.set_defaults(func=get_bdevs)
def delete_bdev(args):
rpc.bdev.delete_bdev(args)
def get_bdevs_config(args):
print_dict(rpc.bdev.get_bdevs_config(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')
p.add_argument('-b', '--name', help="Name of the Blockdev. Example: Nvme0n1", required=False) p.add_argument('-b', '--name', help="Name of the Blockdev. Example: Nvme0n1", required=False)
p.set_defaults(func=rpc.bdev.get_bdevs_config) p.set_defaults(func=get_bdevs_config)
p = subparsers.add_parser('delete_bdev', help='Delete a blockdev') p = subparsers.add_parser('delete_bdev', help='Delete a blockdev')
p.add_argument( p.add_argument(
'bdev_name', help='Blockdev name to be deleted. Example: Malloc0.') 'bdev_name', help='Blockdev name to be deleted. Example: Malloc0.')
p.set_defaults(func=rpc.bdev.delete_bdev) p.set_defaults(func=delete_bdev)
def bdev_inject_error(args):
rpc.bdev.bdev_inject_error(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""")
@ -122,24 +172,39 @@ if __name__ == "__main__":
p.add_argument('error_type', help="""error_type: 'failure' 'pending'""") p.add_argument('error_type', help="""error_type: 'failure' 'pending'""")
p.add_argument( p.add_argument(
'-n', '--num', help='the number of commands you want to fail', type=int, default=1) '-n', '--num', help='the number of commands you want to fail', type=int, default=1)
p.set_defaults(func=rpc.bdev.bdev_inject_error) p.set_defaults(func=bdev_inject_error)
def apply_firmware(args):
print_dict(rpc.bdev.apply_firmware(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')
p.add_argument('bdev_name', help='name of the NVMe device') p.add_argument('bdev_name', help='name of the NVMe device')
p.set_defaults(func=rpc.bdev.apply_firmware) p.set_defaults(func=apply_firmware)
# iSCSI # iSCSI
def get_portal_groups(args):
print_dict(rpc.iscsi.get_portal_groups(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=rpc.iscsi.get_portal_groups) p.set_defaults(func=get_portal_groups)
def get_initiator_groups(args):
print_dict(rpc.iscsi.get_initiator_groups(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=rpc.iscsi.get_initiator_groups) p.set_defaults(func=get_initiator_groups)
def get_target_nodes(args):
print_dict(rpc.iscsi.get_target_nodes(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=rpc.iscsi.get_target_nodes) p.set_defaults(func=get_target_nodes)
def construct_target_node(args):
rpc.iscsi.construct_target_node(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')
@ -169,7 +234,10 @@ if __name__ == "__main__":
help='Header Digest should be required for this target node.', action='store_true') help='Header Digest should be required for this target node.', action='store_true')
p.add_argument('-D', '--data-digest', p.add_argument('-D', '--data-digest',
help='Data Digest should be required for this target node.', action='store_true') help='Data Digest should be required for this target node.', action='store_true')
p.set_defaults(func=rpc.iscsi.construct_target_node) p.set_defaults(func=construct_target_node)
def target_node_add_lun(args):
rpc.iscsi.target_node_add_lun(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)')
@ -177,7 +245,10 @@ if __name__ == "__main__":
*** bdev name cannot contain space or colon characters ***""") *** bdev name cannot contain space or colon characters ***""")
p.add_argument('-i', dest='lun_id', help="""LUN ID (integer >= 0) p.add_argument('-i', dest='lun_id', help="""LUN ID (integer >= 0)
*** If LUN ID is omitted or -1, the lowest free one is assigned ***""", type=int, required=False) *** If LUN ID is omitted or -1, the lowest free one is assigned ***""", type=int, required=False)
p.set_defaults(func=rpc.iscsi.target_node_add_lun) p.set_defaults(func=target_node_add_lun)
def add_pg_ig_maps(args):
rpc.iscsi.add_pg_ig_maps(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)')
@ -186,7 +257,10 @@ if __name__ == "__main__":
separated list of "tags" (int > 0) separated list of "tags" (int > 0)
Example: '1:1 2:2 2:1' Example: '1:1 2:2 2:1'
*** The Portal/Initiator Groups must be precreated ***""") *** The Portal/Initiator Groups must be precreated ***""")
p.set_defaults(func=rpc.iscsi.add_pg_ig_maps) p.set_defaults(func=add_pg_ig_maps)
def delete_pg_ig_maps(args):
rpc.iscsi.delete_pg_ig_maps(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)')
@ -195,7 +269,10 @@ if __name__ == "__main__":
separated list of "tags" (int > 0) separated list of "tags" (int > 0)
Example: '1:1 2:2 2:1' Example: '1:1 2:2 2:1'
*** The Portal/Initiator Groups must be precreated ***""") *** The Portal/Initiator Groups must be precreated ***""")
p.set_defaults(func=rpc.iscsi.delete_pg_ig_maps) p.set_defaults(func=delete_pg_ig_maps)
def add_portal_group(args):
rpc.iscsi.add_portal_group(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(
@ -203,7 +280,10 @@ if __name__ == "__main__":
p.add_argument('portal_list', nargs=argparse.REMAINDER, help="""List of portals in 'host:port@cpumask' format, separated by whitespace p.add_argument('portal_list', nargs=argparse.REMAINDER, help="""List of portals in 'host:port@cpumask' format, separated by whitespace
(cpumask is optional and can be skipped) (cpumask is optional and can be skipped)
Example: '192.168.100.100:3260' '192.168.100.100:3261' '192.168.100.100:3262@0x1""") Example: '192.168.100.100:3260' '192.168.100.100:3261' '192.168.100.100:3262@0x1""")
p.set_defaults(func=rpc.iscsi.add_portal_group) p.set_defaults(func=add_portal_group)
def add_initiator_group(args):
rpc.iscsi.add_initiator_group(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')
@ -213,7 +293,10 @@ if __name__ == "__main__":
enclosed in quotes. Example: 'ANY' or '127.0.0.1 192.168.200.100'""") enclosed in quotes. Example: 'ANY' or '127.0.0.1 192.168.200.100'""")
p.add_argument('netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes. p.add_argument('netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes.
Example: '255.255.0.0 255.248.0.0' etc""") Example: '255.255.0.0 255.248.0.0' etc""")
p.set_defaults(func=rpc.iscsi.add_initiator_group) p.set_defaults(func=add_initiator_group)
def add_initiators_to_initiator_group(args):
rpc.iscsi.add_initiators_to_initiator_group(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')
@ -223,7 +306,10 @@ if __name__ == "__main__":
enclosed in quotes. This parameter can be omitted. Example: 'ANY' or '127.0.0.1 192.168.200.100'""", required=False) enclosed in quotes. This parameter can be omitted. Example: 'ANY' or '127.0.0.1 192.168.200.100'""", required=False)
p.add_argument('-m', dest='netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes. p.add_argument('-m', dest='netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes.
This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False) This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False)
p.set_defaults(func=rpc.iscsi.add_initiators_to_initiator_group) p.set_defaults(func=add_initiators_to_initiator_group)
def delete_initiators_from_initiator_group(args):
rpc.iscsi.delete_initiators_from_initiator_group(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')
@ -233,75 +319,123 @@ if __name__ == "__main__":
enclosed in quotes. This parameter can be omitted. Example: 'ANY' or '127.0.0.1 192.168.200.100'""", required=False) enclosed in quotes. This parameter can be omitted. Example: 'ANY' or '127.0.0.1 192.168.200.100'""", required=False)
p.add_argument('-m', dest='netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes. p.add_argument('-m', dest='netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes.
This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False) This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False)
p.set_defaults(func=rpc.iscsi.delete_initiators_from_initiator_group) p.set_defaults(func=delete_initiators_from_initiator_group)
def delete_target_node(args):
rpc.iscsi.delete_target_node(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')
p.add_argument('target_node_name', p.add_argument('target_node_name',
help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.') help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.')
p.set_defaults(func=rpc.iscsi.delete_target_node) p.set_defaults(func=delete_target_node)
def delete_portal_group(args):
rpc.iscsi.delete_portal_group(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')
p.add_argument( p.add_argument(
'tag', help='Portal group tag (unique, integer > 0)', type=int) 'tag', help='Portal group tag (unique, integer > 0)', type=int)
p.set_defaults(func=rpc.iscsi.delete_portal_group) p.set_defaults(func=delete_portal_group)
def delete_initiator_group(args):
rpc.iscsi.delete_initiator_group(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')
p.add_argument( p.add_argument(
'tag', help='Initiator group tag (unique, integer > 0)', type=int) 'tag', help='Initiator group tag (unique, integer > 0)', type=int)
p.set_defaults(func=rpc.iscsi.delete_initiator_group) p.set_defaults(func=delete_initiator_group)
def get_iscsi_connections(args):
print_dict(rpc.iscsi.get_iscsi_connections(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=rpc.iscsi.get_iscsi_connections) p.set_defaults(func=get_iscsi_connections)
def get_iscsi_global_params(args):
print_dict(rpc.iscsi.get_iscsi_global_params(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=rpc.iscsi.get_iscsi_global_params) p.set_defaults(func=get_iscsi_global_params)
def get_scsi_devices(args):
print_dict(rpc.iscsi.get_scsi_devices(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=rpc.iscsi.get_scsi_devices) p.set_defaults(func=get_scsi_devices)
# log # log
def set_trace_flag(args):
rpc.log.set_trace_flag(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(
'flag', help='trace mask we want to set. (for example "debug").') 'flag', help='trace mask we want to set. (for example "debug").')
p.set_defaults(func=rpc.log.set_trace_flag) p.set_defaults(func=set_trace_flag)
def clear_trace_flag(args):
rpc.log.clear_trace_flag(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(
'flag', help='trace mask we want to clear. (for example "debug").') 'flag', help='trace mask we want to clear. (for example "debug").')
p.set_defaults(func=rpc.log.clear_trace_flag) p.set_defaults(func=clear_trace_flag)
def get_trace_flags(args):
print_dict(rpc.log.get_trace_flags(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=rpc.log.get_trace_flags) p.set_defaults(func=get_trace_flags)
def set_log_level(args):
rpc.log.set_log_level(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=rpc.log.set_log_level) p.set_defaults(func=set_log_level)
def get_log_level(args):
print_dict(rpc.log.get_log_level(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=rpc.log.get_log_level) p.set_defaults(func=get_log_level)
def set_log_print_level(args):
rpc.log.set_log_print_level(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=rpc.log.set_log_print_level) p.set_defaults(func=set_log_print_level)
def get_log_print_level(args):
print_dict(rpc.log.get_log_print_level(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=rpc.log.get_log_print_level) p.set_defaults(func=get_log_print_level)
# lvol # lvol
def construct_lvol_store(args):
print_array(rpc.lvol.construct_lvol_store(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')
p.add_argument('lvs_name', help='name for lvol store') p.add_argument('lvs_name', help='name for lvol store')
p.add_argument('-c', '--cluster-sz', help='size of cluster (in bytes)', type=int, required=False) p.add_argument('-c', '--cluster-sz', help='size of cluster (in bytes)', type=int, required=False)
p.set_defaults(func=rpc.lvol.construct_lvol_store) p.set_defaults(func=construct_lvol_store)
def rename_lvol_store(args):
rpc.lvol.rename_lvol_store(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')
p.add_argument('new_name', help='new name') p.add_argument('new_name', help='new name')
p.set_defaults(func=rpc.lvol.rename_lvol_store) p.set_defaults(func=rename_lvol_store)
def construct_lvol_bdev(args):
print_array(rpc.lvol.construct_lvol_bdev(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)
@ -309,62 +443,98 @@ if __name__ == "__main__":
p.add_argument('-t', '--thin-provision', action='store_true', help='create lvol bdev as thin provisioned') p.add_argument('-t', '--thin-provision', action='store_true', help='create lvol bdev as thin provisioned')
p.add_argument('lvol_name', help='name for this lvol') p.add_argument('lvol_name', help='name for this lvol')
p.add_argument('size', help='size in MiB for this bdev', type=int) p.add_argument('size', help='size in MiB for this bdev', type=int)
p.set_defaults(func=rpc.lvol.construct_lvol_bdev) p.set_defaults(func=construct_lvol_bdev)
def rename_lvol_bdev(args):
rpc.lvol.rename_lvol_bdev(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')
p.add_argument('new_name', help='new lvol name') p.add_argument('new_name', help='new lvol name')
p.set_defaults(func=rpc.lvol.rename_lvol_bdev) p.set_defaults(func=rename_lvol_bdev)
# 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):
# rpc.lvol.resize_bdev(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')
# p.add_argument('size', help='new size in MiB for this bdev', type=int) # p.add_argument('size', help='new size in MiB for this bdev', type=int)
# p.set_defaults(func=rpc.lvol.resize_lvol_bdev) # p.set_defaults(func=resize_lvol_bdev)
def destroy_lvol_store(args):
rpc.lvol.destroy_lvol_store(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)
p.add_argument('-l', '--lvs_name', help='lvol store name', required=False) p.add_argument('-l', '--lvs_name', help='lvol store name', required=False)
p.set_defaults(func=rpc.lvol.destroy_lvol_store) p.set_defaults(func=destroy_lvol_store)
def get_lvol_stores(args):
print_dict(rpc.lvol.get_lvol_stores(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)
p.add_argument('-l', '--lvs_name', help='lvol store name', required=False) p.add_argument('-l', '--lvs_name', help='lvol store name', required=False)
p.set_defaults(func=rpc.lvol.get_lvol_stores) p.set_defaults(func=get_lvol_stores)
# nbd # nbd
def start_nbd_disk(args):
rpc.nbd.start_nbd_disk(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.')
p.add_argument('nbd_device', help='Nbd device name to be assigned. Example: /dev/nbd0.') p.add_argument('nbd_device', help='Nbd device name to be assigned. Example: /dev/nbd0.')
p.set_defaults(func=rpc.nbd.start_nbd_disk) p.set_defaults(func=start_nbd_disk)
def stop_nbd_disk(args):
rpc.nbd.stop_nbd_disk(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=rpc.nbd.stop_nbd_disk) p.set_defaults(func=stop_nbd_disk)
def get_nbd_disks(args):
print_dict(rpc.nbd.get_nbd_disks(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)
p.set_defaults(func=rpc.nbd.get_nbd_disks) p.set_defaults(func=get_nbd_disks)
# net # net
def add_ip_address(args):
rpc.net.add_ip_address(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)
p.add_argument('ip_addr', help='ip address will be added.') p.add_argument('ip_addr', help='ip address will be added.')
p.set_defaults(func=rpc.net.add_ip_address) p.set_defaults(func=add_ip_address)
def delete_ip_address(args):
rpc.net.delete_ip_address(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)
p.add_argument('ip_addr', help='ip address will be deleted.') p.add_argument('ip_addr', help='ip address will be deleted.')
p.set_defaults(func=rpc.net.delete_ip_address) p.set_defaults(func=delete_ip_address)
def get_interfaces(args):
print_dict(rpc.net.get_interfaces(args))
p = subparsers.add_parser( p = subparsers.add_parser(
'get_interfaces', help='Display current interface list') 'get_interfaces', help='Display current interface list')
p.set_defaults(func=rpc.net.get_interfaces) p.set_defaults(func=get_interfaces)
# NVMe-oF # NVMe-oF
def get_nvmf_subsystems(args):
print_dict(rpc.nvmf.get_nvmf_subsystems(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=rpc.nvmf.get_nvmf_subsystems) p.set_defaults(func=get_nvmf_subsystems)
def construct_nvmf_subsystem(args):
rpc.nvmf.construct_nvmf_subsystem(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)')
@ -382,13 +552,19 @@ if __name__ == "__main__":
Format: 'bdev_name1[:nsid1] bdev_name2[:nsid2] bdev_name3[:nsid3]' etc Format: 'bdev_name1[:nsid1] bdev_name2[:nsid2] bdev_name3[:nsid3]' etc
Example: '1:Malloc0 2:Malloc1 3:Malloc2' Example: '1:Malloc0 2:Malloc1 3:Malloc2'
*** The devices must pre-exist ***""") *** The devices must pre-exist ***""")
p.set_defaults(func=rpc.nvmf.construct_nvmf_subsystem) p.set_defaults(func=construct_nvmf_subsystem)
def delete_nvmf_subsystem(args):
rpc.nvmf.delete_nvmf_subsystem(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')
p.add_argument('subsystem_nqn', p.add_argument('subsystem_nqn',
help='subsystem nqn to be deleted. Example: nqn.2016-06.io.spdk:cnode1.') help='subsystem nqn to be deleted. Example: nqn.2016-06.io.spdk:cnode1.')
p.set_defaults(func=rpc.nvmf.delete_nvmf_subsystem) p.set_defaults(func=delete_nvmf_subsystem)
def nvmf_subsystem_add_listener(args):
rpc.nvmf.nvmf_subsystem_add_listener(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')
@ -396,7 +572,10 @@ if __name__ == "__main__":
p.add_argument('-a', '--traddr', help='NVMe-oF transport address: e.g., an ip address', required=True) p.add_argument('-a', '--traddr', help='NVMe-oF transport address: e.g., an ip address', required=True)
p.add_argument('-f', '--adrfam', help='NVMe-oF transport adrfam: e.g., ipv4, ipv6, ib, fc, intra_host') p.add_argument('-f', '--adrfam', help='NVMe-oF transport adrfam: e.g., ipv4, ipv6, ib, fc, intra_host')
p.add_argument('-s', '--trsvcid', help='NVMe-oF transport service id: e.g., a port number') p.add_argument('-s', '--trsvcid', help='NVMe-oF transport service id: e.g., a port number')
p.set_defaults(func=rpc.nvmf.nvmf_subsystem_add_listener) p.set_defaults(func=nvmf_subsystem_add_listener)
def nvmf_subsystem_remove_listener(args):
rpc.nvmf.nvmf_subsystem_remove_listener(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')
@ -404,7 +583,10 @@ if __name__ == "__main__":
p.add_argument('-a', '--traddr', help='NVMe-oF transport address: e.g., an ip address', required=True) p.add_argument('-a', '--traddr', help='NVMe-oF transport address: e.g., an ip address', required=True)
p.add_argument('-f', '--adrfam', help='NVMe-oF transport adrfam: e.g., ipv4, ipv6, ib, fc, intra_host') p.add_argument('-f', '--adrfam', help='NVMe-oF transport adrfam: e.g., ipv4, ipv6, ib, fc, intra_host')
p.add_argument('-s', '--trsvcid', help='NVMe-oF transport service id: e.g., a port number') p.add_argument('-s', '--trsvcid', help='NVMe-oF transport service id: e.g., a port number')
p.set_defaults(func=rpc.nvmf.nvmf_subsystem_remove_listener) p.set_defaults(func=nvmf_subsystem_remove_listener)
def nvmf_subsystem_add_ns(args):
rpc.nvmf.nvmf_subsystem_add_ns(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')
@ -412,91 +594,142 @@ if __name__ == "__main__":
p.add_argument('-n', '--nsid', help='The requested NSID (optional)', type=int) p.add_argument('-n', '--nsid', help='The requested NSID (optional)', type=int)
p.add_argument('-g', '--nguid', help='Namespace globally unique identifier (optional)') p.add_argument('-g', '--nguid', help='Namespace globally unique identifier (optional)')
p.add_argument('-e', '--eui64', help='Namespace EUI-64 identifier (optional)') p.add_argument('-e', '--eui64', help='Namespace EUI-64 identifier (optional)')
p.set_defaults(func=rpc.nvmf.nvmf_subsystem_add_ns) p.set_defaults(func=nvmf_subsystem_add_ns)
def nvmf_subsystem_remove_ns(args):
rpc.nvmf.nvmf_subsystem_remove_ns(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')
p.add_argument('nsid', help='The requested NSID', type=int) p.add_argument('nsid', help='The requested NSID', type=int)
p.set_defaults(func=rpc.nvmf.nvmf_subsystem_remove_ns) p.set_defaults(func=nvmf_subsystem_remove_ns)
def nvmf_subsystem_add_host(args):
rpc.nvmf.nvmf_subsystem_add_host(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')
p.add_argument('host', help='Host NQN to allow') p.add_argument('host', help='Host NQN to allow')
p.set_defaults(func=rpc.nvmf.nvmf_subsystem_add_host) p.set_defaults(func=nvmf_subsystem_add_host)
def nvmf_subsystem_remove_host(args):
rpc.nvmf.nvmf_subsystem_remove_host(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')
p.add_argument('host', help='Host NQN to remove') p.add_argument('host', help='Host NQN to remove')
p.set_defaults(func=rpc.nvmf.nvmf_subsystem_remove_host) p.set_defaults(func=nvmf_subsystem_remove_host)
def nvmf_subsystem_allow_any_host(args):
rpc.nvmf.nvmf_subsystem_allow_any_host(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')
p.add_argument('-e', '--enable', action='store_true', help='Enable allowing any host') p.add_argument('-e', '--enable', action='store_true', help='Enable allowing any host')
p.add_argument('-d', '--disable', action='store_true', help='Disable allowing any host') p.add_argument('-d', '--disable', action='store_true', help='Disable allowing any host')
p.set_defaults(func=rpc.nvmf.nvmf_subsystem_allow_any_host) p.set_defaults(func=nvmf_subsystem_allow_any_host)
# pmem # pmem
def create_pmem_pool(args):
rpc.pmem.create_pmem_pool(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')
p.add_argument('total_size', help='Size of malloc bdev in MB (int > 0)', type=int) p.add_argument('total_size', help='Size of malloc bdev in MB (int > 0)', type=int)
p.add_argument('block_size', help='Block size for this pmem pool', type=int) p.add_argument('block_size', help='Block size for this pmem pool', type=int)
p.set_defaults(func=rpc.pmem.create_pmem_pool) p.set_defaults(func=create_pmem_pool)
def pmem_pool_info(args):
print_dict(rpc.pmem.pmem_pool_info(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=rpc.pmem.pmem_pool_info) p.set_defaults(func=pmem_pool_info)
def delete_pmem_pool(args):
rpc.pmem.delete_pmem_pool(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')
p.set_defaults(func=rpc.pmem.delete_pmem_pool) p.set_defaults(func=delete_pmem_pool)
# subsystem # subsystem
def get_subsystems(args):
print_dict(rpc.subsystem.get_subsystems(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=rpc.subsystem.get_subsystems) p.set_defaults(func=get_subsystems)
def get_subsystem_config(args):
print_dict(rpc.subsystem.get_subsystem_config(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')
p.set_defaults(func=rpc.subsystem.get_subsystem_config) p.set_defaults(func=get_subsystem_config)
# vhost # vhost
def set_vhost_controller_coalescing(args):
rpc.vhost.set_vhost_controller_coalescing(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')
p.add_argument('delay_base_us', help='Base delay time', type=int) p.add_argument('delay_base_us', help='Base delay time', type=int)
p.add_argument('iops_threshold', help='IOPS threshold when coalescing is enabled', type=int) p.add_argument('iops_threshold', help='IOPS threshold when coalescing is enabled', type=int)
p.set_defaults(func=rpc.vhost.set_vhost_controller_coalescing) p.set_defaults(func=set_vhost_controller_coalescing)
def construct_vhost_scsi_controller(args):
rpc.vhost.construct_vhost_scsi_controller(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')
p.add_argument('ctrlr', help='controller name') p.add_argument('ctrlr', help='controller name')
p.add_argument('--cpumask', help='cpu mask for this controller') p.add_argument('--cpumask', help='cpu mask for this controller')
p.set_defaults(func=rpc.vhost.construct_vhost_scsi_controller) p.set_defaults(func=construct_vhost_scsi_controller)
def add_vhost_scsi_lun(args):
rpc.vhost.add_vhost_scsi_lun(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')
p.add_argument('ctrlr', help='conntroller name where add lun') p.add_argument('ctrlr', help='conntroller name where add lun')
p.add_argument('scsi_target_num', help='scsi_target_num', type=int) p.add_argument('scsi_target_num', help='scsi_target_num', type=int)
p.add_argument('bdev_name', help='bdev name') p.add_argument('bdev_name', help='bdev name')
p.set_defaults(func=rpc.vhost.add_vhost_scsi_lun) p.set_defaults(func=add_vhost_scsi_lun)
def remove_vhost_scsi_target(args):
rpc.vhost.remove_vhost_scsi_target(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')
p.add_argument('scsi_target_num', help='scsi_target_num', type=int) p.add_argument('scsi_target_num', help='scsi_target_num', type=int)
p.set_defaults(func=rpc.vhost.remove_vhost_scsi_target) p.set_defaults(func=remove_vhost_scsi_target)
def construct_vhost_blk_controller(args):
rpc.vhost.construct_vhost_blk_controller(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')
p.add_argument('dev_name', help='device name') p.add_argument('dev_name', help='device name')
p.add_argument('--cpumask', help='cpu mask for this controller') p.add_argument('--cpumask', help='cpu mask for this controller')
p.add_argument("-r", "--readonly", action='store_true', help='Set controller as read-only') p.add_argument("-r", "--readonly", action='store_true', help='Set controller as read-only')
p.set_defaults(func=rpc.vhost.construct_vhost_blk_controller) p.set_defaults(func=construct_vhost_blk_controller)
def get_vhost_controllers(args):
print_dict(rpc.vhost.get_vhost_controllers(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=rpc.vhost.get_vhost_controllers) p.set_defaults(func=get_vhost_controllers)
def remove_vhost_controller(args):
rpc.vhost.remove_vhost_controller(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=rpc.vhost.remove_vhost_controller) p.set_defaults(func=remove_vhost_controller)
def construct_virtio_user_scsi_bdev(args):
print_dict(rpc.vhost.construct_virtio_user_scsi_bdev(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.
@ -506,7 +739,10 @@ if __name__ == "__main__":
Base will be used to construct new bdev's found on target by adding 't<TARGET_ID>' sufix.""") Base will be used to construct new bdev's found on target by adding 't<TARGET_ID>' sufix.""")
p.add_argument('--vq-count', help='Number of virtual queues to be used.', type=int) p.add_argument('--vq-count', help='Number of virtual queues to be used.', type=int)
p.add_argument('--vq-size', help='Size of each queue', type=int) p.add_argument('--vq-size', help='Size of each queue', type=int)
p.set_defaults(func=rpc.vhost.construct_virtio_user_scsi_bdev) p.set_defaults(func=construct_virtio_user_scsi_bdev)
def construct_virtio_pci_scsi_bdev(args):
print_dict(rpc.vhost.construct_virtio_pci_scsi_bdev(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.""")
@ -514,25 +750,34 @@ if __name__ == "__main__":
domain.bus.device.function format""") domain.bus.device.function format""")
p.add_argument('name', help="""Name for the virtio device. p.add_argument('name', help="""Name for the virtio device.
It will be inhereted by all created bdevs, which are named n the following format: <name>t<target_id>""") It will be inhereted by all created bdevs, which are named n the following format: <name>t<target_id>""")
p.set_defaults(func=rpc.vhost.construct_virtio_pci_scsi_bdev) p.set_defaults(func=construct_virtio_pci_scsi_bdev)
def remove_virtio_scsi_bdev(args):
rpc.vhost.remove_virtio_scsi_bdev(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""")
p.add_argument('name', help='Virtio device name. E.g. VirtioUser0') p.add_argument('name', help='Virtio device name. E.g. VirtioUser0')
p.set_defaults(func=rpc.vhost.remove_virtio_scsi_bdev) p.set_defaults(func=remove_virtio_scsi_bdev)
def construct_virtio_user_blk_bdev(args):
print_dict(rpc.vhost.construct_virtio_user_blk_bdev(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')
p.add_argument('name', help='Name for the bdev') p.add_argument('name', help='Name for the bdev')
p.add_argument('--vq-count', help='Number of virtual queues to be used.', type=int) p.add_argument('--vq-count', help='Number of virtual queues to be used.', type=int)
p.add_argument('--vq-size', help='Size of each queue', type=int) p.add_argument('--vq-size', help='Size of each queue', type=int)
p.set_defaults(func=rpc.vhost.construct_virtio_user_blk_bdev) p.set_defaults(func=construct_virtio_user_blk_bdev)
def construct_virtio_pci_blk_bdev(args):
print_dict(rpc.vhost.construct_virtio_pci_blk_bdev(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
domain.bus.device.function format""") domain.bus.device.function format""")
p.add_argument('name', help='Name for the bdev') p.add_argument('name', help='Name for the bdev')
p.set_defaults(func=rpc.vhost.construct_virtio_pci_blk_bdev) p.set_defaults(func=construct_virtio_pci_blk_bdev)
args = parser.parse_args() args = parser.parse_args()

3
scripts/rpc/__init__.py
View File

@ -1,6 +1,5 @@
import app import app
import bdev import bdev
from client import print_dict
import iscsi import iscsi
import log import log
import lvol import lvol
@ -15,7 +14,7 @@ import sys
def get_rpc_methods(args): def get_rpc_methods(args):
print_dict(args.client.call('get_rpc_methods')) return args.client.call('get_rpc_methods')
def save_config(args): def save_config(args):

7
scripts/rpc/app.py
View File

@ -1,9 +1,6 @@
from client import print_dict, print_array, int_arg
def kill_instance(args): def kill_instance(args):
params = {'sig_name': args.sig_name} params = {'sig_name': args.sig_name}
args.client.call('kill_instance', params) return args.client.call('kill_instance', params)
def context_switch_monitor(args): def context_switch_monitor(args):
@ -12,4 +9,4 @@ def context_switch_monitor(args):
params['enabled'] = True params['enabled'] = True
if args.disable: if args.disable:
params['enabled'] = False params['enabled'] = False
print_dict(args.client.call('context_switch_monitor', params)) return args.client.call('context_switch_monitor', params)

31
scripts/rpc/bdev.py
View File

@ -1,6 +1,3 @@
from client import print_dict, print_array, int_arg
def construct_malloc_bdev(args): def construct_malloc_bdev(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}
@ -8,8 +5,7 @@ def construct_malloc_bdev(args):
params['name'] = args.name params['name'] = args.name
if args.uuid: if args.uuid:
params['uuid'] = args.uuid params['uuid'] = args.uuid
print_array(args.client.call( return args.client.call('construct_malloc_bdev', params)
'construct_malloc_bdev', params))
def construct_null_bdev(args): def construct_null_bdev(args):
@ -18,8 +14,7 @@ def construct_null_bdev(args):
'block_size': args.block_size} 'block_size': args.block_size}
if args.uuid: if args.uuid:
params['uuid'] = args.uuid params['uuid'] = args.uuid
print_array(args.client.call( return args.client.call('construct_null_bdev', params)
'construct_null_bdev', params))
def construct_aio_bdev(args): def construct_aio_bdev(args):
@ -29,8 +24,7 @@ def construct_aio_bdev(args):
if args.block_size: if args.block_size:
params['block_size'] = args.block_size params['block_size'] = args.block_size
print_array(args.client.call( return args.client.call('construct_aio_bdev', params)
'construct_aio_bdev', params))
def construct_nvme_bdev(args): def construct_nvme_bdev(args):
@ -47,7 +41,7 @@ def construct_nvme_bdev(args):
if args.subnqn: if args.subnqn:
params['subnqn'] = 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): def construct_rbd_bdev(args):
@ -60,13 +54,12 @@ def construct_rbd_bdev(args):
if args.name: if args.name:
params['name'] = args.name params['name'] = args.name
print_array(args.client.call( return args.client.call('construct_rbd_bdev', params)
'construct_rbd_bdev', params))
def construct_error_bdev(args): def construct_error_bdev(args):
params = {'base_name': args.base_name} 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): def construct_pmem_bdev(args):
@ -74,26 +67,26 @@ def construct_pmem_bdev(args):
'pmem_file': args.pmem_file, 'pmem_file': args.pmem_file,
'name': args.name 'name': args.name
} }
print_array(args.client.call('construct_pmem_bdev', params)) return args.client.call('construct_pmem_bdev', params)
def get_bdevs(args): def get_bdevs(args):
params = {} params = {}
if args.name: if args.name:
params['name'] = 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): def get_bdevs_config(args):
params = {} params = {}
if args.name: if args.name:
params['name'] = 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): def delete_bdev(args):
params = {'name': args.bdev_name} params = {'name': args.bdev_name}
args.client.call('delete_bdev', params) return args.client.call('delete_bdev', params)
def bdev_inject_error(args): def bdev_inject_error(args):
@ -104,7 +97,7 @@ def bdev_inject_error(args):
'num': args.num, 'num': args.num,
} }
args.client.call('bdev_inject_error', params) return args.client.call('bdev_inject_error', params)
def apply_firmware(args): def apply_firmware(args):
@ -112,4 +105,4 @@ def apply_firmware(args):
'filename': args.filename, 'filename': args.filename,
'bdev_name': args.bdev_name, 'bdev_name': args.bdev_name,
} }
print_dict(args.client.call('apply_nvme_firmware', params)) return args.client.call('apply_nvme_firmware', params)

37
scripts/rpc/iscsi.py
View File

@ -1,16 +1,13 @@
from client import print_dict, print_array, int_arg
def get_portal_groups(args): 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): 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): 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): def construct_target_node(args):
@ -44,7 +41,7 @@ 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
args.client.call('construct_target_node', params) return args.client.call('construct_target_node', params)
def target_node_add_lun(args): def target_node_add_lun(args):
@ -54,7 +51,7 @@ def target_node_add_lun(args):
} }
if args.lun_id: if args.lun_id:
params['lun_id'] = 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): def delete_pg_ig_maps(args):
@ -66,7 +63,7 @@ def delete_pg_ig_maps(args):
'name': args.name, 'name': args.name,
'pg_ig_maps': pg_ig_maps, '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): def add_pg_ig_maps(args):
@ -78,7 +75,7 @@ def add_pg_ig_maps(args):
'name': args.name, 'name': args.name,
'pg_ig_maps': pg_ig_maps, '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): def add_portal_group(args):
@ -96,7 +93,7 @@ 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}
args.client.call('add_portal_group', params) return args.client.call('add_portal_group', params)
def add_initiator_group(args): def add_initiator_group(args):
@ -108,7 +105,7 @@ 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}
args.client.call('add_initiator_group', params) return args.client.call('add_initiator_group', params)
def add_initiators_to_initiator_group(args): def add_initiators_to_initiator_group(args):
@ -122,7 +119,7 @@ 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}
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): def delete_initiators_from_initiator_group(args):
@ -136,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}
args.client.call('delete_initiators_from_initiator_group', params) return args.client.call('delete_initiators_from_initiator_group', params)
def delete_target_node(args): def delete_target_node(args):
params = {'name': args.target_node_name} 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): def delete_portal_group(args):
params = {'tag': args.tag} params = {'tag': args.tag}
args.client.call('delete_portal_group', params) return args.client.call('delete_portal_group', params)
def delete_initiator_group(args): def delete_initiator_group(args):
params = {'tag': args.tag} params = {'tag': args.tag}
args.client.call('delete_initiator_group', params) return args.client.call('delete_initiator_group', params)
def get_iscsi_connections(args): 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): 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): def get_scsi_devices(args):
print_dict(args.client.call('get_scsi_devices')) return args.client.call('get_scsi_devices')

17
scripts/rpc/log.py
View File

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

17
scripts/rpc/lvol.py
View File

@ -1,11 +1,8 @@
from client import print_dict, print_array, int_arg
def construct_lvol_store(args): def construct_lvol_store(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
print_array(args.client.call('construct_lvol_store', params)) return args.client.call('construct_lvol_store', params)
def rename_lvol_store(args): def rename_lvol_store(args):
@ -13,7 +10,7 @@ def rename_lvol_store(args):
'old_name': args.old_name, 'old_name': args.old_name,
'new_name': args.new_name 'new_name': args.new_name
} }
args.client.call('rename_lvol_store', params) return args.client.call('rename_lvol_store', params)
def construct_lvol_bdev(args): def construct_lvol_bdev(args):
@ -28,7 +25,7 @@ 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
print_array(args.client.call('construct_lvol_bdev', params)) return args.client.call('construct_lvol_bdev', params)
def rename_lvol_bdev(args): def rename_lvol_bdev(args):
@ -36,7 +33,7 @@ def rename_lvol_bdev(args):
'old_name': args.old_name, 'old_name': args.old_name,
'new_name': args.new_name 'new_name': args.new_name
} }
args.client.call('rename_lvol_bdev', params) return args.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
@ -46,7 +43,7 @@ def rename_lvol_bdev(args):
# 'name': args.name, # 'name': args.name,
# 'size': args.size, # 'size': args.size,
# } # }
# args.client.call('resize_lvol_bdev', params) # return args.client.call('resize_lvol_bdev', params)
def destroy_lvol_store(args): def destroy_lvol_store(args):
@ -58,7 +55,7 @@ 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
args.client.call('destroy_lvol_store', params) return args.client.call('destroy_lvol_store', params)
def get_lvol_stores(args): def get_lvol_stores(args):
@ -69,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
print_dict(args.client.call('get_lvol_stores', params)) return args.client.call('get_lvol_stores', params)

9
scripts/rpc/nbd.py
View File

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

9
scripts/rpc/net.py
View File

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

23
scripts/rpc/nvmf.py
View File

@ -1,8 +1,5 @@
from client import print_dict, print_array, int_arg
def get_nvmf_subsystems(args): def get_nvmf_subsystems(args):
print_dict(args.client.call('get_nvmf_subsystems')) return args.client.call('get_nvmf_subsystems')
def construct_nvmf_subsystem(args): def construct_nvmf_subsystem(args):
@ -41,7 +38,7 @@ def construct_nvmf_subsystem(args):
namespaces.append(ns_params) namespaces.append(ns_params)
params['namespaces'] = namespaces params['namespaces'] = namespaces
args.client.call('construct_nvmf_subsystem', params) return args.client.call('construct_nvmf_subsystem', params)
def nvmf_subsystem_add_listener(args): def nvmf_subsystem_add_listener(args):
@ -55,7 +52,7 @@ def nvmf_subsystem_add_listener(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'listen_address': listen_address} 'listen_address': listen_address}
args.client.call('nvmf_subsystem_add_listener', params) return args.client.call('nvmf_subsystem_add_listener', params)
def nvmf_subsystem_remove_listener(args): def nvmf_subsystem_remove_listener(args):
@ -69,7 +66,7 @@ def nvmf_subsystem_remove_listener(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'listen_address': listen_address} 'listen_address': listen_address}
args.client.call('nvmf_subsystem_remove_listener', params) return args.client.call('nvmf_subsystem_remove_listener', params)
def nvmf_subsystem_add_ns(args): def nvmf_subsystem_add_ns(args):
@ -87,7 +84,7 @@ def nvmf_subsystem_add_ns(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'namespace': ns} 'namespace': ns}
args.client.call('nvmf_subsystem_add_ns', params) return args.client.call('nvmf_subsystem_add_ns', params)
def nvmf_subsystem_remove_ns(args): def nvmf_subsystem_remove_ns(args):
@ -95,30 +92,30 @@ def nvmf_subsystem_remove_ns(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'nsid': args.nsid} 'nsid': args.nsid}
args.client.call('nvmf_subsystem_remove_ns', params) return args.client.call('nvmf_subsystem_remove_ns', params)
def nvmf_subsystem_add_host(args): def nvmf_subsystem_add_host(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'host': args.host} 'host': args.host}
args.client.call('nvmf_subsystem_add_host', params) return args.client.call('nvmf_subsystem_add_host', params)
def nvmf_subsystem_remove_host(args): def nvmf_subsystem_remove_host(args):
params = {'nqn': args.nqn, params = {'nqn': args.nqn,
'host': args.host} 'host': args.host}
args.client.call('nvmf_subsystem_remove_host', params) return args.client.call('nvmf_subsystem_remove_host', params)
def nvmf_subsystem_allow_any_host(args): def nvmf_subsystem_allow_any_host(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
args.client.call('nvmf_subsystem_allow_any_host', params) return args.client.call('nvmf_subsystem_allow_any_host', params)
def delete_nvmf_subsystem(args): def delete_nvmf_subsystem(args):
params = {'nqn': args.subsystem_nqn} params = {'nqn': args.subsystem_nqn}
args.client.call('delete_nvmf_subsystem', params) return args.client.call('delete_nvmf_subsystem', params)

9
scripts/rpc/pmem.py
View File

@ -1,19 +1,16 @@
from client import print_dict, print_array, int_arg
def create_pmem_pool(args): def create_pmem_pool(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}
args.client.call('create_pmem_pool', params) return args.client.call('create_pmem_pool', params)
def pmem_pool_info(args): def pmem_pool_info(args):
params = {'pmem_file': args.pmem_file} params = {'pmem_file': args.pmem_file}
print_dict(args.client.call('pmem_pool_info', params)) return args.client.call('pmem_pool_info', params)
def delete_pmem_pool(args): def delete_pmem_pool(args):
params = {'pmem_file': args.pmem_file} params = {'pmem_file': args.pmem_file}
args.client.call('delete_pmem_pool', params) return args.client.call('delete_pmem_pool', params)

7
scripts/rpc/subsystem.py
View File

@ -1,10 +1,7 @@
from client import print_dict, print_array, int_arg
def get_subsystems(args): def get_subsystems(args):
print_dict(args.client.call('get_subsystems')) return args.client.call('get_subsystems')
def get_subsystem_config(args): def get_subsystem_config(args):
params = {'name': args.name} params = {'name': args.name}
print_dict(args.client.call('get_subsystem_config', params)) return args.client.call('get_subsystem_config', params)

28
scripts/rpc/vhost.py
View File

@ -1,13 +1,10 @@
from client import print_dict, print_array, int_arg
def set_vhost_controller_coalescing(args): def set_vhost_controller_coalescing(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,
} }
args.client.call('set_vhost_controller_coalescing', params) return args.client.call('set_vhost_controller_coalescing', params)
def construct_vhost_scsi_controller(args): def construct_vhost_scsi_controller(args):
@ -16,8 +13,7 @@ def construct_vhost_scsi_controller(args):
if args.cpumask: if args.cpumask:
params['cpumask'] = args.cpumask params['cpumask'] = args.cpumask
args.client.call('construct_vhost_scsi_controller', return args.client.call('construct_vhost_scsi_controller', params)
params)
def add_vhost_scsi_lun(args): def add_vhost_scsi_lun(args):
@ -26,7 +22,7 @@ def add_vhost_scsi_lun(args):
'bdev_name': args.bdev_name, 'bdev_name': args.bdev_name,
'scsi_target_num': args.scsi_target_num 'scsi_target_num': args.scsi_target_num
} }
args.client.call('add_vhost_scsi_lun', params) return args.client.call('add_vhost_scsi_lun', params)
def remove_vhost_scsi_target(args): def remove_vhost_scsi_target(args):
@ -34,7 +30,7 @@ def remove_vhost_scsi_target(args):
'ctrlr': args.ctrlr, 'ctrlr': args.ctrlr,
'scsi_target_num': args.scsi_target_num 'scsi_target_num': args.scsi_target_num
} }
args.client.call('remove_vhost_scsi_target', params) return args.client.call('remove_vhost_scsi_target', params)
def construct_vhost_blk_controller(args): def construct_vhost_blk_controller(args):
@ -46,16 +42,16 @@ 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
args.client.call('construct_vhost_blk_controller', params) return args.client.call('construct_vhost_blk_controller', params)
def get_vhost_controllers(args): def get_vhost_controllers(args):
print_dict(args.client.call('get_vhost_controllers')) return args.client.call('get_vhost_controllers')
def remove_vhost_controller(args): def remove_vhost_controller(args):
params = {'ctrlr': args.ctrlr} params = {'ctrlr': args.ctrlr}
args.client.call('remove_vhost_controller', params) return args.client.call('remove_vhost_controller', params)
def construct_virtio_user_scsi_bdev(args): def construct_virtio_user_scsi_bdev(args):
@ -67,7 +63,7 @@ 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
print_dict(args.client.call('construct_virtio_user_scsi_bdev', params)) return args.client.call('construct_virtio_user_scsi_bdev', params)
def construct_virtio_pci_scsi_bdev(args): def construct_virtio_pci_scsi_bdev(args):
@ -75,12 +71,12 @@ def construct_virtio_pci_scsi_bdev(args):
'pci_address': args.pci_address, 'pci_address': args.pci_address,
'name': args.name, 'name': args.name,
} }
print_dict(args.client.call('construct_virtio_pci_scsi_bdev', params)) return args.client.call('construct_virtio_pci_scsi_bdev', params)
def remove_virtio_scsi_bdev(args): def remove_virtio_scsi_bdev(args):
params = {'name': args.name} params = {'name': args.name}
args.client.call('remove_virtio_scsi_bdev', params) return args.client.call('remove_virtio_scsi_bdev', params)
def construct_virtio_user_blk_bdev(args): def construct_virtio_user_blk_bdev(args):
@ -92,7 +88,7 @@ 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
print_dict(args.client.call('construct_virtio_user_blk_bdev', params)) return args.client.call('construct_virtio_user_blk_bdev', params)
def construct_virtio_pci_blk_bdev(args): def construct_virtio_pci_blk_bdev(args):
@ -100,4 +96,4 @@ def construct_virtio_pci_blk_bdev(args):
'pci_address': args.pci_address, 'pci_address': args.pci_address,
'name': args.name, 'name': args.name,
} }
print_dict(args.client.call('construct_virtio_pci_blk_bdev', params)) return args.client.call('construct_virtio_pci_blk_bdev', params)