From cb3cf038ebbe6e561aeca10adffd575338bfca61 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 26 Sep 2019 00:02:54 +0000
Subject: [PATCH] Move logging from _request() to raw_request()

rest_client log all request and response data when called via its get,
post, put, delete method etc because logging is done in self._request().

But when any service client make API request via raw_request() then logging
is not done.

_request() method internally call the raw_request() method so moving the
logging from _request() to raw_request() will not effect existing behavior.

Change-Id: I096ea150bfdd1d700a15612a391142216f0fd0e8
---
 tempest/lib/common/rest_client.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tempest/lib/common/rest_client.py b/tempest/lib/common/rest_client.py
index f076727ef4..6cc0561a28 100644
--- a/tempest/lib/common/rest_client.py
+++ b/tempest/lib/common/rest_client.py
@@ -547,18 +547,10 @@ class RestClient(object):
         req_url, req_headers, req_body = self.auth_provider.auth_request(
             method, url, headers, body, self.filters)
 
-        # Do the actual request, and time it
-        start = time.time()
-        self._log_request_start(method, req_url)
         resp, resp_body = self.raw_request(
             req_url, method, headers=req_headers, body=req_body,
             chunked=chunked
         )
-        end = time.time()
-        self._log_request(method, req_url, resp, secs=(end - start),
-                          req_headers=req_headers, req_body=req_body,
-                          resp_body=resp_body)
-
         # Verify HTTP response codes
         self.response_checker(method, resp, resp_body)
 
@@ -586,8 +578,17 @@ class RestClient(object):
         """
         if headers is None:
             headers = self.get_headers()
-        return self.http_obj.request(url, method, headers=headers,
-                                     body=body, chunked=chunked)
+        # Do the actual request, and time it
+        start = time.time()
+        self._log_request_start(method, url)
+        resp, resp_body = self.http_obj.request(
+            url, method, headers=headers,
+            body=body, chunked=chunked)
+        end = time.time()
+        self._log_request(method, url, resp, secs=(end - start),
+                          req_headers=headers, req_body=body,
+                          resp_body=resp_body)
+        return resp, resp_body
 
     def request(self, method, url, extra_headers=False, headers=None,
                 body=None, chunked=False):