From 71e676dd1cd2ed4ae348cb686dfd6ed96a4fc5b4 Mon Sep 17 00:00:00 2001 From: bmiklos Date: Thu, 14 Jul 2022 17:15:43 +0200 Subject: Refractor code to use the new LcmEvent schema -Old schema deleted and comments from tests are removed -EventDateTimeFormatter utility added -From LcmEventsCreator.populateLcmEvent the NcmpServiceCmHandle param removed and tests are fixed accordingly -Changes made in test of the LcmEventsCreator for payload testing to make it more clear Issue-ID: CPS-1147 Change-Id: Id87c81f2755a6617a0fc68ba92a3d0e3170fd20f Signed-off-by: bmiklos --- .../resources/schemas/ncmp-event-schema-v1.json | 81 ---------------------- 1 file changed, 81 deletions(-) delete mode 100644 cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json (limited to 'cps-ncmp-events') diff --git a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json deleted file mode 100644 index 8685034dc..000000000 --- a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "urn:cps:org.onap.ncmp.cmhandle.lcm-event:v1", - - "$ref": "#/definitions/NcmpEvent", - - "definitions": { - - "NcmpEvent": { - "description": "The payload for NCMP event.", - "type": "object", - "javaType" : "org.onap.ncmp.cmhandle.lcm.event.NcmpEvent", - "properties": { - "eventId": { - "description": "The unique id identifying the event for the specified source.", - "type": "string" - }, - "eventCorrelationId": { - "description": "The id identifying the event for the specified source.", - "type": "string" - }, - "eventTime": { - "description": "The timestamp when the data has been observed.", - "type": "string" - }, - "eventSource": { - "description": "The source of the event.", - "type": "string" - }, - "eventType": { - "description": "The type of the event.", - "type": "string" - }, - "eventSchema": { - "description": "The schema, including its version, that this event adheres to.", - "type": "string" - }, - "event": { - "$ref": "#/definitions/Event" - } - }, - "required": [ - "eventId", - "eventTime", - "eventSource", - "eventType", - "eventSchema", - "event" - ], - "additionalProperties": false - }, - - "Event": { - "description": "The Payload of an event.", - "type": "object", - "properties": { - "cmHandleId": { - "description": "cmHandle id", - "type": "string" - }, - "cmhandle-state": { - "description": "State of cmHandle.", - "type": "string", - "enum": ["ADVISED", "READY", "LOCKED", "DELETING", "DELETED"] - }, - "cmhandle-properties": { - "description": "cmHandle properties as json object.", - "type": "object", - "default": null, - "existingJavaType": "java.util.List>", - "additionalProperties": false - } - }, - "required": [ - "operation" - ], - "additionalProperties": false - } - } -} -- cgit 1.2.3-korg