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, 8 deletions

diff --git a/policyhandler/step_timer.py b/policyhandler/step_timer.py
index 0f4f8e4..5ed4af5 100644
--- a/policyhandler/step_timer.py
+++ b/policyhandler/step_timer.py
@@ -1,5 +1,5 @@
 # ================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-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,7 +14,6 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 """periodically callback"""
 
@@ -22,6 +21,9 @@ import json
 from datetime import datetime
 from threading import Event, RLock, Thread
 
+from .utils import Utils
+
+_LOGGER = Utils.get_logger(__file__)
 
 class StepTimer(Thread):
     """call on_time after interval number of seconds, then wait to continue"""
@@ -32,12 +34,11 @@ class StepTimer(Thread):
     STATE_STOPPING = "stopping"
     STATE_STOPPED = "stopped"
 
-    def __init__(self, name, interval, on_time, logger, *args, **kwargs):
+    def __init__(self, name, interval, on_time, *args, **kwargs):
         """create step timer with controlled start. next step and pause"""
         Thread.__init__(self, name=name)
         self._interval = interval
         self._on_time = on_time
-        self._logger = logger
         self._args = args
         self._kwargs = kwargs
 
@@ -110,8 +111,8 @@ class StepTimer(Thread):
             utcnow = datetime.utcnow()
             self._req_time = (utcnow - self._req_ts).total_seconds()
             self._req_ts = utcnow
-            self._logger.info("{0}[{1}] {2}->{3}".format(
-                self.name, self._req_time, prev_req, self.get_timer_status()))
+            _LOGGER.info("{}[{}] {}->{}".format(self.name, self._req_time, prev_req,
+                                                self.get_timer_status()))
 
     def _log_substep(self, substep):
         """log timer substep"""
@@ -120,7 +121,8 @@ class StepTimer(Thread):
             utcnow = datetime.utcnow()
             self._substep_time = (utcnow - self._substep_ts).total_seconds()
             self._substep_ts = utcnow
-            self._logger.info("[{0}] {1}".format(self._substep_time, self.get_timer_status()))
+            _LOGGER.info("{}[{}] {}".format(self.name, self._substep_time,
+                                            self.get_timer_status()))
 
     def _on_time_event(self):
         """execute the _on_time event"""
@@ -135,7 +137,7 @@ class StepTimer(Thread):
             error_msg = ("{0}: crash {1} {2} at {3}: args({4}), kwargs({5})"
                          .format(self.name, type(ex).__name__, str(ex), "_on_time",
                                  json.dumps(self._args), json.dumps(self._kwargs)))
-            self._logger.exception(error_msg)
+            _LOGGER.exception(error_msg)
 
     def run(self):
         """loop one step a time until stopped=finished"""