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

RPC: rename delete_nvmf_subsystem to nvmf_delete_subsystem 



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


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

doc/jsonrpc.md

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

~~~



## delete_nvmf_subsystem method {#rpc_delete_nvmf_subsystem}

## nvmf_delete_subsystem method {#rpc_nvmf_delete_subsystem}



Delete an existing NVMe-oF subsystem.
@@ -3898,7 +3898,7 @@ Example request: 
{

  "jsonrpc": "2.0",

  "id": 1,

  "method": "delete_nvmf_subsystem",

  "method": "nvmf_delete_subsystem",

  "params": {

    "nqn": "nqn.2016-06.io.spdk:cnode1"

  }

lib/nvmf/nvmf_rpc.c

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



static void

spdk_rpc_delete_nvmf_subsystem(struct spdk_jsonrpc_request *request,

spdk_rpc_nvmf_delete_subsystem(struct spdk_jsonrpc_request *request,

			       const struct spdk_json_val *params)

{

	struct rpc_delete_subsystem req = { 0 };
@@ -520,7 +520,8 @@ invalid: 
invalid_custom_response:

	free_rpc_delete_subsystem(&req);

}

SPDK_RPC_REGISTER("delete_nvmf_subsystem", spdk_rpc_delete_nvmf_subsystem, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("nvmf_delete_subsystem", spdk_rpc_nvmf_delete_subsystem, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_delete_subsystem, delete_nvmf_subsystem)



struct rpc_listen_address {

	char *transport;

scripts/rpc.py

+4 −4
Original line number Diff line number Diff line
@@ -1656,17 +1656,17 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                   type=int, default=0)

    p.set_defaults(func=nvmf_create_subsystem)



    def delete_nvmf_subsystem(args):

        rpc.nvmf.delete_nvmf_subsystem(args.client,

    def nvmf_delete_subsystem(args):

        rpc.nvmf.nvmf_delete_subsystem(args.client,

                                       nqn=args.subsystem_nqn,

                                       tgt_name=args.tgt_name)



    p = subparsers.add_parser('delete_nvmf_subsystem',

    p = subparsers.add_parser('nvmf_delete_subsystem', aliases=['delete_nvmf_subsystem'],

                              help='Delete a nvmf subsystem')

    p.add_argument('subsystem_nqn',

                   help='subsystem nqn to be deleted. Example: nqn.2016-06.io.spdk:cnode1.')

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

    p.set_defaults(func=delete_nvmf_subsystem)

    p.set_defaults(func=nvmf_delete_subsystem)



    def nvmf_subsystem_add_listener(args):

        rpc.nvmf.nvmf_subsystem_add_listener(args.client,

scripts/rpc/nvmf.py

+3 −2
Original line number Diff line number Diff line
@@ -412,7 +412,8 @@ def nvmf_subsystem_allow_any_host(client, nqn, disable, tgt_name=None): 
    return client.call('nvmf_subsystem_allow_any_host', params)





def delete_nvmf_subsystem(client, nqn, tgt_name=None):

@deprecated_alias('delete_nvmf_subsystem')

def nvmf_delete_subsystem(client, nqn, tgt_name=None):

    """Delete an existing NVMe-oF subsystem.



    Args:
@@ -427,7 +428,7 @@ def delete_nvmf_subsystem(client, nqn, tgt_name=None): 
    if tgt_name:

        params['tgt_name'] = tgt_name



    return client.call('delete_nvmf_subsystem', params)

    return client.call('nvmf_delete_subsystem', params)





def nvmf_get_stats(client, tgt_name=None):

scripts/spdkcli/ui_node_nvmf.py

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class UINVMfSubsystems(UINode): 
            UINVMfSubsystem(subsystem, self)



    def delete(self, subsystem_nqn):

        self.get_root().delete_nvmf_subsystem(nqn=subsystem_nqn)

        self.get_root().nvmf_delete_subsystem(nqn=subsystem_nqn)



    def ui_command_create(self, nqn, serial_number=None,

                          max_namespaces=None, allow_any_host="false"):