summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-01-27 23:53:28 -0600
committerSandy Walsh <sandy.walsh@rackspace.com>2011-01-27 23:53:28 -0600
commiteabc4c00eea8859c37efed3f180edbc41fd3b71d (patch)
tree55e443f1aff547645c4dbc54429c48bd7cefdbe5 /nova/api
parent2a64ccb8139eb30aab394391cf137d4cb83ce55e (diff)
downloadnova-eabc4c00eea8859c37efed3f180edbc41fd3b71d.tar.gz
nova-eabc4c00eea8859c37efed3f180edbc41fd3b71d.tar.xz
nova-eabc4c00eea8859c37efed3f180edbc41fd3b71d.zip
Working on api / manager / db support for zones
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/__init__.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index c70bb39ed..025fa12a4 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -34,6 +34,7 @@ from nova.api.openstack import flavors
from nova.api.openstack import images
from nova.api.openstack import servers
from nova.api.openstack import shared_ip_groups
+from nova.api.openstack import zones
LOG = logging.getLogger('nova.api.openstack')
@@ -79,6 +80,10 @@ class APIRouter(wsgi.Router):
server_members["actions"] = "GET"
server_members['suspend'] = 'POST'
server_members['resume'] = 'POST'
+
+ mapper.resource("zone", "zones", controller=zones.Controller(),
+ collection={'detail': 'GET'},
+ member=zone_members)
mapper.resource("server", "servers", controller=servers.Controller(),
collection={'detail': 'GET'},