Fix osdf code after upgrading to py38

Fix osdf logging to work with 3.8
Fix osdf code that broke after migration
Fix test cases after migration
Fixing pep8 violations

Change-Id: I11ca33959882c8b9010f00ff744d59c7eeb3c2f2
Signed-off-by: vrvarma <vikas.varma@att.com>
Issue-ID: OPTFRA-796

3 files changed, 53 insertions, 47 deletions

diff --git a/test/config/log.yml b/test/config/log.yml
index 0b8815f..ad0de21 100644
--- a/test/config/log.yml
+++ b/test/config/log.yml
@@ -3,19 +3,19 @@ disable_existing_loggers: True
 
 loggers:
   error:
-    handlers: [error_handler]
+    handlers: [error_handler, console_handler]
     level: "WARN"
     propagate: True
   debug:
-    handlers: [debug_handler]
+    handlers: [debug_handler, console_handler]
     level: "DEBUG"
     propagate: True
   metrics:
-    handlers: [metrics_handler]
+    handlers: [metrics_handler, console_handler]
     level: "INFO"
     propagate: True
   audit:
-    handlers: [audit_handler]
+    handlers: [audit_handler, console_handler]
     level: "INFO"
     propagate: True
 handlers:
@@ -59,37 +59,42 @@ handlers:
     utc: True
     delay: False
     backupCount: 10
+  console_handler:
+    level: "DEBUG"
+    class: "logging.StreamHandler"
+    formatter: "metricsFormat"
+
 formatters:
   standard:
     format: "%(asctime)s|||||%(name)s||%(thread)||%(funcName)s||%(levelname)s||%(message)s"
   debugFormat:
-    format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s"
-    mdcfmt: "{requestID} {threadID} {serverName} {serviceName} {instanceUUID} {upperLogLevel} {severity} {serverIPAddress} {server} {IPAddress} {className} {timer} {detailMessage}"
-    datefmt: "%Y-%m-%d %H:%M:%S"
-    (): onaplogging.mdcformatter.MDCFormatter
+    format: "%(mdc)s"
+    datefmt: "%Y-%m-%dT%H:%M:%S"
+    mdcfmt: "%(asctime)s.%(msecs)03d+00:00|{requestID}|%(threadName)s|{server}|%(levelname)s|%(message)s"
+    (): osdf.logging.oof_mdc_formatter.OOFMDCFormatter
   errorFormat:
-    format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s"
-    mdcfmt: "{requestID} {threadID} {serviceName} {partnerName} {targetEntity} {targetServiceName} {errorCode} {errorDescription} {detailMessage}"
-    datefmt: "%Y-%m-%d %H:%M:%S"
-    (): onaplogging.mdcformatter.MDCFormatter
+    format: "%(mdc)s"
+    datefmt: "%Y-%m-%dT%H:%M:%S"
+    mdcfmt: "%(asctime)s.%(msecs)03d+00:00|{requestID}|%(threadName)s|{serviceName}|{partnerName}\
+    |{targetEntity}|{targetServiceName}|%(levelname)s|{errorCode}|{errorDescription}|%(message)s"
+    (): osdf.logging.oof_mdc_formatter.OOFMDCFormatter
   auditFormat:
-    format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s"
-    mdcfmt: "{requestID} {serviceInstanceID} {threadID} {serverName} {serviceName} {partnerName} {statusCode} {responseCode} {responseDescription} {instanceUUID} {upperLogLevel} {severity} \
-             {serverIPAddress} {timer} {server} {IPAddress} {className} {unused} {processKey} {customField1} {customField2} {customField3} {customField4} {detailMessage}"
-    datefmt: "%Y-%m-%d %H:%M:%S"
-    (): onaplogging.mdcformatter.MDCFormatter
+    format: "%(mdc)s"
+    datefmt: "%Y-%m-%dT%H:%M:%S"
+    mdcfmt: "{entryTimestamp}+00:00|%(asctime)s.%(msecs)03d+00:00|{requestID}|{serviceInstanceID}\
+        |%(threadName)s|{server}|{serviceName}|{partnerName}|{statusCode}|{responseCode}|{responseDescription}\
+        |{instanceUUID}|%(levelname)s|{severity}|{serverIPAddress}|{timer}|{server}|{IPAddress}||{unused}\
+        |{processKey}|{customField1}|{customField2}|{customField3}|{customField4}|%(message)s"
+    (): osdf.logging.oof_mdc_formatter.OOFMDCFormatter
   metricsFormat:
-    format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s"
-    mdcfmt: "{requestID} {serviceInstanceID} {threadID} {serverName} {serviceName} {partnerName} \
-             {targetEntity} {targetServiceName} {statusCode} {responseCode} {responseDescription} \
-             {instanceUUID} {upperLogLevel} {severity} {serverIPAddress} {timer} {server} {IPAddress} \
-             {className} {unused} {processKey} {targetVirtualEntity} {customField1} {customField2} \
-             {customField3} {customField4} {detailMessage}"
-    datefmt: "%Y-%m-%d %H:%M:%S"
-    (): onaplogging.mdcformatter.MDCFormatter
-
+    format: "%(mdc)s"
+    datefmt: "%Y-%m-%dT%H:%M:%S"
+    mdcfmt: "{entryTimestamp}+00:00|%(asctime)s.%(msecs)03d+00:00|{requestID}|{serviceInstanceID}\
+        |%(threadName)s|{server}|{serviceName}|{partnerName}|{targetEntity}|{targetServiceName}|{statusCode}|{responseCode}|{responseDescription}\
+        |{instanceUUID}|%(levelname)s|{severity}|{serverIPAddress}|{timer}|{server}|{IPAddress}||{unused}\
+        |{processKey}|{TargetVirtualEntity}|{customField1}|{customField2}|{customField3}|{customField4}|%(message)s"
+    (): osdf.logging.oof_mdc_formatter.OOFMDCFormatter
   mdcFormat:
-    format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s"
-    mdcfmt: "{requestID} {invocationID} {serviceName} {serviceIP}"
-    datefmt: "%Y-%m-%d %H:%M:%S"
-    (): onaplogging.mdcformatter.MDCFormatter
+    format: "%(asctime)s.%(msecs)03d+00:00|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s"
+    mdcfmt: "{requestID} {invocationID} {serviceName} {serverIPAddress}"
+    (): osdf.logging.oof_mdc_formatter.OOFMDCFormatter
diff --git a/test/logging/test_osdf_logging.py b/test/logging/test_osdf_logging.py
index 50689dd..c8fa3ae 100755
--- a/test/logging/test_osdf_logging.py
+++ b/test/logging/test_osdf_logging.py
@@ -16,13 +16,11 @@
 # -------------------------------------------------------------------------
 #
 import unittest
-import json
-import yaml
+from unittest import mock
 
 from osdf.logging import osdf_logging as L1
-from osdf.logging.osdf_logging import OOF_OSDFLogMessageHelper as MH
-from osdf.logging.osdf_logging import OOF_OSDFLogMessageFormatter as formatter
-from unittest import mock
+from osdf.logging.osdf_logging import OOFOSDFLogMessageFormatter as formatter
+from osdf.logging.osdf_logging import OOFOSDFLogMessageHelper as MH
 
 
 class TestOSDFLogging(unittest.TestCase):
@@ -46,7 +44,7 @@ class TestOSDFLogging(unittest.TestCase):
         self.F = formatter
 
     def test_format_exception(self):
-        res = L1.format_exception(Exception("Some error"))
+        L1.format_exception(Exception("Some error"))
 
     def test_accepted_valid_request(self):
         res = formatter.accepted_valid_request(self.req_id, self.request)
@@ -91,7 +89,7 @@ class TestOSDFLogging(unittest.TestCase):
     def test_error_calling_back(self):
         res = formatter.error_calling_back(self.service_name, self.callback_url, self.err)
         assert res.startswith("Error while posting result to callback URL")
-        
+
     def test_calling_back(self):
         res = formatter.calling_back(self.req_id, self.callback_url)
         assert res.startswith("Posting result to callback URL")
@@ -167,4 +165,3 @@ class TestOSDFLogging(unittest.TestCase):
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/test/mainapp/test_osdfapp.py b/test/mainapp/test_osdfapp.py
index d1f6d7e..e4f12e6 100644
--- a/test/mainapp/test_osdfapp.py
+++ b/test/mainapp/test_osdfapp.py
@@ -17,20 +17,25 @@
 #
 
 import unittest
+from unittest import TestCase
+from unittest import mock
+from unittest.mock import patch
+
+from requests import Request
+from requests import RequestException
+from schematics.exceptions import DataError
 
 from osdf.apps import baseapp
+from osdf.apps.baseapp import app
 from osdf.operation.exceptions import BusinessException
-from requests import Request, RequestException
-from schematics.exceptions import DataError
-from unittest import mock, TestCase
-from unittest.mock import patch
 
 
 class TestOSDFApp(TestCase):
 
     def setUp(self):
-        self.patcher_g = patch('osdf.apps.baseapp.g', return_value={'request_id':'DUMMY-REQ'})
-        self.Mock_g = self.patcher_g.start()
+        with app.app_context():
+            self.patcher_g = patch('osdf.apps.baseapp.g', return_value={'request_id': 'DUMMY-REQ'})
+            self.Mock_g = self.patcher_g.start()
         # self.patcher2 = patch('package.module.Class2')
         # self.MockClass2 = self.patcher2.start()
 
@@ -45,7 +50,7 @@ class TestOSDFApp(TestCase):
         e.response.content = "Some request exception occurred"
         # request().raise_for_status.side_effect = e
         return e
- 
+
     def test_handle_business_exception(self):
         e = BusinessException("Business Exception Description")
         resp = baseapp.handle_business_exception(e)
@@ -67,9 +72,8 @@ class TestOSDFApp(TestCase):
         assert resp.status_code == 500
 
     def test_get_options_default(self):
-        opts = baseapp.get_options(["PROG"])  # ensure nothing breaks
+        baseapp.get_options(["PROG"])  # ensure nothing breaks
 
 
 if __name__ == "__main__":
     unittest.main()
-