5.1.0 policy-handler - policy-updates from new PDP5.1.0

DCAEGEN2-1851:
- policy-handler now supports the policy-update notification
  from the new policy-engine thru DMaaP MR
  = no policy-filters - only policy-id values
- see README for discoverable config settings of dmaap_mr client
  = DMaaP MR client has the same flexibility as policy_engine
  = set the query.timeout to high value like 15000 (default)
- requests to DMaaP MR go through a single blocking connection
- first catch-up only after draining the policy-updates from DMaaP MR
  on the first loop
- safe parsing of messages from DMaaP MR
- policy-engine changed the data type for policy-version field
  from int to string that is expected to have the semver value
- related change to deployment-handler (DCAEGEN2-2085) has to be
  deployed to handle the non-numeric policyVersion
- on new PDP API: http /policy_latest and policy-updates
  return the new data from the new PDP API with the following fields
  added/renamed by the policy-handler to keep other policy related parts
  intact in R4-R6 (see pdp_api/policy_utils.py)
  * policyName = policy_id + "." + policyVersion.replace(".","-")
                                 + ".xml"
  * policyVersion = str(metadata["policy-version"])
  * "config" - is the renamed "properties" from the new PDP API response
- enabled the /catch_up and the periodic auto-catch-up for the new PDP
  API
- enabled GET /policies_latest - returns the latest policies for the
  deployed components
- POST /policies_latest - still disabled since no support for the
  policy-filters is provided for the new PDP API
- fixed hiding the Authorization value on comparing the configs
- logging of secrets is now sha256 to see whether they changed
- added X-ONAP-RequestID to headers the same way as X-ECOMP-RequestID
- on policy-update process the removal first, then addition
- changed the pool_connections=1 (number of pools) on PDP and DH sides
  == only a single destination is expected for each
- log the exception as fatal into error.log
- other minor fixes and refactoring
- unit-test coverage 74%
- integration testing is requested

DCAEGEN2-1976:
- policy-handler is enhanced to get user/password from env vars
  for PDP and DMaaP MR clients and overwriting the Authorization field
  in https headers received from the discoverable config
  = to override the Authorization value on policy_engine,
    set the environment vars $PDP_USER and $PDP_PWD in policy-handler
    container
  = to override the Authorization value on dmaap_mr,
    if using https and user-password authentication,
    set the environment vars $DMAAP_MR_USER and $DMAAP_MR_PWD in
    policy-handler container

Change-Id: Iad8eab9e20e615a0e0d2822f4735dc64c50aa55c
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-1851
Issue-ID: DCAEGEN2-1976

1 files changed, 10 insertions, 31 deletions

diff --git a/tests/pdp_api_v0/test_policyhandler.py b/tests/pdp_api_v0/test_policyhandler.py
index 2b2629b..06de265 100644
--- a/tests/pdp_api_v0/test_policyhandler.py
+++ b/tests/pdp_api_v0/test_policyhandler.py
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2020 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.
@@ -21,12 +21,13 @@ import json
 import time
 import uuid
 
-import cherrypy
 import pytest
-from cherrypy.test.helper import CPWebCase
 
+import cherrypy
+from cherrypy.test.helper import CPWebCase
 from policyhandler.config import Config
-from policyhandler.onap.audit import REQUEST_X_ECOMP_REQUESTID, Audit
+from policyhandler.onap.audit import (REQUEST_X_ECOMP_REQUESTID,
+                                      REQUEST_X_ONAP_REQUESTID, Audit)
 from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME
 from policyhandler.policy_consts import LATEST_POLICIES
 from policyhandler.policy_receiver import PolicyReceiver
@@ -89,10 +90,6 @@ class WebServer2018Test(CPWebCase):
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus('200 OK')
 
         policies_latest = json.loads(self.body)
@@ -114,20 +111,18 @@ class WebServer2018Test(CPWebCase):
         expected_policies = MockPolicyEngine2018.gen_policies_latest(match_to_policy_name)
 
         body = json.dumps({POLICY_NAME: match_to_policy_name})
+        request_id = str(uuid.uuid4())
         result = self.getPage("/policies_latest", method='POST',
                               body=body,
                               headers=[
-                                  (REQUEST_X_ECOMP_REQUESTID, str(uuid.uuid4())),
+                                  (REQUEST_X_ECOMP_REQUESTID, request_id),
+                                  (REQUEST_X_ONAP_REQUESTID, request_id),
                                   ("Content-Type", "application/json"),
                                   ('Content-Length', str(len(body)))
                               ])
         _LOGGER.info("result: %s", result)
         _LOGGER.info("body: %s", self.body)
 
-        if Config.is_pdp_api_default():
-            self.assertStatus('404 Not Found')
-            return
-
         self.assertStatus('200 OK')
 
         policies_latest = json.loads(self.body)[LATEST_POLICIES]
@@ -144,10 +139,6 @@ class WebServer2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_policy_updates_and_catch_ups(self):
         """test run policy handler with policy updates and catchups"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start policy_updates_and_catch_ups")
         assert not PolicyReceiver.is_running()
 
@@ -177,10 +168,6 @@ class WebServer2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_catch_up_on_deploy_handler_changed(self):
         """test run policy handler with deployment-handler changed underneath"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start zzz_catch_up_on_deploy_handler_changed")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_catch_up_on_deploy_handler_changed",
@@ -201,8 +188,8 @@ class WebServer2018Test(CPWebCase):
         _LOGGER.info("sleep after send_notification...")
         time.sleep(3)
 
-        _LOGGER.info("sleep 5 before shutdown...")
-        time.sleep(5)
+        _LOGGER.info("sleep 3 before shutdown...")
+        time.sleep(3)
 
         result = self.getPage("/healthcheck")
         _LOGGER.info("healthcheck result: %s", result)
@@ -216,10 +203,6 @@ class WebServer2018Test(CPWebCase):
     @pytest.mark.usefixtures("fix_deploy_handler", "fix_policy_receiver_websocket")
     def test_zzz_get_catch_up(self):
         """test /catch_up"""
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         _LOGGER.info("start /catch_up")
         assert not PolicyReceiver.is_running()
         audit = Audit(job_name="test_zzz_get_catch_up", req_message="start /catch_up")
@@ -273,8 +256,4 @@ class WebServer2018Test(CPWebCase):
         time.sleep(1)
         assert not PolicyReceiver.is_running()
 
-        if Config.is_pdp_api_default():
-            _LOGGER.info("passive for new PDP API")
-            return
-
         Tracker.validate()