diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/rackspace/__init__.py | 2 | ||||
| -rw-r--r-- | nova/api/rackspace/servers.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/rackspace/__init__.py b/nova/api/rackspace/__init__.py index bd31bbc2f..63b0edc6a 100644 --- a/nova/api/rackspace/__init__.py +++ b/nova/api/rackspace/__init__.py @@ -145,7 +145,7 @@ class APIRouter(wsgi.Router): def __init__(self): mapper = routes.Mapper() - mapper.resource("server", "servers", controller=servers.Controller() + mapper.resource("server", "servers", controller=servers.Controller(), collection={'detail': 'GET'}) mapper.resource("image", "images", controller=images.Controller(), collection={'detail': 'GET'}) diff --git a/nova/api/rackspace/servers.py b/nova/api/rackspace/servers.py index 3ba5af8cf..08b6768f9 100644 --- a/nova/api/rackspace/servers.py +++ b/nova/api/rackspace/servers.py @@ -20,6 +20,7 @@ from nova import db from nova import flags from nova import rpc from nova import utils +from nova import compute from nova.api.rackspace import base from webob import exc from nova import flags @@ -121,7 +122,7 @@ class Controller(base.Controller): 'reservation_id', 'project_id', 'launch_time', 'bridge_name', 'mac_address', 'user_id'] - for key in filtered_keys:: + for key in filtered_keys: del inst[key] if allowed_keys: |