From: ling-yun <zengyunling@huawei.com>
Date: Fri, 17 Jan 2014 02:49:58 +0000 (+0800)
Subject: Fix exception log msg in attach volume method
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2f39c8523091c9a2e55254fb32900305524a6fff;p=openstack-build%2Fcinder-build.git

Fix exception log msg in attach volume method

Attach volume happened when volume's status is attaching or available, but
the exception msg only contain info about "available". So fix it.

Change-Id: I1caf83b94b3e4158eff88871a4187041a25e5d1c
Closes-Bug: #1270020
---

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 3026576be..1da9d01f0 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -577,7 +577,7 @@ class VolumeManager(manager.SchedulerDependentManager):
                     msg = _("being attached by different mode")
                     raise exception.InvalidVolume(reason=msg)
             elif volume['status'] != "available":
-                msg = _("status must be available")
+                msg = _("status must be available or attaching")
                 raise exception.InvalidVolume(reason=msg)
 
             # TODO(jdg): attach_time column is currently varchar