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

rpc: Rename construct_target_node to iscsi_create_target_node 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 7d114278

doc/iscsi.md

+3 −3
Original line number Diff line number Diff line
@@ -103,13 +103,13 @@ In addition to the configuration file, the iSCSI target may also be configured v 


### Target nodes



 - construct_target_node -- Add a iSCSI target node.

 - iscsi_create_target_node -- Add a iSCSI target node.

 - delete_target_node -- Delete a iSCSI target node.

 - target_node_add_lun -- Add an LUN to an existing iSCSI target node.

 - iscsi_get_target_nodes -- Show information about all available iSCSI target nodes.



~~~

/path/to/spdk/scripts/rpc.py construct_target_node Target3 Target3_alias MyBdev:0 1:2 64 -d

/path/to/spdk/scripts/rpc.py iscsi_create_target_node Target3 Target3_alias MyBdev:0 1:2 64 -d

~~~



## Configuring iSCSI Initiator {#iscsi_initiator}
@@ -253,7 +253,7 @@ Finally construct one target using previously created bdevs as LUN0 (Malloc0) an 
with a name "disk1" and alias "Data Disk1" using portal group 1 and initiator group 2.



```

$ ./scripts/rpc.py construct_target_node disk1 "Data Disk1" "Malloc0:0 Malloc1:1" 1:2 64 -d

$ ./scripts/rpc.py iscsi_create_target_node disk1 "Data Disk1" "Malloc0:0 Malloc1:1" 1:2 64 -d

```



#### Configure initiator

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ Example response: 
    "delete_target_node",

    "delete_pg_ig_maps",

    "add_pg_ig_maps",

    "construct_target_node",

    "iscsi_create_target_node",

    "iscsi_get_target_nodes",

    "delete_initiator_group",

    "delete_initiators_from_initiator_group",
@@ -3162,7 +3162,7 @@ Example response: 
}

~~~



## construct_target_node method {#rpc_construct_target_node}

## iscsi_create_target_node method {#rpc_iscsi_create_target_node}



Add a iSCSI target node.
@@ -3216,7 +3216,7 @@ Example request: 
    "queue_depth": 24

  },

  "jsonrpc": "2.0",

  "method": "construct_target_node",

  "method": "iscsi_create_target_node",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+9 −8
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ decode_rpc_pg_ig_maps(const struct spdk_json_val *val, void *out) 
				      sizeof(struct rpc_pg_ig_map));

}



#define RPC_CONSTRUCT_TARGET_NODE_MAX_LUN	64

#define RPC_ISCSI_CREATE_TARGET_NODE_MAX_LUN	64



struct rpc_lun {

	char *bdev_name;
@@ -370,7 +370,7 @@ decode_rpc_lun(const struct spdk_json_val *val, void *out) 


struct rpc_luns {

	size_t num_luns;

	struct rpc_lun luns[RPC_CONSTRUCT_TARGET_NODE_MAX_LUN];

	struct rpc_lun luns[RPC_ISCSI_CREATE_TARGET_NODE_MAX_LUN];

};



static int
@@ -379,7 +379,7 @@ decode_rpc_luns(const struct spdk_json_val *val, void *out) 
	struct rpc_luns *luns = out;



	return spdk_json_decode_array(val, decode_rpc_lun, luns->luns,

				      RPC_CONSTRUCT_TARGET_NODE_MAX_LUN,

				      RPC_ISCSI_CREATE_TARGET_NODE_MAX_LUN,

				      &luns->num_luns, sizeof(struct rpc_lun));

}
@@ -433,15 +433,15 @@ static const struct spdk_json_object_decoder rpc_target_node_decoders[] = { 
};



static void

spdk_rpc_construct_target_node(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_create_target_node(struct spdk_jsonrpc_request *request,

				  const struct spdk_json_val *params)

{

	struct rpc_target_node req = {};

	struct spdk_json_write_ctx *w;

	struct spdk_iscsi_tgt_node *target;

	int32_t pg_tags[MAX_TARGET_MAP] = {0}, ig_tags[MAX_TARGET_MAP] = {0};

	char *bdev_names[RPC_CONSTRUCT_TARGET_NODE_MAX_LUN] = {0};

	int32_t lun_ids[RPC_CONSTRUCT_TARGET_NODE_MAX_LUN] = {0};

	char *bdev_names[RPC_ISCSI_CREATE_TARGET_NODE_MAX_LUN] = {0};

	int32_t lun_ids[RPC_ISCSI_CREATE_TARGET_NODE_MAX_LUN] = {0};

	size_t i;



	if (spdk_json_decode_object(params, rpc_target_node_decoders,
@@ -496,7 +496,8 @@ invalid: 
	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");

	free_rpc_target_node(&req);

}

SPDK_RPC_REGISTER("construct_target_node", spdk_rpc_construct_target_node, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_create_target_node", spdk_rpc_iscsi_create_target_node, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_target_node, construct_target_node)



struct rpc_tgt_node_pg_ig_maps {

	char *name;

lib/iscsi/tgt_node.c

+1 −1
Original line number Diff line number Diff line
@@ -1580,7 +1580,7 @@ iscsi_tgt_node_config_json(struct spdk_iscsi_tgt_node *target, 
{

	spdk_json_write_object_begin(w);



	spdk_json_write_named_string(w, "method", "construct_target_node");

	spdk_json_write_named_string(w, "method", "iscsi_create_target_node");



	spdk_json_write_name(w, "params");

	iscsi_tgt_node_info_json(target, w);

scripts/config_converter.py

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ iscsi_dict = OrderedDict() 
iscsi_dict["set_iscsi_options"] = []

iscsi_dict["add_portal_group"] = []

iscsi_dict["add_initiator_group"] = []

iscsi_dict["construct_target_node"] = []

iscsi_dict["iscsi_create_target_node"] = []



nvmf_dict = OrderedDict()

nvmf_dict["set_nvmf_target_config"] = []
@@ -639,7 +639,7 @@ def get_iscsi_target_node_json(config, section): 


    target_json = {

        "params": params,

        "method": "construct_target_node"

        "method": "iscsi_create_target_node"

    }



    return [target_json]