From 0fbba82dd6c6073a3d98320b1bf3354bfa852927 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Wed, 4 Sep 2019 05:52:01 -0400 Subject: [PATCH] rpc: Rename delete_initiators_from_initiator_group to iscsi_initiator_group_remove_initiators Change-Id: Id1bf2b21bb91982f3e8d6466b8493b4608f99299 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467328 Community-CI: Broadcom SPDK FC-NVMe CI Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- doc/jsonrpc.md | 2 +- lib/iscsi/iscsi_rpc.c | 8 +++++--- scripts/rpc.py | 9 +++++---- scripts/rpc/iscsi.py | 5 +++-- scripts/spdkcli/ui_node_iscsi.py | 2 +- scripts/spdkcli/ui_root.py | 4 ++-- test/iscsi_tgt/rpc_config/rpc_config.py | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index f989373eed..70e044cb59 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -266,7 +266,7 @@ Example response: "iscsi_create_target_node", "iscsi_get_target_nodes", "delete_initiator_group", - "delete_initiators_from_initiator_group", + "iscsi_initiator_group_remove_initiators", "iscsi_initiator_group_add_initiators", "add_initiator_group", "get_initiator_groups", diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index 34beed966c..de7558d95f 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -217,7 +217,7 @@ SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_initiator_group_add_initiators, add_initiators_to_initiator_group) static void -spdk_rpc_delete_initiators_from_initiator_group(struct spdk_jsonrpc_request *request, +spdk_rpc_iscsi_initiator_group_remove_initiators(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_initiator_group req = {}; @@ -249,8 +249,10 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); free_rpc_initiator_group(&req); } -SPDK_RPC_REGISTER("delete_initiators_from_initiator_group", - spdk_rpc_delete_initiators_from_initiator_group, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("iscsi_initiator_group_remove_initiators", + spdk_rpc_iscsi_initiator_group_remove_initiators, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_initiator_group_remove_initiators, + delete_initiators_from_initiator_group) struct rpc_delete_initiator_group { int32_t tag; diff --git a/scripts/rpc.py b/scripts/rpc.py index 9b9e5f570f..d7d8dfdf9f 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1006,7 +1006,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False) p.set_defaults(func=iscsi_initiator_group_add_initiators) - def delete_initiators_from_initiator_group(args): + def iscsi_initiator_group_remove_initiators(args): initiators = None netmasks = None if args.initiator_list: @@ -1017,13 +1017,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse netmasks = [] for n in args.netmask_list.strip().split(' '): netmasks.append(n) - rpc.iscsi.delete_initiators_from_initiator_group( + rpc.iscsi.iscsi_initiator_group_remove_initiators( args.client, tag=args.tag, initiators=initiators, netmasks=netmasks) - p = subparsers.add_parser('delete_initiators_from_initiator_group', + p = subparsers.add_parser('iscsi_initiator_group_remove_initiators', + aliases=['delete_initiators_from_initiator_group'], help='Delete initiators from an existing initiator group') p.add_argument( 'tag', help='Initiator group tag (unique, integer > 0)', type=int) @@ -1031,7 +1032,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse enclosed in quotes. This parameter can be omitted. Example: 'ANY' or '127.0.0.1 192.168.200.100'""", required=False) p.add_argument('-m', dest='netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes. This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False) - p.set_defaults(func=delete_initiators_from_initiator_group) + p.set_defaults(func=iscsi_initiator_group_remove_initiators) def delete_target_node(args): rpc.iscsi.delete_target_node( diff --git a/scripts/rpc/iscsi.py b/scripts/rpc/iscsi.py index dd390bc550..55eec47368 100644 --- a/scripts/rpc/iscsi.py +++ b/scripts/rpc/iscsi.py @@ -415,7 +415,8 @@ def iscsi_initiator_group_add_initiators( return client.call('iscsi_initiator_group_add_initiators', params) -def delete_initiators_from_initiator_group( +@deprecated_alias('delete_initiators_from_initiator_group') +def iscsi_initiator_group_remove_initiators( client, tag, initiators=None, netmasks=None): """Delete initiators from an existing initiator group. @@ -433,7 +434,7 @@ def delete_initiators_from_initiator_group( params['initiators'] = initiators if netmasks: params['netmasks'] = netmasks - return client.call('delete_initiators_from_initiator_group', params) + return client.call('iscsi_initiator_group_remove_initiators', params) def delete_target_node(client, target_node_name): diff --git a/scripts/spdkcli/ui_node_iscsi.py b/scripts/spdkcli/ui_node_iscsi.py index a1d1d2b7ce..3df640da8c 100644 --- a/scripts/spdkcli/ui_node_iscsi.py +++ b/scripts/spdkcli/ui_node_iscsi.py @@ -439,7 +439,7 @@ class UIInitiatorGroups(UINode): initiators = initiators.split(" ") if netmasks: netmasks = netmasks.split(" ") - self.get_root().delete_initiators_from_initiator_group( + self.get_root().iscsi_initiator_group_remove_initiators( tag=tag, initiators=initiators, netmasks=netmasks) diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index ceb6eadd57..8b6f35be30 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -432,8 +432,8 @@ class UIRoot(UINode): rpc.iscsi.iscsi_initiator_group_add_initiators(self.client, **kwargs) @verbose - def delete_initiators_from_initiator_group(self, **kwargs): - rpc.iscsi.delete_initiators_from_initiator_group(self.client, **kwargs) + def iscsi_initiator_group_remove_initiators(self, **kwargs): + rpc.iscsi.iscsi_initiator_group_remove_initiators(self.client, **kwargs) @verbose def add_pg_ig_maps(self, **kwargs): diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py index bff0275e0a..289ce66aee 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.py +++ b/test/iscsi_tgt/rpc_config/rpc_config.py @@ -268,7 +268,7 @@ def verify_initiator_groups_rpc_methods(rpc_py, rpc_param): for idx, value in enumerate(rpc_param['netmask']): tag = idx + 1 - rpc.delete_initiators_from_initiator_group(tag, '-n', rpc_param['initiator_name'], '-m', value) + rpc.iscsi_initiator_group_remove_initiators(tag, '-n', rpc_param['initiator_name'], '-m', value) output = rpc.get_initiator_groups() jsonvalues = json.loads(output)