Commit 80494e3f authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

Rename target_node_add_lun to iscsi_target_node_add_lun 



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


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 6d779941

doc/iscsi.md

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


 - iscsi_create_target_node -- Add a iSCSI target node.

 - delete_target_node -- Delete a iSCSI target node.

 - target_node_add_lun -- Add an LUN to an existing 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
@@ -255,7 +255,7 @@ Example response: 
    "get_log_print_level",

    "set_log_print_level",

    "get_iscsi_global_params",

    "target_node_add_lun",

    "iscsi_target_node_add_lun",

    "iscsi_get_connections",

    "iscsi_delete_portal_group",

    "iscsi_create_portal_group",
@@ -3604,7 +3604,7 @@ Example response: 
}

~~~



## target_node_add_lun method {#rpc_target_node_add_lun}

## iscsi_target_node_add_lun method {#rpc_iscsi_target_node_add_lun}



Add an LUN to an existing iSCSI target node.
@@ -3628,7 +3628,7 @@ Example request: 
    "bdev_name": "Malloc0"

  },

  "jsonrpc": "2.0",

  "method": "target_node_add_lun",

  "method": "iscsi_target_node_add_lun",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+4 −3
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ static const struct spdk_json_object_decoder rpc_target_lun_decoders[] = { 
};



static void

spdk_rpc_target_node_add_lun(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_target_node_add_lun(struct spdk_jsonrpc_request *request,

				   const struct spdk_json_val *params)

{

	struct rpc_target_lun req = {};
@@ -1011,7 +1011,8 @@ invalid: 
					 "Invalid parameters");

	free_rpc_target_lun(&req);

}

SPDK_RPC_REGISTER("target_node_add_lun", spdk_rpc_target_node_add_lun, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_target_node_add_lun", spdk_rpc_iscsi_target_node_add_lun, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_add_lun, target_node_add_lun)



struct rpc_target_auth {

	char *name;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -865,20 +865,21 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                   help='Data Digest should be required for this target node.', action='store_true')

    p.set_defaults(func=iscsi_create_target_node)



    def target_node_add_lun(args):

        rpc.iscsi.target_node_add_lun(

    def iscsi_target_node_add_lun(args):

        rpc.iscsi.iscsi_target_node_add_lun(

            args.client,

            name=args.name,

            bdev_name=args.bdev_name,

            lun_id=args.lun_id)



    p = subparsers.add_parser('target_node_add_lun', help='Add LUN to the target node')

    p = subparsers.add_parser('iscsi_target_node_add_lun', aliases=['target_node_add_lun'],

                              help='Add LUN to the target node')

    p.add_argument('name', help='Target node name (ASCII)')

    p.add_argument('bdev_name', help="""bdev name enclosed in quotes.

    *** bdev name cannot contain space or colon characters ***""")

    p.add_argument('-i', dest='lun_id', help="""LUN ID (integer >= 0)

    *** If LUN ID is omitted or -1, the lowest free one is assigned ***""", type=int, required=False)

    p.set_defaults(func=target_node_add_lun)

    p.set_defaults(func=iscsi_target_node_add_lun)



    def set_iscsi_target_node_auth(args):

        rpc.iscsi.set_iscsi_target_node_auth(

scripts/rpc/iscsi.py

+3 −2
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ def iscsi_create_target_node( 
    return client.call('iscsi_create_target_node', params)





def target_node_add_lun(client, name, bdev_name, lun_id=None):

@deprecated_alias('target_node_add_lun')

def iscsi_target_node_add_lun(client, name, bdev_name, lun_id=None):

    """Add LUN to the target node.



    Args:
@@ -226,7 +227,7 @@ def target_node_add_lun(client, name, bdev_name, lun_id=None): 
    }

    if lun_id:

        params['lun_id'] = lun_id

    return client.call('target_node_add_lun', params)

    return client.call('iscsi_target_node_add_lun', params)





def set_iscsi_target_node_auth(