summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2010-12-29 17:40:18 -0600
committerTrey Morris <trey.morris@rackspace.com>2010-12-29 17:40:18 -0600
commitbe6750a77e5121fe8f0d95016da4e96c9de3b5aa (patch)
treeb8eb40665b5692e3d6b83b2598973c4e630cf8f9 /nova/api
parentaac25e8cc6e75d5d0abc41a8cf979300e58bcc3b (diff)
removed lock check from show and changed returning 404 to 405
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 74b4f55b5..24fd5000c 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -66,7 +66,7 @@ def checks_instance_lock(function):
if admin or not locked:
return function(*args, **kwargs)
- return faults.Fault(exc.HTTPNotFound())
+ return faults.Fault(exc.HTTPMethodNotAllowed())
return decorated_function
@@ -138,7 +138,6 @@ class Controller(wsgi.Controller):
res = [entity_maker(inst)['server'] for inst in limited_list]
return dict(servers=res)
- @checks_instance_lock
def show(self, req, id):
""" Returns server details by server id """
try: