From: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Date: Wed, 11 Aug 2021 09:55:41 +0000 (+0200)
Subject: [DCAEGEN2] Change AAI variable syntax in PRH
X-Git-Tag: 9.0.0~167^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=57a143b4542a14faa29542d61a958335c90cc2af

[DCAEGEN2] Change AAI variable syntax in PRH

- Change AAI URL syntax in config
- Top up PRH container to 1.7.0.
- Top up bootstrap container to 3.3.3.

Issue-ID: DCAEGEN2-2863
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: Idff98a11cb0418e5c327251e04de2bd202f79315
---

diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
index 2c523e6dd7..043a7b09a8 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
@@ -39,7 +39,7 @@ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.6.1
+image: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.7.0
 pullPolicy: Always
 
 # log directory where logging sidecar should look for log files
@@ -120,7 +120,7 @@ applicationConfig:
   aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true
   aai.aaiClientConfiguration.aaiBasePath: "/aai/v23"
   aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf"
-  aai.aaiClientConfiguration.aaiServiceInstancePath: "/business/customers/customer/$${undefined}{customer}/service-subscriptions/service-subscription/$${undefined}{serviceType}/service-instances/service-instance/$${undefined}{serviceInstanceId}"
+  aai.aaiClientConfiguration.aaiServiceInstancePath: "/business/customers/customer/{{customer}}/service-subscriptions/service-subscription/{{serviceType}}/service-instances/service-instance/{{serviceInstanceId}}"
   aai.aaiClientConfiguration.aaiHeaders:
       X-FromAppId: "prh"
       X-TransactionId: "9999"
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index 011c92124b..ec322dd61f 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@ -104,7 +104,7 @@ mongo:
   disableNfsProvisioner: true
 
 # application image
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:3.3.2
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:3.3.3
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager
@@ -112,7 +112,7 @@ default_k8s_location: central
 componentImages:
   tcagen2: onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.3.0
   ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.10.0
-  prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.6.1
+  prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.7.0
   hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.9.0
 
 # Resource Limit flavor -By Default using small