Commit a1c9546f authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

rpc: Rename add_pg_ig_maps to iscsi_target_node_add_pg_ig_maps 



Change-Id: Ie738991ef27f836a0027e64281cbda1599439240
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467605


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent 8fb1cf2f

doc/iscsi.md

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,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.

 - 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_get_portal_groups -- Show information about all available portal groups.

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ Example response: 
    "iscsi_get_portal_groups",

    "delete_target_node",

    "delete_pg_ig_maps",

    "add_pg_ig_maps",

    "iscsi_target_node_add_pg_ig_maps",

    "iscsi_create_target_node",

    "iscsi_get_target_nodes",

    "delete_initiator_group",
@@ -3275,7 +3275,7 @@ Example response: 
}

~~~



## add_pg_ig_maps method {#rpc_add_pg_ig_maps}

## iscsi_target_node_add_pg_ig_maps method {#rpc_iscsi_target_node_add_pg_ig_maps}



Add initiator group to portal group mappings to an existing iSCSI target node.
@@ -3317,7 +3317,7 @@ Example request: 
    "name": "iqn.2016-06.io.spdk:target3"

  },

  "jsonrpc": "2.0",

  "method": "add_pg_ig_maps",

  "method": "iscsi_target_node_add_pg_ig_maps",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+7 −5
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static const struct spdk_json_object_decoder rpc_tgt_node_pg_ig_maps_decoders[] 
};



static void

spdk_rpc_add_pg_ig_maps(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_target_node_add_pg_ig_maps(struct spdk_jsonrpc_request *request,

		const struct spdk_json_val *params)

{

	struct rpc_tgt_node_pg_ig_maps req = {};
@@ -544,7 +544,7 @@ spdk_rpc_add_pg_ig_maps(struct spdk_jsonrpc_request *request, 
		ig_tags[i] = req.pg_ig_maps.maps[i].ig_tag;

	}



	rc = spdk_iscsi_tgt_node_add_pg_ig_maps(target, pg_tags, ig_tags,

	rc = spdk_iscsi_target_node_add_pg_ig_maps(target, pg_tags, ig_tags,

			req.pg_ig_maps.num_maps);

	if (rc < 0) {

		SPDK_ERRLOG("add pg-ig maps failed\n");
@@ -563,7 +563,9 @@ invalid: 
					 "Invalid parameters");

	free(req.name);

}

SPDK_RPC_REGISTER("add_pg_ig_maps", spdk_rpc_add_pg_ig_maps, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_target_node_add_pg_ig_maps",

		  spdk_rpc_iscsi_target_node_add_pg_ig_maps, SPDK_RPC_RUNTIME)

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,

lib/iscsi/tgt_node.c

+4 −3
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ failed: 
}



int

spdk_iscsi_tgt_node_add_pg_ig_maps(struct spdk_iscsi_tgt_node *target,

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)

{

	uint16_t i;
@@ -993,7 +993,8 @@ spdk_iscsi_tgt_node_construct(int target_index, 
	}



	TAILQ_INIT(&target->pg_map_head);

	rc = spdk_iscsi_tgt_node_add_pg_ig_maps(target, pg_tag_list, ig_tag_list, num_maps);

	rc = spdk_iscsi_target_node_add_pg_ig_maps(target, pg_tag_list,

			ig_tag_list, num_maps);

	if (rc != 0) {

		SPDK_ERRLOG("could not add map to target\n");

		iscsi_tgt_node_destruct(target, NULL, NULL);

lib/iscsi/tgt_node.h

+3 −3
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ spdk_iscsi_tgt_node_construct(int target_index, 


bool spdk_iscsi_check_chap_params(bool disable, bool require, bool mutual, int group);



int spdk_iscsi_tgt_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,

		uint16_t num_maps);

int spdk_iscsi_tgt_node_delete_pg_ig_maps(struct spdk_iscsi_tgt_node *target,