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

rpc: Rename delete_iscsi_auth_group to iscsi_delete_auth_group

Browse Source 
Change-Id: I480c9bbe521eb9998ba827ea1a9989b61a501dd3
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468358
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Pawel Kaminski 2019-09-13 09:39:01 -04:00 committed by Ben Walker
parent d9edd3afbb
commit bcab0b3b53
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/jsonrpc.md
View File

@ -2749,7 +2749,7 @@ Example response:
} }
~~~ ~~~
## delete_iscsi_auth_group method {#rpc_delete_iscsi_auth_group} ## iscsi_delete_auth_group method {#rpc_iscsi_delete_auth_group}
Delete an existing authentication group for CHAP authentication. Delete an existing authentication group for CHAP authentication.
@ -2769,7 +2769,7 @@ Example request:
"tag": 2 "tag": 2
}, },
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "delete_iscsi_auth_group", "method": "iscsi_delete_auth_group",
"id": 1 "id": 1
} }
~~~ ~~~

5
lib/iscsi/iscsi_rpc.c
View File

@ -1295,7 +1295,7 @@ static const struct spdk_json_object_decoder rpc_delete_auth_group_decoders[] =
}; };
static void static void
spdk_rpc_delete_iscsi_auth_group(struct spdk_jsonrpc_request *request, spdk_rpc_iscsi_delete_auth_group(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_auth_group req = {}; struct rpc_delete_auth_group req = {};
@ -1329,7 +1329,8 @@ spdk_rpc_delete_iscsi_auth_group(struct spdk_jsonrpc_request *request,
spdk_json_write_bool(w, true); spdk_json_write_bool(w, true);
spdk_jsonrpc_end_result(request, w); spdk_jsonrpc_end_result(request, w);
} }
SPDK_RPC_REGISTER("delete_iscsi_auth_group", spdk_rpc_delete_iscsi_auth_group, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("iscsi_delete_auth_group", spdk_rpc_iscsi_delete_auth_group, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_auth_group, delete_iscsi_auth_group)
struct rpc_add_auth_secret { struct rpc_add_auth_secret {
int32_t tag; int32_t tag;

9
scripts/rpc.py
View File

@ -764,12 +764,13 @@ if __name__ == "__main__":
Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 msecret:ms2'""", required=False) Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 msecret:ms2'""", required=False)
p.set_defaults(func=iscsi_create_auth_group) p.set_defaults(func=iscsi_create_auth_group)
def delete_iscsi_auth_group(args): def iscsi_delete_auth_group(args):
rpc.iscsi.delete_iscsi_auth_group(args.client, tag=args.tag) rpc.iscsi.iscsi_delete_auth_group(args.client, tag=args.tag)
p = subparsers.add_parser('delete_iscsi_auth_group', help='Delete an authentication group.') p = subparsers.add_parser('iscsi_delete_auth_group', aliases=['delete_iscsi_auth_group'],
help='Delete an authentication group.')
p.add_argument('tag', help='Authentication group tag', type=int) p.add_argument('tag', help='Authentication group tag', type=int)
p.set_defaults(func=delete_iscsi_auth_group) p.set_defaults(func=iscsi_delete_auth_group)
def iscsi_auth_group_add_secret(args): def iscsi_auth_group_add_secret(args):
rpc.iscsi.iscsi_auth_group_add_secret( rpc.iscsi.iscsi_auth_group_add_secret(

5
scripts/rpc/iscsi.py
View File

@ -285,7 +285,8 @@ def iscsi_create_auth_group(client, tag, secrets=None):
return client.call('iscsi_create_auth_group', params) return client.call('iscsi_create_auth_group', params)
def delete_iscsi_auth_group(client, tag): @deprecated_alias('delete_iscsi_auth_group')
def iscsi_delete_auth_group(client, tag):
"""Delete an authentication group. """Delete an authentication group.
Args: Args:
@ -295,7 +296,7 @@ def delete_iscsi_auth_group(client, tag):
True or False True or False
""" """
params = {'tag': tag} params = {'tag': tag}
return client.call('delete_iscsi_auth_group', params) return client.call('iscsi_delete_auth_group', params)
@deprecated_alias('add_secret_to_iscsi_auth_group') @deprecated_alias('add_secret_to_iscsi_auth_group')

2
scripts/spdkcli/ui_node_iscsi.py
View File

@ -523,7 +523,7 @@ class UIISCSIAuthGroups(UINode):
UIISCSIAuthGroup(ag, self) UIISCSIAuthGroup(ag, self)
def delete(self, tag): def delete(self, tag):
self.get_root().delete_iscsi_auth_group(tag=tag) self.get_root().iscsi_delete_auth_group(tag=tag)
def delete_secret(self, tag, user): def delete_secret(self, tag, user):
self.get_root().delete_secret_from_iscsi_auth_group( self.get_root().delete_secret_from_iscsi_auth_group(

4
scripts/spdkcli/ui_root.py
View File

@ -461,8 +461,8 @@ class UIRoot(UINode):
rpc.iscsi.iscsi_create_auth_group(self.client, **kwargs) rpc.iscsi.iscsi_create_auth_group(self.client, **kwargs)
@verbose @verbose
def delete_iscsi_auth_group(self, **kwargs): def iscsi_delete_auth_group(self, **kwargs):
rpc.iscsi.delete_iscsi_auth_group(self.client, **kwargs) rpc.iscsi.iscsi_delete_auth_group(self.client, **kwargs)
@verbose @verbose
def iscsi_target_node_set_auth(self, **kwargs): def iscsi_target_node_set_auth(self, **kwargs):