From: Jim Hahn <jrh3@att.com>
Date: Mon, 16 Nov 2020 23:18:11 +0000 (-0500)
Subject: [POLICY] Use apex 2.4.4 and drools 1.7.5
X-Git-Tag: 7.0.0~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=30260762f8af1a676f888640cbdbc1bddef2511c

[POLICY] Use apex 2.4.4 and drools 1.7.5

Update version numbers for some Policy images.
Fixed the following issues:
- update default branch to guilin
- match prov-status with both "ACTIVE" and "active" in drools-apps
- close stdin & stdout in apex-pdp CLI editor
- add stringify method to apex-pdp execution context
- set dmaap fetch timeout for apex-pdp

Issue-ID: POLICY-2893
Change-Id: I30017d6f2f01034b2f8721c800925dcab79672b3
Signed-off-by: Jim Hahn <jrh3@att.com>
---

diff --git a/.gitreview b/.gitreview
index eabfdc6550..97df29621f 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.onap.org
 port=29418
 project=oom
-defaultbranch=master
+defaultbranch=guilin
diff --git a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
index 539ef5a465..66a42f0171 100755
--- a/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
+++ b/kubernetes/policy/components/policy-apex-pdp/resources/config/OnapPfConfig.json
@@ -28,6 +28,7 @@
             "topic" : "POLICY-PDP-PAP",
             "servers" : [ "message-router" ],
             "useHttps" : true,
+            "fetchTimeout": 15000,
             "topicCommInfrastructure" : "dmaap"
         }],
         "topicSinks" : [{
diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index 6243d26dc3..23788e2532 100755
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -52,7 +52,7 @@ secrets:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-apex-pdp:2.4.3
+image: onap/policy-apex-pdp:2.4.4
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 61532fa395..6c865d8369 100755
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -39,7 +39,7 @@ secrets:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pdpd-cl:1.7.4
+image: onap/policy-pdpd-cl:1.7.5
 pullPolicy: Always
 
 # flag to enable debugging - application support required