x
/
mixmatch
Code Issues Proposed changes

Merge "Use get_projects_at_sp in case no MM-PROJECT-ID header"

This commit is contained in:
Jenkins 2016-12-05 21:21:06 +00:00 committed by Gerrit Code Review
parent a88fc04e8e e517507b00
commit 840d176f44
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mixmatch/proxy.py
View File

@ -105,10 +105,15 @@ class RequestHandler(object):
self.local_token = headers['X-AUTH-TOKEN']
LOG.debug('Local Token: %s ' % self.local_token)
if 'MM-SERVICE-PROVIDER' in headers and 'MM-PROJECT-ID' in headers:
if 'MM-SERVICE-PROVIDER' in headers:
# The user wants a specific service provider, use that SP.
self.service_provider = headers['MM-SERVICE-PROVIDER']
self.project_id = headers['MM-PROJECT-ID']
self.project_id = headers.get('MM-PROJECT-ID', None)
if not self.project_id and self.service_provider != 'default':
self.project_id = auth.get_projects_at_sp(
self.service_provider,
self.local_token
)[0]
self._forward = self._targeted_forward
elif aggregate:
self._forward = self._aggregate_forward