CLI: Fix errors with the REST client
* Fix error in instantiating Session object: attributes "verify", "headers" must be passed on after creating the session * Fix error in computing the API URL from the server's base URL Change-Id: Id80956e7026db5ed7192fbc4c2dff3afbbd3c9a8
This commit is contained in:
parent
9c463fc185
commit
2793d27b12
|
@ -36,12 +36,15 @@ class ZuulRESTClient(object):
|
||||||
"""Basic client for Zuul's REST API"""
|
"""Basic client for Zuul's REST API"""
|
||||||
def __init__(self, url, verify=False, auth_token=None):
|
def __init__(self, url, verify=False, auth_token=None):
|
||||||
self.url = url
|
self.url = url
|
||||||
|
if not self.url.endswith('/'):
|
||||||
|
self.url += '/'
|
||||||
self.auth_token = auth_token
|
self.auth_token = auth_token
|
||||||
self.base_url = urllib.parse.urljoin(self.url, '/api/')
|
|
||||||
self.verify = verify
|
self.verify = verify
|
||||||
self.session = requests.Session(
|
self.base_url = urllib.parse.urljoin(self.url, 'api/')
|
||||||
verify=self.verify,
|
self.session = requests.Session()
|
||||||
headers={'Authorization': 'Bearer %s' % self.auth_token})
|
self.session.verify = self.verify
|
||||||
|
self.session.headers = dict(
|
||||||
|
Authorization='Bearer %s' % self.auth_token)
|
||||||
|
|
||||||
def _check_status(self, req):
|
def _check_status(self, req):
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue