openstack
/
os-brick
Code Issues Proposed changes

Merge "Fix incorrect comments in FibreChannelConnector"

This commit is contained in:
Jenkins 2015-08-31 19:42:46 +00:00 committed by Gerrit Code Review
parent 3ea86f7d60 cff52977d9
commit 3ed958f456
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
os_brick/initiator/connector.py
View File

@ -414,7 +414,7 @@ class ISCSIConnector(InitiatorConnector):
raise exception.VolumeDeviceNotFound(device=host_devices) raise exception.VolumeDeviceNotFound(device=host_devices)
LOG.warning(_LW("ISCSI volume not yet found at: %(host_devices)s. " LOG.warning(_LW("ISCSI volume not yet found at: %(host_devices)s. "
"Will rescan & retry. Try number: %(tries)s"), "Will rescan & retry. Try number: %(tries)s."),
{'host_devices': host_devices, {'host_devices': host_devices,
'tries': tries}) 'tries': tries})
@ -852,8 +852,7 @@ class FibreChannelConnector(InitiatorConnector):
"""Attach the volume to instance_name. """Attach the volume to instance_name.
connection_properties for Fibre Channel must include: connection_properties for Fibre Channel must include:
target_portal - ip and optional port target_wwn - World Wide Name
target_iqn - iSCSI Qualified Name
target_lun - LUN id of the volume target_lun - LUN id of the volume
""" """
LOG.debug("execute = %s", self._execute) LOG.debug("execute = %s", self._execute)
@ -888,8 +887,8 @@ class FibreChannelConnector(InitiatorConnector):
LOG.error(_LE("Fibre Channel volume device not found.")) LOG.error(_LE("Fibre Channel volume device not found."))
raise exception.NoFibreChannelVolumeDeviceFound() raise exception.NoFibreChannelVolumeDeviceFound()
LOG.warning(_LW("Fibre volume not yet found. " LOG.warning(_LW("Fibre Channel volume device not yet found. "
"Will rescan & retry. Try number: %(tries)s"), "Will rescan & retry. Try number: %(tries)s."),
{'tries': tries}) {'tries': tries})
self._linuxfc.rescan_hosts(hbas) self._linuxfc.rescan_hosts(hbas)
@ -989,7 +988,7 @@ class FibreChannelConnector(InitiatorConnector):
"""Detach the volume from instance_name. """Detach the volume from instance_name.
connection_properties for Fibre Channel must include: connection_properties for Fibre Channel must include:
target_wwn - iSCSI Qualified Name target_wwn - World Wide Name
target_lun - LUN id of the volume target_lun - LUN id of the volume
""" """