openstack/cinder
Code Issues Proposed changes

Fix error message in Pure driver with correct text

Browse Source 
The error message was specifically mentioning the PureISCSIDriver but
now there is a PureFCDriver which could call the error message. This
change gets the name of the driver and uses that to ensure
the error message refers to the correct driver.

Closes-Bug: #1469523
Change-Id: Ib724073ea352dadfbe7ddcf4ee4ceedd5d2c7c41
This commit is contained in:
Simon Dodsley
2015-07-07 10:06:37 -04:00
parent ad977d456c
commit 2c3fed3925
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cinder/volume/drivers/pure.py
View File

@@ -481,10 +481,10 @@ class PureBaseVolumeDriver(san.SanDriver):
if len(connected_hosts) > 0:
raise exception.ManageExistingInvalidReference(
existing_ref=existing_ref,
reason=_("PureISCSIDriver manage_existing cannot manage a "
"volume connected to hosts. Please disconnect the "
"volume from existing hosts before importing."))
reason=_("%(driver)s manage_existing cannot manage a volume "
"connected to hosts. Please disconnect this volume "
"from existing hosts before importing"
) % {'driver': self.__class__.__name__})
new_vol_name = self._get_vol_name(volume)
LOG.info(_LI("Renaming existing volume %(ref_name)s to %(new_name)s"),
{"ref_name": ref_vol_name, "new_name": new_vol_name})