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, 11 insertions, 9 deletions

diff --git a/policyhandler/web_server.py b/policyhandler/web_server.py
index dc76353..dfd1b51 100644
--- a/policyhandler/web_server.py
+++ b/policyhandler/web_server.py
@@ -14,29 +14,27 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 """web-server for policy_handler"""
 
 import json
-import logging
 from datetime import datetime
 
 import cherrypy
 
+from . import pdp_client
 from .config import Config
 from .deploy_handler import PolicyUpdateMessage
 from .onap.audit import Audit, AuditHttpCode
-from .policy_matcher import PolicyMatcher
 from .policy_receiver import PolicyReceiver
-from .policy_rest import PolicyRest
+from .utils import Utils
 
 
 class PolicyWeb(object):
     """run http API of policy-handler on 0.0.0.0:wservice_port - any incoming address"""
     DATA_NOT_FOUND_ERROR = 404
     HOST_INADDR_ANY = ".".join("0"*4)
-    logger = logging.getLogger("policy_handler.policy_web")
+    logger = Utils.get_logger(__file__)
 
     @staticmethod
     def run_forever(audit):
@@ -84,7 +82,8 @@ class _PolicyWeb(object):
         PolicyWeb.logger.info("%s policy_id=%s headers=%s",
                               req_info, policy_id, json.dumps(cherrypy.request.headers))
 
-        latest_policy = PolicyRest.get_latest_policy((audit, policy_id, None, None)) or {}
+        latest_policy = pdp_client.PolicyRest.get_latest_policy(
+            (audit, policy_id, None, None)) or {}
 
         PolicyWeb.logger.info("res %s policy_id=%s latest_policy=%s",
                               req_info, policy_id, json.dumps(latest_policy))
@@ -104,9 +103,9 @@ class _PolicyWeb(object):
 
         PolicyWeb.logger.info("%s", req_info)
 
-        result, policies, policy_filters = PolicyMatcher.get_deployed_policies(audit)
+        result, policies, policy_filters = pdp_client.PolicyMatcher.get_deployed_policies(audit)
         if not result:
-            result, policy_update = PolicyMatcher.build_catch_up_message(
+            result, policy_update = pdp_client.PolicyMatcher.build_catch_up_message(
                 audit, policies, policy_filters)
             if policy_update and isinstance(policy_update, PolicyUpdateMessage):
                 result["policy_update"] = policy_update.get_message()
@@ -168,6 +167,9 @@ class _PolicyWeb(object):
             }
         }
         """
+        if Config.is_pdp_api_default():
+            raise cherrypy.HTTPError(404, "temporarily unsupported due to the new pdp API")
+
         if cherrypy.request.method == "GET":
             return self._get_all_policies_latest()
 
@@ -184,7 +186,7 @@ class _PolicyWeb(object):
         PolicyWeb.logger.info("%s: policy_filter=%s headers=%s",
                               req_info, str_policy_filter, json.dumps(cherrypy.request.headers))
 
-        result = PolicyRest.get_latest_policies(audit, policy_filter=policy_filter) or {}
+        result = pdp_client.PolicyRest.get_latest_policies(audit, policy_filter=policy_filter) or {}
         result_str = json.dumps(result, sort_keys=True)
 
         PolicyWeb.logger.info("result %s: policy_filter=%s result=%s",