diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2010-09-23 16:55:51 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2010-09-23 16:55:51 -0500 |
| commit | d4edbd26b27de3df6bf8af98486714d1cee5b594 (patch) | |
| tree | 9069462d1cbf2c0a2135a574557c2789211fb69b /nova/api | |
| parent | c14fef2fbb28bffc9a5507f2a23e0c7c0ecb6c2c (diff) | |
| parent | be214c0ecece6d9cffced02f397ba9ce42be6d9f (diff) | |
| download | nova-d4edbd26b27de3df6bf8af98486714d1cee5b594.tar.gz nova-d4edbd26b27de3df6bf8af98486714d1cee5b594.tar.xz nova-d4edbd26b27de3df6bf8af98486714d1cee5b594.zip | |
Merging in changes from rs_auth, since I needed something modern to develop on while waiting for Hudson to right itself
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: |