From 655b64da526c311675b471ab34a5cf07b8727a43 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Fri, 6 Sep 2019 04:59:10 -0400 Subject: [PATCH] rpc: Rename delete_pg_ig_maps to iscsi_target_node_remove_pg_ig_maps Change-Id: I9e704d5fbc68afb006cde0f33d9b9b4c71b18a8a Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467342 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Paul Luse Reviewed-by: Ben Walker --- doc/iscsi.md | 2 +- doc/jsonrpc.md | 6 +++--- lib/iscsi/iscsi_rpc.c | 11 +++++++---- lib/iscsi/tgt_node.c | 4 ++-- lib/iscsi/tgt_node.h | 2 +- scripts/rpc.py | 10 ++++++---- scripts/rpc/iscsi.py | 5 +++-- scripts/spdkcli/ui_node.py | 2 +- scripts/spdkcli/ui_node_iscsi.py | 6 +++--- scripts/spdkcli/ui_root.py | 4 ++-- test/spdkcli/iscsi.sh | 2 +- 11 files changed, 30 insertions(+), 24 deletions(-) diff --git a/doc/iscsi.md b/doc/iscsi.md index b7a5bc312..cebca4157 100644 --- a/doc/iscsi.md +++ b/doc/iscsi.md @@ -83,7 +83,7 @@ In addition to the configuration file, the iSCSI target may also be configured v - iscsi_create_portal_group -- Add a portal group. - iscsi_delete_portal_group -- Delete an existing portal group. - iscsi_target_node_add_pg_ig_maps -- Add initiator group to portal group mappings to an existing iSCSI target node. - - delete_pg_ig_maps -- Delete initiator group to portal group mappings from an existing iSCSI target node. + - iscsi_target_node_remove_pg_ig_maps -- Delete initiator group to portal group mappings from an existing iSCSI target node. - iscsi_get_portal_groups -- Show information about all available portal groups. ~~~ diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 9516cc4c1..5908e229c 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -261,7 +261,7 @@ Example response: "iscsi_create_portal_group", "iscsi_get_portal_groups", "delete_target_node", - "delete_pg_ig_maps", + "iscsi_target_node_remove_pg_ig_maps", "iscsi_target_node_add_pg_ig_maps", "iscsi_create_target_node", "iscsi_get_target_nodes", @@ -3332,7 +3332,7 @@ Example response: } ~~~ -## delete_pg_ig_maps method {#rpc_delete_pg_ig_maps} +## iscsi_target_node_remove_pg_ig_maps method {#rpc_iscsi_target_node_remove_pg_ig_maps} Delete initiator group to portal group mappings from an existing iSCSI target node. @@ -3374,7 +3374,7 @@ Example request: "name": "iqn.2016-06.io.spdk:target3" }, "jsonrpc": "2.0", - "method": "delete_pg_ig_maps", + "method": "iscsi_target_node_remove_pg_ig_maps", "id": 1 } ~~~ diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index c3ceddc98..10ae2beee 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -568,8 +568,8 @@ SPDK_RPC_REGISTER("iscsi_target_node_add_pg_ig_maps", SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_add_pg_ig_maps, add_pg_ig_maps) static void -spdk_rpc_delete_pg_ig_maps(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +spdk_rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_tgt_node_pg_ig_maps req = {}; struct spdk_json_write_ctx *w; @@ -596,7 +596,7 @@ spdk_rpc_delete_pg_ig_maps(struct spdk_jsonrpc_request *request, ig_tags[i] = req.pg_ig_maps.maps[i].ig_tag; } - rc = spdk_iscsi_tgt_node_delete_pg_ig_maps(target, pg_tags, ig_tags, + rc = spdk_iscsi_target_node_remove_pg_ig_maps(target, pg_tags, ig_tags, req.pg_ig_maps.num_maps); if (rc < 0) { SPDK_ERRLOG("remove pg-ig maps failed\n"); @@ -615,7 +615,10 @@ invalid: "Invalid parameters"); free(req.name); } -SPDK_RPC_REGISTER("delete_pg_ig_maps", spdk_rpc_delete_pg_ig_maps, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("iscsi_target_node_remove_pg_ig_maps", + spdk_rpc_iscsi_target_node_remove_pg_ig_maps, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_remove_pg_ig_maps, + delete_pg_ig_maps) struct rpc_delete_target_node { char *name; diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 0bf17af18..20998602e 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -815,8 +815,8 @@ invalid: } int -spdk_iscsi_tgt_node_delete_pg_ig_maps(struct spdk_iscsi_tgt_node *target, - int *pg_tag_list, int *ig_tag_list, uint16_t num_maps) +spdk_iscsi_target_node_remove_pg_ig_maps(struct spdk_iscsi_tgt_node *target, + int *pg_tag_list, int *ig_tag_list, uint16_t num_maps) { uint16_t i; int rc; diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index 119ec3027..9d8f90667 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -130,7 +130,7 @@ bool spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int g int spdk_iscsi_target_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target, int *pg_tag_list, int *ig_tag_list, uint16_t num_maps); -int spdk_iscsi_tgt_node_delete_pg_ig_maps(struct spdk_iscsi_tgt_node *target, +int spdk_iscsi_target_node_remove_pg_ig_maps(struct spdk_iscsi_tgt_node *target, int *pg_tag_list, int *ig_tag_list, uint16_t num_maps); diff --git a/scripts/rpc.py b/scripts/rpc.py index 4c4809d76..b149df559 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -924,22 +924,24 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse *** The Portal/Initiator Groups must be precreated ***""") p.set_defaults(func=iscsi_target_node_add_pg_ig_maps) - def delete_pg_ig_maps(args): + def iscsi_target_node_remove_pg_ig_maps(args): pg_ig_maps = [] for u in args.pg_ig_mappings.strip().split(" "): pg, ig = u.split(":") pg_ig_maps.append({"pg_tag": int(pg), "ig_tag": int(ig)}) - rpc.iscsi.delete_pg_ig_maps( + rpc.iscsi.iscsi_target_node_remove_pg_ig_maps( args.client, pg_ig_maps=pg_ig_maps, name=args.name) - p = subparsers.add_parser('delete_pg_ig_maps', help='Delete PG-IG maps from the target node') + p = subparsers.add_parser('iscsi_target_node_remove_pg_ig_maps', + aliases=['delete_pg_ig_maps'], + help='Delete PG-IG maps from the target node') p.add_argument('name', help='Target node name (ASCII)') p.add_argument('pg_ig_mappings', help="""List of (Portal_Group_Tag:Initiator_Group_Tag) mappings Whitespace separated, quoted, mapping defined with colon separated list of "tags" (int > 0) Example: '1:1 2:2 2:1' *** The Portal/Initiator Groups must be precreated ***""") - p.set_defaults(func=delete_pg_ig_maps) + p.set_defaults(func=iscsi_target_node_remove_pg_ig_maps) def iscsi_create_portal_group(args): portals = [] diff --git a/scripts/rpc/iscsi.py b/scripts/rpc/iscsi.py index 97d50cf19..7fc94a88f 100644 --- a/scripts/rpc/iscsi.py +++ b/scripts/rpc/iscsi.py @@ -331,7 +331,8 @@ def delete_secret_from_iscsi_auth_group(client, tag, user): return client.call('delete_secret_from_iscsi_auth_group', params) -def delete_pg_ig_maps(client, pg_ig_maps, name): +@deprecated_alias('delete_pg_ig_maps') +def iscsi_target_node_remove_pg_ig_maps(client, pg_ig_maps, name): """Delete PG-IG maps from the target node. Args: @@ -345,7 +346,7 @@ def delete_pg_ig_maps(client, pg_ig_maps, name): 'name': name, 'pg_ig_maps': pg_ig_maps, } - return client.call('delete_pg_ig_maps', params) + return client.call('iscsi_target_node_remove_pg_ig_maps', params) @deprecated_alias('add_pg_ig_maps') diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py index 7fc9d93ab..a744d7f94 100644 --- a/scripts/spdkcli/ui_node.py +++ b/scripts/spdkcli/ui_node.py @@ -50,7 +50,7 @@ class UINode(ConfigNode): "destruct_split_bdev", "bdev_pmem_delete_pool", "bdev_pmem_create_pool", "delete_secret_all", "delete_initiator", "set_auth", "delete_secret", - "delete_pg_ig_maps", "load_config", + "iscsi_target_node_remove_pg_ig_maps", "load_config", "load_subsystem_config"]: self.get_root().refresh() self.refresh_node() diff --git a/scripts/spdkcli/ui_node_iscsi.py b/scripts/spdkcli/ui_node_iscsi.py index 7515b7f24..52902e490 100644 --- a/scripts/spdkcli/ui_node_iscsi.py +++ b/scripts/spdkcli/ui_node_iscsi.py @@ -197,8 +197,8 @@ class UIISCSIDevice(UINode): self.get_root().iscsi_target_node_add_pg_ig_maps( pg_ig_maps=pg_ig_maps, name=self.device.device_name) - def ui_command_delete_pg_ig_maps(self, pg_ig_mappings): - """Add PG-IG maps to the target node. + def ui_command_iscsi_target_node_remove_pg_ig_maps(self, pg_ig_mappings): + """Remove PG-IG maps from the target node. Args: pg_ig_maps: List of pg_ig_mappings, e.g. pg_tag:ig_tag pg_tag2:ig_tag2 @@ -207,7 +207,7 @@ class UIISCSIDevice(UINode): for u in pg_ig_mappings.strip().split(" "): pg, ig = u.split(":") pg_ig_maps.append({"pg_tag": int(pg), "ig_tag": int(ig)}) - self.get_root().delete_pg_ig_maps( + self.get_root().iscsi_target_node_remove_pg_ig_maps( pg_ig_maps=pg_ig_maps, name=self.device.device_name) def refresh(self): diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index 8d45fd015..381107176 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -440,8 +440,8 @@ class UIRoot(UINode): rpc.iscsi.iscsi_target_node_add_pg_ig_maps(self.client, **kwargs) @verbose - def delete_pg_ig_maps(self, **kwargs): - rpc.iscsi.delete_pg_ig_maps(self.client, **kwargs) + def iscsi_target_node_remove_pg_ig_maps(self, **kwargs): + rpc.iscsi.iscsi_target_node_remove_pg_ig_maps(self.client, **kwargs) @verbose def add_secret_to_iscsi_auth_group(self, **kwargs): diff --git a/test/spdkcli/iscsi.sh b/test/spdkcli/iscsi.sh index 0bf7de5e7..acdc1b80b 100755 --- a/test/spdkcli/iscsi.sh +++ b/test/spdkcli/iscsi.sh @@ -55,7 +55,7 @@ $spdkcli_job "'/iscsi/auth_groups delete_secret 1 test2' 'user=test2' '/iscsi/auth_groups delete_secret_all 1' 'user=test1' '/iscsi/auth_groups delete 1' 'user=test1' '/iscsi/auth_groups delete_all' 'user=test4' -'/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 delete_pg_ig_maps \"1:3 2:2\"' 'portal_group1 - initiator_group3' +'/iscsi/target_nodes/iqn.2016-06.io.spdk:Target0 iscsi_target_node_remove_pg_ig_maps \"1:3 2:2\"' 'portal_group1 - initiator_group3' '/iscsi/target_nodes delete iqn.2016-06.io.spdk:Target1' 'Target1' '/iscsi/target_nodes delete_all' 'Target0' '/iscsi/initiator_groups delete_initiator 2 ANW 10.0.2.16/32' 'ANW'