diff options
author | 2023-06-16 15:55:52 +0100 | |
---|---|---|
committer | 2023-06-19 11:54:30 +0100 | |
commit | 3032261ec743bde6eb136cd2030774c3dc358fa9 (patch) | |
tree | 6008f44c0c0274d6f22e653ed31da50f12774356 /cps-ncmp-events/src/main | |
parent | 08898672e0de04238acdedea4266c58f17c2b7e0 (diff) |
DMI Data AVC to cloud events
- DMI Data AVC to be consumed as CloudEvents now
- Removed the schema header as it is taken care by cloudevent headers
- Implemented naming and packaging comments on the schema
- Test cases refactoring
Issue-ID: CPS-1719
Change-Id: I9864f90446720fe903fb3c1502d86035d886751d
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
Diffstat (limited to 'cps-ncmp-events/src/main')
-rw-r--r-- | cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-v1.json | 50 | ||||
-rw-r--r-- | cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-1.0.0.json (renamed from cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json) | 9 |
2 files changed, 4 insertions, 55 deletions
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 deleted file mode 100644 index ea1e617c8..000000000 --- a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-header-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-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-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-1.0.0.json index 7e975c9b9..a5bed939b 100644 --- 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-1.0.0.json @@ -1,10 +1,9 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-schema:v1", + "$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-schema:1.0.0", "$ref": "#/definitions/AvcEvent", "definitions": { "Edit": { - "javaType": "org.onap.cps.ncmp.events.avc.v1.Edit", "additionalProperties": false, "properties": { "edit-id": { @@ -48,9 +47,9 @@ "AvcEvent": { "description": "The payload for AVC event.", "type": "object", - "javaType": "org.onap.cps.ncmp.events.avc.v1.AvcEvent", + "javaType": "org.onap.cps.ncmp.events.avc1_0_0.AvcEvent", "properties": { - "event": { + "data": { "description": "The AVC event content compliant with RFC8641 format", "type": "object", "additionalProperties": false, @@ -99,7 +98,7 @@ } }, "required": [ - "event" + "data" ], "additionalProperties": false } |