spdkcli: do not use delete_bdev rpc call
Delete_bdev is depracated in favor of specialized delete_* calls. Removing it's use from "/bdevs" node so that it's no longer available. Moving split related methods to split class while at it, because that's where they belong. Change-Id: I1ff8d8b74cd8c27a734bca3065a98679b8676428 Signed-off-by: Karol Latecki <karol.latecki@intel.com> Reviewed-on: https://review.gerrithub.io/421208 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
parent
af4d1bdc60
commit
8168d62f3c
@ -62,16 +62,6 @@ class UIBdevs(UINode):
|
|||||||
UIVirtioBlkBdev(self)
|
UIVirtioBlkBdev(self)
|
||||||
UIVirtioScsiBdev(self)
|
UIVirtioScsiBdev(self)
|
||||||
|
|
||||||
def ui_command_delete(self, name):
|
|
||||||
"""
|
|
||||||
Deletes bdev from configuration.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
name - Is a unique identifier of the bdev to be deleted - UUID number or name alias.
|
|
||||||
"""
|
|
||||||
self.get_root().delete_bdev(name=name)
|
|
||||||
self.refresh()
|
|
||||||
|
|
||||||
|
|
||||||
class UILvolStores(UINode):
|
class UILvolStores(UINode):
|
||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
@ -133,21 +123,6 @@ class UIBdev(UINode):
|
|||||||
for bdev in self.get_root().get_bdevs(self.name):
|
for bdev in self.get_root().get_bdevs(self.name):
|
||||||
UIBdevObj(bdev, self)
|
UIBdevObj(bdev, self)
|
||||||
|
|
||||||
def ui_command_delete(self, name):
|
|
||||||
"""
|
|
||||||
Deletes bdev from configuration.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
name - Is a unique identifier of the bdev to be deleted - UUID number or name alias.
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
self.get_root().delete_bdev(name=name)
|
|
||||||
except JSONRPCException as e:
|
|
||||||
self.shell.log.error(e.message)
|
|
||||||
|
|
||||||
self.get_root().refresh()
|
|
||||||
self.refresh()
|
|
||||||
|
|
||||||
def ui_command_get_bdev_iostat(self, name=None):
|
def ui_command_get_bdev_iostat(self, name=None):
|
||||||
try:
|
try:
|
||||||
ret = self.get_root().get_bdevs_iostat(name=name)
|
ret = self.get_root().get_bdevs_iostat(name=name)
|
||||||
@ -155,45 +130,6 @@ class UIBdev(UINode):
|
|||||||
except JSONRPCException as e:
|
except JSONRPCException as e:
|
||||||
self.shell.log.error(e.message)
|
self.shell.log.error(e.message)
|
||||||
|
|
||||||
def ui_command_split_bdev(self, base_bdev, split_count, split_size_mb=None):
|
|
||||||
"""
|
|
||||||
Construct split block devices from a base bdev.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
base_bdev - Name of bdev to split
|
|
||||||
split_count - Number of split bdevs to create
|
|
||||||
split_size_mb- Size of each split volume in MiB (optional)
|
|
||||||
"""
|
|
||||||
|
|
||||||
split_count = self.ui_eval_param(split_count, "number", None)
|
|
||||||
split_size_mb = self.ui_eval_param(split_size_mb, "number", None)
|
|
||||||
|
|
||||||
try:
|
|
||||||
ret_name = self.get_root().split_bdev(base_bdev=base_bdev,
|
|
||||||
split_count=split_count,
|
|
||||||
split_size_mb=split_size_mb)
|
|
||||||
self.shell.log.info(ret_name)
|
|
||||||
except JSONRPCException as e:
|
|
||||||
self.shell.log.error(e.message)
|
|
||||||
|
|
||||||
self.parent.refresh()
|
|
||||||
self.refresh()
|
|
||||||
|
|
||||||
def ui_command_destruct_split_bdev(self, base_bdev):
|
|
||||||
"""Destroy split block devices associated with base bdev.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
base_bdev: name of previously split bdev
|
|
||||||
"""
|
|
||||||
|
|
||||||
try:
|
|
||||||
self.get_root().destruct_split_bdev(base_bdev=base_bdev)
|
|
||||||
except JSONRPCException as e:
|
|
||||||
self.shell.log.error(e.message)
|
|
||||||
|
|
||||||
self.parent.refresh()
|
|
||||||
self.refresh()
|
|
||||||
|
|
||||||
def summary(self):
|
def summary(self):
|
||||||
return "Bdevs: %d" % len(self.children), None
|
return "Bdevs: %d" % len(self.children), None
|
||||||
|
|
||||||
@ -464,6 +400,45 @@ class UISplitBdev(UIBdev):
|
|||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
UIBdev.__init__(self, "split_disk", parent)
|
UIBdev.__init__(self, "split_disk", parent)
|
||||||
|
|
||||||
|
def ui_command_split_bdev(self, base_bdev, split_count, split_size_mb=None):
|
||||||
|
"""
|
||||||
|
Construct split block devices from a base bdev.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
base_bdev - Name of bdev to split
|
||||||
|
split_count - Number of split bdevs to create
|
||||||
|
split_size_mb- Size of each split volume in MiB (optional)
|
||||||
|
"""
|
||||||
|
|
||||||
|
split_count = self.ui_eval_param(split_count, "number", None)
|
||||||
|
split_size_mb = self.ui_eval_param(split_size_mb, "number", None)
|
||||||
|
|
||||||
|
try:
|
||||||
|
ret_name = self.get_root().split_bdev(base_bdev=base_bdev,
|
||||||
|
split_count=split_count,
|
||||||
|
split_size_mb=split_size_mb)
|
||||||
|
self.shell.log.info(ret_name)
|
||||||
|
except JSONRPCException as e:
|
||||||
|
self.shell.log.error(e.message)
|
||||||
|
|
||||||
|
self.parent.refresh()
|
||||||
|
self.refresh()
|
||||||
|
|
||||||
|
def ui_command_destruct_split_bdev(self, base_bdev):
|
||||||
|
"""Destroy split block devices associated with base bdev.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
base_bdev: name of previously split bdev
|
||||||
|
"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.get_root().destruct_split_bdev(base_bdev=base_bdev)
|
||||||
|
except JSONRPCException as e:
|
||||||
|
self.shell.log.error(e.message)
|
||||||
|
|
||||||
|
self.parent.refresh()
|
||||||
|
self.refresh()
|
||||||
|
|
||||||
|
|
||||||
class UIPmemBdev(UIBdev):
|
class UIPmemBdev(UIBdev):
|
||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
|
Loading…
Reference in New Issue
Block a user