openstack/python-zaqarclient
Code Issues Proposed changes

Merge "Fix client not working on Python 3"

Browse Source
This commit is contained in:
Jenkins 2016-02-25 19:22:53 +00:00 committed by Gerrit Code Review
commit 17b100b7b9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zaqarclient/transport/request.py
View File

@ -46,11 +46,16 @@ def prepare_request(auth_opts=None, data=None, **kwargs):
# TODO(flaper87): Do something smarter # TODO(flaper87): Do something smarter
# to get the api_version. # to get the api_version.
req = auth_backend.authenticate(1, req) req = auth_backend.authenticate(1, req)
req.headers['X-Project-Id'] = auth_opts.get(
'options', {}).get('os_project_id', {})
# In case of noauth backend, a default project id will be added to header. project_id = auth_opts.get('options', {}).get('os_project_id', {})
if (not req.headers['X-Project-Id'] and
# Let's add project id header, only if it will have non-empty value.
if project_id:
req.headers['X-Project-Id'] = project_id
# In case of noauth backend and no specified project id, the default
# project id will be added as header.
if ('X-Project-Id' not in req.headers and
auth_opts.get("backend") == "noauth"): auth_opts.get("backend") == "noauth"):
req.headers['X-Project-Id'] = "fake_project_id_for_noauth" req.headers['X-Project-Id'] = "fake_project_id_for_noauth"