Merge "5.1.0 policy-handler - policy-updates from new PDP"

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 7342ca6..b459a98 100644 (file)
--- 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 8517073..717497f 100644 (file)
--- 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