Don't need to worry about legacy backstores.
Signed-off-by: Andy Grover <agrover@xxxxxxxxxx>
---
scripts/targetcli | 1 -
targetcli/ui_backstore.py | 15 +--
targetcli/ui_backstore_legacy.py | 452 --------------------------------------
targetcli/ui_node.py | 4 -
targetcli/ui_root.py | 8 +-
targetcli/ui_target.py | 8 +-
6 files changed, 5 insertions(+), 483 deletions(-)
delete mode 100644 targetcli/ui_backstore_legacy.py
diff --git a/scripts/targetcli b/scripts/targetcli
index 738f02c..877b0e7 100755
--- a/scripts/targetcli
+++ b/scripts/targetcli
@@ -43,7 +43,6 @@ class TargetCLI(ConfigShell):
'auto_enable_tpgt': True,
'auto_add_mapped_luns': True,
'auto_cd_after_create': True,
- 'legacy_hba_view': False
}
def main():
diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py
index 664171f..4d9216f 100644
--- a/targetcli/ui_backstore.py
+++ b/targetcli/ui_backstore.py
@@ -26,19 +26,6 @@ from rtslib import PSCSIStorageObject, RDMCPStorageObject
from rtslib.utils import get_block_type, is_disk_partition
from configshell import ExecutionError
-def dedup_so_name(storage_object):
- '''
- Useful for migration from ui_backstore_legacy to new style with
- 1:1 hba:so mapping. If name is a duplicate in a backstore, returns
- name_X where X is the HBA index.
- '''
- names = [so.name for so in RTSRoot().storage_objects
- if so.backstore.plugin == storage_object.backstore.plugin]
- if names.count(storage_object.name) > 1:
- return "%s_%d" % (storage_object.name,
- storage_object.backstore.index)
- else:
- return storage_object.name
class UIBackstores(UINode):
'''
@@ -71,7 +58,7 @@ class UIBackstore(UINode):
for so in RTSRoot().storage_objects:
if so.backstore.plugin == self.name:
ui_so = UIStorageObject(so, self)
- ui_so.name = dedup_so_name(so)
+ ui_so.name = so.name
def summary(self):
no_storage_objects = len(self._children)
diff --git a/targetcli/ui_backstore_legacy.py b/targetcli/ui_backstore_legacy.py
deleted file mode 100644
index f9ef9f7..0000000
--- a/targetcli/ui_backstore_legacy.py
+++ /dev/null
@@ -1,452 +0,0 @@
-'''
-Copyright (c) 2011 by RisingTide Systems LLC.
-All rights reserved.
-
-Jerome Martin <jxm@xxxxxxxxxxxxxxxxxxxxx>
-
-Implements the targetcli backstores related UI.
-'''
-
-from ui_node import UINode, UIRTSLibNode
-from rtslib import RTSRoot
-from rtslib import FileIOBackstore, IBlockBackstore
-from rtslib import PSCSIBackstore, RDMCPBackstore
-from rtslib import FileIOStorageObject, IBlockStorageObject
-from rtslib import PSCSIStorageObject, RDMCPStorageObject
-from rtslib.utils import get_block_type, is_disk_partition
-
-class UIBackstoresLegacy(UINode):
- '''
- The backstores container UI.
- '''
- def __init__(self, parent):
- UINode.__init__(self, 'backstores', parent)
- self.cfs_cwd = "%s/core" % self.cfs_cwd
- self.refresh()
-
- def refresh(self):
- self._children = set([])
- for backstore in RTSRoot().backstores:
- backstore_plugin = backstore.plugin
- if backstore_plugin == 'pscsi':
- UIPSCSIBackstoreLegacy(backstore, self)
- elif backstore_plugin == 'rd_mcp':
- UIRDMCPBackstoreLegacy(backstore, self)
- elif backstore_plugin == 'fileio':
- UIFileIOBackstoreLegacy(backstore, self)
- elif backstore_plugin == 'iblock':
- UIIBlockBackstoreLegacy(backstore, self)
-
- def summary(self):
- no_backstores = len(self._children)
- if no_backstores > 1:
- msg = "%d Backstores (legacy mode)" % no_backstores
- else:
- msg = "%d Backstore (legacy mode)" % no_backstores
- return (msg, None)
-
- def ui_command_create(self, backstore_plugin):
- '''
- Creates a new backstore, using the chosen I{backstore_plugin}. More
- than one backstores using the same I{backstore_plugin} can co-exist.
- They will be identified by incremental index numbers, starting from 0.
-
- AVAILABLE BACKSTORE PLUGINS
- ===========================
-
- B{iblock}
- ---------
- This I{backstore_plugin} provides I{SPC-4}, along with I{ALUA} and
- I{Persistent Reservations} emulation on top of Linux BLOCK devices:
- B{any block device} that appears in /sys/block.
-
- B{pscsi}
- --------
- Provides pass-through for Linux physical SCSI devices. It can be used
- with any storage object that does B{direct pass-through} of SCSI
- commands without SCSI emulation. This assumes an underlying SCSI
- device that appears with lsscsi in /proc/scsi/scsi, such as a SAS hard
- drive, such as any SCSI device. The Linux kernel code for device SCSI
- drivers resides in linux/drivers/scsi. SCSI-3 and higher is supported
- with this subsystem, but only for control CDBs capable by the device
- firmware.
-
- B{fileio}
- ---------
- This I{backstore_plugin} provides I{SPC-4}, along with I{ALUA} and
- I{Persistent Reservations} emulation on top of Linux VFS devices:
- B{any file on a mounted filesystem}. It may be backed by a file or an
- underlying real block device. FILEIO is using struct file to serve
- block I/O with various methods (synchronous or asynchronous) and
- (buffered or direct).
-
- B{rd_dr}
- -------
- This I{backstore_plugin} provides the same level of SCSI emulation than
- the I{fileio} and I{iblock} backstores, but uses a B{ramdisk}, based on
- direct memory mapping. It is the fastest of all backstores, and is
- typically used for bandwidth testing.
-
- B{rd_mcp}
- --------
- This I{backstore_plugin} is a bit slower than B{rd_dr}, but more robust
- with multiple initiators, with a separate memory mapping using memory
- copy. Also typically used for bandwidth testing.
-
- EXAMPLE
- =======
-
- B{create iblock}
- ----------------
- Creates a new backstore, using the B{iblock} I{backstore_plugin}.
- '''
- self.assert_root()
- self.shell.log.debug("%r" % [(backstore.plugin, backstore.index)
- for backstore in RTSRoot().backstores])
- indexes = [backstore.index for backstore in RTSRoot().backstores
- if backstore.plugin == backstore_plugin]
- self.shell.log.debug("Existing %s backstore indexes: %r"
- % (backstore_plugin, indexes))
- for index in range(1048576):
- if index not in indexes:
- backstore_index = index
- break
-
- if backstore_index is None:
- self.shell.log.error("Cannot find an available backstore index.")
- return
- else:
- self.shell.log.info("First available %s backstore index is %d."
- % (backstore_plugin, backstore_index))
-
- if backstore_plugin == 'pscsi':
- backstore = PSCSIBackstore(backstore_index, mode='create')
- return self.new_node(UIPSCSIBackstoreLegacy(backstore, self))
- elif backstore_plugin == 'rd_mcp':
- backstore = RDMCPBackstore(backstore_index, mode='create')
- return self.new_node(UIRDMCPBackstoreLegacy(backstore, self))
- elif backstore_plugin == 'fileio':
- backstore = FileIOBackstore(backstore_index, mode='create')
- return self.new_node(UIFileIOBackstoreLegacy(backstore, self))
- elif backstore_plugin == 'iblock':
- backstore = IBlockBackstore(backstore_index, mode='create')
- return self.new_node(UIIBlockBackstoreLegacy(backstore, self))
- else:
- self.shell.log.error("Invalid backstore plugin %s"
- % backstore_plugin)
- return
-
- self.shell.log.info("Created new backstore %s" % backstore.name)
-
- def ui_complete_create(self, parameters, text, current_param):
- '''
- Parameter auto-completion method for user command create.
- @param parameters: Parameters on the command line.
- @type parameters: dict
- @param text: Current text of parameter being typed by the user.
- @type text: str
- @param current_param: Name of parameter to complete.
- @type current_param: str
- @return: Possible completions
- @rtype: list of str
- '''
- if current_param == 'backstore_plugin':
- plugins = ['pscsi', 'rd_dr', 'rd_mcp', 'fileio', 'iblock']
- completions = [plugin for plugin in plugins
- if plugin.startswith(text)]
- else:
- completions = []
-
- if len(completions) == 1:
- return [completions[0] + ' ']
- else:
- return completions
-
- def ui_command_delete(self, backstore):
- '''
- Deletes a I{backstore}, and recursively all defined storage objects
- hanging under it. If there are existing LUNs making use of those
- storage objects, they will be deleted too.
-
- EXAMPLE
- =======
- B{delete iblock2}
- -----------------
- That would recursively delete the B{iblock} backstore with index 2.
- '''
- self.assert_root()
- try:
- child = self.get_child(backstore)
- except ValueError:
- self.shell.log.error("No backstore named %s." % backstore)
- else:
- child.rtsnode.delete()
- self.remove_child(child)
- self.shell.log.info("Deleted backstore %s." % backstore)
- self.parent.refresh()
-
- def ui_complete_delete(self, parameters, text, current_param):
- '''
- Parameter auto-completion method for user command delete.
- @param parameters: Parameters on the command line.
- @type parameters: dict
- @param text: Current text of parameter being typed by the user.
- @type text: str
- @param current_param: Name of parameter to complete.
- @type current_param: str
- @return: Possible completions
- @rtype: list of str
- '''
- if current_param == 'backstore':
- backstores = [child.name for child in self.children]
- completions = [backstore for backstore in backstores
- if backstore.startswith(text)]
- else:
- completions = []
-
- if len(completions) == 1:
- return [completions[0] + ' ']
- else:
- return completions
-
-
-class UIBackstoreLegacy(UIRTSLibNode):
- '''
- A backstore UI.
- '''
- def __init__(self, backstore, parent):
- UIRTSLibNode.__init__(self, backstore.name, backstore, parent)
- self.cfs_cwd = backstore.path
- self.refresh()
-
- def refresh(self):
- self._children = set([])
- for storage_object in self.rtsnode.storage_objects:
- UIStorageObjectLegacy(storage_object, self)
-
- def summary(self):
- no_storage_objects = len(self._children)
- if no_storage_objects > 1:
- msg = "%d Storage Objects" % no_storage_objects
- else:
- msg = "%d Storage Object" % no_storage_objects
- return (msg, None)
-
- def prm_gen_wwn(self, generate_wwn):
- generate_wwn = \
- self.ui_eval_param(generate_wwn, 'bool', True)
- if generate_wwn:
- self.shell.log.info("Generating a wwn serial.")
- else:
- self.shell.log.info("Not generating a wwn serial.")
- return generate_wwn
-
- def prm_buffered(self, buffered):
- generate_wwn = \
- self.ui_eval_param(buffered, 'bool', True)
- if buffered:
- self.shell.log.info("Using buffered mode.")
- else:
- self.shell.log.info("Not using buffered mode.")
- return buffered
-
- def ui_command_version(self):
- '''
- Displays the version of the current backstore's plugin.
- '''
- self.shell.con.display("Backstore plugin %s %s"
- % (self.rtsnode.plugin, self.rtsnode.version))
-
- def ui_command_delete(self, name):
- '''
- Recursively deletes the storage object having the specified I{name}. If
- there are LUNs using this storage object, they will be deleted too.
-
- EXAMPLE
- =======
- B{delete mystorage}
- -------------------
- Deletes the storage object named mystorage, and all associated LUNs.
- '''
- self.assert_root()
- try:
- child = self.get_child(name)
- except ValueError:
- self.shell.log.error("No storage object named %s." % name)
- else:
- child.rtsnode.delete()
- self.remove_child(child)
- self.shell.log.info("Deleted storage object %s." % name)
- self.parent.parent.refresh()
-
- def ui_complete_delete(self, parameters, text, current_param):
- '''
- Parameter auto-completion method for user command delete.
- @param parameters: Parameters on the command line.
- @type parameters: dict
- @param text: Current text of parameter being typed by the user.
- @type text: str
- @param current_param: Name of parameter to complete.
- @type current_param: str
- @return: Possible completions
- @rtype: list of str
- '''
- if current_param == 'name':
- names = [child.name for child in self.children]
- completions = [name for name in names
- if name.startswith(text)]
- else:
- completions = []
-
- if len(completions) == 1:
- return [completions[0] + ' ']
- else:
- return completions
-
-
-class UIPSCSIBackstoreLegacy(UIBackstoreLegacy):
- '''
- PSCSI backstore UI.
- '''
- def ui_command_create(self, name, dev):
- '''
- Creates a PSCSI storage object, with supplied name and SCSI device. The
- SCSI device I{dev} can either be a path name to the device, in which
- case it is recommended to use the /dev/disk/by-id hierarchy to have
- consistent naming should your physical SCSI system be modified, or an
- SCSI device ID in the H:C:T:L format, which is not recommended as SCSI
- IDs may vary in time.
- '''
- self.assert_root()
- so = PSCSIStorageObject(self.rtsnode, name, dev)
- ui_so = UIStorageObjectLegacy(so, self)
- self.shell.log.info("Created pscsi storage object %s using %s."
- % (name, dev))
- return self.new_node(ui_so)
-
-
-class UIRDMCPBackstoreLegacy(UIBackstoreLegacy):
- '''
- RDMCP backstore UI.
- '''
- def ui_command_create(self, name, size, generate_wwn=None):
- '''
- Creates an RDMCP storage object. I{size} is the size of the ramdisk,
- and the optional I{generate_wwn} parameter is a boolean specifying
- whether or not we should generate a T10 wwn Serial for the unit (by
- default, yes).
-
- SIZE SYNTAX
- ===========
- - If size is an int, it represents a number of bytes.
- - If size is a string, the following units can be used:
- - B{B} or no unit present for bytes
- - B{k}, B{K}, B{kB}, B{KB} for kB (kilobytes)
- - B{m}, B{M}, B{mB}, B{MB} for MB (megabytes)
- - B{g}, B{G}, B{gB}, B{GB} for GB (gigabytes)
- - B{t}, B{T}, B{tB}, B{TB} for TB (terabytes)
- '''
- self.assert_root()
- so = RDMCPStorageObject(self.rtsnode, name, size,
- self.prm_gen_wwn(generate_wwn))
- ui_so = UIStorageObjectLegacy(so, self)
- self.shell.log.info("Created rd_mcp ramdisk %s with size %s."
- % (name, size))
- return self.new_node(ui_so)
-
-
-class UIFileIOBackstoreLegacy(UIBackstoreLegacy):
- '''
- FileIO backstore UI.
- '''
- def ui_command_create(self, name, file_or_dev, size=None,
- generate_wwn=None, buffered=None):
- '''
- Creates a FileIO storage object. If I{file_or_dev} is a path to a
- regular file to be used as backend, then the I{size} parameter is
- mandatory. Else, if I{file_or_dev} is a path to a block device, the
- size parameter B{must} be ommited. If present, I{size} is the size of
- the file to be used, I{file} the path to the file or I{dev} the path to
- a block device. The optional I{generate_wwn} parameter is a boolean
- specifying whether or not we should generate a T10 wwn Serial for the
- unit (by default, yes). The I{buffered} parameter is a boolean stating
- whether or not to enable buffered mode. It is disabled by default
- (synchronous mode).
-
- SIZE SYNTAX
- ===========
- - If size is an int, it represents a number of bytes.
- - If size is a string, the following units can be used:
- - B{B} or no unit present for bytes
- - B{k}, B{K}, B{kB}, B{KB} for kB (kilobytes)
- - B{m}, B{M}, B{mB}, B{MB} for MB (megabytes)
- - B{g}, B{G}, B{gB}, B{GB} for GB (gigabytes)
- - B{t}, B{T}, B{tB}, B{TB} for TB (terabytes)
- '''
- self.assert_root()
- self.shell.log.debug('Using params size=%s generate_wwn=%s buffered=%s'
- % (size, generate_wwn, buffered))
- is_dev = get_block_type(file_or_dev) is not None \
- or is_disk_partition(file_or_dev)
-
- if size is None and is_dev:
- so = FileIOStorageObject(self.rtsnode, name, file_or_dev,
- gen_wwn=self.prm_gen_wwn(generate_wwn),
- buffered_mode=self.prm_buffered(buffered))
- self.shell.log.info("Created fileio %s with size %s."
- % (name, size))
- ui_so = UIStorageObjectLegacy(so, self)
- return self.new_node(ui_so)
- elif size is not None and not is_dev:
- so = FileIOStorageObject(self.rtsnode, name, file_or_dev, size,
- gen_wwn=self.prm_gen_wwn(generate_wwn),
- buffered_mode=self.prm_buffered(buffered))
- self.shell.log.info("Created fileio storage object %s." % name)
- ui_so = UIStorageObjectLegacy(so, self)
- return self.new_node(ui_so)
- else:
- self.shell.log.error("For fileio, you must either specify both a "
- + "file and a size, or just a device path.")
-
-
-class UIIBlockBackstoreLegacy(UIBackstoreLegacy):
- '''
- IBlock backstore UI.
- '''
- def ui_command_create(self, name, dev, generate_wwn=None):
- '''
- Creates an IBlock Storage object. I{dev} is the path to the TYPE_DISK
- block device to use and the optional I{generate_wwn} parameter is a
- boolean specifying whether or not we should generate a T10 wwn Serial
- for the unit (by default, yes).
- '''
- self.assert_root()
- so = IBlockStorageObject(self.rtsnode, name, dev,
- self.prm_gen_wwn(generate_wwn))
- ui_so = UIStorageObjectLegacy(so, self)
- self.shell.log.info("Created iblock storage object %s using %s."
- % (name, dev))
- return self.new_node(ui_so)
-
-
-class UIStorageObjectLegacy(UIRTSLibNode):
- '''
- A storage object UI.
- '''
- def __init__(self, storage_object, parent):
- name = storage_object.name
- UIRTSLibNode.__init__(self, name, storage_object, parent)
- self.cfs_cwd = storage_object.path
- self.refresh()
-
- def summary(self):
- so = self.rtsnode
- if so.backstore.plugin.startswith("rd"):
- path = "ramdisk"
- else:
- path = so.udev_path
- if not path:
- return ("BROKEN STORAGE LINK", False)
- else:
- return ("%s %s" % (path, so.status), True)
-
diff --git a/targetcli/ui_node.py b/targetcli/ui_node.py
index 80a050b..4f73f1b 100644
--- a/targetcli/ui_node.py
+++ b/targetcli/ui_node.py
@@ -35,10 +35,6 @@ class UINode(ConfigNode):
'If true, automatically create node ACLs mapped LUNs '
+ 'after creating a new target LUN or a new node ACL')
self.define_config_group_param(
- 'global', 'legacy_hba_view', 'bool',
- 'If true, use legacy HBA view, allowing to create more '
- + 'than one storage object per HBA.')
- self.define_config_group_param(
'global', 'auto_cd_after_create', 'bool',
'If true, changes current path to newly created objects.')
diff --git a/targetcli/ui_root.py b/targetcli/ui_root.py
index 47823af..1f820b6 100644
--- a/targetcli/ui_root.py
+++ b/targetcli/ui_root.py
@@ -24,7 +24,6 @@ from socket import gethostname
from ui_target import UIFabricModule
from tcm_dump import tcm_full_backup
from ui_backstore import UIBackstores
-from ui_backstore_legacy import UIBackstoresLegacy
class UIRoot(UINode):
'''
@@ -40,10 +39,9 @@ class UIRoot(UINode):
Refreshes the tree of target fabric modules.
'''
self._children = set([])
- if self.shell.prefs['legacy_hba_view']:
- UIBackstoresLegacy(self)
- else:
- UIBackstores(self)
+
+ UIBackstores(self)
+
if not self.loaded:
self.shell.log.debug("Refreshing in non-loaded mode.")
for fabric_module in RTSRoot().fabric_modules:
diff --git a/targetcli/ui_target.py b/targetcli/ui_target.py
index 275c88e..5aaf73d 100644
--- a/targetcli/ui_target.py
+++ b/targetcli/ui_target.py
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
'''
from ui_node import UINode, UIRTSLibNode
-from ui_backstore import dedup_so_name
from rtslib import RTSLibError, RTSLibBrokenLink, utils
from rtslib import NodeACL, NetworkPortal, MappedLUN
from rtslib import Target, TPG, LUN
@@ -854,13 +853,8 @@ class UILUN(UIRTSLibNode):
path = "ramdisk"
else:
path = storage_object.udev_path
- if self.shell.prefs['legacy_hba_view']:
- description = "%s%s/%s (%s)" % (backstore.plugin,
- backstore.index,
- storage_object.name, path)
- else:
description = "%s/%s (%s)" % (backstore.plugin,
- dedup_so_name(storage_object),
+ storage_object.name,
path)
return (description, is_healthy)
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
