diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-11 15:13:05 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-11 15:13:05 -0400 |
| commit | df9bf23ecda1f32fd31ebffc6013e2f60f7fd3fa (patch) | |
| tree | 29e32105346734525ee6a42c25b9bee505de3e30 /nova/api | |
| parent | c230dba962a3db2a3a8bb502dfb33313f0ef274b (diff) | |
| download | nova-df9bf23ecda1f32fd31ebffc6013e2f60f7fd3fa.tar.gz nova-df9bf23ecda1f32fd31ebffc6013e2f60f7fd3fa.tar.xz nova-df9bf23ecda1f32fd31ebffc6013e2f60f7fd3fa.zip | |
zone api tests passing
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/__init__.py | 3 | ||||
| -rw-r--r-- | nova/api/openstack/zones.py | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 8aeb69693..33d040ab3 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -82,8 +82,7 @@ class APIRouter(wsgi.Router): server_members['resume'] = 'POST' mapper.resource("zone", "zones", controller=zones.Controller(), - collection={'detail': 'GET'}, - collection_name='zones') + collection={'detail': 'GET'}) mapper.resource("server", "servers", controller=servers.Controller(), collection={'detail': 'GET'}, diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py index a12d1cc0c..e84b38fa9 100644 --- a/nova/api/openstack/zones.py +++ b/nova/api/openstack/zones.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +import common import logging from nova import flags |