aboutsummaryrefslogtreecommitdiffstats
path: root/onap-client/onap_client/client/request.py
diff options
context:
space:
mode:
authorstark, steven <steven.stark@att.com>2021-09-15 09:08:20 -0700
committerstark, steven <steven.stark@att.com>2021-09-15 09:08:20 -0700
commitc49136b9a48943a681d47090467cd99693fb5129 (patch)
tree7e5ef5d750961e42ec79e7072df5717642801539 /onap-client/onap_client/client/request.py
parente330184a81a453780deca68afd6e764c0eb00109 (diff)
[VVP] Adding proxy to onap-client configHEADmaster
Issue-ID: VVP-565 Signed-off-by: stark, steven <steven.stark@att.com> Change-Id: I734dc5e7f66b2dee4a9ce676c6ad941c2778b83c
Diffstat (limited to 'onap-client/onap_client/client/request.py')
-rw-r--r--onap-client/onap_client/client/request.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/onap-client/onap_client/client/request.py b/onap-client/onap_client/client/request.py
index d06d748..9ea5e3e 100644
--- a/onap-client/onap_client/client/request.py
+++ b/onap-client/onap_client/client/request.py
@@ -59,13 +59,13 @@ class RequestHandler:
"""
self.request_object = request_object
- def make_request(self, attempts, verify):
+ def make_request(self, attempts, verify, proxies):
r = Request(self.request_object)
logger.info("Submitting request: {}".format(self.request_object.description))
# TODO
# Add verify to config file
- return ResponseHandler(r.request(attempts, verify=verify), self.request_object)
+ return ResponseHandler(r.request(attempts, proxies, verify=verify), self.request_object)
class Request:
@@ -113,7 +113,7 @@ class Request:
except TypeError:
logger.info(debug_request)
- def request(self, attempts, verify=True):
+ def request(self, attempts, proxies, verify=True):
http = requests.Session()
retry_strategy = Retry(
total=attempts,
@@ -126,7 +126,9 @@ class Request:
http.mount("https://", adapter)
http.mount("http://", adapter)
- return http.request(**self.kwargs, verify=verify, timeout=(6.05, int(os.environ.get("ONAP_CLIENT_TIMEOUT", 120))))
+ logger.info(f"Using http proxy for request: {proxies}")
+
+ return http.request(**self.kwargs, proxies=proxies, verify=verify, timeout=(6.05, int(os.environ.get("ONAP_CLIENT_TIMEOUT", 120))))
class APICatalogRequestObject: