Commit 4bb8a88c authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

rpc: Rename delete_portal_group to iscsi_delete_portal_group 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 0f4b3490

doc/iscsi.md

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



 - iscsi_create_portal_group -- Add a portal group.

 - delete_portal_group -- Delete an existing portal group.

 - iscsi_delete_portal_group -- Delete an existing portal group.

 - add_pg_ig_maps -- Add initiator group to portal group mappings to an existing iSCSI target node.

 - delete_pg_ig_maps -- Delete initiator group to portal group mappings from an existing iSCSI target node.

 - iscsi_get_portal_groups -- Show information about all available portal groups.

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ Example response: 
    "get_iscsi_global_params",

    "target_node_add_lun",

    "get_iscsi_connections",

    "delete_portal_group",

    "iscsi_delete_portal_group",

    "iscsi_create_portal_group",

    "iscsi_get_portal_groups",

    "delete_target_node",
@@ -3515,7 +3515,7 @@ Example response: 
}

~~~



## delete_portal_group method {#rpc_delete_portal_group}

## iscsi_delete_portal_group method {#rpc_iscsi_delete_portal_group}



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

  },

  "jsonrpc": "2.0",

  "method": "delete_portal_group",

  "method": "iscsi_delete_portal_group",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+10 −9
Original line number Diff line number Diff line
@@ -844,24 +844,24 @@ out: 
SPDK_RPC_REGISTER("iscsi_create_portal_group", spdk_rpc_iscsi_create_portal_group, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_portal_group, add_portal_group)



struct rpc_delete_portal_group {

struct rpc_iscsi_delete_portal_group {

	int32_t tag;

};



static const struct spdk_json_object_decoder rpc_delete_portal_group_decoders[] = {

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

static const struct spdk_json_object_decoder rpc_iscsi_delete_portal_group_decoders[] = {

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

};



static void

spdk_rpc_delete_portal_group(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_delete_portal_group(struct spdk_jsonrpc_request *request,

				   const struct spdk_json_val *params)

{

	struct rpc_delete_portal_group req = {};

	struct rpc_iscsi_delete_portal_group req = {};

	struct spdk_json_write_ctx *w;

	struct spdk_iscsi_portal_grp *pg;



	if (spdk_json_decode_object(params, rpc_delete_portal_group_decoders,

				    SPDK_COUNTOF(rpc_delete_portal_group_decoders),

	if (spdk_json_decode_object(params, rpc_iscsi_delete_portal_group_decoders,

				    SPDK_COUNTOF(rpc_iscsi_delete_portal_group_decoders),

				    &req)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		goto invalid;
@@ -883,7 +883,8 @@ spdk_rpc_delete_portal_group(struct spdk_jsonrpc_request *request, 
invalid:

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

}

SPDK_RPC_REGISTER("delete_portal_group", spdk_rpc_delete_portal_group, SPDK_RPC_RUNTIME)

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 spdk_jsonrpc_request *request;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -1046,14 +1046,15 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                   help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.')

    p.set_defaults(func=delete_target_node)



    def delete_portal_group(args):

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

    def iscsi_delete_portal_group(args):

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



    p = subparsers.add_parser('delete_portal_group',

    p = subparsers.add_parser('iscsi_delete_portal_group',

                              aliases=['delete_portal_group'],

                              help='Delete a portal group')

    p.add_argument(

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

    p.set_defaults(func=delete_portal_group)

    p.set_defaults(func=iscsi_delete_portal_group)



    def delete_initiator_group(args):

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

scripts/rpc/iscsi.py

+3 −2
Original line number Diff line number Diff line
@@ -452,7 +452,8 @@ def delete_target_node(client, target_node_name): 
    return client.call('delete_target_node', params)





def delete_portal_group(client, tag):

@deprecated_alias('delete_portal_group')

def iscsi_delete_portal_group(client, tag):

    """Delete a portal group.



    Args:
@@ -462,7 +463,7 @@ def delete_portal_group(client, tag): 
        True or False

    """

    params = {'tag': tag}

    return client.call('delete_portal_group', params)

    return client.call('iscsi_delete_portal_group', params)





def delete_initiator_group(client, tag):