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

rpc: Rename delete_pg_ig_maps to iscsi_target_node_remove_pg_ig_maps

Browse Source 
Change-Id: I9e704d5fbc68afb006cde0f33d9b9b4c71b18a8a
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467342
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Pawel Kaminski 2019-09-06 04:59:10 -04:00 committed by Ben Walker
parent a1c9546f1a
commit 655b64da52
11 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/iscsi.md
View File

@ -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_create_portal_group -- Add a portal group.
- iscsi_delete_portal_group -- Delete an existing 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. - 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. - iscsi_get_portal_groups -- Show information about all available portal groups.
~~~ ~~~

6
doc/jsonrpc.md
View File

@ -261,7 +261,7 @@ Example response:
"iscsi_create_portal_group", "iscsi_create_portal_group",
"iscsi_get_portal_groups", "iscsi_get_portal_groups",
"delete_target_node", "delete_target_node",
"delete_pg_ig_maps", "iscsi_target_node_remove_pg_ig_maps",
"iscsi_target_node_add_pg_ig_maps", "iscsi_target_node_add_pg_ig_maps",
"iscsi_create_target_node", "iscsi_create_target_node",
"iscsi_get_target_nodes", "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. 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" "name": "iqn.2016-06.io.spdk:target3"
}, },
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "delete_pg_ig_maps", "method": "iscsi_target_node_remove_pg_ig_maps",
"id": 1 "id": 1
} }
~~~ ~~~

9
lib/iscsi/iscsi_rpc.c
View File

@ -568,7 +568,7 @@ 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) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_add_pg_ig_maps, add_pg_ig_maps)
static void static void
spdk_rpc_delete_pg_ig_maps(struct spdk_jsonrpc_request *request, spdk_rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_tgt_node_pg_ig_maps req = {}; struct rpc_tgt_node_pg_ig_maps req = {};
@ -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; 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); req.pg_ig_maps.num_maps);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("remove pg-ig maps failed\n"); SPDK_ERRLOG("remove pg-ig maps failed\n");
@ -615,7 +615,10 @@ invalid:
"Invalid parameters"); "Invalid parameters");
free(req.name); 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 { struct rpc_delete_target_node {
char *name; char *name;

2
lib/iscsi/tgt_node.c
View File

@ -815,7 +815,7 @@ invalid:
} }
int int
spdk_iscsi_tgt_node_delete_pg_ig_maps(struct spdk_iscsi_tgt_node *target, 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) int *pg_tag_list, int *ig_tag_list, uint16_t num_maps)
{ {
uint16_t i; uint16_t i;

2
lib/iscsi/tgt_node.h
View File

@ -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 spdk_iscsi_target_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target,
int *pg_tag_list, int *ig_tag_list, int *pg_tag_list, int *ig_tag_list,
uint16_t num_maps); 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, int *pg_tag_list, int *ig_tag_list,
uint16_t num_maps); uint16_t num_maps);

10
scripts/rpc.py
View File

@ -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 ***""") *** The Portal/Initiator Groups must be precreated ***""")
p.set_defaults(func=iscsi_target_node_add_pg_ig_maps) 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 = [] pg_ig_maps = []
for u in args.pg_ig_mappings.strip().split(" "): for u in args.pg_ig_mappings.strip().split(" "):
pg, ig = u.split(":") pg, ig = u.split(":")
pg_ig_maps.append({"pg_tag": int(pg), "ig_tag": int(ig)}) 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) 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('name', help='Target node name (ASCII)')
p.add_argument('pg_ig_mappings', help="""List of (Portal_Group_Tag:Initiator_Group_Tag) mappings p.add_argument('pg_ig_mappings', help="""List of (Portal_Group_Tag:Initiator_Group_Tag) mappings
Whitespace separated, quoted, mapping defined with colon Whitespace separated, quoted, mapping defined with colon
separated list of "tags" (int > 0) separated list of "tags" (int > 0)
Example: '1:1 2:2 2:1' Example: '1:1 2:2 2:1'
*** The Portal/Initiator Groups must be precreated ***""") *** 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): def iscsi_create_portal_group(args):
portals = [] portals = []

5
scripts/rpc/iscsi.py
View File

@ -331,7 +331,8 @@ def delete_secret_from_iscsi_auth_group(client, tag, user):
return client.call('delete_secret_from_iscsi_auth_group', params) 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. """Delete PG-IG maps from the target node.
Args: Args:
@ -345,7 +346,7 @@ def delete_pg_ig_maps(client, pg_ig_maps, name):
'name': name, 'name': name,
'pg_ig_maps': pg_ig_maps, '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') @deprecated_alias('add_pg_ig_maps')

2
scripts/spdkcli/ui_node.py
View File

@ -50,7 +50,7 @@ class UINode(ConfigNode):
"destruct_split_bdev", "bdev_pmem_delete_pool", "destruct_split_bdev", "bdev_pmem_delete_pool",
"bdev_pmem_create_pool", "delete_secret_all", "bdev_pmem_create_pool", "delete_secret_all",
"delete_initiator", "set_auth", "delete_secret", "delete_initiator", "set_auth", "delete_secret",
"delete_pg_ig_maps", "load_config", "iscsi_target_node_remove_pg_ig_maps", "load_config",
"load_subsystem_config"]: "load_subsystem_config"]:
self.get_root().refresh() self.get_root().refresh()
self.refresh_node() self.refresh_node()

6
scripts/spdkcli/ui_node_iscsi.py
View File

@ -197,8 +197,8 @@ class UIISCSIDevice(UINode):
self.get_root().iscsi_target_node_add_pg_ig_maps( self.get_root().iscsi_target_node_add_pg_ig_maps(
pg_ig_maps=pg_ig_maps, name=self.device.device_name) pg_ig_maps=pg_ig_maps, name=self.device.device_name)
def ui_command_delete_pg_ig_maps(self, pg_ig_mappings): def ui_command_iscsi_target_node_remove_pg_ig_maps(self, pg_ig_mappings):
"""Add PG-IG maps to the target node. """Remove PG-IG maps from the target node.
Args: Args:
pg_ig_maps: List of pg_ig_mappings, e.g. pg_tag:ig_tag pg_tag2:ig_tag2 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(" "): for u in pg_ig_mappings.strip().split(" "):
pg, ig = u.split(":") pg, ig = u.split(":")
pg_ig_maps.append({"pg_tag": int(pg), "ig_tag": int(ig)}) 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) pg_ig_maps=pg_ig_maps, name=self.device.device_name)
def refresh(self): def refresh(self):

4
scripts/spdkcli/ui_root.py
View File

@ -440,8 +440,8 @@ class UIRoot(UINode):
rpc.iscsi.iscsi_target_node_add_pg_ig_maps(self.client, **kwargs) rpc.iscsi.iscsi_target_node_add_pg_ig_maps(self.client, **kwargs)
@verbose @verbose
def delete_pg_ig_maps(self, **kwargs): def iscsi_target_node_remove_pg_ig_maps(self, **kwargs):
rpc.iscsi.delete_pg_ig_maps(self.client, **kwargs) rpc.iscsi.iscsi_target_node_remove_pg_ig_maps(self.client, **kwargs)
@verbose @verbose
def add_secret_to_iscsi_auth_group(self, **kwargs): def add_secret_to_iscsi_auth_group(self, **kwargs):

2
test/spdkcli/iscsi.sh
View File

@ -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_secret_all 1' 'user=test1'
'/iscsi/auth_groups delete 1' 'user=test1' '/iscsi/auth_groups delete 1' 'user=test1'
'/iscsi/auth_groups delete_all' 'user=test4' '/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 iqn.2016-06.io.spdk:Target1' 'Target1'
'/iscsi/target_nodes delete_all' 'Target0' '/iscsi/target_nodes delete_all' 'Target0'
'/iscsi/initiator_groups delete_initiator 2 ANW 10.0.2.16/32' 'ANW' '/iscsi/initiator_groups delete_initiator 2 ANW 10.0.2.16/32' 'ANW'