Commit a1a8585c authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename set_nvmf_target_max_subsystems to nvmf_set_max_subsystems 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I318070b843dddfaa79cf37f1a5d0356fee38e81c
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469112


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 16a47c39

doc/jsonrpc.md

+2 −2
Original line number Diff line number Diff line
@@ -4172,7 +4172,7 @@ Example response: 
}

~~~



## set_nvmf_target_max_subsystems {#rpc_set_nvmf_target_max_subsystems}

## nvmf_set_max_subsystems {#rpc_nvmf_set_max_subsystems}



Set the maximum allowed subsystems for the NVMe-oF target.  This RPC may only be called

before SPDK subsystems have been initialized.
@@ -4191,7 +4191,7 @@ Example request: 
{

  "jsonrpc": "2.0",

  "id": 1,

  "method": "set_nvmf_target_max_subsystems",

  "method": "nvmf_set_max_subsystems",

  "params": {

    "max_subsystems": 1024

  }

lib/nvmf/nvmf.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ spdk_nvmf_tgt_write_config_json(struct spdk_json_write_ctx *w, struct spdk_nvmf_ 
	struct spdk_nvmf_transport *transport;



	spdk_json_write_object_begin(w);

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

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



	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_uint32(w, "max_subsystems", tgt->max_subsystems);

module/event/subsystems/nvmf/nvmf_rpc.c

+4 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static const struct spdk_json_object_decoder nvmf_rpc_subsystem_tgt_opts_decoder 
};



static void

spdk_rpc_set_nvmf_target_max_subsystems(struct spdk_jsonrpc_request *request,

spdk_rpc_nvmf_set_max_subsystems(struct spdk_jsonrpc_request *request,

				 const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;
@@ -70,8 +70,9 @@ spdk_rpc_set_nvmf_target_max_subsystems(struct spdk_jsonrpc_request *request, 
	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("set_nvmf_target_max_subsystems", spdk_rpc_set_nvmf_target_max_subsystems,

SPDK_RPC_REGISTER("nvmf_set_max_subsystems", spdk_rpc_nvmf_set_max_subsystems,

		  SPDK_RPC_STARTUP)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_set_max_subsystems, set_nvmf_target_max_subsystems)



static int decode_conn_sched(const struct spdk_json_val *val, void *out)

{

scripts/config_converter.py

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ iscsi_dict["iscsi_create_target_node"] = [] 


nvmf_dict = OrderedDict()

nvmf_dict["set_nvmf_target_config"] = []

nvmf_dict["set_nvmf_target_max_subsystems"] = []

nvmf_dict["nvmf_set_max_subsystems"] = []

nvmf_dict["subsystems"] = []
@@ -305,7 +305,7 @@ def get_nvmf_options_json(config, section): 
    })

    nvmf_json.append({

        "params": to_json_params(params[1:7]),

        "method": "set_nvmf_target_max_subsystems"

        "method": "nvmf_set_max_subsystems"

    })



    return nvmf_json

scripts/rpc.py

+6 −5
Original line number Diff line number Diff line
@@ -1541,13 +1541,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.set_defaults(func=net_get_interfaces)



    # NVMe-oF

    def set_nvmf_target_max_subsystems(args):

        rpc.nvmf.set_nvmf_target_max_subsystems(args.client,

    def nvmf_set_max_subsystems(args):

        rpc.nvmf.nvmf_set_max_subsystems(args.client,

                                         max_subsystems=args.max_subsystems)



    p = subparsers.add_parser('set_nvmf_target_max_subsystems', help='Set the maximum number of NVMf target subsystems')

    p = subparsers.add_parser('nvmf_set_max_subsystems', aliases=['set_nvmf_target_max_subsystems'],

                              help='Set the maximum number of NVMf target subsystems')

    p.add_argument('-x', '--max-subsystems', help='Max number of NVMf subsystems', type=int, required=True)

    p.set_defaults(func=set_nvmf_target_max_subsystems)

    p.set_defaults(func=nvmf_set_max_subsystems)



    def set_nvmf_target_config(args):

        rpc.nvmf.set_nvmf_target_config(args.client,