diff options
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | prh-app-server/pom.xml | 2 | ||||
| -rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CbsContentParser.java | 1 | ||||
| -rw-r--r-- | prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java | 1 | ||||
| -rw-r--r-- | prh-app-server/src/test/resources/configurationFromCbs.json | 1 | ||||
| -rw-r--r-- | prh-commons/pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
7 files changed, 8 insertions, 5 deletions
@@ -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 87203068..b3fcad81 100644 --- 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 85b4c035..ebb29f36 100644 --- 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 c11fe492..375142db 100644 --- 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 d76aab4f..dd2da43d 100644 --- 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 7c53880a..df370314 100644 --- 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 fee49286..ef20baaf 100644 --- 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 |