From d65298c77307675e3d133753cad2f14cd8b5fbbd Mon Sep 17 00:00:00 2001
From: wejs <maciej.wejs@nokia.com>
Date: Tue, 15 May 2018 16:48:03 +0200
Subject: Correction of AAI Client configuration loading

Change-Id: I42d5dcd2d2e65db9e4eb3cf324ed127ddd882f41
Issue-ID: DCAEGEN2-509
Signed-off-by: wejs <maciej.wejs@nokia.com>
---
 prh-app-server/config/prh_endpoints.json                 |  4 ++--
 .../dcaegen2/services/prh/configuration/AppConfig.java   | 16 ++++++++--------
 prh-app-server/src/test/resources/prh_endpoints.json     |  7 ++++---
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'prh-app-server')

diff --git a/prh-app-server/config/prh_endpoints.json b/prh-app-server/config/prh_endpoints.json
index 1a3ebad5..72d66640 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=="
         }
       }
     },
-- 
cgit 1.2.3-korg