openstack/zaqar
Code Issues Proposed changes

Expose pools and flavors in homedoc

Browse Source 
Pools and flavors were missing from our v1.1 homedoc. This patches adds
them just when admin_mode is enabled. To do so, the falcon resource now
accepts a conf object.

Follow up patches should make all resources accept a conf object, for
the sake of consistency.

Change-Id: I6da7c8e4dedc9722858f360b074611b904c8d131
Closes-bug: #1361275
This commit is contained in:
Flavio Percoco 2014-12-11 08:32:44 +01:00
parent 3bc7f522ae
commit 5684c2da22
2 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zaqar/transport/wsgi/v1_1/__init__.py
View File

@ -33,7 +33,7 @@ def public_endpoints(driver, conf):
return [
# Home
('/',
homedoc.Resource()),
homedoc.Resource(conf)),
# Queues Endpoints
('/queues',

68
zaqar/transport/wsgi/v1_1/homedoc.py
View File

@ -188,9 +188,75 @@ JSON_HOME = {
}
ADMIN_RESOURCES = {
# -----------------------------------------------------------------
# Pools
# -----------------------------------------------------------------
'rel/pools': {
'href-template': '/v1.1/pools{?detailed,limit,marker}',
'href-vars': {
'detailed': 'param/detailed',
'limit': 'param/pool_limit',
'marker': 'param/marker',
},
'hints': {
'allow': ['GET'],
'formats': {
'application/json': {},
},
},
},
'rel/pool': {
'href-template': '/v1.1/pools/{pool_name}',
'href-vars': {
'pool_name': 'param/pool_name',
},
'hints': {
'allow': ['GET', 'PUT', 'PATCH', 'DELETE'],
'formats': {
'application/json': {},
},
},
},
# -----------------------------------------------------------------
# Flavors
# -----------------------------------------------------------------
'rel/flavors': {
'href-template': '/v1.1/flavors{?detailed,limit,marker}',
'href-vars': {
'detailed': 'param/detailed',
'limit': 'param/flavor_limit',
'marker': 'param/marker',
},
'hints': {
'allow': ['GET'],
'formats': {
'application/json': {},
},
},
},
'rel/flavor': {
'href-template': '/v1.1/flavors/{flavor_name}',
'href-vars': {
'flavor_name': 'param/flavor_name',
},
'hints': {
'allow': ['GET', 'PUT', 'PATCH', 'DELETE'],
'formats': {
'application/json': {},
},
},
},
}
class Resource(object):
def __init__(self):
def __init__(self, conf):
if conf.admin_mode:
JSON_HOME['resources'].update(ADMIN_RESOURCES)
document = json.dumps(JSON_HOME, ensure_ascii=False, indent=4)
self.document_utf8 = document.encode('utf-8')