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

rpc: Rename delete_target_node to iscsi_delete_target_node 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.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>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent 3650a733

doc/iscsi.md

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



 - iscsi_create_target_node -- Add a iSCSI target node.

 - delete_target_node -- Delete a iSCSI target node.

 - iscsi_delete_target_node -- Delete a iSCSI target node.

 - iscsi_target_node_add_lun -- Add an LUN to an existing iSCSI target node.

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

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ Example response: 
    "iscsi_delete_portal_group",

    "iscsi_create_portal_group",

    "iscsi_get_portal_groups",

    "delete_target_node",

    "iscsi_delete_target_node",

    "iscsi_target_node_remove_pg_ig_maps",

    "iscsi_target_node_add_pg_ig_maps",

    "iscsi_create_target_node",
@@ -3398,7 +3398,7 @@ Example response: 
}

~~~



## delete_target_node method {#rpc_delete_target_node}

## iscsi_delete_target_node method {#rpc_iscsi_delete_target_node}



Delete a iSCSI target node.
@@ -3418,7 +3418,7 @@ Example request: 
    "name": "iqn.2016-06.io.spdk:target1"

  },

  "jsonrpc": "2.0",

  "method": "delete_target_node",

  "method": "iscsi_delete_target_node",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+18 −17
Original line number Diff line number Diff line
@@ -624,32 +624,32 @@ SPDK_RPC_REGISTER("iscsi_target_node_remove_pg_ig_maps", 
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_remove_pg_ig_maps,

				   delete_pg_ig_maps)



struct rpc_delete_target_node {

struct rpc_iscsi_delete_target_node {

	char *name;

};



static void

free_rpc_delete_target_node(struct rpc_delete_target_node *r)

free_rpc_iscsi_delete_target_node(struct rpc_iscsi_delete_target_node *r)

{

	free(r->name);

}



static const struct spdk_json_object_decoder rpc_delete_target_node_decoders[] = {

	{"name", offsetof(struct rpc_delete_target_node, name), spdk_json_decode_string},

static const struct spdk_json_object_decoder rpc_iscsi_delete_target_node_decoders[] = {

	{"name", offsetof(struct rpc_iscsi_delete_target_node, name), spdk_json_decode_string},

};



struct rpc_delete_target_node_ctx {

	struct rpc_delete_target_node req;

struct rpc_iscsi_delete_target_node_ctx {

	struct rpc_iscsi_delete_target_node req;

	struct spdk_jsonrpc_request *request;

};



static void

rpc_delete_target_node_done(void *cb_arg, int rc)

rpc_iscsi_delete_target_node_done(void *cb_arg, int rc)

{

	struct rpc_delete_target_node_ctx *ctx = cb_arg;

	struct rpc_iscsi_delete_target_node_ctx *ctx = cb_arg;

	struct spdk_json_write_ctx *w;



	free_rpc_delete_target_node(&ctx->req);

	free_rpc_iscsi_delete_target_node(&ctx->req);



	w = spdk_jsonrpc_begin_result(ctx->request);

	spdk_json_write_bool(w, rc == 0);
@@ -659,10 +659,10 @@ rpc_delete_target_node_done(void *cb_arg, int rc) 
}



static void

spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_delete_target_node(struct spdk_jsonrpc_request *request,

				  const struct spdk_json_val *params)

{

	struct rpc_delete_target_node_ctx *ctx;

	struct rpc_iscsi_delete_target_node_ctx *ctx;



	ctx = calloc(1, sizeof(*ctx));

	if (!ctx) {
@@ -671,8 +671,8 @@ spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request, 
		return;

	}



	if (spdk_json_decode_object(params, rpc_delete_target_node_decoders,

				    SPDK_COUNTOF(rpc_delete_target_node_decoders),

	if (spdk_json_decode_object(params, rpc_iscsi_delete_target_node_decoders,

				    SPDK_COUNTOF(rpc_iscsi_delete_target_node_decoders),

				    &ctx->req)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		goto invalid;
@@ -686,15 +686,16 @@ spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request, 
	ctx->request = request;



	spdk_iscsi_shutdown_tgt_node_by_name(ctx->req.name,

					     rpc_delete_target_node_done, ctx);

					     rpc_iscsi_delete_target_node_done, ctx);

	return;



invalid:

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

	free_rpc_delete_target_node(&ctx->req);

	free_rpc_iscsi_delete_target_node(&ctx->req);

	free(ctx);

}

SPDK_RPC_REGISTER("delete_target_node", spdk_rpc_delete_target_node, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_delete_target_node", spdk_rpc_iscsi_delete_target_node, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_target_node, delete_target_node)



static void

spdk_rpc_iscsi_get_portal_groups(struct spdk_jsonrpc_request *request,

scripts/rpc.py

+4 −4
Original line number Diff line number Diff line
@@ -1074,15 +1074,15 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    This parameter can be omitted.  Example: '255.255.0.0 255.248.0.0' etc""", required=False)

    p.set_defaults(func=iscsi_initiator_group_remove_initiators)



    def delete_target_node(args):

        rpc.iscsi.delete_target_node(

    def iscsi_delete_target_node(args):

        rpc.iscsi.iscsi_delete_target_node(

            args.client, target_node_name=args.target_node_name)



    p = subparsers.add_parser('delete_target_node',

    p = subparsers.add_parser('iscsi_delete_target_node', aliases=['delete_target_node'],

                              help='Delete a target node')

    p.add_argument('target_node_name',

                   help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.')

    p.set_defaults(func=delete_target_node)

    p.set_defaults(func=iscsi_delete_target_node)



    def iscsi_delete_portal_group(args):

        rpc.iscsi.iscsi_delete_portal_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 iscsi_initiator_group_remove_initiators( 
    return client.call('iscsi_initiator_group_remove_initiators', params)





def delete_target_node(client, target_node_name):

@deprecated_alias('delete_target_node')

def iscsi_delete_target_node(client, target_node_name):

    """Delete a target node.



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

    """

    params = {'name': target_node_name}

    return client.call('delete_target_node', params)

    return client.call('iscsi_delete_target_node', params)





@deprecated_alias('delete_portal_group')