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

rpc: Rename get_target_nodes to iscsi_get_target_nodes 



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


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 a34248d3

doc/iscsi.md

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ In addition to the configuration file, the iSCSI target may also be configured v 
 - construct_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.

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

 - 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

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ Example response: 
    "delete_pg_ig_maps",

    "add_pg_ig_maps",

    "construct_target_node",

    "get_target_nodes",

    "iscsi_get_target_nodes",

    "delete_initiator_group",

    "delete_initiators_from_initiator_group",

    "add_initiators_to_initiator_group",
@@ -3090,7 +3090,7 @@ response: 
}

~~~



## get_target_nodes method {#rpc_get_target_nodes}

## iscsi_get_target_nodes method {#rpc_iscsi_get_target_nodes}



Show information about all available iSCSI target nodes.
@@ -3123,7 +3123,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "get_target_nodes",

  "method": "iscsi_get_target_nodes",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+5 −4
Original line number Diff line number Diff line
@@ -291,14 +291,14 @@ invalid: 
SPDK_RPC_REGISTER("delete_initiator_group", spdk_rpc_delete_initiator_group, SPDK_RPC_RUNTIME)



static void

spdk_rpc_get_target_nodes(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request,

				const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;



	if (params != NULL) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "get_target_nodes requires no parameters");

						 "iscsi_get_target_nodes requires no parameters");

		return;

	}
@@ -309,7 +309,8 @@ spdk_rpc_get_target_nodes(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("get_target_nodes", spdk_rpc_get_target_nodes, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_get_target_nodes", spdk_rpc_iscsi_get_target_nodes, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_target_nodes, get_target_nodes)



struct rpc_pg_ig_map {

	int32_t pg_tag;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -796,11 +796,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                              help='Display current initiator group configuration')

    p.set_defaults(func=get_initiator_groups)



    def get_target_nodes(args):

        print_dict(rpc.iscsi.get_target_nodes(args.client))

    def iscsi_get_target_nodes(args):

        print_dict(rpc.iscsi.iscsi_get_target_nodes(args.client))



    p = subparsers.add_parser('get_target_nodes', help='Display target nodes')

    p.set_defaults(func=get_target_nodes)

    p = subparsers.add_parser('iscsi_get_target_nodes', aliases=['get_target_nodes'],

                              help='Display target nodes')

    p.set_defaults(func=iscsi_get_target_nodes)



    def construct_target_node(args):

        luns = []

scripts/rpc/iscsi.py

+4 −2
Original line number Diff line number Diff line 
from .helpers import deprecated_alias





def set_iscsi_options(
@@ -141,13 +142,14 @@ def get_initiator_groups(client): 
    return client.call('get_initiator_groups')





def get_target_nodes(client):

@deprecated_alias('get_target_nodes')

def iscsi_get_target_nodes(client):

    """Display target nodes.



    Returns:

        List of ISCSI target node objects.

    """

    return client.call('get_target_nodes')

    return client.call('iscsi_get_target_nodes')





def construct_target_node(