Commit 14273794 authored by wanghailiangx's avatar wanghailiangx Committed by Tomasz Zawadzki
Browse files

nvmf: remove support for deprecated RPC names 



These were deprecated in 2019, it's time to remove
support for them now.

Change-Id: I3b75eea83bd7d700d20a6189e8fb6d1f066dc9b4
Signed-off-by: default avatarwanghailiangx <hailiangx.e.wang@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12603


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 5da326ee

lib/nvmf/nvmf_rpc.c

+0 −4
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ rpc_nvmf_get_subsystems(struct spdk_jsonrpc_request *request, 
	free(req.nqn);

}

SPDK_RPC_REGISTER("nvmf_get_subsystems", rpc_nvmf_get_subsystems, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_get_subsystems, get_nvmf_subsystems)



struct rpc_subsystem_create {

	char *nqn;
@@ -498,7 +497,6 @@ cleanup: 
	}

}

SPDK_RPC_REGISTER("nvmf_create_subsystem", rpc_nvmf_create_subsystem, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_create_subsystem, nvmf_subsystem_create)



struct rpc_delete_subsystem {

	char *nqn;
@@ -603,7 +601,6 @@ invalid_custom_response: 
	free_rpc_delete_subsystem(&req);

}

SPDK_RPC_REGISTER("nvmf_delete_subsystem", rpc_nvmf_delete_subsystem, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_delete_subsystem, delete_nvmf_subsystem)



struct rpc_listen_address {

	char *transport;
@@ -2103,7 +2100,6 @@ rpc_nvmf_get_transports(struct spdk_jsonrpc_request *request, 
	free(req.tgt_name);

}

SPDK_RPC_REGISTER("nvmf_get_transports", rpc_nvmf_get_transports, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(nvmf_get_transports, get_nvmf_transports)



struct rpc_nvmf_get_stats_ctx {

	char *tgt_name;

python/spdk/rpc/nvmf.py

+0 −6
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ from .helpers import deprecated_alias 
from .cmd_parser import *





@deprecated_alias('set_nvmf_target_max_subsystems')

def nvmf_set_max_subsystems(client,

                            max_subsystems=None):

    """Set NVMe-oF target options.
@@ -19,7 +18,6 @@ def nvmf_set_max_subsystems(client, 
    return client.call('nvmf_set_max_subsystems', params)





@deprecated_alias('set_nvmf_target_config')

def nvmf_set_config(client,

                    passthru_identify_ctrlr=None,

                    poll_groups_mask=None,
@@ -134,7 +132,6 @@ def nvmf_create_transport(client, **params): 
    return client.call('nvmf_create_transport', params)





@deprecated_alias('get_nvmf_transports')

def nvmf_get_transports(client, trtype=None, tgt_name=None):

    """Get list of NVMe-oF transports.

    Args:
@@ -156,7 +153,6 @@ def nvmf_get_transports(client, trtype=None, tgt_name=None): 
    return client.call('nvmf_get_transports', params)





@deprecated_alias('get_nvmf_subsystems')

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

    """Get list of NVMe-oF subsystems.

    Args:
@@ -178,7 +174,6 @@ def nvmf_get_subsystems(client, nqn=None, tgt_name=None): 
    return client.call('nvmf_get_subsystems', params)





@deprecated_alias('nvmf_subsystem_create')

def nvmf_create_subsystem(client,

                          nqn,

                          serial_number,
@@ -484,7 +479,6 @@ def nvmf_subsystem_allow_any_host(client, nqn, disable, tgt_name=None): 
    return client.call('nvmf_subsystem_allow_any_host', params)





@deprecated_alias('delete_nvmf_subsystem')

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

    """Delete an existing NVMe-oF subsystem.

scripts/rpc.py

+6 −11
Original line number Diff line number Diff line
@@ -2104,7 +2104,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
        rpc.nvmf.nvmf_set_max_subsystems(args.client,

                                         max_subsystems=args.max_subsystems)



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

    p = subparsers.add_parser('nvmf_set_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=nvmf_set_max_subsystems)
@@ -2115,8 +2115,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                                 poll_groups_mask=args.poll_groups_mask,

                                 discovery_filter=args.discovery_filter)



    p = subparsers.add_parser('nvmf_set_config', aliases=['set_nvmf_target_config'],

                              help='Set NVMf target config')

    p = subparsers.add_parser('nvmf_set_config', help='Set NVMf target config')

    p.add_argument('-i', '--passthru-identify-ctrlr', help="""Passthrough fields like serial number and model number

    when the controller has a single namespace that is an NVMe bdev""", action='store_true')

    p.add_argument('-m', '--poll-groups-mask', help='Set cpumask for NVMf poll groups (optional)', type=str)
@@ -2164,8 +2163,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    def nvmf_get_transports(args):

        print_dict(rpc.nvmf.nvmf_get_transports(args.client, trtype=args.trtype, tgt_name=args.tgt_name))



    p = subparsers.add_parser('nvmf_get_transports', aliases=['get_nvmf_transports'],

                              help='Display nvmf transports or required transport')

    p = subparsers.add_parser('nvmf_get_transports', help='Display nvmf transports or required transport')

    p.add_argument('--trtype', help='Transport type (optional)')

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

    p.set_defaults(func=nvmf_get_transports)
@@ -2173,8 +2171,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    def nvmf_get_subsystems(args):

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



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

                              help='Display nvmf subsystems or required subsystem')

    p = subparsers.add_parser('nvmf_get_subsystems', help='Display nvmf subsystems or required subsystem')

    p.add_argument('nqn', help='Subsystem NQN (optional)', nargs="?", default=None)

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

    p.set_defaults(func=nvmf_get_subsystems)
@@ -2191,8 +2188,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                                       min_cntlid=args.min_cntlid,

                                       max_cntlid=args.max_cntlid)



    p = subparsers.add_parser('nvmf_create_subsystem', aliases=['nvmf_subsystem_create'],

                              help='Create an NVMe-oF subsystem')

    p = subparsers.add_parser('nvmf_create_subsystem', help='Create an NVMe-oF subsystem')

    p.add_argument('nqn', help='Subsystem NQN (ASCII)')

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

    p.add_argument("-s", "--serial-number", help="""
@@ -2214,8 +2210,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                                       nqn=args.subsystem_nqn,

                                       tgt_name=args.tgt_name)



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

                              help='Delete a nvmf subsystem')

    p = subparsers.add_parser('nvmf_delete_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)