Add baseUrl parameter

Add support for baseUrl usage. It is needed for handling objects other than pnfs from the inventory.
BaseUrl is necessary for fixing the existing bug, where pnf path is used to get service-instance from AAI.

Issue-ID: INT-1181
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: I22f4eac0656621ad4c75b26e880109d93b72adce

diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template
index 87a60f6..347768f 100644 (file)
--- a/blueprints/k8s-prh.yaml-template
+++ b/blueprints/k8s-prh.yaml-template
@@ -27,6 +27,9 @@ inputs:
   pnfUrl:
     type: string
     default: "https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf"
+  baseUrl:
+    type: string
+    default: "https://aai.onap.svc.cluster.local:8443/aai/v12"
   aaiEnrichmentHost:
     type: string
     default: aai.onap.svc.cluster.local
@@ -60,7 +63,7 @@ inputs:
     default: "admin"
   tag_version:
     type: string
-    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.2"
+    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.4.0"
   replicas:
     type: integer
     description: number of instances
@@ -89,6 +92,7 @@ node_templates:
         dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword: { get_input: dmaap_passwd }
         dmaap.dmaapUpdateProducerConfiguration.dmaapContentType: "application/json"
         aai.aaiClientConfiguration.pnfUrl: { get_input: pnfUrl }
+        aai.aaiClientConfiguration.baseUrl: { get_input: baseUrl }
         aai.aaiClientConfiguration.aaiHost: { get_input: aaiEnrichmentHost }
         aai.aaiClientConfiguration.aaiHostPortNumber: { get_input: aaiEnrichmentPort }
         aai.aaiClientConfiguration.aaiProtocol: "https"