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

rpc: Rename set_iscsi_options to iscsi_set_options 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 44c859e3

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ Example response: 
    "iscsi_initiator_group_add_initiators",

    "add_initiator_group",

    "iscsi_get_initiator_groups",

    "set_iscsi_options",

    "iscsi_set_options",

    "set_bdev_options",

    "bdev_set_qos_limit",

    "bdev_get_bdevs",
@@ -2530,7 +2530,7 @@ Example response: 


# iSCSI Target {#jsonrpc_components_iscsi_tgt}



## set_iscsi_options method {#rpc_set_iscsi_options}

## iscsi_set_options method {#rpc_iscsi_set_options}



Set global parameters for iSCSI targets.
@@ -2582,7 +2582,7 @@ Example request: 
    "default_time2wait": 2

  },

  "jsonrpc": "2.0",

  "method": "set_iscsi_options",

  "method": "iscsi_set_options",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+3 −2
Original line number Diff line number Diff line
@@ -1522,7 +1522,7 @@ static const struct spdk_json_object_decoder rpc_set_iscsi_opts_decoders[] = { 
};



static void

spdk_rpc_set_iscsi_options(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_set_options(struct spdk_jsonrpc_request *request,

			   const struct spdk_json_val *params)

{

	struct spdk_iscsi_opts *opts;
@@ -1568,4 +1568,5 @@ spdk_rpc_set_iscsi_options(struct spdk_jsonrpc_request *request, 
	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("set_iscsi_options", spdk_rpc_set_iscsi_options, SPDK_RPC_STARTUP)
 
SPDK_RPC_REGISTER("iscsi_set_options", spdk_rpc_iscsi_set_options, SPDK_RPC_STARTUP)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_set_options, set_iscsi_options)

lib/iscsi/iscsi_subsystem.c

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ iscsi_opts_config_json(struct spdk_json_write_ctx *w) 
{

	spdk_json_write_object_begin(w);



	spdk_json_write_named_string(w, "method", "set_iscsi_options");

	spdk_json_write_named_string(w, "method", "iscsi_set_options");



	spdk_json_write_name(w, "params");

	spdk_iscsi_opts_info_json(w);

scripts/config_converter.py

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ vhost_dict["construct_vhost_blk_controller"] = [] 
vhost_dict["construct_vhost_nvme_controller"] = []



iscsi_dict = OrderedDict()

iscsi_dict["set_iscsi_options"] = []

iscsi_dict["iscsi_set_options"] = []

iscsi_dict["iscsi_create_portal_group"] = []

iscsi_dict["add_initiator_group"] = []

iscsi_dict["iscsi_create_target_node"] = []
@@ -515,7 +515,7 @@ def get_iscsi_options_json(config, section): 
    ]

    for option in config.options(section):

        set_param(params, option, config.get(section, option))

    return [{"method": "set_iscsi_options", "params": to_json_params(params)}]

    return [{"method": "iscsi_set_options", "params": to_json_params(params)}]





def get_iscsi_portal_group_json(config, name):

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -673,8 +673,8 @@ if __name__ == "__main__": 
    p.set_defaults(func=bdev_nvme_apply_firmware)



    # iSCSI

    def set_iscsi_options(args):

        rpc.iscsi.set_iscsi_options(

    def iscsi_set_options(args):

        rpc.iscsi.iscsi_set_options(

            args.client,

            auth_file=args.auth_file,

            node_base=args.node_base,
@@ -694,7 +694,8 @@ if __name__ == "__main__": 
            error_recovery_level=args.error_recovery_level,

            allow_duplicated_isid=args.allow_duplicated_isid)



    p = subparsers.add_parser('set_iscsi_options', help="""Set options of iSCSI subsystem""")

    p = subparsers.add_parser('iscsi_set_options', aliases=['set_iscsi_options'],

                              help="""Set options of iSCSI subsystem""")

    p.add_argument('-f', '--auth-file', help='Path to CHAP shared secret file')

    p.add_argument('-b', '--node-base', help='Prefix of the name of iSCSI target node')

    p.add_argument('-o', '--nop-timeout', help='Timeout in seconds to nop-in request to the initiator', type=int)
@@ -715,7 +716,7 @@ if __name__ == "__main__": 
    p.add_argument('-i', '--immediate-data', help='Negotiated parameter, ImmediateData.', action='store_true')

    p.add_argument('-l', '--error-recovery-level', help='Negotiated parameter, ErrorRecoveryLevel', type=int)

    p.add_argument('-p', '--allow-duplicated-isid', help='Allow duplicated initiator session ID.', action='store_true')

    p.set_defaults(func=set_iscsi_options)

    p.set_defaults(func=iscsi_set_options)



    def set_iscsi_discovery_auth(args):

        rpc.iscsi.set_iscsi_discovery_auth(