Adding new initiator to an existing initiator group to allow login will be usual. This patch support the following JSON-RPC commands: - add_initiators_to_initiator_group - delete_initiators_from_initiator_group Both initiator's name and netmask are optional but already added name or netmask cannot be added. Test code is added too. Change-Id: Ic101210b9d00c2b36e37ece23fcba8cfe8e44eb8 Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-on: https://review.gerrithub.io/398361 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
176 lines
4.8 KiB
Python
Executable File
176 lines
4.8 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 add_initiators_to_initiator_group(args):
|
|
initiators = []
|
|
netmasks = []
|
|
if args.initiator_list:
|
|
for i in args.initiator_list.strip().split(' '):
|
|
initiators.append(i)
|
|
if args.netmask_list:
|
|
for n in args.netmask_list.strip().split(' '):
|
|
netmasks.append(n)
|
|
|
|
params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks}
|
|
args.client.call('add_initiators_to_initiator_group', params)
|
|
|
|
|
|
def delete_initiators_from_initiator_group(args):
|
|
initiators = []
|
|
netmasks = []
|
|
if args.initiator_list:
|
|
for i in args.initiator_list.strip().split(' '):
|
|
initiators.append(i)
|
|
if args.netmask_list:
|
|
for n in args.netmask_list.strip().split(' '):
|
|
netmasks.append(n)
|
|
|
|
params = {'tag': args.tag, 'initiators': initiators, 'netmasks': netmasks}
|
|
args.client.call('delete_initiators_from_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'))
|