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

RPC: rename get_nvmf_subsystems to nvmf_get_subsystems 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 8e052bf4

doc/jsonrpc.md

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

~~~



## get_nvmf_subsystems method {#rpc_get_nvmf_subsystems}

## nvmf_get_subsystems method {#rpc_nvmf_get_subsystems}



### Parameters
@@ -3792,7 +3792,7 @@ Example request: 
{

  "jsonrpc": "2.0",

  "id": 1,

  "method": "get_nvmf_subsystems"

  "method": "nvmf_get_subsystems"

}

~~~

lib/nvmf/nvmf_rpc.c

+3 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s 
}



static void

spdk_rpc_get_nvmf_subsystems(struct spdk_jsonrpc_request *request,

spdk_rpc_nvmf_get_subsystems(struct spdk_jsonrpc_request *request,

			     const struct spdk_json_val *params)

{

	struct rpc_get_subsystem req = { 0 };
@@ -336,7 +336,8 @@ spdk_rpc_get_nvmf_subsystems(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);

	free(req.tgt_name);

}

SPDK_RPC_REGISTER("get_nvmf_subsystems", spdk_rpc_get_nvmf_subsystems, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("nvmf_get_subsystems", spdk_rpc_nvmf_get_subsystems, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_get_subsystems, get_nvmf_subsystems)



struct rpc_subsystem_create {

	char *nqn;

scripts/perf/nvmf/run_nvmf.py

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ class SPDKTarget(Target): 
                                                     adrfam="ipv4")



        self.log_print("SPDK NVMeOF subsystem configuration:")

        rpc.client.print_dict(rpc.nvmf.get_nvmf_subsystems(self.client))

        rpc.client.print_dict(rpc.nvmf.nvmf_get_subsystems(self.client))



    def tgt_start(self):

        self.subsys_no = get_nvme_devices_count()

scripts/rpc.py

+4 −4
Original line number Diff line number Diff line
@@ -1624,13 +1624,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('-t', '--tgt_name', help='The name of the parent NVMe-oF target (optional)', type=str)

    p.set_defaults(func=get_nvmf_transports)



    def get_nvmf_subsystems(args):

        print_dict(rpc.nvmf.get_nvmf_subsystems(args.client, tgt_name=args.tgt_name))

    def nvmf_get_subsystems(args):

        print_dict(rpc.nvmf.nvmf_get_subsystems(args.client, tgt_name=args.tgt_name))



    p = subparsers.add_parser('get_nvmf_subsystems',

    p = subparsers.add_parser('nvmf_get_subsystems', aliases=['get_nvmf_subsystems'],

                              help='Display nvmf subsystems')

    p.add_argument('-t', '--tgt_name', help='The name of the parent NVMe-oF target (optional)', type=str)

    p.set_defaults(func=get_nvmf_subsystems)

    p.set_defaults(func=nvmf_get_subsystems)



    def nvmf_subsystem_create(args):

        rpc.nvmf.nvmf_subsystem_create(args.client,

scripts/rpc/nvmf.py

+6 −2
Original line number Diff line number Diff line 
from .helpers import deprecated_alias





def set_nvmf_target_max_subsystems(client,

                                   max_subsystems=None):

    """Set NVMe-oF target options.
@@ -159,7 +162,8 @@ def get_nvmf_transports(client, tgt_name=None): 
    return client.call('get_nvmf_transports', params)





def get_nvmf_subsystems(client, tgt_name=None):

@deprecated_alias('get_nvmf_subsystems')

def nvmf_get_subsystems(client, tgt_name=None):

    """Get list of NVMe-oF subsystems.

    Args:

        tgt_name: name of the parent NVMe-oF target (optional).
@@ -175,7 +179,7 @@ def get_nvmf_subsystems(client, tgt_name=None): 
            'tgt_name': tgt_name,

        }



    return client.call('get_nvmf_subsystems', params)

    return client.call('nvmf_get_subsystems', params)





def nvmf_subsystem_create(client,