TCA: Get DMaaP pub/sub info from preferences

Change-Id: Ifb300fbd50dfe329590f74f6933118cab44b196c
Signed-off-by: Singla, Rajiv (rs153v) <rs153v@att.com>
Issue-Id: DCAEGEN2-123

diff --git a/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java b/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java
index 986c301..8a16f0f 100644 (file)
--- a/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java
+++ b/dcae-analytics-cdap-tca/src/main/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtils.java
@@ -136,6 +136,7 @@ public abstract class CDAPTCAUtils extends TCAUtils {
 \r
         if (null != tcaAppPreferences.getSubscriberHostName() || null != tcaAppPreferences.getPublisherHostName()) {\r
             LOG.info("DMaaP Information is set from runtime preferences. Skipping getting DMaaP info from App Config");\r
+            return;\r
         }\r
 \r
         LOG.info("Fetching DMaaP information from App Configuration String: {}", appConfigString);\r

diff --git a/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java b/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java
index 2cb9002..7b4f72b 100644 (file)
--- a/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java
+++ b/dcae-analytics-cdap-tca/src/test/java/org/openecomp/dcae/apod/analytics/cdap/tca/utils/CDAPTCAUtilsTest.java
@@ -28,6 +28,8 @@ import org.openecomp.dcae.apod.analytics.cdap.tca.BaseAnalyticsCDAPTCAUnitTest;
 import org.openecomp.dcae.apod.analytics.cdap.tca.settings.TCAAppPreferences;\r
 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;\r
 \r
+import java.util.Map;\r
+\r
 import static org.hamcrest.CoreMatchers.is;\r
 import static org.junit.Assert.assertEquals;\r
 import static org.junit.Assert.assertThat;\r
@@ -42,7 +44,10 @@ public class CDAPTCAUtilsTest extends BaseAnalyticsCDAPTCAUnitTest {
     @Test\r
     public void testGetValidatedTCAAppPreferences() throws Exception {\r
         RuntimeContext runtimeContext = mock(RuntimeContext.class);\r
-        when(runtimeContext.getRuntimeArguments()).thenReturn(getPreferenceMap());\r
+        final Map<String, String> preferenceMap = getPreferenceMap();\r
+        preferenceMap.remove("subscriberHostName");\r
+        preferenceMap.remove("publisherHostName");\r
+        when(runtimeContext.getRuntimeArguments()).thenReturn(preferenceMap);\r
         ApplicationSpecification mockApplicationSpecification = Mockito.mock(ApplicationSpecification.class);\r
         when(mockApplicationSpecification.getConfiguration()).thenReturn(fromStream(TCA_APP_CONFIG_FILE_LOCATION));\r
         when(runtimeContext.getApplicationSpecification()).thenReturn(mockApplicationSpecification);\r