From 032a8b1c9b9c2fc643693ddf29e04224737c7020 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Tue, 10 Sep 2019 07:13:46 -0400 Subject: [PATCH] rpc: Rename set_iscsi_target_node_auth to iscsi_target_node_set_auth Change-Id: Iab107a8ebc92deb20dd7ae3aed9e7a12bdf87d43 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467938 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Paul Luse Reviewed-by: Shuhei Matsumoto --- doc/jsonrpc.md | 4 ++-- lib/iscsi/iscsi_rpc.c | 5 +++-- scripts/rpc.py | 9 +++++---- scripts/rpc/iscsi.py | 5 +++-- scripts/spdkcli/ui_node_iscsi.py | 2 +- scripts/spdkcli/ui_root.py | 4 ++-- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 30f417a30..3cceea769 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -3231,7 +3231,7 @@ Example response: } ~~~ -## set_iscsi_target_node_auth method {#rpc_set_iscsi_target_node_auth} +## iscsi_target_node_set_auth method {#rpc_iscsi_target_node_set_auth} Set CHAP authentication to an existing iSCSI target node. @@ -3260,7 +3260,7 @@ Example request: "mutual_chap": true }, "jsonrpc": "2.0", - "method": "set_iscsi_target_node_auth", + "method": "iscsi_target_node_set_auth", "id": 1 } ~~~ diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index 4bf654e3f..4c581cab7 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -1037,7 +1037,7 @@ static const struct spdk_json_object_decoder rpc_target_auth_decoders[] = { }; static void -spdk_rpc_set_iscsi_target_node_auth(struct spdk_jsonrpc_request *request, +spdk_rpc_iscsi_target_node_set_auth(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_target_auth req = {}; @@ -1078,8 +1078,9 @@ spdk_rpc_set_iscsi_target_node_auth(struct spdk_jsonrpc_request *request, exit: free_rpc_target_auth(&req); } -SPDK_RPC_REGISTER("set_iscsi_target_node_auth", spdk_rpc_set_iscsi_target_node_auth, +SPDK_RPC_REGISTER("iscsi_target_node_set_auth", spdk_rpc_iscsi_target_node_set_auth, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_set_auth, set_iscsi_target_node_auth) static void spdk_rpc_get_iscsi_global_params(struct spdk_jsonrpc_request *request, diff --git a/scripts/rpc.py b/scripts/rpc.py index c1146b1fc..133b84d8d 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -881,8 +881,8 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse *** If LUN ID is omitted or -1, the lowest free one is assigned ***""", type=int, required=False) p.set_defaults(func=iscsi_target_node_add_lun) - def set_iscsi_target_node_auth(args): - rpc.iscsi.set_iscsi_target_node_auth( + def iscsi_target_node_set_auth(args): + rpc.iscsi.iscsi_target_node_set_auth( args.client, name=args.name, chap_group=args.chap_group, @@ -890,7 +890,8 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse require_chap=args.require_chap, mutual_chap=args.mutual_chap) - p = subparsers.add_parser('set_iscsi_target_node_auth', help='Set CHAP authentication for the target node') + p = subparsers.add_parser('iscsi_target_node_set_auth', aliases=['set_iscsi_target_node_auth'], + help='Set CHAP authentication for the target node') p.add_argument('name', help='Target node name (ASCII)') p.add_argument('-g', '--chap-group', help="""Authentication group ID for this target node. *** Authentication group must be precreated ***""", type=int, default=0) @@ -900,7 +901,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse *** Mutually exclusive with --disable-chap ***""", action='store_true') p.add_argument('-m', '--mutual-chap', help='CHAP authentication should be mutual/bidirectional.', action='store_true') - p.set_defaults(func=set_iscsi_target_node_auth) + p.set_defaults(func=iscsi_target_node_set_auth) def add_pg_ig_maps(args): pg_ig_maps = [] diff --git a/scripts/rpc/iscsi.py b/scripts/rpc/iscsi.py index bd7481f1a..25644d4e4 100644 --- a/scripts/rpc/iscsi.py +++ b/scripts/rpc/iscsi.py @@ -230,7 +230,8 @@ def iscsi_target_node_add_lun(client, name, bdev_name, lun_id=None): return client.call('iscsi_target_node_add_lun', params) -def set_iscsi_target_node_auth( +@deprecated_alias('set_iscsi_target_node_auth') +def iscsi_target_node_set_auth( client, name, chap_group=None, @@ -261,7 +262,7 @@ def set_iscsi_target_node_auth( params['require_chap'] = require_chap if mutual_chap: params['mutual_chap'] = mutual_chap - return client.call('set_iscsi_target_node_auth', params) + return client.call('iscsi_target_node_set_auth', params) def add_iscsi_auth_group(client, tag, secrets=None): diff --git a/scripts/spdkcli/ui_node_iscsi.py b/scripts/spdkcli/ui_node_iscsi.py index 41d8c34e0..087a8448e 100644 --- a/scripts/spdkcli/ui_node_iscsi.py +++ b/scripts/spdkcli/ui_node_iscsi.py @@ -179,7 +179,7 @@ class UIISCSIDevice(UINode): disable_chap = self.ui_eval_param(d, "bool", None) require_chap = self.ui_eval_param(r, "bool", None) mutual_chap = self.ui_eval_param(m, "bool", None) - self.get_root().set_iscsi_target_node_auth( + self.get_root().iscsi_target_node_set_auth( name=self.device.device_name, chap_group=chap_group, disable_chap=disable_chap, require_chap=require_chap, mutual_chap=mutual_chap) diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index 81a52686f..653e0b148 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -465,8 +465,8 @@ class UIRoot(UINode): rpc.iscsi.delete_iscsi_auth_group(self.client, **kwargs) @verbose - def set_iscsi_target_node_auth(self, **kwargs): - rpc.iscsi.set_iscsi_target_node_auth(self.client, **kwargs) + def iscsi_target_node_set_auth(self, **kwargs): + rpc.iscsi.iscsi_target_node_set_auth(self.client, **kwargs) @verbose def iscsi_target_node_add_lun(self, **kwargs):