5.0.0 policy-handler - new PDP API or old PDP API4.0.0-ONAPdublin

- in R4 Dublin the policy-engine introduced a totally new API
- policy-handler now has a startup option to either use the new PDP API
  or the old PDP API that was created-updated before the end of 2018
- see README.md and README_pdp_api_v0.md for instructions on how to
  setup the policy-handler running either with the new PDP API
  or the old (pdp_api_v0) PDP API
- this is a massive refactoring that changed almost all the source files,
  but kept the old logic when using the old (pdp_api_v0) PDP API
- all the code related to PDP API version is split into two subfolders
  = pdp_api/ contains the new PDP API source code
  = pdp_api_v0/ contains the old (2018) PDP API source code
  = pdp_client.py imports from either pdp_api or pdp_api_v0
  = the rest of the code is only affected when it needs to branch
    the logic
- logging to policy_handler.log now shows the path of the source file to
  allow tracing which PDP API is actually used
- when the new PDP API is used, the policy-update flow is disabled
  = passive mode of operation
  = no web-socket
  = no periodic catch_up
  = no policy-filters
  = reduced web-API - only a single /policy_latest endpoint is available
    /policies_latest returns 404
    /catch_up request is accepted, but ignored
- on new PDP API: http /policy_latest returns the new data from the
  new PDP API with the following fields added by the policy-handler
  to keep other policy related parts intact in R4
  (see pdp_api/policy_utils.py)
  = "policyName" = policy_id + "." + "policyVersion" + ".xml"
  = "policyVersion" = str("metadata"."policy-version")
  = "config" - is the renamed "properties" from the new PDP API response
- unit tests are split into two subfolders as well
  = main/ for the new PDP API testing
  = pdp_api_v0/ for the old (2018) PDP API
- removed the following line from the license text of changed files
  ECOMP is a trademark and service mark of AT&T Intellectual Property.

- the new PDP API is expected to be extended and redesigned in R5 El Alto
- on retiring the old PDP API - the intention is to be able to remove
  the pdp_api_v0/ subfolder and minimal related cleanup of the code
  that imports that as well as the cleanup of the config.py, etc.

Change-Id: Ief9a2ae4541300308caaf97377f4ed051535dbe4
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-1128

1 files changed, 18 insertions, 16 deletions

diff --git a/policyhandler/onap/audit.py b/policyhandler/onap/audit.py
index db4498a..3c09c16 100644
--- a/policyhandler/onap/audit.py
+++ b/policyhandler/onap/audit.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 """generic class to keep track of request handling
  from receiving it through reponse and log all the activities
@@ -68,6 +67,7 @@ class AuditHttpCode(Enum):
     PERMISSION_UNAUTHORIZED_ERROR = 401
     PERMISSION_FORBIDDEN_ERROR = 403
     RESPONSE_ERROR = 400
+    PAGE_NOT_FOUND_ERROR = 404
     SERVER_INTERNAL_ERROR = 500
     SERVICE_UNAVAILABLE_ERROR = 503
     DATA_ERROR = 1030
@@ -94,7 +94,8 @@ class AuditResponseCode(Enum):
         elif http_status_code in [AuditHttpCode.PERMISSION_UNAUTHORIZED_ERROR.value,
                                   AuditHttpCode.PERMISSION_FORBIDDEN_ERROR.value]:
             response_code = AuditResponseCode.PERMISSION_ERROR
-        elif http_status_code == AuditHttpCode.SERVICE_UNAVAILABLE_ERROR.value:
+        elif http_status_code in [AuditHttpCode.SERVICE_UNAVAILABLE_ERROR.value,
+                                  AuditHttpCode.PAGE_NOT_FOUND_ERROR.value]:
             response_code = AuditResponseCode.AVAILABILITY_ERROR
         elif http_status_code == AuditHttpCode.SERVER_INTERNAL_ERROR.value:
             response_code = AuditResponseCode.BUSINESS_PROCESS_ERROR
@@ -125,9 +126,9 @@ class _Audit(object):
 
     :kwargs: - put any request related params into kwargs
     """
-    _service_name = ""
+    SERVICE_INSTANCE_UUID = str(uuid.uuid4())
+    service_name = ""
     _service_version = ""
-    _service_instance_uuid = str(uuid.uuid4())
     _started = datetime.utcnow()
     _key_format = re.compile(r"\W")
     _logger_debug = None
@@ -144,15 +145,15 @@ class _Audit(object):
     @staticmethod
     def init(service_name, config_file_path):
         """init static invariants and loggers"""
-        _Audit._service_name = service_name
+        _Audit.service_name = service_name
         _Audit._logger_debug = CommonLogger(config_file_path, "debug", \
-            instanceUUID=_Audit._service_instance_uuid, serviceName=_Audit._service_name)
+            instanceUUID=_Audit.SERVICE_INSTANCE_UUID, serviceName=_Audit.service_name)
         _Audit._logger_error = CommonLogger(config_file_path, "error", \
-            instanceUUID=_Audit._service_instance_uuid, serviceName=_Audit._service_name)
+            instanceUUID=_Audit.SERVICE_INSTANCE_UUID, serviceName=_Audit.service_name)
         _Audit._logger_metrics = CommonLogger(config_file_path, "metrics", \
-            instanceUUID=_Audit._service_instance_uuid, serviceName=_Audit._service_name)
+            instanceUUID=_Audit.SERVICE_INSTANCE_UUID, serviceName=_Audit.service_name)
         _Audit._logger_audit = CommonLogger(config_file_path, "audit", \
-            instanceUUID=_Audit._service_instance_uuid, serviceName=_Audit._service_name)
+            instanceUUID=_Audit.SERVICE_INSTANCE_UUID, serviceName=_Audit.service_name)
         ProcessInfo.init()
         try:
             _Audit._service_version = subprocess.check_output(
@@ -175,7 +176,7 @@ class _Audit(object):
         :req_message: is the request message string for logging
         :kwargs: - put any request related params into kwargs
         """
-        self.job_name = _Audit._key_format.sub('_', job_name or req_message or _Audit._service_name)
+        self.job_name = _Audit._key_format.sub('_', job_name or req_message or _Audit.service_name)
         self.request_id = request_id
         self.req_message = req_message or ""
         self.kwargs = kwargs or {}
@@ -200,9 +201,9 @@ class _Audit(object):
         utcnow = datetime.utcnow()
         health = {
             "server" : {
-                "service_name" : _Audit._service_name,
+                "service_name" : _Audit.service_name,
                 "service_version" : _Audit._service_version,
-                "service_instance_uuid" : _Audit._service_instance_uuid
+                "service_instance_uuid" : _Audit.SERVICE_INSTANCE_UUID
             },
             "runtime" : {
                 "started" : str(_Audit._started),
@@ -214,11 +215,12 @@ class _Audit(object):
                 "process_memory" : ProcessInfo.process_memory()
             },
             "stats" : _Audit._health.dump(),
-            "items" : dict((health_name, health_getter())
-                           for health_name, health_getter in _Audit._health_checkers.items()),
             "soft" : {"python" : _Audit._py_ver, "packages" : _Audit._packages}
         }
-        self.info("{} health: {}".format(_Audit._service_name,
+        health.update(dict((health_name, health_getter())
+                           for health_name, health_getter in _Audit._health_checkers.items())
+                     )
+        self.info("{} health: {}".format(_Audit.service_name,
                                          json.dumps(health, sort_keys=True)))
         return health
 
@@ -226,7 +228,7 @@ class _Audit(object):
     def process_info(self):
         """get the debug info on all the threads and memory"""
         process_info = ProcessInfo.get_all()
-        self.info("{} process_info: {}".format(_Audit._service_name, json.dumps(process_info)))
+        self.info("{} process_info: {}".format(_Audit.service_name, json.dumps(process_info)))
         return process_info