Update PRH to 1.7.03.3.3

_ Update image to 1.7.0
- Change AAI variable syntax in URL config
- Update config to use AAI v23 API

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

2 files changed, 7 insertions, 5 deletions

diff --git a/Changelog.md b/Changelog.md
index 83079cc..16bec02 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [3.3.3] - 2021-08-03
          - [DCAEGEN2-2853] SNMPTrap container updated to 2.0.5 - Switched to CBS client lib to 2.2.1
+         - [DCAEGEN2-2863] PRH Change AAI variable syntax in URL config
+         - [DCAEGEN2-1531] PRH Update config to use AAI v23 API
 
 ## [3.3.2] - 2021-08-02
          - [DCAEGEN2-2808](https://jira.onap.org/browse/DCAEGEN2-2808)- PRH container updated to 1.6.1 - Update Spring-Boot to version 2.4.8 (fix vulnerabilities)
diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml
index eb24df3..519ee6d 100644
--- a/blueprints/k8s-prh.yaml
+++ b/blueprints/k8s-prh.yaml
@@ -26,10 +26,10 @@ imports:
 inputs:
   pnfUrl:
     type: string
-    default: "https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf"
+    default: "https://aai.onap.svc.cluster.local:8443/aai/v23/network/pnfs/pnf"
   baseUrl:
     type: string
-    default: "https://aai.onap.svc.cluster.local:8443/aai/v12"
+    default: "https://aai.onap.svc.cluster.local:8443/aai/v23"
   aaiEnrichmentHost:
     type: string
     default: "aai.onap.svc.cluster.local"
@@ -63,7 +63,7 @@ inputs:
     default: "admin"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.6.1"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.7.0"
   replicas:
     type: integer
     description: number of instances
@@ -112,9 +112,9 @@ node_templates:
         aai.aaiClientConfiguration.aaiUserName: { get_input: aaiEnrichmentUser }
         aai.aaiClientConfiguration.aaiUserPassword: { get_input: aaiEnrichmentPasswd }
         aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors: true
-        aai.aaiClientConfiguration.aaiBasePath: "/aai/v12"
+        aai.aaiClientConfiguration.aaiBasePath: "/aai/v23"
         aai.aaiClientConfiguration.aaiPnfPath: "/network/pnfs/pnf"
-        aai.aaiClientConfiguration.aaiServiceInstancePath: "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${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"