LcmEvent to have header now

- Introduce LcmEventHeader as per our agreement with stakeholders
- The version remains v1 as we just add the header and dont change
  anything in the existing event payload.
- Later we will remove the header fields from the event payload.
- tests modification and little code refractor for dmi data avc as well

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

3 files changed, 58 insertions, 2 deletions

diff --git a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-headers-v1.json b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-v1.json
index caae82bb23..ea1e617c82 100644
--- a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-headers-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-v1.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-headers-schema:v1",
+  "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-header-schema:v1",
   "$ref": "#/definitions/AvcEventHeader",
   "definitions": {
     "AvcEventHeader": {
diff --git a/cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-header-v1.json b/cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-header-v1.json
new file mode 100644
index 0000000000..8c9922ef7e
--- /dev/null
+++ b/cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-header-v1.json
@@ -0,0 +1,56 @@
+{
+
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "$id": "urn:cps:org.onap.ncmp.cmhandle.lcm-event-header:v1",
+  "$ref": "#/definitions/LcmEventHeader",
+
+  "definitions": {
+    "LcmEventHeader": {
+      "description": "The header for LCM event",
+      "type": "object",
+      "javaType" : "org.onap.cps.ncmp.events.lcm.v1.LcmEventHeader",
+      "properties": {
+        "eventId": {
+          "description": "The unique id identifying the event",
+          "type": "string"
+        },
+        "eventCorrelationId": {
+          "description": "The id identifying the event",
+          "type": "string"
+        },
+        "eventTime": {
+          "description": "The timestamp when original event occurred",
+          "type": "string"
+        },
+        "eventSource": {
+          "description": "The source of the event",
+          "type": "string"
+        },
+        "eventType": {
+          "description": "The type of the event",
+          "type": "string"
+        },
+        "eventSchema": {
+          "description": "The schema that this event adheres to",
+          "type": "string"
+        },
+        "eventSchemaVersion": {
+          "description": "The version of the schema that this event adheres to",
+          "type": "string"
+        }
+      },
+      "required": [
+        "eventId",
+        "eventCorrelationId",
+        "eventTime",
+        "eventSource",
+        "eventType",
+        "eventSchema",
+        "eventSchemaVersion",
+        "event"
+      ],
+      "additionalProperties": false
+    }
+
+  }
+}
diff --git a/cps-ncmp-events/src/main/resources/schemas/lcm-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-schema-v1.json
index 97c0fbee22..7006b78360 100644
--- a/cps-ncmp-events/src/main/resources/schemas/lcm-event-schema-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-schema-v1.json
@@ -55,7 +55,7 @@
     "LcmEvent": {
       "description": "The payload for LCM event",
       "type": "object",
-      "javaType" : "org.onap.ncmp.cmhandle.event.lcm.LcmEvent",
+      "javaType" : "org.onap.cps.ncmp.events.lcm.v1.LcmEvent",
       "properties": {
         "eventId": {
           "description": "The unique id identifying the event",