Support SSL and Insecure
Currently, Zaqarclient doesn't support SSL and insecure very well. This patch fix it. Implement blueprint: support-ssl-insecure Change-Id: I2247fbbabc3afb7b5dccc2b48cd4e96864013a7e
This commit is contained in:
parent
89ad44d746
commit
632ede8ef2
@ -57,7 +57,9 @@ class TestHttpTransport(base.TestBase):
|
|||||||
request_method.assert_called_with('GET', url=final_url,
|
request_method.assert_called_with('GET', url=final_url,
|
||||||
params=final_params,
|
params=final_params,
|
||||||
headers=final_headers,
|
headers=final_headers,
|
||||||
data=None)
|
data=None,
|
||||||
|
verify=True,
|
||||||
|
cert=None)
|
||||||
|
|
||||||
def test_send_without_api(self):
|
def test_send_without_api(self):
|
||||||
params = {'name': 'Test',
|
params = {'name': 'Test',
|
||||||
@ -79,7 +81,9 @@ class TestHttpTransport(base.TestBase):
|
|||||||
request_method.assert_called_with('GET', url=final_url,
|
request_method.assert_called_with('GET', url=final_url,
|
||||||
params=params,
|
params=params,
|
||||||
headers=final_headers,
|
headers=final_headers,
|
||||||
data=None)
|
data=None,
|
||||||
|
verify=True,
|
||||||
|
cert=None)
|
||||||
|
|
||||||
def test_error_handling(self):
|
def test_error_handling(self):
|
||||||
params = {'name': 'Opportunity',
|
params = {'name': 'Opportunity',
|
||||||
|
@ -203,4 +203,8 @@ class KeystoneAuth(base.AuthBackend):
|
|||||||
# NOTE(flaper87): Update the request spec
|
# NOTE(flaper87): Update the request spec
|
||||||
# with the final token.
|
# with the final token.
|
||||||
request.headers['X-Auth-Token'] = token
|
request.headers['X-Auth-Token'] = token
|
||||||
|
# NOTE(flwang): We also need to apply the insecure and cacert when
|
||||||
|
# talking with Zaqar server.
|
||||||
|
request.verify = not get_options('insecure')
|
||||||
|
request.cert = get_options('cacert')
|
||||||
return request
|
return request
|
||||||
|
@ -86,7 +86,9 @@ class HttpTransport(base.Transport):
|
|||||||
url=url,
|
url=url,
|
||||||
params=request.params,
|
params=request.params,
|
||||||
headers=headers,
|
headers=headers,
|
||||||
data=request.content)
|
data=request.content,
|
||||||
|
verify=request.verify,
|
||||||
|
cert=request.cert)
|
||||||
|
|
||||||
if resp.status_code in self.http_to_zaqar:
|
if resp.status_code in self.http_to_zaqar:
|
||||||
kwargs = {}
|
kwargs = {}
|
||||||
|
@ -90,7 +90,7 @@ class Request(object):
|
|||||||
|
|
||||||
def __init__(self, endpoint='', operation='',
|
def __init__(self, endpoint='', operation='',
|
||||||
ref='', content=None, params=None,
|
ref='', content=None, params=None,
|
||||||
headers=None, api=None):
|
headers=None, api=None, verify=True, cert=None):
|
||||||
|
|
||||||
self._api = None
|
self._api = None
|
||||||
# ensure that some values like "v1.0" could work as "v1"
|
# ensure that some values like "v1.0" could work as "v1"
|
||||||
@ -106,6 +106,8 @@ class Request(object):
|
|||||||
self.content = content
|
self.content = content
|
||||||
self.params = params or {}
|
self.params = params or {}
|
||||||
self.headers = headers or {}
|
self.headers = headers or {}
|
||||||
|
self.verify = verify
|
||||||
|
self.cert = cert
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def api(self):
|
def api(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user