diff options
| author |   Lusheng Ji <lji@research.att.com> | 2018-05-16 04:23:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-16 04:23:34 +0000 |
| commit | 66a071133ae4a56e5add6c6408a74e1d2b301a5e (patch) | |
| tree | c9b0c8d7ecb0462edef43c16fae283d902b483ae /prh-app-server | |
| parent | 1a754849c09d4dd3d4a7dab04f9bdd87fd638912 (diff) | |
| parent | d65298c77307675e3d133753cad2f14cd8b5fbbd (diff) | |
Merge "Correction of AAI Client configuration loading"
Diffstat (limited to 'prh-app-server')
3 files changed, 14 insertions, 13 deletions
diff --git a/prh-app-server/config/prh_endpoints.json b/prh-app-server/config/prh_endpoints.json index 282cc64e..7cb83c07 100644 --- a/prh-app-server/config/prh_endpoints.json +++ b/prh-app-server/config/prh_endpoints.json @@ -25,8 +25,8 @@ } }, "aai": { - "aaiHttpClientConfiguration": { - "aaiHost": "", + "aaiClientConfiguration": { + "aaiHost": "localhost", "aaiHostPortNumber": 8080, "aaiProtocol": "https", "aaiUserName": "admin", 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==" } } }, |