Add support to 7.1 VES data-stream in-parallel to 5.4

Change-Id: I9ee1d712c419cb95547e5f6125ff8f7b8c686b08
Issue-ID: HOLMES-308
Signed-off-by: Venkata Molluru <venkatamuralimohanreddy.molluru@techmahindra.com>

2 files changed, 13 insertions, 6 deletions

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/api/stat/VesAlarmTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/api/stat/VesAlarmTest.java
index f046517..0f5a2b4 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/api/stat/VesAlarmTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/api/stat/VesAlarmTest.java
@@ -19,7 +19,9 @@ package org.onap.holmes.common.api.stat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.*;
 
-import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.TimeZone;
 import org.junit.Test;
 
 public class VesAlarmTest {
@@ -69,16 +71,20 @@ public class VesAlarmTest {
         alarm.setSourceId("");
         alarm.setSourceName("");
         alarm.setStartEpochMicrosec(0L);
-        alarm.setVersion(0L);
-        alarm.setAlarmAdditionalInformation(new ArrayList<>());
-        alarm.setAlarmCondition("");
+        alarm.setVersion("0");
+        alarm.setAlarmAdditionalInformation(new HashMap<>());
+	alarm.setAlarmCondition("");
         alarm.setAlarmInterfaceA("");
         alarm.setEventCategory("");
         alarm.setEventSeverity("");
         alarm.setEventSourceType("");
-        alarm.setFaultFieldsVersion(0L);
+        alarm.setFaultFieldsVersion("0");
         alarm.setSpecificProblem("");
         alarm.setVfStatus("");
+        TimeZone offtime_zone = TimeZone.getTimeZone("Europe/Rome");
+	alarm.setTimeZoneOffset(offtime_zone);
+	alarm.setNfVendorName("");
+        alarm.setVesEventListenerVersion("0");
 
         alarm.getDomain();
         alarm.getEventId();
@@ -107,4 +113,4 @@ public class VesAlarmTest {
         alarm.getVfStatus();
     }
 
-}
\ No newline at end of file
+}
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/AlarmInfoMapperTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/AlarmInfoMapperTest.java
index 06bbfa8..3d36def 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/AlarmInfoMapperTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/AlarmInfoMapperTest.java
@@ -33,6 +33,7 @@ public class AlarmInfoMapperTest {
         expect(resultSet.getString("eventname")).andReturn("");

         expect(resultSet.getString("sourceid")).andReturn("");

         expect(resultSet.getString("sourcename")).andReturn("");

+	expect(resultSet.getInt("sequence")).andReturn(0);

         expect(resultSet.getLong("startepochmicrosec")).andReturn(0L);

         expect(resultSet.getLong("lastepochmicrosec")).andReturn(0L);

         expect(resultSet.getInt("alarmiscleared")).andReturn(0);