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

rpc: Rename delete_initiator_group to iscsi_delete_initiator_group 



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


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

doc/iscsi.md

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ In addition to the configuration file, the iSCSI target may also be configured v 
### Initiator groups



 - iscsi_create_initiator_group -- Add an initiator group.

 - delete_initiator_group -- Delete an existing initiator group.

 - iscsi_delete_initiator_group -- Delete an existing initiator group.

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

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

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ Example response: 
    "iscsi_target_node_add_pg_ig_maps",

    "iscsi_create_target_node",

    "iscsi_get_target_nodes",

    "delete_initiator_group",

    "iscsi_delete_initiator_group",

    "iscsi_initiator_group_remove_initiators",

    "iscsi_initiator_group_add_initiators",

    "iscsi_create_initiator_group",
@@ -3019,7 +3019,7 @@ response: 
}

~~~



## delete_initiator_group method {#rpc_delete_initiator_group}

## iscsi_delete_initiator_group method {#rpc_iscsi_delete_initiator_group}



Delete an existing initiator group.
@@ -3039,7 +3039,7 @@ Example request: 
    "tag": 1

  },

  "jsonrpc": "2.0",

  "method": "delete_initiator_group",

  "method": "iscsi_delete_initiator_group",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+11 −9
Original line number Diff line number Diff line
@@ -258,24 +258,24 @@ SPDK_RPC_REGISTER("iscsi_initiator_group_remove_initiators", 
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_initiator_group_remove_initiators,

				   delete_initiators_from_initiator_group)



struct rpc_delete_initiator_group {

struct rpc_iscsi_delete_initiator_group {

	int32_t tag;

};



static const struct spdk_json_object_decoder rpc_delete_initiator_group_decoders[] = {

	{"tag", offsetof(struct rpc_delete_initiator_group, tag), spdk_json_decode_int32},

static const struct spdk_json_object_decoder rpc_iscsi_delete_initiator_group_decoders[] = {

	{"tag", offsetof(struct rpc_iscsi_delete_initiator_group, tag), spdk_json_decode_int32},

};



static void

spdk_rpc_delete_initiator_group(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_delete_initiator_group(struct spdk_jsonrpc_request *request,

				      const struct spdk_json_val *params)

{

	struct rpc_delete_initiator_group req = {};

	struct rpc_iscsi_delete_initiator_group req = {};

	struct spdk_json_write_ctx *w;

	struct spdk_iscsi_init_grp *ig;



	if (spdk_json_decode_object(params, rpc_delete_initiator_group_decoders,

				    SPDK_COUNTOF(rpc_delete_initiator_group_decoders),

	if (spdk_json_decode_object(params, rpc_iscsi_delete_initiator_group_decoders,

				    SPDK_COUNTOF(rpc_iscsi_delete_initiator_group_decoders),

				    &req)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		goto invalid;
@@ -296,7 +296,9 @@ spdk_rpc_delete_initiator_group(struct spdk_jsonrpc_request *request, 
invalid:

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");

}

SPDK_RPC_REGISTER("delete_initiator_group", spdk_rpc_delete_initiator_group, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_delete_initiator_group", spdk_rpc_iscsi_delete_initiator_group,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_initiator_group, delete_initiator_group)



static void

spdk_rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request,

scripts/rpc.py

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

    p.set_defaults(func=iscsi_delete_portal_group)



    def delete_initiator_group(args):

        rpc.iscsi.delete_initiator_group(args.client, tag=args.tag)

    def iscsi_delete_initiator_group(args):

        rpc.iscsi.iscsi_delete_initiator_group(args.client, tag=args.tag)



    p = subparsers.add_parser('delete_initiator_group',

    p = subparsers.add_parser('iscsi_delete_initiator_group',

                              aliases=['delete_initiator_group'],

                              help='Delete an initiator group')

    p.add_argument(

        'tag', help='Initiator group tag (unique, integer > 0)', type=int)

    p.set_defaults(func=delete_initiator_group)

    p.set_defaults(func=iscsi_delete_initiator_group)



    def iscsi_get_connections(args):

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

scripts/rpc/iscsi.py

+3 −2
Original line number Diff line number Diff line
@@ -478,7 +478,8 @@ def iscsi_delete_portal_group(client, tag): 
    return client.call('iscsi_delete_portal_group', params)





def delete_initiator_group(client, tag):

@deprecated_alias('delete_initiator_group')

def iscsi_delete_initiator_group(client, tag):

    """Delete an initiator group.



    Args:
@@ -488,7 +489,7 @@ def delete_initiator_group(client, tag): 
        True or False

    """

    params = {'tag': tag}

    return client.call('delete_initiator_group', params)

    return client.call('iscsi_delete_initiator_group', params)





@deprecated_alias('get_iscsi_connections')