From: Geora Barsky <georab@amdocs.com>
Date: Tue, 25 Sep 2018 02:36:11 +0000 (-0400)
Subject: Fix AAI connectivity issue
X-Git-Tag: 1.4.1~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=20289e87771520272f289093f0372460231a35c8;p=sdnc%2Fapps.git

Fix AAI connectivity issue

Modify AAI Rest client configuration to ensure that
aai.port and host are not overriden by environment
variables

Issue-ID: LOG-694
Change-Id: I1b3fc449a07e967efa0466dacb5e75253d937c0a
Signed-off-by: Geora Barsky <georab@amdocs.com>
---

diff --git a/pomba/service-decomposition/config/application.properties b/pomba/service-decomposition/config/application.properties
index fbe20ee..116db83 100644
--- a/pomba/service-decomposition/config/application.properties
+++ b/pomba/service-decomposition/config/application.properties
@@ -19,8 +19,8 @@ basicAuth.username=admin
 basicAuth.password=OBF:1u2a1toa1w8v1tok1u30
 
 # AAI REST Client Configuration
-aai.host=135.63.125.59
-aai.port=8443
+aai.serviceName=135.63.125.59
+aai.servicePort=8443
 aai.httpProtocol=http
 aai.securityProtocol=TLS
 aai.connectionTimeout=5000
diff --git a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java
index 41451a1..6febf42 100644
--- a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java
+++ b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java
@@ -24,10 +24,10 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class AAIConfiguration {
-    @Value("${aai.host}")
+    @Value("${aai.serviceName}")
     private String host;
 
-    @Value("${aai.port}")
+    @Value("${aai.servicePort}")
     private String port;
 
     @Value("${aai.httpProtocol}")
diff --git a/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java b/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java
index 94c73bf..37a5518 100644
--- a/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java
+++ b/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java
@@ -59,8 +59,8 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @SpringBootTest
 @TestPropertySource(properties = {
         "aai.httpProtocol=http",
-        "aai.host=localhost",
-        "aai.port=8081",
+        "aai.serviceName=localhost",
+        "aai.servicePort=8081",
         "basicAuth.username=admin",
         "basicAuth.password=OBF:1u2a1toa1w8v1tok1u30"
 })