From e619af968c4470a5d9bc5076a7eb6f4afcbcacfb Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Thu, 31 Jan 2019 16:17:59 -0500 Subject: [PATCH] 4.6.0 policy-handler active-passive DCAEGEN2-932: - mode_of_operation: active or passive = active is as before this change = in passive mode the policy-handler * closes the web-socket to PDP * skips the periodic catch_ups * still periodically checks for reconfigure * still allows usig the web-server to retrieve policies from PDP - default is active - when mode_of_operation changes from passive to active, the policy-handler invokes the catch_up right away - config-kv contains the optional override field mode_of_operation = changing the mode_of_operation in config-kv and invoking POST /reconfigure will bring the new value and change the mode of operation of the policy-handler if no service_activator section is provided in consul-kv record - reduced the default web-socket ping interval from 180 to 30 seconds because PDP changed its default timeout on the web-socket from 400 seconds to 50 seconds Change-Id: Iab66270dc4b1ee1ec422350be794ff161cd4a512 Signed-off-by: Alex Shatov Issue-ID: DCAEGEN2-932 --- .../resources/inputs/k8s-policy_handler-inputs.yaml | 8 +++++++- kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml index 50ac16ffc9..9cd37b5e2a 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml @@ -31,6 +31,12 @@ application_config: policy_retry_count : 5 policy_retry_sleep : 5 + # mode of operation for the policy-handler + # either active or passive + # in passive mode the policy-hanlder will not listen to + # and will not bring the policy-updates from policy-engine + mode_of_operation : "active" + # config of automatic catch_up for resiliency catch_up : # interval in seconds on how often to call automatic catch_up @@ -77,7 +83,7 @@ application_config: # optional timeout_in_secs specifies the timeout for the http requests timeout_in_secs: 60 # optional ws_ping_interval_in_secs specifies the ping interval for the web-socket connection - ws_ping_interval_in_secs: 180 + ws_ping_interval_in_secs: 30 # deploy_handler config # changed from string "deployment_handler" in 2.3.1 to structure in 2.4.0 deploy_handler : diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index c44401168e..81119c5e32 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -88,7 +88,7 @@ componentImages: deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:3.1.0 holmes_rules: onap/holmes/rule-management:1.2.3 holmes_engine: onap/holmes/engine-management:1.2.2 - policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.5.0 + policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.6.0 tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0 ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1 snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0 -- 2.16.6