vhost: remove support for deprecated RPC names
These were deprecated in 2019, it's time to remove support for them now. Change-Id: I33a497fb134320f13606b66ad55fc7b068d011d9 Signed-off-by: wanghailiangx <hailiangx.e.wang@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12716 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: GangCao <gang.cao@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com> Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
wanghailiangx
Jim Harris
parent
405be3b794
commit
23d832a04c
@ -93,7 +93,6 @@ invalid:
|
||||
}
|
||||
SPDK_RPC_REGISTER("vhost_create_scsi_controller", rpc_vhost_create_scsi_controller,
|
||||
SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_scsi_controller, construct_vhost_scsi_controller)
|
||||
|
||||
struct rpc_vhost_scsi_ctrlr_add_target {
|
||||
char *ctrlr;
|
||||
@ -159,7 +158,6 @@ invalid:
|
||||
}
|
||||
SPDK_RPC_REGISTER("vhost_scsi_controller_add_target", rpc_vhost_scsi_controller_add_target,
|
||||
SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_scsi_controller_add_target, add_vhost_scsi_lun)
|
||||
|
||||
struct rpc_remove_vhost_scsi_ctrlr_target {
|
||||
char *ctrlr;
|
||||
@ -229,7 +227,6 @@ invalid:
|
||||
|
||||
SPDK_RPC_REGISTER("vhost_scsi_controller_remove_target",
|
||||
rpc_vhost_scsi_controller_remove_target, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_scsi_controller_remove_target, remove_vhost_scsi_target)
|
||||
|
||||
struct rpc_vhost_blk_ctrlr {
|
||||
char *ctrlr;
|
||||
@ -284,7 +281,6 @@ invalid:
|
||||
}
|
||||
SPDK_RPC_REGISTER("vhost_create_blk_controller", rpc_vhost_create_blk_controller,
|
||||
SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_blk_controller, construct_vhost_blk_controller)
|
||||
|
||||
struct rpc_delete_vhost_ctrlr {
|
||||
char *ctrlr;
|
||||
@ -341,7 +337,6 @@ invalid:
|
||||
|
||||
}
|
||||
SPDK_RPC_REGISTER("vhost_delete_controller", rpc_vhost_delete_controller, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_delete_controller, remove_vhost_controller)
|
||||
|
||||
struct rpc_get_vhost_ctrlrs {
|
||||
char *name;
|
||||
@ -440,7 +435,6 @@ invalid:
|
||||
spdk_strerror(-rc));
|
||||
}
|
||||
SPDK_RPC_REGISTER("vhost_get_controllers", rpc_vhost_get_controllers, SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_get_controllers, get_vhost_controllers)
|
||||
|
||||
|
||||
struct rpc_vhost_ctrlr_coalescing {
|
||||
@ -502,6 +496,5 @@ invalid:
|
||||
}
|
||||
SPDK_RPC_REGISTER("vhost_controller_set_coalescing", rpc_vhost_controller_set_coalescing,
|
||||
SPDK_RPC_RUNTIME)
|
||||
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_controller_set_coalescing, set_vhost_controller_coalescing)
|
||||
|
||||
SPDK_LOG_REGISTER_COMPONENT(vhost_rpc)
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
from .helpers import deprecated_alias
|
||||
|
||||
|
||||
@deprecated_alias('set_vhost_controller_coalescing')
|
||||
def vhost_controller_set_coalescing(client, ctrlr, delay_base_us, iops_threshold):
|
||||
"""Set coalescing for vhost controller.
|
||||
Args:
|
||||
@ -17,7 +16,6 @@ def vhost_controller_set_coalescing(client, ctrlr, delay_base_us, iops_threshold
|
||||
return client.call('vhost_controller_set_coalescing', params)
|
||||
|
||||
|
||||
@deprecated_alias('construct_vhost_scsi_controller')
|
||||
def vhost_create_scsi_controller(client, ctrlr, cpumask=None):
|
||||
"""Create a vhost scsi controller.
|
||||
Args:
|
||||
@ -32,7 +30,6 @@ def vhost_create_scsi_controller(client, ctrlr, cpumask=None):
|
||||
return client.call('vhost_create_scsi_controller', params)
|
||||
|
||||
|
||||
@deprecated_alias('add_vhost_scsi_lun')
|
||||
def vhost_scsi_controller_add_target(client, ctrlr, scsi_target_num, bdev_name):
|
||||
"""Add LUN to vhost scsi controller target.
|
||||
Args:
|
||||
@ -48,7 +45,6 @@ def vhost_scsi_controller_add_target(client, ctrlr, scsi_target_num, bdev_name):
|
||||
return client.call('vhost_scsi_controller_add_target', params)
|
||||
|
||||
|
||||
@deprecated_alias('remove_vhost_scsi_target')
|
||||
def vhost_scsi_controller_remove_target(client, ctrlr, scsi_target_num):
|
||||
"""Remove target from vhost scsi controller.
|
||||
Args:
|
||||
@ -62,7 +58,6 @@ def vhost_scsi_controller_remove_target(client, ctrlr, scsi_target_num):
|
||||
return client.call('vhost_scsi_controller_remove_target', params)
|
||||
|
||||
|
||||
@deprecated_alias('construct_vhost_blk_controller')
|
||||
def vhost_create_blk_controller(client, ctrlr, dev_name, cpumask=None, readonly=None, packed_ring=None, packed_ring_recovery=None):
|
||||
"""Create vhost BLK controller.
|
||||
Args:
|
||||
@ -88,7 +83,6 @@ def vhost_create_blk_controller(client, ctrlr, dev_name, cpumask=None, readonly=
|
||||
return client.call('vhost_create_blk_controller', params)
|
||||
|
||||
|
||||
@deprecated_alias('get_vhost_controllers')
|
||||
def vhost_get_controllers(client, name=None):
|
||||
"""Get information about configured vhost controllers.
|
||||
|
||||
@ -104,7 +98,6 @@ def vhost_get_controllers(client, name=None):
|
||||
return client.call('vhost_get_controllers', params)
|
||||
|
||||
|
||||
@deprecated_alias('remove_vhost_controller')
|
||||
def vhost_delete_controller(client, ctrlr):
|
||||
"""Delete vhost controller from configuration.
|
||||
Args:
|
||||
|
||||
@ -2412,8 +2412,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
delay_base_us=args.delay_base_us,
|
||||
iops_threshold=args.iops_threshold)
|
||||
|
||||
p = subparsers.add_parser('vhost_controller_set_coalescing', aliases=['set_vhost_controller_coalescing'],
|
||||
help='Set vhost controller coalescing')
|
||||
p = subparsers.add_parser('vhost_controller_set_coalescing', help='Set vhost controller coalescing')
|
||||
p.add_argument('ctrlr', help='controller name')
|
||||
p.add_argument('delay_base_us', help='Base delay time', type=int)
|
||||
p.add_argument('iops_threshold', help='IOPS threshold when coalescing is enabled', type=int)
|
||||
@ -2424,9 +2423,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
ctrlr=args.ctrlr,
|
||||
cpumask=args.cpumask)
|
||||
|
||||
p = subparsers.add_parser(
|
||||
'vhost_create_scsi_controller', aliases=['construct_vhost_scsi_controller'],
|
||||
help='Add new vhost controller')
|
||||
p = subparsers.add_parser('vhost_create_scsi_controller', help='Add new vhost controller')
|
||||
p.add_argument('ctrlr', help='controller name')
|
||||
p.add_argument('--cpumask', help='cpu mask for this controller')
|
||||
p.set_defaults(func=vhost_create_scsi_controller)
|
||||
@ -2437,9 +2434,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
scsi_target_num=args.scsi_target_num,
|
||||
bdev_name=args.bdev_name))
|
||||
|
||||
p = subparsers.add_parser('vhost_scsi_controller_add_target',
|
||||
aliases=['add_vhost_scsi_lun'],
|
||||
help='Add lun to vhost controller')
|
||||
p = subparsers.add_parser('vhost_scsi_controller_add_target', help='Add lun to vhost controller')
|
||||
p.add_argument('ctrlr', help='controller name where add lun')
|
||||
p.add_argument('scsi_target_num', help='scsi_target_num', type=int)
|
||||
p.add_argument('bdev_name', help='bdev name')
|
||||
@ -2451,7 +2446,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
scsi_target_num=args.scsi_target_num)
|
||||
|
||||
p = subparsers.add_parser('vhost_scsi_controller_remove_target',
|
||||
aliases=['remove_vhost_scsi_target'],
|
||||
help='Remove target from vhost controller')
|
||||
p.add_argument('ctrlr', help='controller name to remove target from')
|
||||
p.add_argument('scsi_target_num', help='scsi_target_num', type=int)
|
||||
@ -2466,9 +2460,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
packed_ring=args.packed_ring,
|
||||
packed_ring_recovery=args.packed_ring_recovery)
|
||||
|
||||
p = subparsers.add_parser('vhost_create_blk_controller',
|
||||
aliases=['construct_vhost_blk_controller'],
|
||||
help='Add a new vhost block controller')
|
||||
p = subparsers.add_parser('vhost_create_blk_controller', help='Add a new vhost block controller')
|
||||
p.add_argument('ctrlr', help='controller name')
|
||||
p.add_argument('dev_name', help='device name')
|
||||
p.add_argument('--cpumask', help='cpu mask for this controller')
|
||||
@ -2480,8 +2472,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
def vhost_get_controllers(args):
|
||||
print_dict(rpc.vhost.vhost_get_controllers(args.client, args.name))
|
||||
|
||||
p = subparsers.add_parser('vhost_get_controllers', aliases=['get_vhost_controllers'],
|
||||
help='List all or specific vhost controller(s)')
|
||||
p = subparsers.add_parser('vhost_get_controllers', help='List all or specific vhost controller(s)')
|
||||
p.add_argument('-n', '--name', help="Name of vhost controller", required=False)
|
||||
p.set_defaults(func=vhost_get_controllers)
|
||||
|
||||
@ -2489,8 +2480,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
|
||||
rpc.vhost.vhost_delete_controller(args.client,
|
||||
ctrlr=args.ctrlr)
|
||||
|
||||
p = subparsers.add_parser('vhost_delete_controller', aliases=['remove_vhost_controller'],
|
||||
help='Delete a vhost controller')
|
||||
p = subparsers.add_parser('vhost_delete_controller', help='Delete a vhost controller')
|
||||
p.add_argument('ctrlr', help='controller name')
|
||||
p.set_defaults(func=vhost_delete_controller)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user