diff options
author | Alex Shatov <alexs@att.com> | 2018-08-07 12:11:35 -0400 |
---|---|---|
committer | Alex Shatov <alexs@att.com> | 2018-08-07 12:11:35 -0400 |
commit | d7f34d4b71ec4d86547628cda351d20bff4d017f (patch) | |
tree | 101c7669fb5508a103894e262964da0d0c8319bc /etc_upload | |
parent | a29f70823b18f492417629f56c86f61f94b96af8 (diff) |
4.0.0 new dataflow on policy-update and catchup
- changed API and functionality - new dataflow
- new dataflow between policy-handler and deployment-handler
on policy-update and catchup
= GETting policy_ids+versions and policy-filters from
deployment-handler
= PUTting policy-update and catchup in the new message format
= data segmenting the policy-update/catchup messages to
deployment-handler to avoid 413 on deployment-handler side
= matching policies from policy-engine to policies
and policy-filters from deployment-handler
= coarsening the policyName filter received from deployment-handler
to reduce the number messages passed to policy-engine on catchup
= consolidating sequential policy-updates into a single request
when the policy-update is busy
- removed policy scope-prefixes from config and logic -
it is not needed anymore because
= the policy matching happens directly to policies and
policy-filters received from deployment-handler
= on catchup - the policy scope-prefix equivalents are calculated
based on the data received from deployment-handler
- API - GET /policies_latest now returns the info on deployed
policy_ids+versions and policy-filters, rather than policies
of the scope-prefixes previously found in config (obsolete)
- not sending an empty catch_up message to deployment-handler
when nothing changed
- send policy-removed to deployment-handler when getting
404-not found from PDP on removal of policy
- config change: removed catch_up.max_skips - obsolete
- brought the latest CommonLogger.py
- minor refactoring - improved naming of variables
Change-Id: I36b3412eefd439088cb693703a6e5f18f4238b00
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-492
Diffstat (limited to 'etc_upload')
-rw-r--r-- | etc_upload/config.json | 15 | ||||
-rw-r--r-- | etc_upload/upload_config_for_ph_in_docker.sh | 40 |
2 files changed, 7 insertions, 48 deletions
diff --git a/etc_upload/config.json b/etc_upload/config.json index aae8e84..a38d81c 100644 --- a/etc_upload/config.json +++ b/etc_upload/config.json @@ -3,29 +3,28 @@ "system" : "policy_handler", "thread_pool_size" : 4, "pool_connections" : 20, - "scope_prefixes" : ["DCAE.Config_", "CLAMP"], "policy_retry_count" : 5, "policy_retry_sleep" : 5, "catch_up" : { - "interval" : 1200, - "max_skips" : 5 + "interval" : 1200 }, "policy_engine" : { - "url" : "https://peawiv9nspd01.pedc.sbc.com:8081", - "path_pdp" :"/pdp/", + "url" : "https://policy_engine:8081", + "path_pdp" : "/pdp/", "path_api" : "/pdp/api/", "headers" : { "Accept" : "application/json", "Content-Type" : "application/json", - "ClientAuth" : "Basic bTAzOTQ5OnBvbGljeVIwY2sk", - "Authorization" : "Basic dGVzdHBkcDphbHBoYTEyMw==", + "ClientAuth" : "Basic blah", + "Authorization" : "Basic blah", "Environment" : "TEST" }, "target_entity" : "policy_engine" }, "deploy_handler" : { "target_entity" : "deployment_handler", - "url" : "http://deployment_handler:8188" + "url" : "http://deployment_handler:8188", + "max_msg_length_mb" : 5 } } } diff --git a/etc_upload/upload_config_for_ph_in_docker.sh b/etc_upload/upload_config_for_ph_in_docker.sh deleted file mode 100644 index 0854d21..0000000 --- a/etc_upload/upload_config_for_ph_in_docker.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# ================================================================================ -# Copyright (c) 2017-2018 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========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. - -echo "to upload the config to consul-kv discovery:" -echo " - place it into etc_upload/config.json" -echo " - and run this script: etc_upload/upload_config_for_ph_in_docker.sh" -echo " from main dir == on the same level as etc_upload/" - -APPNAME=policy_handler - -if [[ -n ${DOCKER_HOST} ]]; then - # DOCKER_HOSTNAME=${DOCKER_HOST//*(tcp:|:*[0-9]|\/)/} - DOCKER_HOSTNAME=${DOCKER_HOST//tcp:/} - DOCKER_HOSTNAME=${DOCKER_HOSTNAME//:*[0-9]/} - DOCKER_HOSTNAME=${DOCKER_HOSTNAME//\//} - CONSUL_HOST=${DOCKER_HOSTNAME} -else - CONSUL_HOST=devcnsl00.dcae.sic.research.att.com -fi - -echo "uploading etc_upload/config.json for ${APPNAME} to CONSUL_HOST=${CONSUL_HOST}" - -curl -X PUT -H 'Content-Type: application/json' --data-binary "$(cat etc_upload/config.json)" http://${CONSUL_HOST}:8500/v1/kv/${APPNAME} |