df55840009
You need to supply auth_url to authenticate using Keystone. Otherwise, auth_token, user_id, project_id and mistral_url provided will be directly transmitted to HTTPClient. Also: * renamed input_auth_token as auth_token * optimized few checks * added checks to prevent header update when not needed * simplified API test setUp Change-Id: I1b34282956d21a1809ec37b0368fbb68aa113bea Implements: blueprint mistral-optional-keystone-authentication
68 lines
2.2 KiB
Python
68 lines
2.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
#
|
|
# Copyright 2013 - Mirantis, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import requests
|
|
|
|
|
|
class HTTPClient(object):
|
|
def __init__(self, base_url, token=None, project_id=None, user_id=None):
|
|
self.base_url = base_url
|
|
self.token = token
|
|
self.project_id = project_id
|
|
self.user_id = user_id
|
|
|
|
def get(self, url, headers=None):
|
|
headers = self._update_headers(headers)
|
|
|
|
return requests.get(self.base_url + url, headers=headers)
|
|
|
|
def post(self, url, body, headers=None):
|
|
headers = self._update_headers(headers)
|
|
content_type = headers.get('content-type', 'application/json')
|
|
headers['content-type'] = content_type
|
|
|
|
return requests.post(self.base_url + url, body, headers=headers)
|
|
|
|
def put(self, url, body, headers=None):
|
|
headers = self._update_headers(headers)
|
|
content_type = headers.get('content-type', 'application/json')
|
|
headers['content-type'] = content_type
|
|
|
|
return requests.put(self.base_url + url, body, headers=headers)
|
|
|
|
def delete(self, url, headers=None):
|
|
headers = self._update_headers(headers)
|
|
|
|
return requests.delete(self.base_url + url, headers=headers)
|
|
|
|
def _update_headers(self, headers):
|
|
if not headers:
|
|
headers = {}
|
|
|
|
token = headers.get('x-auth-token', self.token)
|
|
if token:
|
|
headers['x-auth-token'] = token
|
|
|
|
project_id = headers.get('X-Project-Id', self.project_id)
|
|
if project_id:
|
|
headers['X-Project-Id'] = project_id
|
|
|
|
user_id = headers.get('X-User-Id', self.user_id)
|
|
if user_id:
|
|
headers['X-User-Id'] = user_id
|
|
|
|
return headers
|