rpc: Rename add_secret_to_iscsi_auth_group to iscsi_auth_group_add_secret

Change-Id: Ic3a536a78c3d32b0924c7dcae5ca2662b32b8ea9
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468485
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>

doc/jsonrpc.md

@@ -2835,7 +2835,7 @@ Example response:
 }
 ~~~
 
-## add_secret_to_iscsi_auth_group {#rpc_add_secret_to_iscsi_auth_group}
+## iscsi_auth_group_add_secret {#rpc_iscsi_auth_group_add_secret}
 
 Add a secret to an existing authentication group for CHAP authentication.
 
@@ -2863,7 +2863,7 @@ Example request:
     "msecret": "ms3"
   },
   "jsonrpc": "2.0",
-  "method": "add_secret_to_iscsi_auth_group",
+  "method": "iscsi_auth_group_add_secret",
   "id": 1
 }
 ~~~

lib/iscsi/iscsi_rpc.c

@@ -1356,8 +1356,8 @@ static const struct spdk_json_object_decoder rpc_add_auth_secret_decoders[] = {
 };
 
 static void
-spdk_rpc_add_secret_to_iscsi_auth_group(struct spdk_jsonrpc_request *request,
-					const struct spdk_json_val *params)
+spdk_rpc_iscsi_auth_group_add_secret(struct spdk_jsonrpc_request *request,
+				     const struct spdk_json_val *params)
 {
 	struct rpc_add_auth_secret req = {};
 	struct spdk_json_write_ctx *w;
@@ -1404,8 +1404,10 @@ spdk_rpc_add_secret_to_iscsi_auth_group(struct spdk_jsonrpc_request *request,
 	spdk_json_write_bool(w, true);
 	spdk_jsonrpc_end_result(request, w);
 }
-SPDK_RPC_REGISTER("add_secret_to_iscsi_auth_group", spdk_rpc_add_secret_to_iscsi_auth_group,
+SPDK_RPC_REGISTER("iscsi_auth_group_add_secret", spdk_rpc_iscsi_auth_group_add_secret,
 		  SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_auth_group_add_secret, add_secret_to_iscsi_auth_group)
+
 
 struct rpc_delete_auth_secret {
 	int32_t tag;

scripts/rpc.py

@@ -757,8 +757,8 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
     p.add_argument('tag', help='Authentication group tag', type=int)
     p.set_defaults(func=delete_iscsi_auth_group)
 
-    def add_secret_to_iscsi_auth_group(args):
-        rpc.iscsi.add_secret_to_iscsi_auth_group(
+    def iscsi_auth_group_add_secret(args):
+        rpc.iscsi.iscsi_auth_group_add_secret(
             args.client,
             tag=args.tag,
             user=args.user,
@@ -766,13 +766,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
             muser=args.muser,
             msecret=args.msecret)
 
-    p = subparsers.add_parser('add_secret_to_iscsi_auth_group', help='Add a secret to an authentication group.')
+    p = subparsers.add_parser('iscsi_auth_group_add_secret', aliases=['add_secret_to_iscsi_auth_group'],
+                              help='Add a secret to an authentication group.')
     p.add_argument('tag', help='Authentication group tag', type=int)
     p.add_argument('-u', '--user', help='User name for one-way CHAP authentication', required=True)
     p.add_argument('-s', '--secret', help='Secret for one-way CHAP authentication', required=True)
     p.add_argument('-m', '--muser', help='User name for mutual CHAP authentication')
     p.add_argument('-r', '--msecret', help='Secret for mutual CHAP authentication')
-    p.set_defaults(func=add_secret_to_iscsi_auth_group)
+    p.set_defaults(func=iscsi_auth_group_add_secret)
 
     def delete_secret_from_iscsi_auth_group(args):
         rpc.iscsi.delete_secret_from_iscsi_auth_group(args.client, tag=args.tag, user=args.user)

scripts/rpc/iscsi.py

@@ -296,7 +296,8 @@ def delete_iscsi_auth_group(client, tag):
     return client.call('delete_iscsi_auth_group', params)
 
 
-def add_secret_to_iscsi_auth_group(client, tag, user, secret, muser=None, msecret=None):
+@deprecated_alias('add_secret_to_iscsi_auth_group')
+def iscsi_auth_group_add_secret(client, tag, user, secret, muser=None, msecret=None):
     """Add a secret to an authentication group.
 
     Args:
@@ -315,7 +316,7 @@ def add_secret_to_iscsi_auth_group(client, tag, user, secret, muser=None, msecre
         params['muser'] = muser
     if msecret:
         params['msecret'] = msecret
-    return client.call('add_secret_to_iscsi_auth_group', params)
+    return client.call('iscsi_auth_group_add_secret', params)
 
 
 def delete_secret_from_iscsi_auth_group(client, tag, user):

scripts/spdkcli/ui_node_iscsi.py

@@ -577,7 +577,7 @@ class UIISCSIAuthGroups(UINode):
            msecret: Secret for mutual CHAP authentication
         """
         tag = self.ui_eval_param(tag, "number", None)
-        self.get_root().add_secret_to_iscsi_auth_group(
+        self.get_root().iscsi_auth_group_add_secret(
             tag=tag, user=user, secret=secret,
             muser=muser, msecret=msecret)
 

scripts/spdkcli/ui_root.py

@@ -444,8 +444,8 @@ class UIRoot(UINode):
         rpc.iscsi.iscsi_target_node_remove_pg_ig_maps(self.client, **kwargs)
 
     @verbose
-    def add_secret_to_iscsi_auth_group(self, **kwargs):
-        rpc.iscsi.add_secret_to_iscsi_auth_group(self.client, **kwargs)
+    def iscsi_auth_group_add_secret(self, **kwargs):
+        rpc.iscsi.iscsi_auth_group_add_secret(self.client, **kwargs)
 
     @verbose
     def delete_secret_from_iscsi_auth_group(self, **kwargs):