openstack
/
keystone
Code Issues Proposed changes

Merge "Enhance V3 routers to store basic resource description"

This commit is contained in:
Jenkins 2014-08-25 14:50:52 +00:00 committed by Gerrit Code Review
parent f6fd969262 de61102e0a
commit de2c6e15b9
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
keystone/common/wsgi.py
View File

@ -612,6 +612,9 @@ class ExtensionRouter(Router):
class RoutersBase(object):
"""Base class for Routers."""
def __init__(self):
self.v3_resources = []
def append_v3_routers(self, mapper, routers):
"""Append v3 routers.
@ -623,7 +626,8 @@ class RoutersBase(object):
def _add_resource(self, mapper, controller, path,
get_action=None, head_action=None, get_head_action=None,
put_action=None, post_action=None, patch_action=None,
delete_action=None, get_post_action=None):
delete_action=None, get_post_action=None, rel=None,
path_vars=None):
if get_head_action:
mapper.connect(path, controller=controller, action=get_head_action,
conditions=dict(method=['GET', 'HEAD']))
@ -649,6 +653,17 @@ class RoutersBase(object):
mapper.connect(path, controller=controller, action=get_post_action,
conditions=dict(method=['GET', 'POST']))
if rel:
resource_data = dict()
if path_vars:
resource_data['href-template'] = path
resource_data['href-vars'] = path_vars
else:
resource_data['href'] = path
self.v3_resources.append((rel, resource_data))
class V3ExtensionRouter(ExtensionRouter, RoutersBase):
"""Base class for V3 extension router."""