summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/main
diff options
context:
space:
mode:
authorgrabinsk <maciej.grabinski@nokia.com>2019-04-05 15:13:18 +0200
committergrabinsk <maciej.grabinski@nokia.com>2019-04-05 15:13:18 +0200
commit2abfecad9aeb88ba95d62d718376535fb6e00325 (patch)
tree58d92becb52f8882207c948975ef0fcc36c2b669 /prh-app-server/src/main
parentd7fa23e2912dd4a4a28b79bdfbb92c9b33b55f49 (diff)
Add pnfUrl field
Due to changes in the aai client configuration json old parameters aaiHost, aaiProtocol, aaiPort, aaiBasePath, aaiPnfPath will be replaced by pnfUrl Change-Id: Ifd8841f8a80d743a95e3b0ea7d868eda923febca Issue-ID: DCAEGEN2-1398 Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
Diffstat (limited to 'prh-app-server/src/main')
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java4
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfigParser.java1
2 files changed, 5 insertions, 0 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
index 2a7661a9..21495740 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java
@@ -117,6 +117,9 @@ public class AppConfig extends PrhAppConfig {
@Value("${dmaap.dmaapUpdateProducerConfiguration.dmaapContentType:}")
public String updateProducerDmaapContentType;
+ @Value("${aai.aaiClientConfiguration.pnfUrl:}")
+ public String pnfUrl;
+
@Value("${aai.aaiClientConfiguration.aaiHost:}")
public String aaiHost;
@@ -222,6 +225,7 @@ public class AppConfig extends PrhAppConfig {
return null;
}
return new ImmutableAaiClientConfiguration.Builder()
+ .pnfUrl(Optional.ofNullable(pnfUrl).filter(isEmpty.negate()).orElse(aaiClientConfiguration.pnfUrl()))
.aaiHost(Optional.ofNullable(aaiHost).filter(isEmpty.negate()).orElse(aaiClientConfiguration.aaiHost()))
.aaiPort(
Optional.ofNullable(aaiPort).filter(p -> !p.toString().isEmpty())
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfigParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfigParser.java
index 2360c075..ec01ff50 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfigParser.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/CloudConfigParser.java
@@ -81,6 +81,7 @@ class CloudConfigParser {
AaiClientConfiguration getAaiClientConfig() {
return new ImmutableAaiClientConfiguration.Builder()
+ .pnfUrl(jsonObject.get("aai.aaiClientConfiguration.pnfUrl").getAsString())
.aaiHost(jsonObject.get("aai.aaiClientConfiguration.aaiHost").getAsString())
.aaiPort(jsonObject.get("aai.aaiClientConfiguration.aaiHostPortNumber").getAsInt())
.aaiUserName(jsonObject.get("aai.aaiClientConfiguration.aaiUserName").getAsString())