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

rpc: Rename get_iscsi_connections to iscsi_get_connections 



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


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

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ Example response: 
    "set_log_print_level",

    "get_iscsi_global_params",

    "target_node_add_lun",

    "get_iscsi_connections",

    "iscsi_get_connections",

    "iscsi_delete_portal_group",

    "iscsi_create_portal_group",

    "iscsi_get_portal_groups",
@@ -3550,7 +3550,7 @@ Example response: 
}

~~~



## get_iscsi_connections method {#rpc_get_iscsi_connections}

## iscsi_get_connections method {#rpc_iscsi_get_connections}



Show information about all active connections.
@@ -3579,7 +3579,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "get_iscsi_connections",

  "method": "iscsi_get_connections",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+13 −12
Original line number Diff line number Diff line
@@ -888,15 +888,15 @@ invalid: 
SPDK_RPC_REGISTER("iscsi_delete_portal_group", spdk_rpc_iscsi_delete_portal_group, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_portal_group, delete_portal_group)



struct rpc_get_iscsi_connections_ctx {

struct rpc_iscsi_get_connections_ctx {

	struct spdk_jsonrpc_request *request;

	struct spdk_json_write_ctx *w;

};



static void

rpc_get_iscsi_connections_done(struct spdk_io_channel_iter *i, int status)

rpc_iscsi_get_connections_done(struct spdk_io_channel_iter *i, int status)

{

	struct rpc_get_iscsi_connections_ctx *ctx = spdk_io_channel_iter_get_ctx(i);

	struct rpc_iscsi_get_connections_ctx *ctx = spdk_io_channel_iter_get_ctx(i);



	spdk_json_write_array_end(ctx->w);

	spdk_jsonrpc_end_result(ctx->request, ctx->w);
@@ -905,9 +905,9 @@ rpc_get_iscsi_connections_done(struct spdk_io_channel_iter *i, int status) 
}



static void

rpc_get_iscsi_connections(struct spdk_io_channel_iter *i)

rpc_iscsi_get_connections(struct spdk_io_channel_iter *i)

{

	struct rpc_get_iscsi_connections_ctx *ctx = spdk_io_channel_iter_get_ctx(i);

	struct rpc_iscsi_get_connections_ctx *ctx = spdk_io_channel_iter_get_ctx(i);

	struct spdk_io_channel *ch = spdk_io_channel_iter_get_channel(i);

	struct spdk_iscsi_poll_group *pg = spdk_io_channel_get_ctx(ch);

	struct spdk_iscsi_conn *conn;
@@ -920,18 +920,18 @@ rpc_get_iscsi_connections(struct spdk_io_channel_iter *i) 
}



static void

spdk_rpc_get_iscsi_connections(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_get_connections(struct spdk_jsonrpc_request *request,

			       const struct spdk_json_val *params)

{

	struct rpc_get_iscsi_connections_ctx *ctx;

	struct rpc_iscsi_get_connections_ctx *ctx;



	if (params != NULL) {

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "get_iscsi_connections requires no parameters");

						 "iscsi_get_connections requires no parameters");

		return;

	}



	ctx = calloc(1, sizeof(struct rpc_get_iscsi_connections_ctx));

	ctx = calloc(1, sizeof(struct rpc_iscsi_get_connections_ctx));

	if (ctx == NULL) {

		SPDK_ERRLOG("Failed to allocate rpc_get_iscsi_conns_ctx struct\n");

		spdk_jsonrpc_send_error_response(request, -ENOMEM, spdk_strerror(ENOMEM));
@@ -944,11 +944,12 @@ spdk_rpc_get_iscsi_connections(struct spdk_jsonrpc_request *request, 
	spdk_json_write_array_begin(ctx->w);



	spdk_for_each_channel(&g_spdk_iscsi,

			      rpc_get_iscsi_connections,

			      rpc_iscsi_get_connections,

			      ctx,

			      rpc_get_iscsi_connections_done);

			      rpc_iscsi_get_connections_done);

}

SPDK_RPC_REGISTER("get_iscsi_connections", spdk_rpc_get_iscsi_connections, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_get_connections", spdk_rpc_iscsi_get_connections, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_connections, get_iscsi_connections)



struct rpc_target_lun {

	char *name;

scripts/rpc.py

+4 −4
Original line number Diff line number Diff line
@@ -1071,12 +1071,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
        'tag', help='Initiator group tag (unique, integer > 0)', type=int)

    p.set_defaults(func=delete_initiator_group)



    def get_iscsi_connections(args):

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

    def iscsi_get_connections(args):

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



    p = subparsers.add_parser('get_iscsi_connections',

    p = subparsers.add_parser('iscsi_get_connections', aliases=['get_iscsi_connections'],

                              help='Display iSCSI connections')

    p.set_defaults(func=get_iscsi_connections)

    p.set_defaults(func=iscsi_get_connections)



    def get_iscsi_global_params(args):

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

scripts/rpc/iscsi.py

+3 −2
Original line number Diff line number Diff line
@@ -480,13 +480,14 @@ def delete_initiator_group(client, tag): 
    return client.call('delete_initiator_group', params)





def get_iscsi_connections(client):

@deprecated_alias('get_iscsi_connections')

def iscsi_get_connections(client):

    """Display iSCSI connections.



    Returns:

        List of iSCSI connection.

    """

    return client.call('get_iscsi_connections')

    return client.call('iscsi_get_connections')





def get_iscsi_global_params(client):

scripts/spdkcli/ui_node_iscsi.py

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ class UIISCSIConnections(UINode): 


    def refresh(self):

        self._children = set([])

        self.iscsicons = list(self.get_root().get_iscsi_connections())

        self.iscsicons = list(self.get_root().iscsi_get_connections())

        for ic in self.iscsicons:

            UIISCSIConnection(ic, self)