a54e7e584b
Rather than requiring the 'verbose' flag as a parameter to JSONRPCClient.call(), move it to the JSONRPCClient constructor so that it can be set once. This fixes the inconsistency between RPC method wrappers that passed args.verbose and those that didn't; now, rpc.py -v works reliably for all methods. The JSONRPCClient.call() verbose parameter is maintained as well to allow individual calls to be set to verbose if desired. Change-Id: Iee385510cc9eb1d2984d3b9982055789dff188c6 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/398508 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: <shuhei.matsumoto.xt@hitachi.com>
148 lines
3.9 KiB
Python
Executable File
148 lines
3.9 KiB
Python
Executable File
from client import print_dict, print_array, int_arg
|
|
|
|
|
|
def get_luns(args):
|
|
print_dict(args.client.call('get_luns'))
|
|
|
|
|
|
def get_portal_groups(args):
|
|
print_dict(args.client.call('get_portal_groups'))
|
|
|
|
|
|
def get_initiator_groups(args):
|
|
print_dict(args.client.call('get_initiator_groups'))
|
|
|
|
|
|
def get_target_nodes(args):
|
|
print_dict(args.client.call('get_target_nodes'))
|
|
|
|
|
|
def construct_target_node(args):
|
|
bdev_name_id_dict = dict(u.split(":") for u in args.bdev_name_id_pairs.strip().split(" "))
|
|
bdev_names = bdev_name_id_dict.keys()
|
|
lun_ids = list(map(int, bdev_name_id_dict.values()))
|
|
|
|
pg_tags = []
|
|
ig_tags = []
|
|
for u in args.pg_ig_mappings.strip().split(" "):
|
|
pg, ig = u.split(":")
|
|
pg_tags.append(int(pg))
|
|
ig_tags.append(int(ig))
|
|
|
|
params = {
|
|
'name': args.name,
|
|
'alias_name': args.alias_name,
|
|
'pg_tags': pg_tags,
|
|
'ig_tags': ig_tags,
|
|
'bdev_names': bdev_names,
|
|
'lun_ids': lun_ids,
|
|
'queue_depth': args.queue_depth,
|
|
'chap_disabled': args.chap_disabled,
|
|
'chap_required': args.chap_required,
|
|
'chap_mutual': args.chap_mutual,
|
|
'chap_auth_group': args.chap_auth_group,
|
|
}
|
|
|
|
if args.header_digest:
|
|
params['header_digest'] = args.header_digest
|
|
if args.data_digest:
|
|
params['data_digest'] = args.data_digest
|
|
args.client.call('construct_target_node', params)
|
|
|
|
|
|
def target_node_add_lun(args):
|
|
params = {
|
|
'name': args.name,
|
|
'bdev_name': args.bdev_name,
|
|
}
|
|
if args.lun_id:
|
|
params['lun_id'] = args.lun_id
|
|
args.client.call('target_node_add_lun', params)
|
|
|
|
|
|
def delete_pg_ig_maps(args):
|
|
pg_tags = []
|
|
ig_tags = []
|
|
for u in args.pg_ig_mappings.strip().split(" "):
|
|
pg, ig = u.split(":")
|
|
pg_tags.append(int(pg))
|
|
ig_tags.append(int(ig))
|
|
params = {
|
|
'name': args.name,
|
|
'pg_tags': pg_tags,
|
|
'ig_tags': ig_tags,
|
|
}
|
|
args.client.call('delete_pg_ig_maps', params)
|
|
|
|
|
|
def add_pg_ig_maps(args):
|
|
pg_tags = []
|
|
ig_tags = []
|
|
for u in args.pg_ig_mappings.strip().split(" "):
|
|
pg, ig = u.split(":")
|
|
pg_tags.append(int(pg))
|
|
ig_tags.append(int(ig))
|
|
params = {
|
|
'name': args.name,
|
|
'pg_tags': pg_tags,
|
|
'ig_tags': ig_tags,
|
|
}
|
|
args.client.call('add_pg_ig_maps', params)
|
|
|
|
|
|
def add_portal_group(args):
|
|
# parse out portal list host1:port1 host2:port2
|
|
portals = []
|
|
for p in args.portal_list:
|
|
ip, separator, port_cpumask = p.rpartition(':')
|
|
split_port_cpumask = port_cpumask.split('@')
|
|
if len(split_port_cpumask) == 1:
|
|
port = port_cpumask
|
|
portals.append({'host': ip, 'port': port})
|
|
else:
|
|
port = split_port_cpumask[0]
|
|
cpumask = split_port_cpumask[1]
|
|
portals.append({'host': ip, 'port': port, 'cpumask': cpumask})
|
|
|
|
params = {'tag': args.tag, 'portals': portals}
|
|
args.client.call('add_portal_group', params)
|
|
|
|
|
|
def add_initiator_group(args):
|
|
initiators = []
|
|
netmasks = []
|
|
for i in args.initiator_list.strip().split(' '):
|
|
initiators.append(i)
|
|
for n in args.netmask_list.strip().split(' '):
|
|
netmasks.append(n)
|
|
|
|
params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks}
|
|
args.client.call('add_initiator_group', params)
|
|
|
|
|
|
def delete_target_node(args):
|
|
params = {'name': args.target_node_name}
|
|
args.client.call('delete_target_node', params)
|
|
|
|
|
|
def delete_portal_group(args):
|
|
params = {'tag': args.tag}
|
|
args.client.call('delete_portal_group', params)
|
|
|
|
|
|
def delete_initiator_group(args):
|
|
params = {'tag': args.tag}
|
|
args.client.call('delete_initiator_group', params)
|
|
|
|
|
|
def get_iscsi_connections(args):
|
|
print_dict(args.client.call('get_iscsi_connections'))
|
|
|
|
|
|
def get_iscsi_global_params(args):
|
|
print_dict(args.client.call('get_iscsi_global_params'))
|
|
|
|
|
|
def get_scsi_devices(args):
|
|
print_dict(args.client.call('get_scsi_devices'))
|