d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts/rpc.py: rename print_string to print_json

Browse Source 
The previous name wasn't very accurate. The function
accepts a json object, so call it print_json().

Change-Id: If1cae587fd13f0a8a2761049125fc7fb234c0360
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459388
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Darek Stojaczyk 2019-06-25 20:23:46 +02:00
parent 90513d3c5f
commit 31c25ab3ae
2 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
scripts/rpc.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from rpc.client import print_dict, print_string, JSONRPCException from rpc.client import print_dict, print_json, JSONRPCException
from rpc.helpers import deprecated_aliases from rpc.helpers import deprecated_aliases
import logging import logging
@ -60,7 +60,7 @@ if __name__ == "__main__":
p.set_defaults(func=rpc_get_methods) p.set_defaults(func=rpc_get_methods)
def get_spdk_version(args): def get_spdk_version(args):
print_string(rpc.get_spdk_version(args.client)) print_json(rpc.get_spdk_version(args.client))
p = subparsers.add_parser('get_spdk_version', help='Get SPDK version') p = subparsers.add_parser('get_spdk_version', help='Get SPDK version')
p.set_defaults(func=get_spdk_version) p.set_defaults(func=get_spdk_version)
@ -137,9 +137,9 @@ if __name__ == "__main__":
p.set_defaults(func=set_bdev_options) p.set_defaults(func=set_bdev_options)
def construct_compress_bdev(args): def construct_compress_bdev(args):
print_string(rpc.bdev.construct_compress_bdev(args.client, print_json(rpc.bdev.construct_compress_bdev(args.client,
base_bdev_name=args.base_bdev_name, base_bdev_name=args.base_bdev_name,
pm_path=args.pm_path)) pm_path=args.pm_path))
p = subparsers.add_parser('construct_compress_bdev', p = subparsers.add_parser('construct_compress_bdev',
help='Add a compress vbdev') help='Add a compress vbdev')
p.add_argument('-b', '--base_bdev_name', help="Name of the base bdev") p.add_argument('-b', '--base_bdev_name', help="Name of the base bdev")
@ -162,11 +162,11 @@ if __name__ == "__main__":
p.set_defaults(func=set_compress_pmd) p.set_defaults(func=set_compress_pmd)
def construct_crypto_bdev(args): def construct_crypto_bdev(args):
print_string(rpc.bdev.construct_crypto_bdev(args.client, print_json(rpc.bdev.construct_crypto_bdev(args.client,
base_bdev_name=args.base_bdev_name, base_bdev_name=args.base_bdev_name,
name=args.name, name=args.name,
crypto_pmd=args.crypto_pmd, crypto_pmd=args.crypto_pmd,
key=args.key)) key=args.key))
p = subparsers.add_parser('construct_crypto_bdev', p = subparsers.add_parser('construct_crypto_bdev',
help='Add a crypto vbdev') help='Add a crypto vbdev')
p.add_argument('-b', '--base_bdev_name', help="Name of the base bdev") p.add_argument('-b', '--base_bdev_name', help="Name of the base bdev")
@ -184,11 +184,11 @@ if __name__ == "__main__":
p.set_defaults(func=delete_crypto_bdev) p.set_defaults(func=delete_crypto_bdev)
def construct_ocf_bdev(args): def construct_ocf_bdev(args):
print_string(rpc.bdev.construct_ocf_bdev(args.client, print_json(rpc.bdev.construct_ocf_bdev(args.client,
name=args.name, name=args.name,
mode=args.mode, mode=args.mode,
cache_bdev_name=args.cache_bdev_name, cache_bdev_name=args.cache_bdev_name,
core_bdev_name=args.core_bdev_name)) core_bdev_name=args.core_bdev_name))
p = subparsers.add_parser('construct_ocf_bdev', p = subparsers.add_parser('construct_ocf_bdev',
help='Add an OCF block device') help='Add an OCF block device')
p.add_argument('name', help='Name of resulting OCF bdev') p.add_argument('name', help='Name of resulting OCF bdev')
@ -224,11 +224,11 @@ if __name__ == "__main__":
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
print_string(rpc.bdev.construct_malloc_bdev(args.client, print_json(rpc.bdev.construct_malloc_bdev(args.client,
num_blocks=int(num_blocks), num_blocks=int(num_blocks),
block_size=args.block_size, block_size=args.block_size,
name=args.name, name=args.name,
uuid=args.uuid)) uuid=args.uuid))
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")
@ -248,11 +248,11 @@ if __name__ == "__main__":
def construct_null_bdev(args): def construct_null_bdev(args):
num_blocks = (args.total_size * 1024 * 1024) // args.block_size num_blocks = (args.total_size * 1024 * 1024) // args.block_size
print_string(rpc.bdev.construct_null_bdev(args.client, print_json(rpc.bdev.construct_null_bdev(args.client,
num_blocks=num_blocks, num_blocks=num_blocks,
block_size=args.block_size, block_size=args.block_size,
name=args.name, name=args.name,
uuid=args.uuid)) uuid=args.uuid))
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')
@ -272,10 +272,10 @@ if __name__ == "__main__":
p.set_defaults(func=delete_null_bdev) p.set_defaults(func=delete_null_bdev)
def construct_aio_bdev(args): def construct_aio_bdev(args):
print_string(rpc.bdev.construct_aio_bdev(args.client, print_json(rpc.bdev.construct_aio_bdev(args.client,
filename=args.filename, filename=args.filename,
name=args.name, name=args.name,
block_size=args.block_size)) block_size=args.block_size))
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')
@ -389,13 +389,13 @@ if __name__ == "__main__":
if len(parts) != 2: if len(parts) != 2:
raise Exception('--config %s not in key=value form' % entry) raise Exception('--config %s not in key=value form' % entry)
config[parts[0]] = parts[1] config[parts[0]] = parts[1]
print_string(rpc.bdev.construct_rbd_bdev(args.client, print_json(rpc.bdev.construct_rbd_bdev(args.client,
name=args.name, name=args.name,
user=args.user, user=args.user,
config=config, config=config,
pool_name=args.pool_name, pool_name=args.pool_name,
rbd_name=args.rbd_name, rbd_name=args.rbd_name,
block_size=args.block_size)) block_size=args.block_size))
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')
@ -417,13 +417,13 @@ if __name__ == "__main__":
p.set_defaults(func=delete_rbd_bdev) p.set_defaults(func=delete_rbd_bdev)
def bdev_delay_create(args): def bdev_delay_create(args):
print_string(rpc.bdev.bdev_delay_create(args.client, print_json(rpc.bdev.bdev_delay_create(args.client,
base_bdev_name=args.base_bdev_name, base_bdev_name=args.base_bdev_name,
name=args.name, name=args.name,
avg_read_latency=args.avg_read_latency, avg_read_latency=args.avg_read_latency,
p99_read_latency=args.nine_nine_read_latency, p99_read_latency=args.nine_nine_read_latency,
avg_write_latency=args.avg_write_latency, avg_write_latency=args.avg_write_latency,
p99_write_latency=args.nine_nine_write_latency)) p99_write_latency=args.nine_nine_write_latency))
p = subparsers.add_parser('bdev_delay_create', p = subparsers.add_parser('bdev_delay_create',
help='Add a delay bdev on existing bdev') help='Add a delay bdev on existing bdev')
@ -444,8 +444,8 @@ if __name__ == "__main__":
p.set_defaults(func=bdev_delay_delete) p.set_defaults(func=bdev_delay_delete)
def construct_error_bdev(args): def construct_error_bdev(args):
print_string(rpc.bdev.construct_error_bdev(args.client, print_json(rpc.bdev.construct_error_bdev(args.client,
base_name=args.base_name)) base_name=args.base_name))
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')
@ -461,10 +461,10 @@ if __name__ == "__main__":
p.set_defaults(func=delete_error_bdev) p.set_defaults(func=delete_error_bdev)
def construct_iscsi_bdev(args): def construct_iscsi_bdev(args):
print_string(rpc.bdev.construct_iscsi_bdev(args.client, print_json(rpc.bdev.construct_iscsi_bdev(args.client,
name=args.name, name=args.name,
url=args.url, url=args.url,
initiator_iqn=args.initiator_iqn)) initiator_iqn=args.initiator_iqn))
p = subparsers.add_parser('construct_iscsi_bdev', p = subparsers.add_parser('construct_iscsi_bdev',
help='Add bdev with iSCSI initiator backend') help='Add bdev with iSCSI initiator backend')
@ -482,9 +482,9 @@ if __name__ == "__main__":
p.set_defaults(func=delete_iscsi_bdev) p.set_defaults(func=delete_iscsi_bdev)
def construct_pmem_bdev(args): def construct_pmem_bdev(args):
print_string(rpc.bdev.construct_pmem_bdev(args.client, print_json(rpc.bdev.construct_pmem_bdev(args.client,
pmem_file=args.pmem_file, pmem_file=args.pmem_file,
name=args.name)) name=args.name))
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')
@ -500,9 +500,9 @@ if __name__ == "__main__":
p.set_defaults(func=delete_pmem_bdev) p.set_defaults(func=delete_pmem_bdev)
def construct_passthru_bdev(args): def construct_passthru_bdev(args):
print_string(rpc.bdev.construct_passthru_bdev(args.client, print_json(rpc.bdev.construct_passthru_bdev(args.client,
base_bdev_name=args.base_bdev_name, base_bdev_name=args.base_bdev_name,
name=args.name)) name=args.name))
p = subparsers.add_parser('construct_passthru_bdev', p = subparsers.add_parser('construct_passthru_bdev',
help='Add a pass through bdev on existing bdev') help='Add a pass through bdev on existing bdev')
@ -1101,11 +1101,11 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
# lvol # lvol
def construct_lvol_store(args): def construct_lvol_store(args):
print_string(rpc.lvol.construct_lvol_store(args.client, print_json(rpc.lvol.construct_lvol_store(args.client,
bdev_name=args.bdev_name, bdev_name=args.bdev_name,
lvs_name=args.lvs_name, lvs_name=args.lvs_name,
cluster_sz=args.cluster_sz, cluster_sz=args.cluster_sz,
clear_method=args.clear_method)) clear_method=args.clear_method))
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')
@ -1126,13 +1126,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
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_string(rpc.lvol.construct_lvol_bdev(args.client, print_json(rpc.lvol.construct_lvol_bdev(args.client,
lvol_name=args.lvol_name, lvol_name=args.lvol_name,
size=args.size * 1024 * 1024, size=args.size * 1024 * 1024,
thin_provision=args.thin_provision, thin_provision=args.thin_provision,
clear_method=args.clear_method, clear_method=args.clear_method,
uuid=args.uuid, uuid=args.uuid,
lvs_name=args.lvs_name)) lvs_name=args.lvs_name))
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)
@ -1145,9 +1145,9 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
p.set_defaults(func=construct_lvol_bdev) p.set_defaults(func=construct_lvol_bdev)
def snapshot_lvol_bdev(args): def snapshot_lvol_bdev(args):
print_string(rpc.lvol.snapshot_lvol_bdev(args.client, print_json(rpc.lvol.snapshot_lvol_bdev(args.client,
lvol_name=args.lvol_name, lvol_name=args.lvol_name,
snapshot_name=args.snapshot_name)) snapshot_name=args.snapshot_name))
p = subparsers.add_parser('snapshot_lvol_bdev', help='Create a snapshot of an lvol bdev') p = subparsers.add_parser('snapshot_lvol_bdev', help='Create a snapshot of an lvol bdev')
p.add_argument('lvol_name', help='lvol bdev name') p.add_argument('lvol_name', help='lvol bdev name')
@ -1155,9 +1155,9 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
p.set_defaults(func=snapshot_lvol_bdev) p.set_defaults(func=snapshot_lvol_bdev)
def clone_lvol_bdev(args): def clone_lvol_bdev(args):
print_string(rpc.lvol.clone_lvol_bdev(args.client, print_json(rpc.lvol.clone_lvol_bdev(args.client,
snapshot_name=args.snapshot_name, snapshot_name=args.snapshot_name,
clone_name=args.clone_name)) clone_name=args.clone_name))
p = subparsers.add_parser('clone_lvol_bdev', help='Create a clone of an lvol snapshot') p = subparsers.add_parser('clone_lvol_bdev', help='Create a clone of an lvol snapshot')
p.add_argument('snapshot_name', help='lvol snapshot name') p.add_argument('snapshot_name', help='lvol snapshot name')
@ -1641,10 +1641,10 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
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):
print_string(rpc.vhost.add_vhost_scsi_lun(args.client, print_json(rpc.vhost.add_vhost_scsi_lun(args.client,
ctrlr=args.ctrlr, ctrlr=args.ctrlr,
scsi_target_num=args.scsi_target_num, scsi_target_num=args.scsi_target_num,
bdev_name=args.bdev_name)) bdev_name=args.bdev_name))
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')
@ -1844,7 +1844,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
if args.dry_run: if args.dry_run:
args.client = mock_client() args.client = mock_client()
print_dict = mock_print print_dict = mock_print
print_string = mock_print print_json = mock_print
print_array = mock_print print_array = mock_print
else: else:
args.client = rpc.client.JSONRPCClient(args.server_addr, args.port, args.timeout, log_level=getattr(logging, args.verbose.upper())) args.client = rpc.client.JSONRPCClient(args.server_addr, args.port, args.timeout, log_level=getattr(logging, args.verbose.upper()))

2
scripts/rpc/client.py
View File

@ -10,7 +10,7 @@ def print_dict(d):
print(json.dumps(d, indent=2)) print(json.dumps(d, indent=2))
def print_string(s): def print_json(s):
print(json.dumps(s, indent=2).strip('"')) print(json.dumps(s, indent=2).strip('"'))