Commit e3366470 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

rpc: Rename get_initiator_groups to iscsi_get_initiator_groups 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 74bf9193

doc/iscsi.md

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ In addition to the configuration file, the iSCSI target may also be configured v 
 - add_initiator_group -- Add an initiator group.

 - delete_initiator_group -- Delete an existing initiator group.

 - iscsi_initiator_group_add_initiators -- Add initiators to an existing initiator group.

 - get_initiator_groups -- Show information about all available initiator groups.

 - iscsi_get_initiator_groups -- Show information about all available initiator groups.



~~~

/path/to/spdk/scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ Example response: 
    "iscsi_initiator_group_remove_initiators",

    "iscsi_initiator_group_add_initiators",

    "add_initiator_group",

    "get_initiator_groups",

    "iscsi_get_initiator_groups",

    "set_iscsi_options",

    "set_bdev_options",

    "set_bdev_qos_limit",
@@ -2914,7 +2914,7 @@ Example response: 
}

~~~



## get_initiator_groups method {#rpc_get_initiator_groups}

## iscsi_get_initiator_groups method {#rpc_iscsi_get_initiator_groups}



Show information about all available initiator groups.
@@ -2939,7 +2939,7 @@ Example request: 
~~~

{

  "jsonrpc": "2.0",

  "method": "get_initiator_groups",

  "method": "iscsi_get_initiator_groups",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+6 −4
Original line number Diff line number Diff line
@@ -45,14 +45,14 @@ 
#include "spdk_internal/log.h"



static void

spdk_rpc_get_initiator_groups(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_get_initiator_groups(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_initiator_groups requires no parameters");

						 "iscsi_get_initiator_groups requires no parameters");

		return;

	}
@@ -63,7 +63,9 @@ spdk_rpc_get_initiator_groups(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("get_initiator_groups", spdk_rpc_get_initiator_groups, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_get_initiator_groups", spdk_rpc_iscsi_get_initiator_groups,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_initiator_groups, get_initiator_groups)



struct rpc_initiator_list {

	size_t num_initiators;

scripts/rpc.py

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

    p.set_defaults(func=iscsi_get_portal_groups)



    def get_initiator_groups(args):

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

    def iscsi_get_initiator_groups(args):

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



    p = subparsers.add_parser('get_initiator_groups',

    p = subparsers.add_parser('iscsi_get_initiator_groups',

                              aliases=['get_initiator_groups'],

                              help='Display current initiator group configuration')

    p.set_defaults(func=get_initiator_groups)

    p.set_defaults(func=iscsi_get_initiator_groups)



    def iscsi_get_target_nodes(args):

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

scripts/rpc/iscsi.py

+3 −2
Original line number Diff line number Diff line
@@ -134,13 +134,14 @@ def iscsi_get_portal_groups(client): 
    return client.call('iscsi_get_portal_groups')





def get_initiator_groups(client):

@deprecated_alias('get_initiator_groups')

def iscsi_get_initiator_groups(client):

    """Display current initiator group configuration.



    Returns:

        List of current initiator group configuration.

    """

    return client.call('get_initiator_groups')

    return client.call('iscsi_get_initiator_groups')





@deprecated_alias('get_target_nodes')