summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Shatov <alexs@att.com>2020-02-25 15:24:02 -0500
committerVijay Venkatesh Kumar <vv770d@att.com>2020-03-09 15:43:05 +0000
commit32f991921b273e820c4df083a933b90440ff2756 (patch)
treed926fcd764c5c8f8a4b62aa1c2b760478ff56dbb
parentd98cc501b887299af62d46a0d9071835d9af5ed0 (diff)
5.1.0 policy-handler - policy-updates from new PDP
- need help with url to DMaaP MR and info on policy-update topic plus the subscriber info DCAEGEN2-1851: - policy-handler now supports the policy-update notification from the new policy-engine thru DMaaP MR - 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 - Fixed service definition external port to 80 Change-Id: I8c1089542ed00408614da0720653221d475293e6 Signed-off-by: Alex Shatov <alexs@att.com> Issue-ID: DCAEGEN2-1851 Issue-ID: DCAEGEN2-1976 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json19
-rw-r--r--kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml6
2 files changed, 16 insertions, 9 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json b/kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json
index 7342ca633a..b459a989d7 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/resources/config/config.json
@@ -13,20 +13,27 @@
"policy_engine": {
"url": "https://{{ .Values.config.address.policy_xacml_pdp }}:6969",
"path_decision": "/policy/pdpx/v1/decision",
- "path_notifications": "/pdp/notifications",
- "path_api": "/pdp/api/",
"headers": {
"Accept": "application/json",
"Content-Type": "application/json",
- "ClientAuth": "cHl0aG9uOnRlc3Q=",
"Authorization": "Basic aGVhbHRoY2hlY2s6emIhWHp0RzM0",
"Environment": "TEST"
},
"target_entity": "policy_engine",
"tls_ca_mode": "cert_directory",
- "tls_wss_ca_mode": "cert_directory",
- "timeout_in_secs": 60,
- "ws_ping_interval_in_secs": 180
+ "timeout_in_secs": 60
+ },
+ "dmaap_mr" : {
+ "url" : "https://message-router:3904/events/unauthenticated.POLICY-NOTIFICATION/policy-handler/ph1",
+ "query": {
+ "timeout": 15000
+ },
+ "headers" : {
+ "Content-Type" : "application/json"
+ },
+ "target_entity" : "dmaap_mr",
+ "tls_ca_mode" : "cert_directory",
+ "timeout_in_secs": 60
},
"deploy_handler": {
"target_entity": "deployment_handler",
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml
index 8517073729..717497f4d4 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/values.yaml
@@ -1,6 +1,6 @@
#============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.
@@ -47,7 +47,7 @@ config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.platform.policy-handler:5.0.0
+image: onap/org.onap.dcaegen2.platform.policy-handler:5.1.0
pullPolicy: Always
# probe configuration parameters
@@ -68,7 +68,7 @@ readiness:
service:
type: ClusterIP
name: policy-handler
- externalPort: 25577
+ externalPort: 80
internalPort: 25577