Add protocols to hosts

Add default protocols for Consul hosts

Add controller for healt check

Fix for merging properties from file and Consul

Change-Id: Ifa8c7cdfa333d8ffee175b5eb4446f0c3a986f27
Issue-ID: DCAEGEN2-747
Signed-off-by: Jakub Zieba <jakub.zieba@nokia.com>

2 files changed, 43 insertions, 56 deletions

diff --git a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
index 310e8be3..eaf59410 100644
--- a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
+++ b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
@@ -22,11 +22,11 @@ package org.onap.dcae.vestest;
 import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertNotEquals;

 

+import com.google.gson.JsonParser;

+import com.google.gson.JsonObject;

 import java.io.FileReader;

 import java.io.IOException;

 import org.json.JSONObject;

-import com.google.gson.JsonParser;

-import com.google.gson.JsonObject;

 import org.junit.Test;

 

 import org.onap.dcae.commonFunction.ConfigProcessors;

@@ -87,7 +87,8 @@ public class TestConfigProcessor {
         System.out.println("event==" + jsonObject.toString());

         System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);

         final JSONObject jsonArgs = new JSONObject(

-                "{\"field\": \"event.faultFields.eventAdditionalInformation\",\"oldField\": \"event.faultFields.alarmAdditionalInformation\"}");

+                "{\"field\": \"event.faultFields.eventAdditionalInformation\",\"oldField\": "

+                    + "\"event.faultFields.alarmAdditionalInformation\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.map(jsonArgs);

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.eventAdditionalInformation")

@@ -101,11 +102,10 @@ public class TestConfigProcessor {
     public void testJSONObjectMapToArray() {

 

         final JSONObject jsonObject = getFileAsJsonObject();

-        //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();

         System.out.println("event==" + jsonObject.toString());

-        //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);

         final JSONObject jsonArgs = new JSONObject(

-                "{\"field\": \"event.faultFields.vNicPerformanceArray[]\",\"oldField\": \"event.faultFields.errors\",\"attrMap\":{\"receiveDiscards\":\"receivedDiscardedPacketsAccumulated\"}}");

+                "{\"field\": \"event.faultFields.vNicPerformanceArray[]\",\"oldField\": "

+                    + "\"event.faultFields.errors\",\"attrMap\":{\"receiveDiscards\":\"receivedDiscardedPacketsAccumulated\"}}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         final String receiveDiscards = cpEvent.getEventObjectVal("event.faultFields.errors.receiveDiscards").toString();

         System.out.println("receiveDiscards==" + receiveDiscards);

@@ -122,9 +122,7 @@ public class TestConfigProcessor {
     public void testMapRenameObject() {

 

         final JSONObject jsonObject = getFileAsJsonObject();

-        //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();

         System.out.println("event==" + jsonObject.toString());

-        //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);

         final JSONObject jsonArgs = new JSONObject(

                 "{\"field\": \"event.faultFields.faultVFScalingFields\",\"oldField\": \"event.faultFields.errors\",\"mapType\":\"renameObject\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

@@ -142,9 +140,7 @@ public class TestConfigProcessor {
     public void testMapHashmapToNameValueArray() {

 

         final JSONObject jsonObject = getFileAsJsonObject();

-        //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();

         System.out.println("event==" + jsonObject.toString());

-        //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);

         final JSONObject jsonArgs = new JSONObject(

                 "{\"field\": \"event.faultFields.errors\",\"mapType\":\"hashmapToNameValueArray\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

@@ -163,9 +159,7 @@ public class TestConfigProcessor {
     public void testMapNameValueArrayToHashmap() {

 

         final JSONObject jsonObject = getFileAsJsonObject();

-        //final String receiveDiscards = (((jsonObject.getJSONObject("event")).getJSONObject("faultFields")).get("errors")).get("receiveDiscards").toString();

         System.out.println("event==" + jsonObject.toString());

-        //System.out.println("alarmAdditionalInformation==" + alarmAdditionalInformation);

         final JSONObject jsonArgs = new JSONObject(

                 "{\"field\": \"event.faultFields.alarmAdditionalInformation\",\"mapType\":\"nameValueArrayToHashmap\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

@@ -184,9 +178,7 @@ public class TestConfigProcessor {
     public void testAttrAdd() {

 

         final JSONObject jsonObject = getFileAsJsonObject();

-        //final String functionRole = (jsonObject.getJSONObject("event")).getJSONObject("commonEventHeader").get("functionalRole").toString();

         System.out.println("event==" + jsonObject.toString());

-        //System.out.println("functionRole==" + functionRole);

         final JSONObject jsonArgs = new JSONObject(

                 "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

@@ -201,9 +193,7 @@ public class TestConfigProcessor {
     public void testAttrUpdate() {

 

         final JSONObject jsonObject = getFileAsJsonObject();

-        //final String functionRole = (jsonObject.getJSONObject("event")).getJSONObject("commonEventHeader").get("functionalRole").toString();

         System.out.println("event==" + jsonObject.toString());

-        //System.out.println("functionRole==" + functionRole);

         final JSONObject jsonArgs = new JSONObject(

                 "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}");

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

@@ -280,7 +270,6 @@ public class TestConfigProcessor {
         final JSONObject jsonObject = getFileAsJsonObject();

         System.out.println("event==" + jsonObject.toString());

         System.out.println("Testing SetEventObjectVal");

-        //final JSONObject jsonArgs = new JSONObject ( "{\"field\": \"event.faultFields.version\",\"value\": \"2.0\",\"fieldType\": \"number\"}" );

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.setEventObjectVal("event.faultFields.version", "2.0", "number");

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.version").toString();

@@ -310,7 +299,6 @@ public class TestConfigProcessor {
         final JSONObject jsonObject = getFileAsJsonObject();

         System.out.println("event==" + jsonObject.toString());

         System.out.println("Testing GetEventObjectVal");

-        //final JSONObject jsonArgs = new JSONObject ( "{\"field\": \"event.faultFields.eventSeverity\"}" );

         ConfigProcessors cpEvent = new ConfigProcessors(jsonObject);

         cpEvent.getEventObjectVal("event.faultFields.eventSeverity");

         final String responseData = cpEvent.getEventObjectVal("event.faultFields.eventSeverity").toString();

diff --git a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
index 484f7dc8..848f2b76 100644
--- a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
+++ b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
@@ -19,57 +19,56 @@
  */
 package org.onap.dcae.vestest;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.onap.dcae.commonFunction.VESLogger.REQUEST_ID;
-
 import com.att.nsa.logging.LoggingContext;
 import com.att.nsa.logging.log4j.EcompFields;
-import java.util.UUID;
 import org.junit.Test;
 import org.onap.dcae.commonFunction.VESLogger;
 
+import java.util.UUID;
+
+import static org.junit.Assert.*;
+import static org.onap.dcae.commonFunction.VESLogger.REQUEST_ID;
+
 public class TestVESLogger {
 
-	@Test
-	public void shouldOnLoggingContextInitializationPutRandomUUIDAsRequestID() {
-		LoggingContext commonLoggingContext = VESLogger.getCommonLoggingContext();
-		String requestId = commonLoggingContext.get(REQUEST_ID, "default");
+    @Test
+    public void shouldOnLoggingContextInitializationPutRandomUuidAsRequestId() {
+        LoggingContext commonLoggingContext = VESLogger.getCommonLoggingContext();
+        String requestId = commonLoggingContext.get(REQUEST_ID, "default");
 
-		assertNotNull(requestId);
-		assertNotSame(requestId, "default");
+        assertNotNull(requestId);
+        assertNotSame(requestId, "default");
 
-	}
+    }
 
-	@Test
-	public void shouldOnLoggingContextInitializationPutGivenUUIDAsRequestIDAndSupplyEndTimestamp() {
-		final UUID uuid = UUID.randomUUID();
-		LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid);
-		String requestId = loggingContextForThread.get(REQUEST_ID, "default");
-		String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
+    @Test
+    public void shouldOnLoggingContextInitializationPutGivenUuuidAsRequestIdAndSupplyEndTimestamp() {
+        final UUID uuid = UUID.randomUUID();
+        LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid);
+        String requestId = loggingContextForThread.get(REQUEST_ID, "default");
+        String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
 
-		assertNotNull(requestId);
-		assertNotNull(endTimestamp);
-		assertNotSame(endTimestamp, "default");
-		assertEquals(requestId, uuid.toString());
-	}
+        assertNotNull(requestId);
+        assertNotNull(endTimestamp);
+        assertNotSame(endTimestamp, "default");
+        assertEquals(requestId, uuid.toString());
+    }
 
-	@Test
-	public void shouldOnLoggingContextInitializationPutGivenUUIDAsRequestIDAndSupplyEndTimestampAndCompleteStatusCode() {
-		final UUID uuid = UUID.randomUUID();
-		LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid.toString());
-		String requestId = loggingContextForThread.get(REQUEST_ID, "default");
-		String statusCode = loggingContextForThread.get("statusCode", "default");
-		String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
+    @Test
+    public void shouldOnLoggingContextInitializationPutGivenUuidAsRequestIdAndSupplyEndTimestampAndCompleteStatusCode() {
+        final UUID uuid = UUID.randomUUID();
+        LoggingContext loggingContextForThread = VESLogger.getLoggingContextForThread(uuid.toString());
+        String requestId = loggingContextForThread.get(REQUEST_ID, "default");
+        String statusCode = loggingContextForThread.get("statusCode", "default");
+        String endTimestamp = loggingContextForThread.get(EcompFields.kEndTimestamp, "default");
 
-		assertNotNull(requestId);
-		assertNotNull(endTimestamp);
-		assertNotNull(statusCode);
-		assertNotSame(endTimestamp, "default");
-		assertEquals(requestId, uuid.toString());
-		assertEquals(statusCode, "COMPLETE");
-	}
+        assertNotNull(requestId);
+        assertNotNull(endTimestamp);
+        assertNotNull(statusCode);
+        assertNotSame(endTimestamp, "default");
+        assertEquals(requestId, uuid.toString());
+        assertEquals(statusCode, "COMPLETE");
+    }
 
 }