Fix exception message of CoraidESMConfigureError

Since 'message' is the same name as the second argument to the
constructor of CinderException, 'message="Oorah"' is not a keyword
argument.

Therefore, "message = _('ESM configure request failed: %(message)s.')"
doesn't work correctly.

Then, remove the redundant period.

Change-Id: Iafc457197fc3993f9f942babcdda0cd79b7bd518
Closes-Bug: #1290627

diff --git a/cinder/exception.py b/cinder/exception.py
index 8ef9c7cb6aceee62c12e881478089bbfcb0719d0..dc7407be3f79092ec2bd6babbb3658e3c683e3ae 100644 (file)
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -594,11 +594,11 @@ class CoraidESMBadGroup(CoraidException):
 
 
 class CoraidESMConfigureError(CoraidException):
-    message = _('ESM configure request failed: %(message)s.')
+    message = _('ESM configure request failed: %(reason)s')
 
 
 class CoraidESMNotAvailable(CoraidException):
-    message = _('Coraid ESM not available with reason: %(reason)s.')
+    message = _('Coraid ESM not available with reason: %(reason)s')
 
 
 # Zadara

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index a7e309d938603c54a970fe29b53a6c955746df62..be162f9456a35d5a896e90c1781a020a574b8ed2 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -241,10 +241,10 @@ class CoraidAppliance(object):
         if self._is_bad_config_state(reply):
             # Calculate error message
             if not reply:
-                message = _('Reply is empty.')
+                reason = _('Reply is empty.')
             else:
-                message = reply.get('message', _('Error message is empty.'))
-            raise exception.CoraidESMConfigureError(message=message)
+                reason = reply.get('message', _('Error message is empty.'))
+            raise exception.CoraidESMConfigureError(reason=reason)
         return reply
 
     def esm_command(self, request):