2 files changed, 29 insertions, 15 deletions
diff --git a/cps-ncmp-events/src/main/resources/schemas/avc-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-headers-v1.json
index 0e9f256639..caae82bb23 100644
--- a/cps-ncmp-events/src/main/resources/schemas/avc-event-schema-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-headers-v1.json
@@ -1,11 +1,12 @@
 {
   "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-schema:v1",
-  "$ref": "#/definitions/AvcEvent",
+  "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-headers-schema:v1",
+  "$ref": "#/definitions/AvcEventHeader",
   "definitions": {
-    "AvcEvent": {
-      "description": "The payload for AVC event.",
+    "AvcEventHeader": {
+      "description": "The header for AVC event.",
       "type": "object",
+      "javaType" : "org.onap.cps.ncmp.events.avc.v1.AvcEventHeader",
       "properties": {
         "eventId": {
           "description": "The unique id identifying the event generated by DMI for this AVC event.",
@@ -34,27 +35,16 @@
         "eventSchemaVersion": {
           "description": "The event schema version for AVC events.",
           "type": "string"
-        },
-        "event": {
-        "$ref": "#/definitions/Event"
         }
       },
       "required": [
         "eventId",
         "eventCorrelationId",
-        "eventTime",
-        "eventSource",
         "eventType",
         "eventSchema",
         "eventSchemaVersion"
       ],
       "additionalProperties": false
-    },
-    "Event": {
-      "description": "The AVC event content.",
-      "type": "object",
-      "existingJavaType": "java.lang.Object",
-      "additionalProperties": false
     }
   }
 }
 \ No newline at end of file
diff --git a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json
new file mode 100644
index 0000000000..407551f4fd
--- /dev/null
+++ b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-schema:v1",
+  "$ref": "#/definitions/AvcEvent",
+  "definitions": {
+    "AvcEvent": {
+      "description": "The payload for AVC event.",
+      "type": "object",
+      "javaType" : "org.onap.cps.ncmp.events.avc.v1.AvcEvent",
+      "properties": {
+        "event": {
+          "description": "The AVC event content.",
+          "type": "object",
+          "existingJavaType": "java.lang.Object",
+          "additionalProperties": false
+        }
+      },
+      "required": [
+        "event"
+      ],
+      "additionalProperties": false
+    }
+  }
+}
+\ No newline at end of file