diff options
Diffstat (limited to 'tests/pdp_api_v0/test_pz_ph_boom.py')
-rw-r--r-- | tests/pdp_api_v0/test_pz_ph_boom.py | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/tests/pdp_api_v0/test_pz_ph_boom.py b/tests/pdp_api_v0/test_pz_ph_boom.py index 4203110..432450c 100644 --- a/tests/pdp_api_v0/test_pz_ph_boom.py +++ b/tests/pdp_api_v0/test_pz_ph_boom.py @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-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. @@ -23,9 +23,9 @@ import uuid import cherrypy import pytest 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, AuditHttpCode) from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME from policyhandler.policy_receiver import PolicyReceiver @@ -81,10 +81,6 @@ class WebServerInternalBoom2018Test(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(AuditHttpCode.SERVER_INTERNAL_ERROR.value) result = self.getPage("/healthcheck") @@ -97,20 +93,18 @@ class WebServerInternalBoom2018Test(CPWebCase): match_to_policy_name = MockPolicyEngine2018.scope_prefix + "amet.*" 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(AuditHttpCode.SERVER_INTERNAL_ERROR.value) result = self.getPage("/healthcheck") @@ -121,10 +115,6 @@ class WebServerInternalBoom2018Test(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() audit = Audit(job_name="test_zzz_policy_updates_and_catch_ups", @@ -153,10 +143,6 @@ class WebServerInternalBoom2018Test(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", @@ -192,10 +178,6 @@ class WebServerInternalBoom2018Test(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") @@ -249,8 +231,4 @@ class WebServerInternalBoom2018Test(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() |