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, 10 insertions, 12 deletions

diff --git a/policyhandler/discovery.py b/policyhandler/discovery.py
index 4c5b64e..83f54ac 100644
--- a/policyhandler/discovery.py
+++ b/policyhandler/discovery.py
@@ -1,5 +1,5 @@
 # ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 """client to talk to consul services and kv"""
 
 import base64
 import json
-import logging
 
 import requests
 
 from .config import Config
 from .customize import CustomizerUser
 from .onap.audit import AuditHttpCode, Metrics
+from .utils import Utils
 
+_LOGGER = Utils.get_logger(__file__)
 
 class DiscoveryClient(object):
     """talking to consul at Config.consul_url
@@ -51,13 +51,12 @@ class DiscoveryClient(object):
     CONSUL_ENTITY = "consul"
     CONSUL_SERVICE_MASK = "{}/v1/catalog/service/{}"
     CONSUL_KV_MASK = "{}/v1/kv/{}"
-    _logger = logging.getLogger("policy_handler.discovery")
 
     @staticmethod
     def _discover_service(audit, service_name, service_path):
         """find the service record in consul"""
         response = requests.get(service_path, timeout=Config.consul_timeout_in_secs)
-        DiscoveryClient._logger.info(audit.info("response {} from {}: {}".format(
+        _LOGGER.info(audit.info("response {} from {}: {}".format(
             response.status_code, service_path, response.text)))
 
         response.raise_for_status()
@@ -75,7 +74,7 @@ class DiscoveryClient(object):
 
         log_line = "get from {} at {}".format(DiscoveryClient.CONSUL_ENTITY, service_path)
 
-        DiscoveryClient._logger.info(metrics.metrics_start(log_line))
+        _LOGGER.info(metrics.metrics_start(log_line))
         status_code = None
         try:
             (status_code,
@@ -86,7 +85,7 @@ class DiscoveryClient(object):
                           else AuditHttpCode.SERVER_INTERNAL_ERROR.value)
             error_msg = ("failed {}/{} to {} {}: {}".format(status_code, error_code, log_line,
                                                             type(ex).__name__, str(ex)))
-            DiscoveryClient._logger.exception(error_msg)
+            _LOGGER.exception(error_msg)
             metrics.set_http_status_code(error_code)
             audit.set_http_status_code(error_code)
             metrics.metrics(error_msg)
@@ -95,15 +94,14 @@ class DiscoveryClient(object):
         if not service_url:
             error_code = AuditHttpCode.DATA_ERROR.value
             error_msg = "failed {}/{} to {}".format(status_code, error_code, log_line)
-            DiscoveryClient._logger.error(audit.error(error_msg))
+            _LOGGER.error(audit.error(error_msg))
             metrics.set_http_status_code(error_code)
             audit.set_http_status_code(error_code)
             metrics.metrics(error_msg)
             return None
 
         log_line = "response {} {}".format(status_code, log_line)
-        DiscoveryClient._logger.info(audit.info("got service_url: {} after {}"
-                                                .format(service_url, log_line)))
+        _LOGGER.info(audit.info("got service_url: {} after {}".format(service_url, log_line)))
 
         metrics.set_http_status_code(status_code)
         audit.set_http_status_code(status_code)
@@ -128,7 +126,7 @@ class DiscoveryClient(object):
 
         log_line = "get from {} at {}".format(DiscoveryClient.CONSUL_ENTITY, discovery_url)
 
-        DiscoveryClient._logger.info(metrics.metrics_start(log_line))
+        _LOGGER.info(metrics.metrics_start(log_line))
         status_code = None
         try:
             status_code, value = DiscoveryClient._get_value_from_kv(discovery_url)
@@ -138,7 +136,7 @@ class DiscoveryClient(object):
                           else AuditHttpCode.SERVER_INTERNAL_ERROR.value)
             error_msg = ("failed {}/{} to {} {}: {}".format(status_code, error_code, log_line,
                                                             type(ex).__name__, str(ex)))
-            DiscoveryClient._logger.exception(error_msg)
+            _LOGGER.exception(error_msg)
             metrics.set_http_status_code(error_code)
             audit.set_http_status_code(error_code)
             metrics.metrics(error_msg)