Fix Avc event creator

- adhere to changes in the Avc event schema in cps-and-ncmp repo.
- Update cps version dependency in dmi-plugin

Issue-ID: CPS-1578
Change-Id: I6749aac437b7954725e5a3a7887ec260cb5e733e
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

diff --git a/pom.xml b/pom.xml
index 3d88aa6..e6c8c66 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     <properties>
         <app>org.onap.cps.ncmp.dmi.Application</app>
         <base.image>${docker.pull.registry}/onap/integration-java11:8.0.0</base.image>
-        <cps.version>3.2.1</cps.version>
+        <cps.version>3.2.6</cps.version>
         <image.tag>${project.version}-${maven.build.timestamp}</image.tag>
         <jacoco.minimum.coverage>0.98</jacoco.minimum.coverage>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>

diff --git a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventCreator.java b/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventCreator.java
index 6902b2e..03ed1c4 100644 (file)
--- a/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventCreator.java
+++ b/src/main/java/org/onap/cps/ncmp/dmi/notifications/avc/DmiDataAvcEventCreator.java
@@ -22,10 +22,11 @@ package org.onap.cps.ncmp.dmi.notifications.avc;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.ncmp.event.model.AvcEvent;
-import org.onap.cps.ncmp.event.model.Event;
 
 /**
  * Helper to create AvcEvents.
@@ -49,12 +50,12 @@ public class DmiDataAvcEventCreator {
         avcEvent.setEventType(AvcEvent.class.getName());
         avcEvent.setEventSchema("urn:cps:" + AvcEvent.class.getName());
         avcEvent.setEventSchemaVersion("v1");
-        avcEvent.setEventTarget("NCMP");
+        avcEvent.setEventSource("NCMP");
         avcEvent.setEventTime(ZonedDateTime.now().format(dateTimeFormatter));
 
-        final Event event = new Event();
-        event.setAdditionalProperty("payload", "Hello world!");
-        avcEvent.setEvent(event);
+        final Map<String, Object> eventPayload = new LinkedHashMap<>();
+        eventPayload.put("push-change-update", "{}");
+        avcEvent.setEvent(eventPayload);
 
         log.debug("Avc Event Created ID: {}", avcEvent.getEventId());
         return avcEvent;