diff options
Diffstat (limited to 'tests/pdp_api_v0')
| -rw-r--r-- | tests/pdp_api_v0/conftest.py | 105 | ||||
| -rw-r--r-- | tests/pdp_api_v0/expectations.json (renamed from tests/pdp_api_v0/mock_expected.py) | 644 | ||||
| -rw-r--r-- | tests/pdp_api_v0/mock_deploy_handler.py | 53 | ||||
| -rw-r--r-- | tests/pdp_api_v0/mock_websocket.py | 6 | ||||
| -rw-r--r-- | tests/pdp_api_v0/test_policy_rest_auth.py | 47 | ||||
| -rw-r--r-- | tests/pdp_api_v0/test_policyhandler.py | 41 | ||||
| -rw-r--r-- | tests/pdp_api_v0/test_pz_catch_up.py | 11 | ||||
| -rw-r--r-- | tests/pdp_api_v0/test_pz_pdp_boom.py | 34 | ||||
| -rw-r--r-- | tests/pdp_api_v0/test_pz_ph_boom.py | 34 |
9 files changed, 701 insertions, 274 deletions
diff --git a/tests/pdp_api_v0/conftest.py b/tests/pdp_api_v0/conftest.py index 07e566f..8220778 100644 --- a/tests/pdp_api_v0/conftest.py +++ b/tests/pdp_api_v0/conftest.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. @@ -22,11 +22,14 @@ https://docs.pytest.org/en/latest/fixture.html import pytest from policyhandler import pdp_client +from policyhandler.deploy_handler import DeployHandler +from policyhandler.onap.audit import Audit from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME from policyhandler.utils import Utils from ..mock_settings import MockSettings from ..mock_tracker import MockHttpResponse +from .mock_deploy_handler import MockDeploymentHandler from .mock_policy_engine import MockPolicyEngine2018 from .mock_websocket import MockWebSocket @@ -57,9 +60,10 @@ def fix_pdp_post(monkeypatch): def monkeyed_policy_rest_post(uri, json=None, **kwargs): """monkeypatch for the POST to policy-engine""" res_json = MockPolicyEngine2018.get_config(json.get(POLICY_NAME)) - return MockHttpResponse("post", uri, res_json, json=json, **kwargs) + return MockHttpResponse("post", uri, res_json=res_json, json=json, **kwargs) _LOGGER.info("setup fix_pdp_post") + pdp_client.PolicyRest._lazy_inited = False pdp_client.PolicyRest._lazy_init() monkeypatch.setattr('policyhandler.pdp_client.PolicyRest._requests_session.post', monkeyed_policy_rest_post) @@ -72,9 +76,10 @@ def fix_pdp_post_big(monkeypatch): def monkeyed_policy_rest_post(uri, **kwargs): """monkeypatch for the POST to policy-engine""" res_json = MockPolicyEngine2018.get_configs_all() - return MockHttpResponse("post", uri, res_json, **kwargs) + return MockHttpResponse("post", uri, res_json=res_json, **kwargs) _LOGGER.info("setup fix_pdp_post_big") + pdp_client.PolicyRest._lazy_inited = False pdp_client.PolicyRest._lazy_init() monkeypatch.setattr('policyhandler.pdp_client.PolicyRest._requests_session.post', monkeyed_policy_rest_post) @@ -94,6 +99,7 @@ def fix_pdp_post_boom(monkeypatch): raise MockException("fix_pdp_post_boom {}".format(uri)) _LOGGER.info("setup fix_pdp_post_boom") + pdp_client.PolicyRest._lazy_inited = False pdp_client.PolicyRest._lazy_init() monkeypatch.setattr('policyhandler.pdp_client.PolicyRest._requests_session.post', monkeyed_policy_rest_post_boom) @@ -131,3 +137,96 @@ def fix_select_latest_policies_boom(monkeypatch): yield fix_select_latest_policies_boom _LOGGER.info("teardown fix_select_latest_policies_boom at %s", policy_utils_path) + +@pytest.fixture() +def fix_deploy_handler(monkeypatch): + """monkeyed requests to deployment-handler""" + def monkeyed_deploy_handler_put(uri, **kwargs): + """monkeypatch for policy-update request.put to deploy_handler""" + return MockHttpResponse("put", uri, res_json=MockDeploymentHandler.default_response(), + **kwargs) + + def monkeyed_deploy_handler_get(uri, **kwargs): + """monkeypatch policy-update request.get to deploy_handler""" + return MockHttpResponse("get", uri, + res_json=MockDeploymentHandler.get_deployed_policies(), + **kwargs) + + _LOGGER.info("setup fix_deploy_handler") + audit = None + if DeployHandler._lazy_inited is False: + audit = Audit(req_message="fix_deploy_handler") + DeployHandler._lazy_init(audit) + + monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put', + monkeyed_deploy_handler_put) + monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get', + monkeyed_deploy_handler_get) + + yield fix_deploy_handler + if audit: + audit.audit_done("teardown") + _LOGGER.info("teardown fix_deploy_handler") + + +@pytest.fixture() +def fix_deploy_handler_413(monkeypatch): + """monkeyed failed discovery request.get""" + def monkeyed_deploy_handler_put(uri, **kwargs): + """monkeypatch for deploy_handler""" + return MockHttpResponse( + "put", uri, + res_json={"server_instance_uuid": MockSettings.deploy_handler_instance_uuid}, + status_code=413, **kwargs + ) + + def monkeyed_deploy_handler_get(uri, **kwargs): + """monkeypatch policy-update request.get to deploy_handler""" + return MockHttpResponse("get", uri, res_json=MockDeploymentHandler.get_deployed_policies(), + **kwargs) + + _LOGGER.info("setup fix_deploy_handler_413") + audit = None + if DeployHandler._lazy_inited is False: + audit = Audit(req_message="fix_deploy_handler_413") + DeployHandler._lazy_init(audit) + + monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put', + monkeyed_deploy_handler_put) + monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get', + monkeyed_deploy_handler_get) + + yield fix_deploy_handler_413 + if audit: + audit.audit_done("teardown") + _LOGGER.info("teardown fix_deploy_handler_413") + + +@pytest.fixture() +def fix_deploy_handler_404(monkeypatch): + """monkeyed failed discovery request.get""" + def monkeyed_deploy_handler_put(uri, **kwargs): + """monkeypatch for deploy_handler""" + return MockHttpResponse("put", uri, res_json=MockDeploymentHandler.default_response(), + **kwargs) + + def monkeyed_deploy_handler_get(uri, **kwargs): + """monkeypatch policy-update request.get to deploy_handler""" + return MockHttpResponse("get", uri, res_json=MockDeploymentHandler.default_response(), + **kwargs) + + _LOGGER.info("setup fix_deploy_handler_404") + audit = None + if DeployHandler._lazy_inited is False: + audit = Audit(req_message="fix_deploy_handler_404") + DeployHandler._lazy_init(audit) + + monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.put', + monkeyed_deploy_handler_put) + monkeypatch.setattr('policyhandler.deploy_handler.DeployHandler._requests_session.get', + monkeyed_deploy_handler_get) + + yield fix_deploy_handler_404 + if audit: + audit.audit_done("teardown") + _LOGGER.info("teardown fix_deploy_handler_404") diff --git a/tests/pdp_api_v0/mock_expected.py b/tests/pdp_api_v0/expectations.json index 6210e10..9c7a285 100644 --- a/tests/pdp_api_v0/mock_expected.py +++ b/tests/pdp_api_v0/expectations.json @@ -1,24 +1,5 @@ -# ============LICENSE_START======================================================= -# 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -"""expected message history per test for pdp API 2018 and before""" - - -HISTORY_EXPECTED = { - "tests/pdp_api_v0/test_policy_rest.py::test_get_policy_latest" : [ +{ + "tests/pdp_api_v0/test_policy_rest.py::test_get_policy_latest": [ { "request": { "headers": { @@ -27,13 +8,37 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_sit" }, "method": "post", - "params": None, + "params": null, + "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" + }, + "res": "*", + "status_code": 200 + } + ], + "tests/pdp_api_v0/test_policy_rest_auth.py::test_get_policy_latest": [ + { + "request": { + "headers": { + "Accept": "application/json", + "Authorization": "Basic YWxleC1QRFBfVVNFUjphbGV4LVBEUF9QV0Q=", + "ClientAuth": "Basic user", + "Content-Type": "application/json", + "Environment": "TEST", + "X-ONAP-RequestID": "*", + "X-ECOMP-RequestID": "*" + }, + "json": { + "policyName": "test_scope_prefix.Config_sit" + }, + "method": "post", + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -44,9 +49,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -64,13 +70,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -86,13 +93,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_amet.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -108,13 +116,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_sit" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -125,9 +134,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -145,13 +155,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -160,10 +171,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -181,7 +193,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -203,7 +215,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -225,7 +237,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -247,7 +259,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -269,7 +281,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -291,7 +303,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -313,7 +325,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -343,9 +355,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -363,13 +376,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -378,10 +392,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -399,7 +414,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -421,7 +436,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -443,7 +458,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -465,7 +480,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -487,7 +502,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -509,7 +524,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -531,7 +546,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -563,9 +578,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -583,13 +599,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -598,10 +615,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -619,7 +637,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -641,7 +659,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -663,7 +681,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -685,7 +703,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -707,7 +725,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -729,7 +747,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -751,7 +769,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -781,9 +799,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -801,13 +820,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_ipsum" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -821,13 +841,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_sit" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -841,13 +862,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_consectetur" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -856,10 +878,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": False, + "catch_up": false, "latest_policies": { "test_scope_prefix.Config_consectetur": { "policy_body": { @@ -877,7 +900,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -899,7 +922,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -921,7 +944,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -949,9 +972,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -969,13 +993,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -984,10 +1009,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -1005,7 +1031,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1027,7 +1053,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1049,7 +1075,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1071,7 +1097,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1093,7 +1119,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1115,7 +1141,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1137,7 +1163,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1167,9 +1193,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -1187,13 +1214,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_ipsum" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1207,13 +1235,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_sit" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1227,13 +1256,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_consectetur" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1242,10 +1272,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": False, + "catch_up": false, "latest_policies": { "test_scope_prefix.Config_consectetur": { "policy_body": { @@ -1263,7 +1294,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1285,7 +1316,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1307,7 +1338,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1335,9 +1366,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -1355,13 +1387,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1370,10 +1403,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -1391,7 +1425,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1413,7 +1447,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1435,7 +1469,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1457,7 +1491,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1479,7 +1513,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1501,7 +1535,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1523,7 +1557,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1553,9 +1587,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -1573,13 +1608,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_ipsum" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1588,10 +1624,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": False, + "catch_up": false, "latest_policies": { "test_scope_prefix.Config_ipsum": { "policy_body": { @@ -1609,7 +1646,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1633,9 +1670,231 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", + "X-ECOMP-RequestID": "*" + }, + "json": null, + "method": "get", + "params": { + "cfy_tenant_name": "default_tenant" + }, + "uri": "http://unit-test-deployment_handler:8188000/policy" + }, + "res": "*", + "status_code": 200 + }, + { + "request": { + "headers": { + "Accept": "application/json", + "Authorization": "Basic auth", + "ClientAuth": "Basic user", + "Content-Type": "application/json", + "Environment": "TEST", + "X-ONAP-RequestID": "*", + "X-ECOMP-RequestID": "*" + }, + "json": { + "policyName": "test_scope_prefix.Config_.*" + }, + "method": "post", + "params": null, + "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" + }, + "res": "*", + "status_code": 200 + }, + { + "request": { + "headers": { + "X-ONAP-RequestID": "*", + "X-ECOMP-RequestID": "*" + }, + "json": { + "catch_up": true, + "latest_policies": { + "test_scope_prefix.Config_Lorem": { + "policy_body": { + "config": { + "policy_hello": "world!", + "policy_updated_from_ver": "0", + "policy_updated_to_ver": "1", + "updated_policy_id": "test_scope_prefix.Config_Lorem" + }, + "matchingConditions": { + "ConfigName": "alex_config_name", + "ONAPName": "DCAE" + }, + "policyConfigMessage": "Config Retrieved! ", + "policyConfigStatus": "CONFIG_RETRIEVED", + "policyName": "test_scope_prefix.Config_Lorem.1.xml", + "policyVersion": "1", + "property": null, + "responseAttributes": {}, + "type": "JSON" + }, + "policy_id": "test_scope_prefix.Config_Lorem" + }, + "test_scope_prefix.Config_amet": { + "policy_body": { + "config": { + "policy_hello": "world!", + "policy_updated_from_ver": "4", + "policy_updated_to_ver": "5", + "updated_policy_id": "test_scope_prefix.Config_amet" + }, + "matchingConditions": { + "ConfigName": "alex_config_name", + "ONAPName": "DCAE" + }, + "policyConfigMessage": "Config Retrieved! ", + "policyConfigStatus": "CONFIG_RETRIEVED", + "policyName": "test_scope_prefix.Config_amet.5.xml", + "policyVersion": "5", + "property": null, + "responseAttributes": {}, + "type": "JSON" + }, + "policy_id": "test_scope_prefix.Config_amet" + }, + "test_scope_prefix.Config_ametist": { + "policy_body": { + "config": { + "policy_hello": "world!", + "policy_updated_from_ver": "6", + "policy_updated_to_ver": "7", + "updated_policy_id": "test_scope_prefix.Config_ametist" + }, + "matchingConditions": { + "ConfigName": "alex_config_name", + "ONAPName": "DCAE" + }, + "policyConfigMessage": "Config Retrieved! ", + "policyConfigStatus": "CONFIG_RETRIEVED", + "policyName": "test_scope_prefix.Config_ametist.7.xml", + "policyVersion": "7", + "property": null, + "responseAttributes": {}, + "type": "JSON" + }, + "policy_id": "test_scope_prefix.Config_ametist" + }, + "test_scope_prefix.Config_consectetur": { + "policy_body": { + "config": { + "policy_hello": "world!", + "policy_updated_from_ver": "5", + "policy_updated_to_ver": "6", + "updated_policy_id": "test_scope_prefix.Config_consectetur" + }, + "matchingConditions": { + "ConfigName": "alex_config_name", + "ONAPName": "DCAE" + }, + "policyConfigMessage": "Config Retrieved! ", + "policyConfigStatus": "CONFIG_RETRIEVED", + "policyName": "test_scope_prefix.Config_consectetur.6.xml", + "policyVersion": "6", + "property": null, + "responseAttributes": {}, + "type": "JSON" + }, + "policy_id": "test_scope_prefix.Config_consectetur" + }, + "test_scope_prefix.Config_dolor": { + "policy_body": { + "config": { + "policy_hello": "world!", + "policy_updated_from_ver": "2", + "policy_updated_to_ver": "3", + "updated_policy_id": "test_scope_prefix.Config_dolor" + }, + "matchingConditions": { + "ConfigName": "alex_config_name", + "ONAPName": "DCAE" + }, + "policyConfigMessage": "Config Retrieved! ", + "policyConfigStatus": "CONFIG_RETRIEVED", + "policyName": "test_scope_prefix.Config_dolor.3.xml", + "policyVersion": "3", + "property": null, + "responseAttributes": {}, + "type": "JSON" + }, + "policy_id": "test_scope_prefix.Config_dolor" + }, + "test_scope_prefix.Config_ipsum": { + "policy_body": { + "config": { + "policy_hello": "world!", + "policy_updated_from_ver": "1", + "policy_updated_to_ver": "2", + "updated_policy_id": "test_scope_prefix.Config_ipsum" + }, + "matchingConditions": { + "ConfigName": "alex_config_name", + "ONAPName": "DCAE" + }, + "policyConfigMessage": "Config Retrieved! ", + "policyConfigStatus": "CONFIG_RETRIEVED", + "policyName": "test_scope_prefix.Config_ipsum.2.xml", + "policyVersion": "2", + "property": null, + "responseAttributes": {}, + "type": "JSON" + }, + "policy_id": "test_scope_prefix.Config_ipsum" + }, + "test_scope_prefix.Config_sit": { + "policy_body": { + "config": { + "policy_hello": "world!", + "policy_updated_from_ver": "3", + "policy_updated_to_ver": "4", + "updated_policy_id": "test_scope_prefix.Config_sit" + }, + "matchingConditions": { + "ConfigName": "alex_config_name", + "ONAPName": "DCAE" + }, + "policyConfigMessage": "Config Retrieved! ", + "policyConfigStatus": "CONFIG_RETRIEVED", + "policyName": "test_scope_prefix.Config_sit.4.xml", + "policyVersion": "4", + "property": null, + "responseAttributes": {}, + "type": "JSON" + }, + "policy_id": "test_scope_prefix.Config_sit" + } + }, + "policy_filter_matches": { + "test_scope_prefix.Config_Lorem": {}, + "test_scope_prefix.Config_amet": {}, + "test_scope_prefix.Config_ametist": {}, + "test_scope_prefix.Config_consectetur": {}, + "test_scope_prefix.Config_dolor": {}, + "test_scope_prefix.Config_ipsum": {}, + "test_scope_prefix.Config_sit": {} + }, + "removed_policies": {} + }, + "method": "put", + "params": { + "cfy_tenant_name": "default_tenant" + }, + "uri": "http://unit-test-deployment_handler:8188000/policy" + }, + "res": "*", + "status_code": 200 + }, + { + "request": { + "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -1653,13 +1912,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_dolor" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1673,13 +1933,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_amet" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1688,10 +1949,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": False, + "catch_up": false, "latest_policies": { "test_scope_prefix.Config_amet": { "policy_body": { @@ -1709,7 +1971,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1731,7 +1993,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1756,9 +2018,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -1776,13 +2039,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -1791,10 +2055,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -1812,7 +2077,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1834,7 +2099,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1856,7 +2121,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1878,7 +2143,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1900,7 +2165,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1922,7 +2187,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1944,7 +2209,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -1976,9 +2241,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -1996,13 +2262,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2011,10 +2278,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -2027,7 +2295,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2044,7 +2312,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2061,7 +2329,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2078,7 +2346,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2095,7 +2363,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2112,7 +2380,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2129,7 +2397,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2159,9 +2427,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2179,13 +2448,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2194,10 +2464,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -2210,7 +2481,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2227,7 +2498,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2244,7 +2515,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2261,7 +2532,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2278,7 +2549,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2295,7 +2566,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2312,7 +2583,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2342,9 +2613,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2362,13 +2634,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2377,10 +2650,11 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { - "catch_up": True, + "catch_up": true, "latest_policies": { "test_scope_prefix.Config_Lorem": { "policy_body": { @@ -2393,7 +2667,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_Lorem.1.xml", "policyVersion": "1", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2410,7 +2684,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_amet.5.xml", "policyVersion": "5", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2427,7 +2701,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ametist.7.xml", "policyVersion": "7", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2444,7 +2718,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_consectetur.6.xml", "policyVersion": "6", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2461,7 +2735,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_dolor.3.xml", "policyVersion": "3", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2478,7 +2752,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_ipsum.2.xml", "policyVersion": "2", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2495,7 +2769,7 @@ HISTORY_EXPECTED = { "policyConfigStatus": "CONFIG_RETRIEVED", "policyName": "test_scope_prefix.Config_sit.4.xml", "policyVersion": "4", - "property": None, + "property": null, "responseAttributes": {}, "type": "JSON" }, @@ -2527,9 +2801,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2542,9 +2817,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2557,9 +2833,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2574,9 +2851,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2591,9 +2869,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2606,9 +2885,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2621,9 +2901,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2636,9 +2917,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2653,9 +2935,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2668,9 +2951,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2685,9 +2969,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2700,9 +2985,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2717,9 +3003,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2732,9 +3019,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2749,9 +3037,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2769,13 +3058,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2791,13 +3081,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_amet.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2813,13 +3104,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_sit" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2830,9 +3122,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2850,13 +3143,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2867,9 +3161,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2887,13 +3182,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2902,9 +3198,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2922,13 +3219,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2939,9 +3237,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2959,13 +3258,14 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", @@ -2976,9 +3276,10 @@ HISTORY_EXPECTED = { { "request": { "headers": { + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, - "json": None, + "json": null, "method": "get", "params": { "cfy_tenant_name": "default_tenant" @@ -2996,17 +3297,18 @@ HISTORY_EXPECTED = { "ClientAuth": "Basic user", "Content-Type": "application/json", "Environment": "TEST", + "X-ONAP-RequestID": "*", "X-ECOMP-RequestID": "*" }, "json": { "policyName": "test_scope_prefix.Config_.*" }, "method": "post", - "params": None, + "params": null, "uri": "https://unit-test-pdp-server:8081000/pdp/api/getConfig" }, "res": "*", "status_code": 200 } ] -} +}
\ No newline at end of file diff --git a/tests/pdp_api_v0/mock_deploy_handler.py b/tests/pdp_api_v0/mock_deploy_handler.py new file mode 100644 index 0000000..5446070 --- /dev/null +++ b/tests/pdp_api_v0/mock_deploy_handler.py @@ -0,0 +1,53 @@ +# ============LICENSE_START======================================================= +# 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +# +"""mocking for the deployment-handler - shared by many tests""" + +import json + +from policyhandler.pdp_api_v0.pdp_consts import POLICY_VERSION +from policyhandler.policy_consts import POLICY_BODY, POLICY_ID, POLICY_VERSIONS +from policyhandler.utils import Utils + +from ..mock_settings import MockSettings +from .mock_policy_engine import MockPolicyEngine2018 + +_LOGGER = Utils.get_logger(__file__) + +class MockDeploymentHandler(object): + """pretend this is the deployment-handler""" + + @staticmethod + def default_response(): + """generate the deployed policies message""" + return {"server_instance_uuid": MockSettings.deploy_handler_instance_uuid} + + @staticmethod + def get_deployed_policies(): + """generate the deployed policies message""" + all_policies = MockPolicyEngine2018.gen_all_policies_latest(version_offset=1) + _LOGGER.info("all_policies: %s", json.dumps(all_policies)) + + response = MockDeploymentHandler.default_response() + policies = dict( + (policy_id, { + POLICY_ID: policy_id, + POLICY_VERSIONS: {policy.get(POLICY_BODY, {}).get(POLICY_VERSION, "999"): True}, + "pending_update": False}) + for policy_id, policy in all_policies.items()) + response["policies"] = policies + + return response diff --git a/tests/pdp_api_v0/mock_websocket.py b/tests/pdp_api_v0/mock_websocket.py index 17f3bbe..3e3e63b 100644 --- a/tests/pdp_api_v0/mock_websocket.py +++ b/tests/pdp_api_v0/mock_websocket.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. @@ -21,8 +21,8 @@ import time from policyhandler.pdp_api_v0.pdp_consts import POLICY_NAME from policyhandler.pdp_api_v0.policy_listener import (LOADED_POLICIES, - POLICY_VER, - REMOVED_POLICIES) + POLICY_VER, + REMOVED_POLICIES) from policyhandler.utils import Utils from .mock_policy_engine import MockPolicyEngine2018 diff --git a/tests/pdp_api_v0/test_policy_rest_auth.py b/tests/pdp_api_v0/test_policy_rest_auth.py new file mode 100644 index 0000000..dd8dc83 --- /dev/null +++ b/tests/pdp_api_v0/test_policy_rest_auth.py @@ -0,0 +1,47 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +# +"""test policy_rest methods directly""" + +import json + +import pytest + +from policyhandler import pdp_client +from policyhandler.onap.audit import Audit +from policyhandler.utils import Utils + +from ..mock_tracker import Tracker +from .mock_policy_engine import MockPolicyEngine2018 + +_LOGGER = Utils.get_logger(__file__) + +@pytest.mark.usefixtures("fix_pdp_authorization", "fix_pdp_api_v0", "fix_pdp_post") +def test_get_policy_latest(): + """test /policy_latest/<policy-id>""" + policy_id, expected_policy = MockPolicyEngine2018.gen_policy_latest(3) + + audit = Audit(job_name="test_get_policy_latest", + req_message="get /policy_latest/{}".format(policy_id or "")) + + policy_latest = pdp_client.PolicyRest.get_latest_policy((audit, policy_id, None, None)) or {} + audit.audit_done(result=json.dumps(policy_latest)) + + _LOGGER.info("expected_policy: %s", json.dumps(expected_policy)) + _LOGGER.info("policy_latest: %s", json.dumps(policy_latest)) + assert Utils.are_the_same(policy_latest, expected_policy) + + Tracker.validate() 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() diff --git a/tests/pdp_api_v0/test_pz_catch_up.py b/tests/pdp_api_v0/test_pz_catch_up.py index 3b37af5..8d461e8 100644 --- a/tests/pdp_api_v0/test_pz_catch_up.py +++ b/tests/pdp_api_v0/test_pz_catch_up.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. @@ -21,7 +21,6 @@ import time import pytest -from policyhandler.config import Config from policyhandler.onap.audit import Audit from policyhandler.policy_receiver import PolicyReceiver from policyhandler.utils import Utils @@ -40,10 +39,6 @@ _LOGGER = Utils.get_logger(__file__) ) def test_catch_up_failed_dh(): """test run policy handler with catchups and failed deployment-handler""" - if Config.is_pdp_api_default(): - _LOGGER.info("passive for new PDP API") - return - _LOGGER.info("start test_catch_up_failed_dh") assert not PolicyReceiver.is_running() audit = Audit(job_name="test_catch_up_failed_dh", @@ -78,10 +73,6 @@ def test_catch_up_failed_dh(): ) def test_catch_up_dh_404(): """test run policy handler with catchups and failed deployment-handler""" - if Config.is_pdp_api_default(): - _LOGGER.info("passive for new PDP API") - return - _LOGGER.info("start test_catch_up_dh_404") assert not PolicyReceiver.is_running() audit = Audit(job_name="test_catch_up_dh_404", diff --git a/tests/pdp_api_v0/test_pz_pdp_boom.py b/tests/pdp_api_v0/test_pz_pdp_boom.py index effadc2..8ce42a7 100644 --- a/tests/pdp_api_v0/test_pz_pdp_boom.py +++ b/tests/pdp_api_v0/test_pz_pdp_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 @@ -80,10 +80,6 @@ class WebServerPDPBoom2018Test(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") @@ -96,20 +92,18 @@ class WebServerPDPBoom2018Test(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") @@ -120,10 +114,6 @@ class WebServerPDPBoom2018Test(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", @@ -152,10 +142,6 @@ class WebServerPDPBoom2018Test(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", @@ -191,10 +177,6 @@ class WebServerPDPBoom2018Test(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") @@ -248,8 +230,4 @@ class WebServerPDPBoom2018Test(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() 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() |