Added id code and removed from name

Added funtionality to consumer and send kpi events to onap

Change-Id: I0849e3b9188b1fa53210c341f1fc6e6228c5de9b
Signed-off-by: William Kurkian <wkurkian@cisco.com>
diff --git a/src/main/java/mapper/VesVolthaMapper.java b/src/main/java/mapper/VesVolthaMapper.java
index a3ee1ab..6d927ca 100644
--- a/src/main/java/mapper/VesVolthaMapper.java
+++ b/src/main/java/mapper/VesVolthaMapper.java
@@ -19,6 +19,7 @@
 import org.slf4j.LoggerFactory;

 import com.google.gson.Gson;

 import com.google.gson.GsonBuilder;

+import com.google.gson.JsonObject;

 

 public class VesVolthaMapper {

 

@@ -30,7 +31,17 @@
         gson = new GsonBuilder().create();

     }

 

-    public VesVolthaMessage parseJson(String json) {

-        return gson.fromJson(json, VesVolthaMessage.class);

+    public VesVolthaAlarm parseAlarm(String json) {

+        return gson.fromJson(json, VesVolthaAlarm.class);

+    }

+

+    public VesVolthaKpi parseKpi(String json) {

+        //return gson.fromJson(json, VesVolthaKpi.class);

+        JsonObject body = gson.fromJson(json, JsonObject.class);

+        VesVolthaKpi kpi = new VesVolthaKpi();

+        kpi.setType(body.get("type").getAsString());

+        kpi.setTs(body.get("ts").getAsString());

+        kpi.setSliceData(body.get("slice_data").toString());

+        return kpi;

     }

 }