summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src
diff options
context:
space:
mode:
authorwejs <maciej.wejs@nokia.com>2018-05-15 16:48:03 +0200
committerwejs <maciej.wejs@nokia.com>2018-05-15 16:48:03 +0200
commitd65298c77307675e3d133753cad2f14cd8b5fbbd (patch)
tree28b82868e7aa4d6eb7d6b7fc3c535af56f861a4a /prh-app-server/src
parent0a42016657086debbf41eba82d9f8cc0da6b7d80 (diff)
Correction of AAI Client configuration loading
Change-Id: I42d5dcd2d2e65db9e4eb3cf324ed127ddd882f41 Issue-ID: DCAEGEN2-509 Signed-off-by: wejs <maciej.wejs@nokia.com>
Diffstat (limited to 'prh-app-server/src')
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AppConfig.java16
-rw-r--r--prh-app-server/src/test/resources/prh_endpoints.json7
2 files changed, 12 insertions, 11 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 92fb666c..a6014c4b 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
@@ -88,28 +88,28 @@ public class AppConfig extends PrhAppConfig {
@Value("${dmaap.dmaapProducerConfiguration.dmaapContentType:}")
public String producerDmaapContentType;
- @Value("${aai.aaiHttpClientConfiguration.aaiHost:}")
+ @Value("${aai.aaiClientConfiguration.aaiHost:}")
public String aaiHost;
- @Value("${aai.aaiHttpClientConfiguration.aaiHostPortNumber:}")
+ @Value("${aai.aaiClientConfiguration.aaiHostPortNumber:}")
public Integer aaiHostPortNumber;
- @Value("${aai.aaiHttpClientConfiguration.aaiProtocol:}")
+ @Value("${aai.aaiClientConfiguration.aaiProtocol:}")
public String aaiProtocol;
- @Value("${aai.aaiHttpClientConfiguration.aaiUserName:}")
+ @Value("${aai.aaiClientConfiguration.aaiUserName:}")
public String aaiUserName;
- @Value("${aai.aaiHttpClientConfiguration.aaiUserPassword:}")
+ @Value("${aai.aaiClientConfiguration.aaiUserPassword:}")
public String aaiUserPassword;
- @Value("${aai.aaiHttpClientConfiguration.aaiIgnoreSSLCertificateErrors:}")
+ @Value("${aai.aaiClientConfiguration.aaiIgnoreSSLCertificateErrors:}")
public Boolean aaiIgnoreSSLCertificateErrors;
- @Value("${aai.aaiHttpClientConfiguration.aaiBasePath:}")
+ @Value("${aai.aaiClientConfiguration.aaiBasePath:}")
public String aaiBasePath;
- @Value("${aai.aaiHttpClientConfiguration.aaiPnfPath:}")
+ @Value("${aai.aaiClientConfiguration.aaiPnfPath:}")
public String aaiPnfPath;
@Override
diff --git a/prh-app-server/src/test/resources/prh_endpoints.json b/prh-app-server/src/test/resources/prh_endpoints.json
index a67ee02b..0fe4b276 100644
--- a/prh-app-server/src/test/resources/prh_endpoints.json
+++ b/prh-app-server/src/test/resources/prh_endpoints.json
@@ -1,8 +1,8 @@
{
"configs": {
"aai": {
- "aaiHttpClientConfiguration": {
- "aaiHost": "",
+ "aaiClientConfiguration": {
+ "aaiHost": "localhost",
"aaiHostPortNumber": 8080,
"aaiIgnoreSSLCertificateErrors": true,
"aaiProtocol": "https",
@@ -14,7 +14,8 @@
"X-FromAppId": "prh",
"X-TransactionId": "9999",
"Accept": "application/json",
- "Real-Time": "true"
+ "Real-Time": "true",
+ "Authorization": "Basic QUFJOkFBSQ=="
}
}
},