Add baseUrl support

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.

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

diff --git a/pom.xml b/pom.xml
index 404053b..e5db3b0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
   <groupId>org.onap.dcaegen2.services</groupId>
   <artifactId>prh</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.2-SNAPSHOT</version>
 
   <name>dcaegen2-services-prh</name>
   <description>PNF Registration Handler</description>
@@ -51,7 +51,7 @@
     <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
     <springfox.version>2.9.2</springfox.version>
     <immutables.version>2.7.5</immutables.version>
-    <sdk.version>1.3.0</sdk.version>
+    <sdk.version>1.3.1</sdk.version>
   </properties>
 
   <modules>

diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
index 8720306..b3fcad8 100644 (file)
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>prh</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.prh</groupId>

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java
index 85b4c03..ebb29f3 100644 (file)
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java
@@ -113,6 +113,7 @@ class CbsContentParser {
     AaiClientConfiguration getAaiClientConfig() {
         return new ImmutableAaiClientConfiguration.Builder()
             .pnfUrl(jsonObject.get("aai.aaiClientConfiguration.pnfUrl").getAsString())
+            .baseUrl(jsonObject.get("aai.aaiClientConfiguration.baseUrl").getAsString())
             .aaiUserName(jsonObject.get("aai.aaiClientConfiguration.aaiUserName").getAsString())
             .aaiServiceInstancePath(jsonObject.get("aai.aaiClientConfiguration.aaiServiceInstancePath").getAsString())
             .aaiIgnoreSslCertificateErrors(

diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java
index c11fe49..375142d 100644 (file)
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java
@@ -57,6 +57,7 @@ public class TestAppConfiguration {
     public static ImmutableAaiClientConfiguration createDefaultAaiClientConfiguration() {
         return new ImmutableAaiClientConfiguration.Builder()
                 .pnfUrl("https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf")
+                .baseUrl("https://aai.onap.svc.cluster.local:8443/aai/v12")
                 .aaiUserName("AAI")
                 .aaiUserPassword("AAI")
                 .aaiIgnoreSslCertificateErrors(true)

diff --git a/prh-app-server/src/test/resources/configurationFromCbs.json b/prh-app-server/src/test/resources/configurationFromCbs.json
index d76aab4..dd2da43 100644 (file)
--- a/prh-app-server/src/test/resources/configurationFromCbs.json
+++ b/prh-app-server/src/test/resources/configurationFromCbs.json
@@ -11,6 +11,7 @@
     "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName":"admin",
     "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword":"admin",
     "aai.aaiClientConfiguration.pnfUrl": "https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf",
+    "aai.aaiClientConfiguration.baseUrl": "https://aai.onap.svc.cluster.local:8443/aai/v12",
     "aai.aaiClientConfiguration.aaiUserName":"AAI",
     "aai.aaiClientConfiguration.aaiUserPassword":"AAI",
     "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors":true,

diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml
index 7c53880..df37031 100644 (file)
--- a/prh-commons/pom.xml
+++ b/prh-commons/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>prh</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.dcaegen2.services.prh</groupId>

diff --git a/version.properties b/version.properties
index fee4928..ef20baa 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=3
-patch=1
+patch=2
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT