diff options
author | Alex Shatov <alexs@att.com> | 2020-02-27 12:45:54 -0500 |
---|---|---|
committer | Alex Shatov <alexs@att.com> | 2020-02-27 12:45:54 -0500 |
commit | 78ff88f9b3a3d32f941b3b9fedc2abfbaba291cb (patch) | |
tree | 5670dddc0e0cd9f793d419420b61ad0559639497 /tests/main/conftest.py | |
parent | 715fc8a36ac1809cd3e36cbb6cfb7107ebb038ea (diff) |
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
Diffstat (limited to 'tests/main/conftest.py')
-rw-r--r-- | tests/main/conftest.py | 79 |
1 files changed, 62 insertions, 17 deletions
diff --git a/tests/main/conftest.py b/tests/main/conftest.py index c985380..11f5d0b 100644 --- a/tests/main/conftest.py +++ b/tests/main/conftest.py @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2019-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. @@ -15,42 +15,87 @@ # ============LICENSE_END========================================================= # """ -startdard pytest file that contains the shared fixtures +standard pytest file that contains the shared fixtures https://docs.pytest.org/en/latest/fixture.html """ -import pytest +import time +import pytest from policyhandler import pdp_client -from policyhandler.pdp_api.pdp_consts import PDP_POLICY_ID, PDP_REQ_RESOURCE +from policyhandler.deploy_handler import DeployHandler +from policyhandler.onap.audit import Audit +from policyhandler.pdp_api.dmaap_mr import DmaapMr from policyhandler.utils import Utils from ..mock_tracker import MockHttpResponse -from .mock_policy_engine import MockPolicyEngine _LOGGER = Utils.get_logger(__file__) -@pytest.fixture(scope="session", autouse=True) -def _auto_setup_policy_engine(): - """initialize the mock-policy-engine per the whole test session""" - _LOGGER.info("create _auto_setup_policy_engine") - MockPolicyEngine.init() - yield _auto_setup_policy_engine - _LOGGER.info("teardown _auto_setup_policy_engine") - @pytest.fixture() def fix_pdp_post(monkeypatch): """monkeyed request /decision/v1 to PDP""" def monkeyed_policy_rest_post(uri, json=None, **kwargs): """monkeypatch for the POST to policy-engine""" - policy_ids = json.get(PDP_REQ_RESOURCE, {}).get(PDP_POLICY_ID) - policy_id = policy_ids and policy_ids[0] - res_json = MockPolicyEngine.get_policy(policy_id) - return MockHttpResponse("post", uri, res_json, json=json, **kwargs) + return MockHttpResponse("post", uri, 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) yield fix_pdp_post _LOGGER.info("teardown fix_pdp_post") + +@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, **kwargs) + + def monkeyed_deploy_handler_get(uri, **kwargs): + """monkeypatch policy-update request.get to deploy_handler""" + return MockHttpResponse("get", uri, **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_dmaap_mr(monkeypatch): + """monkeyed requests to dmaap_mr""" + def monkeyed_dmaap_mr_get(uri, **kwargs): + """monkeypatch policy-update request.get to dmaap_mr""" + if kwargs.get("params"): + _LOGGER.info("--- fix_dmaap_mr --- sleeping 3 secs...") + time.sleep(3) + else: + _LOGGER.info("--- fix_dmaap_mr --- sleeping 0.5 secs...") + time.sleep(0.5) + _LOGGER.info("--- fix_dmaap_mr --- send back the response") + return MockHttpResponse("get", uri, **kwargs) + + _LOGGER.info("setup fix_dmaap_mr") + audit = Audit(req_message="fix_dmaap_mr") + DmaapMr._lazy_inited = False + DmaapMr._lazy_init(audit) + + monkeypatch.setattr('policyhandler.pdp_api.dmaap_mr.DmaapMr._requests_session.get', + monkeyed_dmaap_mr_get) + + yield fix_dmaap_mr + audit.audit_done("teardown") + _LOGGER.info("teardown fix_dmaap_mr") |