Change check-detach to reject more states

Change check_detach is reject anything other than 'in-use', rather than
just rejecting 'available'.

Fixes bug #1199922

Change-Id: I3180540ca7bb699a3494ca4eea1389ae8a117df0

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 32f415c3f78e75f87ca464364758cbaf6f361941..fdb4169f70937b524c29aac05f9d58f314787d52 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -501,8 +501,8 @@ class API(base.Base):
     @wrap_check_policy
     def check_detach(self, context, volume):
         # TODO(vish): abstract status checking?
-        if volume['status'] == "available":
-            msg = _("already detached")
+        if volume['status'] != "in-use":
+            msg = _("status must be in-use to detach")
             raise exception.InvalidVolume(reason=msg)
 
     @wrap_check_policy