From 30d02e82c80f215fadbedd1a452e4d3eb2a0cf52 Mon Sep 17 00:00:00 2001
From: Alex Shatov <alexs@att.com>
Date: Fri, 29 Mar 2019 08:42:47 -0400
Subject: config for 5.0.0 policy-handler new PDP API

- in R4 Dublin the policy-engine introduced a totally new API
- policy-handler now has a startup option to either use
  = the new PDP API (default)
  = or the old PDP API that was created-updated before the end of 2018
- to use the old PDP API requires changing either the etc/config.json
  or setting up a non-empty env var PDP_API_VERSION on startup:
    export PDP_API_VERSION=2018
    docker run ... -e PDP_API_VERSION ...

Change-Id: Idd6973cf6cc3e76d2969332ff96e5e9e962ece1a
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-1128
---
 bootstrap/README-docker.md |  1 +
 heat/register.sh           | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bootstrap/README-docker.md b/bootstrap/README-docker.md
index d60afe2..7e3dedc 100644
--- a/bootstrap/README-docker.md
+++ b/bootstrap/README-docker.md
@@ -107,6 +107,7 @@ application_config:
     #    related to policy-engine itself.
     policy_engine :
         url : "https://policy-engine.onap.org:8081"
+        path_decision : "/decision/v1"
         path_pdp : "/pdp/"
         path_api : "/pdp/api/"
         headers :
diff --git a/heat/register.sh b/heat/register.sh
index 6843fa4..34c1505 100755
--- a/heat/register.sh
+++ b/heat/register.sh
@@ -238,6 +238,7 @@ REGKV='
       "interval": 600
     },
     "policy_engine": {
+      "path_decision": "/decision/v1",
       "path_api": "/pdp/api/",
       "path_notifications" : "/pdp/notifications",
       "tls_ca_mode" : "cert_directory",
@@ -249,11 +250,8 @@ REGKV='
         "Accept": "application/json",
         "Authorization": "Basic dGVzdHBkcDphbHBoYTEyMw=="
       },
-      "path_pdp": "/pdp/",
       "url": "https://{{ policy_ip_addr }}:8081",
-      "target_entity": "policy_engine",
-      "tls_wss_ca_mode": "do_not_verify", 
-      "tls_ca_mode": "do_not_verify"
+      "target_entity": "policy_engine"
     }
   }
 }'
@@ -527,12 +525,12 @@ curl -v -X PUT -H "Content-Type: application/json" \
 
 
 
-# hv-ves collector 
+# hv-ves collector
 SERVICENAME="${SRVCNAME_STATIC_HVVES}"
-REGKV='{ 
-  "dmaap.kafkaBootstrapServers": "{{ mr_ip_addr }}:9092", 
+REGKV='{
+  "dmaap.kafkaBootstrapServers": "{{ mr_ip_addr }}:9092",
   "collector.routing": {
-    "fromDomain": "HVMEAS", 
+    "fromDomain": "HVMEAS",
     "toTopic": "HV_VES_MEASUREMENTS"
   }
 }'
-- 
cgit 1.2.3-korg