X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-SDN-juniper_contrail%2Fosm_rosdn_juniper_contrail%2Frest_lib.py;h=fff489d62d9a04de552c6c9fa730b0c2ce4caabd;hb=refs%2Fchanges%2F13%2F12713%2F10;hp=4c04c1c95eb3c2a72b656ed5a9e2c28f0c9218a5;hpb=049cbb1b256805f589c24776dcf092c77fefec6a;p=osm%2FRO.git diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py index 4c04c1c9..fff489d6 100644 --- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py @@ -43,10 +43,10 @@ class ServiceUnavailableException(HttpException): class ContrailHttp(object): - def __init__(self, auth_info, logger): + def __init__(self, auth_info, logger, verify): self._logger = logger - # default don't verify client cert - self._ssl_verify = False + # Verify client cert + self.ssl_verify = verify # auth info: must contain auth_url and auth_dict self.auth_url = auth_info["auth_url"] self.auth_dict = auth_info["auth_dict"] @@ -162,9 +162,7 @@ class ContrailHttp(object): except AuthError: # If there is an auth error retry just once if retry_auth_error: - return self._request( - self, op, url, headers, data, retry_auth_error=False - ) + return self._request(op, url, headers, data, retry_auth_error=False) def _request_noauth(self, op, url, headers, data=None): # Method to execute http requests with error control @@ -247,10 +245,14 @@ class ContrailHttp(object): return requests.get(url, headers=headers, params=query_params) def _http_post_headers(self, url, headers, json_data=None): - return requests.head(url, json=json_data, headers=headers, verify=False) + return requests.head( + url, json=json_data, headers=headers, verify=self.ssl_verify + ) def _http_post(self, url, headers, json_data=None): - return requests.post(url, json=json_data, headers=headers, verify=False) + return requests.post( + url, json=json_data, headers=headers, verify=self.ssl_verify + ) def _http_delete(self, url, headers, json_data=None): return requests.delete(url, json=json_data, headers=headers)