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

rpc: Rename delete_initiator_group to iscsi_delete_initiator_group

Browse Source 
Change-Id: I4ab2ee03699456ecf7d75e8b4259ca83d4e51750
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467225
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Pawel Kaminski 2019-09-03 05:30:46 -04:00 committed by Jim Harris
parent 94dd4b9a40
commit 7eedb271a7
9 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/iscsi.md
View File

@ -93,7 +93,7 @@ In addition to the configuration file, the iSCSI target may also be configured v
### Initiator groups ### Initiator groups
- iscsi_create_initiator_group -- Add an initiator group. - iscsi_create_initiator_group -- Add an initiator group.
- delete_initiator_group -- Delete an existing initiator group. - iscsi_delete_initiator_group -- Delete an existing initiator group.
- iscsi_initiator_group_add_initiators -- Add initiators to an existing initiator group. - iscsi_initiator_group_add_initiators -- Add initiators to an existing initiator group.
- iscsi_get_initiator_groups -- Show information about all available initiator groups. - iscsi_get_initiator_groups -- Show information about all available initiator groups.

6
doc/jsonrpc.md
View File

@ -265,7 +265,7 @@ Example response:
"iscsi_target_node_add_pg_ig_maps", "iscsi_target_node_add_pg_ig_maps",
"iscsi_create_target_node", "iscsi_create_target_node",
"iscsi_get_target_nodes", "iscsi_get_target_nodes",
"delete_initiator_group", "iscsi_delete_initiator_group",
"iscsi_initiator_group_remove_initiators", "iscsi_initiator_group_remove_initiators",
"iscsi_initiator_group_add_initiators", "iscsi_initiator_group_add_initiators",
"iscsi_create_initiator_group", "iscsi_create_initiator_group",
@ -3019,7 +3019,7 @@ response:
} }
~~~ ~~~
## delete_initiator_group method {#rpc_delete_initiator_group} ## iscsi_delete_initiator_group method {#rpc_iscsi_delete_initiator_group}
Delete an existing initiator group. Delete an existing initiator group.
@ -3039,7 +3039,7 @@ Example request:
"tag": 1 "tag": 1
}, },
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "delete_initiator_group", "method": "iscsi_delete_initiator_group",
"id": 1 "id": 1
} }
~~~ ~~~

20
lib/iscsi/iscsi_rpc.c
View File

@ -258,24 +258,24 @@ SPDK_RPC_REGISTER("iscsi_initiator_group_remove_initiators",
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_initiator_group_remove_initiators, SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_initiator_group_remove_initiators,
delete_initiators_from_initiator_group) delete_initiators_from_initiator_group)
struct rpc_delete_initiator_group { struct rpc_iscsi_delete_initiator_group {
int32_t tag; int32_t tag;
}; };
static const struct spdk_json_object_decoder rpc_delete_initiator_group_decoders[] = { static const struct spdk_json_object_decoder rpc_iscsi_delete_initiator_group_decoders[] = {
{"tag", offsetof(struct rpc_delete_initiator_group, tag), spdk_json_decode_int32}, {"tag", offsetof(struct rpc_iscsi_delete_initiator_group, tag), spdk_json_decode_int32},
}; };
static void static void
spdk_rpc_delete_initiator_group(struct spdk_jsonrpc_request *request, spdk_rpc_iscsi_delete_initiator_group(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_initiator_group req = {}; struct rpc_iscsi_delete_initiator_group req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
struct spdk_iscsi_init_grp *ig; struct spdk_iscsi_init_grp *ig;
if (spdk_json_decode_object(params, rpc_delete_initiator_group_decoders, if (spdk_json_decode_object(params, rpc_iscsi_delete_initiator_group_decoders,
SPDK_COUNTOF(rpc_delete_initiator_group_decoders), SPDK_COUNTOF(rpc_iscsi_delete_initiator_group_decoders),
&req)) { &req)) {
SPDK_ERRLOG("spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
@ -296,7 +296,9 @@ spdk_rpc_delete_initiator_group(struct spdk_jsonrpc_request *request,
invalid: invalid:
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
} }
SPDK_RPC_REGISTER("delete_initiator_group", spdk_rpc_delete_initiator_group, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("iscsi_delete_initiator_group", spdk_rpc_iscsi_delete_initiator_group,
SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_initiator_group, delete_initiator_group)
static void static void
spdk_rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request, spdk_rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request,

9
scripts/rpc.py
View File

@ -1086,14 +1086,15 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
'tag', help='Portal group tag (unique, integer > 0)', type=int) 'tag', help='Portal group tag (unique, integer > 0)', type=int)
p.set_defaults(func=iscsi_delete_portal_group) p.set_defaults(func=iscsi_delete_portal_group)
def delete_initiator_group(args): def iscsi_delete_initiator_group(args):
rpc.iscsi.delete_initiator_group(args.client, tag=args.tag) rpc.iscsi.iscsi_delete_initiator_group(args.client, tag=args.tag)
p = subparsers.add_parser('delete_initiator_group', p = subparsers.add_parser('iscsi_delete_initiator_group',
aliases=['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=delete_initiator_group) p.set_defaults(func=iscsi_delete_initiator_group)
def iscsi_get_connections(args): def iscsi_get_connections(args):
print_dict(rpc.iscsi.iscsi_get_connections(args.client)) print_dict(rpc.iscsi.iscsi_get_connections(args.client))

5
scripts/rpc/iscsi.py
View File

@ -478,7 +478,8 @@ def iscsi_delete_portal_group(client, tag):
return client.call('iscsi_delete_portal_group', params) return client.call('iscsi_delete_portal_group', params)
def delete_initiator_group(client, tag): @deprecated_alias('delete_initiator_group')
def iscsi_delete_initiator_group(client, tag):
"""Delete an initiator group. """Delete an initiator group.
Args: Args:
@ -488,7 +489,7 @@ def delete_initiator_group(client, tag):
True or False True or False
""" """
params = {'tag': tag} params = {'tag': tag}
return client.call('delete_initiator_group', params) return client.call('iscsi_delete_initiator_group', params)
@deprecated_alias('get_iscsi_connections') @deprecated_alias('get_iscsi_connections')

2
scripts/spdkcli/ui_node_iscsi.py
View File

@ -374,7 +374,7 @@ class UIInitiatorGroups(UINode):
self.refresh() self.refresh()
def delete(self, tag): def delete(self, tag):
self.get_root().delete_initiator_group(tag=tag) self.get_root().iscsi_delete_initiator_group(tag=tag)
def ui_command_create(self, tag, initiator_list, netmask_list): def ui_command_create(self, tag, initiator_list, netmask_list):
"""Add an initiator group. """Add an initiator group.

4
scripts/spdkcli/ui_root.py
View File

@ -417,8 +417,8 @@ class UIRoot(UINode):
rpc.iscsi.iscsi_create_initiator_group(self.client, **kwargs) rpc.iscsi.iscsi_create_initiator_group(self.client, **kwargs)
@verbose @verbose
def delete_initiator_group(self, **kwargs): def iscsi_delete_initiator_group(self, **kwargs):
rpc.iscsi.delete_initiator_group(self.client, **kwargs) rpc.iscsi.iscsi_delete_initiator_group(self.client, **kwargs)
@verbose @verbose
@is_method_available @is_method_available

8
test/iscsi_tgt/rpc_config/rpc_config.py
View File

@ -125,7 +125,7 @@ def verify_iscsi_connection_rpc_methods(rpc_py):
check_output('iscsiadm -m node --logout', shell=True) check_output('iscsiadm -m node --logout', shell=True)
check_output('iscsiadm -m node -o delete', shell=True) check_output('iscsiadm -m node -o delete', shell=True)
rpc.delete_initiator_group(initiator_tag) rpc.iscsi_delete_initiator_group(initiator_tag)
rpc.iscsi_delete_portal_group(portal_tag) rpc.iscsi_delete_portal_group(portal_tag)
rpc.delete_target_node(name) rpc.delete_target_node(name)
output = rpc.iscsi_get_connections() output = rpc.iscsi_get_connections()
@ -166,7 +166,7 @@ def verify_scsi_devices_rpc_methods(rpc_py):
check_output('iscsiadm -m node --logout', shell=True) check_output('iscsiadm -m node --logout', shell=True)
check_output('iscsiadm -m node -o delete', shell=True) check_output('iscsiadm -m node -o delete', shell=True)
rpc.delete_initiator_group(initiator_tag) rpc.iscsi_delete_initiator_group(initiator_tag)
rpc.iscsi_delete_portal_group(portal_tag) rpc.iscsi_delete_portal_group(portal_tag)
rpc.delete_target_node(name) rpc.delete_target_node(name)
output = rpc.get_scsi_devices() output = rpc.get_scsi_devices()
@ -304,7 +304,7 @@ def verify_initiator_groups_rpc_methods(rpc_py, rpc_param):
"netmasks value is {}, expected {}".format(value['netmasks'][0], rpc_param['netmask'][idx])) "netmasks value is {}, expected {}".format(value['netmasks'][0], rpc_param['netmask'][idx]))
for idx, value in enumerate(tag_list): for idx, value in enumerate(tag_list):
rpc.delete_initiator_group(value) rpc.iscsi_delete_initiator_group(value)
output = rpc.iscsi_get_initiator_groups() output = rpc.iscsi_get_initiator_groups()
jsonvalues = json.loads(output) jsonvalues = json.loads(output)
verify(len(jsonvalues) == (len(tag_list) - (idx + 1)), 1, verify(len(jsonvalues) == (len(tag_list) - (idx + 1)), 1,
@ -391,7 +391,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
net_mapping, rpc_param['queue_depth'], '-d') net_mapping, rpc_param['queue_depth'], '-d')
rpc.iscsi_delete_portal_group(portal_tag) rpc.iscsi_delete_portal_group(portal_tag)
rpc.delete_initiator_group(initiator_tag) rpc.iscsi_delete_initiator_group(initiator_tag)
rpc.delete_target_node(name) rpc.delete_target_node(name)
output = rpc.iscsi_get_target_nodes() output = rpc.iscsi_get_target_nodes()
jsonvalues = json.loads(output) jsonvalues = json.loads(output)

2
test/json_config/clear_config.py
View File

@ -87,7 +87,7 @@ def clear_nvmf_subsystem(args, nvmf_config):
def get_iscsi_destroy_method(iscsi): def get_iscsi_destroy_method(iscsi):
delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group", delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group",
'iscsi_create_initiator_group': "delete_initiator_group", 'iscsi_create_initiator_group': "iscsi_delete_initiator_group",
'iscsi_create_target_node': "delete_target_node", 'iscsi_create_target_node': "delete_target_node",
'iscsi_set_options': None 'iscsi_set_options': None
} }