Remove check_{attach,detach} from volumes API

These methods are not called from anywhere and are likely just a relic
from splitting Cinder out from Nova. Moreover their usage from the API
should really be discouraged as they are inherently racy (the result is
immediately outdated since it is not atomic with anything that might
follow).

Partial-bug: #1302774
Change-Id: I5d79b22b2a1d3c9be429a13d094328fc2075fcd2

diff --git a/cinder/tests/policy.json b/cinder/tests/policy.json
index 4347c2c8f5ba75e3df019a52674f736865c85187..608755f162661a07d7be9992b0f30ea4112ff136 100644 (file)
--- a/cinder/tests/policy.json
+++ b/cinder/tests/policy.json
@@ -20,8 +20,6 @@
     "volume:unreserve_volume": [],
     "volume:begin_detaching": [],
     "volume:roll_detaching": [],
-    "volume:check_attach": [],
-    "volume:check_detach": [],
     "volume:initialize_connection": [],
     "volume:terminate_connection": [],
     "volume:create_snapshot": [],

diff --git a/cinder/volume/api.py b/cinder/volume/api.py
index 33e5dc8a4bdf068345a689c8465e134a70cfaa93..a44513d076b5bf18fce7bb93812e9fabae59188a 100644 (file)
--- a/cinder/volume/api.py
+++ b/cinder/volume/api.py
@@ -343,23 +343,6 @@ class API(base.Base):
             snapshots = results
         return snapshots
 
-    @wrap_check_policy
-    def check_attach(self, volume):
-        # TODO(vish): abstract status checking?
-        if volume['status'] != "available":
-            msg = _("status must be available")
-            raise exception.InvalidVolume(reason=msg)
-        if volume['attach_status'] == "attached":
-            msg = _("already attached")
-            raise exception.InvalidVolume(reason=msg)
-
-    @wrap_check_policy
-    def check_detach(self, volume):
-        # TODO(vish): abstract status checking?
-        if volume['status'] != "in-use":
-            msg = _("status must be in-use to detach")
-            raise exception.InvalidVolume(reason=msg)
-
     @wrap_check_policy
     def reserve_volume(self, context, volume):
         #NOTE(jdg): check for Race condition bug 1096983