From 850656b7a159c0fe3070551990311aadec9b6a7f Mon Sep 17 00:00:00 2001 From: mpriyank Date: Thu, 11 May 2023 13:55:55 +0100 Subject: 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 --- .../schemas/dmidataavc/avc-event-header-v1.json | 50 ++++++++++ .../schemas/dmidataavc/avc-event-headers-v1.json | 50 ---------- .../resources/schemas/lcm-event-schema-v1.json | 106 --------------------- .../resources/schemas/lcm/lcm-event-header-v1.json | 56 +++++++++++ .../resources/schemas/lcm/lcm-event-schema-v1.json | 106 +++++++++++++++++++++ 5 files changed, 212 insertions(+), 156 deletions(-) create mode 100644 cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-v1.json delete mode 100644 cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-headers-v1.json delete mode 100644 cps-ncmp-events/src/main/resources/schemas/lcm-event-schema-v1.json create mode 100644 cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-header-v1.json create mode 100644 cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-schema-v1.json (limited to 'cps-ncmp-events') diff --git a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-v1.json b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-v1.json new file mode 100644 index 000000000..ea1e617c8 --- /dev/null +++ b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-v1.json @@ -0,0 +1,50 @@ +{ + "$schema": "https://json-schema.org/draft/2019-09/schema", + "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-header-schema:v1", + "$ref": "#/definitions/AvcEventHeader", + "definitions": { + "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.", + "type": "string" + }, + "eventCorrelationId": { + "description": "The request id passed by NCMP for this AVC event.", + "type": "string" + }, + "eventTime": { + "description": "The time of the AVC event. The expected format is 'yyyy-MM-dd'T'HH:mm:ss.SSSZ'.", + "type": "string" + }, + "eventSource": { + "description": "The source of the AVC event.", + "type": "string" + }, + "eventType": { + "description": "The type of the AVC event.", + "type": "string" + }, + "eventSchema": { + "description": "The event schema for AVC events.", + "type": "string" + }, + "eventSchemaVersion": { + "description": "The event schema version for AVC events.", + "type": "string" + } + }, + "required": [ + "eventId", + "eventCorrelationId", + "eventType", + "eventSchema", + "eventSchemaVersion" + ], + "additionalProperties": false + } + } +} \ No newline at end of file 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-headers-v1.json deleted file mode 100644 index caae82bb2..000000000 --- a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-headers-v1.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-headers-schema:v1", - "$ref": "#/definitions/AvcEventHeader", - "definitions": { - "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.", - "type": "string" - }, - "eventCorrelationId": { - "description": "The request id passed by NCMP for this AVC event.", - "type": "string" - }, - "eventTime": { - "description": "The time of the AVC event. The expected format is 'yyyy-MM-dd'T'HH:mm:ss.SSSZ'.", - "type": "string" - }, - "eventSource": { - "description": "The source of the AVC event.", - "type": "string" - }, - "eventType": { - "description": "The type of the AVC event.", - "type": "string" - }, - "eventSchema": { - "description": "The event schema for AVC events.", - "type": "string" - }, - "eventSchemaVersion": { - "description": "The event schema version for AVC events.", - "type": "string" - } - }, - "required": [ - "eventId", - "eventCorrelationId", - "eventType", - "eventSchema", - "eventSchemaVersion" - ], - "additionalProperties": false - } - } -} \ No newline at end of file diff --git a/cps-ncmp-events/src/main/resources/schemas/lcm-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/lcm-event-schema-v1.json deleted file mode 100644 index 97c0fbee2..000000000 --- a/cps-ncmp-events/src/main/resources/schemas/lcm-event-schema-v1.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "urn:cps:org.onap.ncmp.cmhandle.lcm-event:v1", - - "$ref": "#/definitions/LcmEvent", - - "definitions": { - - "Values": { - "description": "Values that represents the state of a cmHandle", - "type": "object", - "properties": { - "dataSyncEnabled":{ - "description": "Whether data sync enabled", - "type": "boolean" - }, - "cmHandleState": { - "description": "State of cmHandle", - "type": "string", - "enum": ["ADVISED", "READY", "LOCKED", "DELETING", "DELETED"] - }, - "cmHandleProperties": { - "description": "cmHandle properties", - "type": "object", - "default": null, - "existingJavaType": "java.util.List>", - "additionalProperties": false - } - }, - "additionalProperties": false - }, - - "Event": { - "description": "The Payload of an event", - "type": "object", - "properties": { - "cmHandleId": { - "description": "cmHandle id", - "type": "string" - }, - "oldValues": { - "$ref": "#/definitions/Values" - }, - "newValues": { - "$ref": "#/definitions/Values" - } - }, - "required": [ - "cmHandleId" - ], - "additionalProperties": false - }, - - "LcmEvent": { - "description": "The payload for LCM event", - "type": "object", - "javaType" : "org.onap.ncmp.cmhandle.event.lcm.LcmEvent", - "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" - }, - "event": { - "$ref": "#/definitions/Event" - } - }, - "required": [ - "eventId", - "eventCorrelationId", - "eventTime", - "eventSource", - "eventType", - "eventSchema", - "eventSchemaVersion", - "event" - ], - "additionalProperties": false - } - - } -} 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 000000000..8c9922ef7 --- /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/lcm-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-schema-v1.json new file mode 100644 index 000000000..7006b7836 --- /dev/null +++ b/cps-ncmp-events/src/main/resources/schemas/lcm/lcm-event-schema-v1.json @@ -0,0 +1,106 @@ +{ + + "$schema": "https://json-schema.org/draft/2019-09/schema", + "$id": "urn:cps:org.onap.ncmp.cmhandle.lcm-event:v1", + + "$ref": "#/definitions/LcmEvent", + + "definitions": { + + "Values": { + "description": "Values that represents the state of a cmHandle", + "type": "object", + "properties": { + "dataSyncEnabled":{ + "description": "Whether data sync enabled", + "type": "boolean" + }, + "cmHandleState": { + "description": "State of cmHandle", + "type": "string", + "enum": ["ADVISED", "READY", "LOCKED", "DELETING", "DELETED"] + }, + "cmHandleProperties": { + "description": "cmHandle properties", + "type": "object", + "default": null, + "existingJavaType": "java.util.List>", + "additionalProperties": false + } + }, + "additionalProperties": false + }, + + "Event": { + "description": "The Payload of an event", + "type": "object", + "properties": { + "cmHandleId": { + "description": "cmHandle id", + "type": "string" + }, + "oldValues": { + "$ref": "#/definitions/Values" + }, + "newValues": { + "$ref": "#/definitions/Values" + } + }, + "required": [ + "cmHandleId" + ], + "additionalProperties": false + }, + + "LcmEvent": { + "description": "The payload for LCM event", + "type": "object", + "javaType" : "org.onap.cps.ncmp.events.lcm.v1.LcmEvent", + "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" + }, + "event": { + "$ref": "#/definitions/Event" + } + }, + "required": [ + "eventId", + "eventCorrelationId", + "eventTime", + "eventSource", + "eventType", + "eventSchema", + "eventSchemaVersion", + "event" + ], + "additionalProperties": false + } + + } +} -- cgit 1.2.3-korg