From f4c3f0fcebec726ea74b44f9bca3b68e66176671 Mon Sep 17 00:00:00 2001 From: sourabh_sourabh Date: Thu, 8 Jun 2023 15:25:33 +0100 Subject: Patch # 1: Data operation response event (NCMP → Client App) to comply with CloudEvents MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed header definitions (since we now use CloudEvents) - Used 'dataOperation' instead of batch where appropriate. - Modified test json Issue-ID: CPS-1724 Signed-off-by: sourabh_sourabh Change-Id: Ic0f65297b944adf9cf5f3c2cbec679a031a675ec Signed-off-by: sourabh_sourabh --- .../schemas/async/batch-event-headers-1.0.0.json | 55 ------------------ .../schemas/async/batch-event-schema-1.0.0.json | 67 ---------------------- .../async/data-operation-event-schema-1.0.0.json | 66 +++++++++++++++++++++ 3 files changed, 66 insertions(+), 122 deletions(-) delete mode 100644 cps-ncmp-events/src/main/resources/schemas/async/batch-event-headers-1.0.0.json delete mode 100644 cps-ncmp-events/src/main/resources/schemas/async/batch-event-schema-1.0.0.json create mode 100644 cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json (limited to 'cps-ncmp-events/src') diff --git a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-headers-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/async/batch-event-headers-1.0.0.json deleted file mode 100644 index bbcadcd0f4..0000000000 --- a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-headers-1.0.0.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "urn:cps:org.onap.cps.ncmp.events.async:batch-event-headers:1.0.0", - "$ref": "#/definitions/BatchEventHeaders", - "definitions": { - "BatchEventHeaders": { - "description": "The header information of the Batch event.", - "type": "object", - "javaType" : "org.onap.cps.ncmp.events.async.BatchEventHeadersV1", - "properties": { - "eventId": { - "description": "The unique id for identifying the event.", - "type": "string" - }, - "eventCorrelationId": { - "description": "The request id received by NCMP as an acknowledgement.", - "type": "string" - }, - "eventTime": { - "description": "The time of the event. It should be in RFC format ('yyyy-MM-dd'T'HH:mm:ss.SSSZ').", - "type": "string" - }, - "eventTarget": { - "description": "The destination topic to forward the consumed event.", - "type": "string" - }, - "eventSource": { - "description": "The source of the event.", - "type": "string" - }, - "eventType": { - "description": "The type of the Batch event.", - "type": "string" - }, - "eventSchema": { - "description": "The schema of the Batch event payload.", - "type": "string" - }, - "eventSchemaVersion": { - "description": "The schema version of the Batch event payload.", - "type": "string" - } - }, - "required": [ - "eventId", - "eventCorrelationId", - "eventTarget", - "eventType", - "eventSchema", - "eventSchemaVersion" - ], - "additionalProperties": false - } - } -} \ No newline at end of file diff --git a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/async/batch-event-schema-1.0.0.json deleted file mode 100644 index da836ff167..0000000000 --- a/cps-ncmp-events/src/main/resources/schemas/async/batch-event-schema-1.0.0.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "urn:cps:org.onap.cps.ncmp.events.async:batch-event-schema:1.0.0", - "$ref": "#/definitions/BatchDataResponseEvent", - "definitions": { - "BatchDataResponseEvent": { - "description": "The payload of batch event.", - "type": "object", - "javaType" : "org.onap.cps.ncmp.events.async.BatchDataResponseEventV1", - "properties": { - "event": { - "description": "The payload content of the requested data.", - "type": "object", - "javaType" : "org.onap.cps.ncmp.events.async.BatchDataEvent", - "properties": { - "batch-responses": { - "description": "An array of batch responses which contains both success and failure", - "type": "array", - "items": { - "type": "object", - "properties": { - "operationId": { - "description": "Used to distinguish multiple operations using same cmhandleId", - "type": "string" - }, - "ids": { - "description": "Id's of the cmhandles", - "type": "array" - }, - "status-code": { - "description": "which says success or failure (0-99) are for success and (100-199) are for failure", - "type": "string" - }, - "status-message": { - "description": "Human readable message, Which says what the response has", - "type": "string" - }, - "data": { - "description": "Contains the requested data response.", - "type": "object", - "existingJavaType": "java.lang.Object", - "additionalProperties": false - } - }, - "required": [ - "operationId", - "ids", - "status-code", - "status-message" - ], - "additionalProperties": false - } - } - }, - "required": [ - "batch-responses" - ], - "additionalProperties": false - } - }, - "required": [ - "event" - ], - "additionalProperties": false - } - } -} \ No newline at end of file diff --git a/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json new file mode 100644 index 0000000000..308e3068d6 --- /dev/null +++ b/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json @@ -0,0 +1,66 @@ +{ + "$schema": "https://json-schema.org/draft/2019-09/schema", + "$id": "urn:cps:org.onap.cps.ncmp.events.async:data-operation-event-schema:1.0.0", + "$ref": "#/definitions/DataOperationEvent", + "definitions": { + "DataOperationEvent": { + "description": "The payload of data operation event.", + "type": "object", + "javaType" : "org.onap.cps.ncmp.events.async1_0_0.DataOperationEvent", + "properties": { + "data": { + "description": "The payload content of the requested data.", + "type": "object", + "properties": { + "responses": { + "description": "An array of batch responses which contains both success and failure", + "type": "array", + "items": { + "type": "object", + "properties": { + "operationId": { + "description": "Used to distinguish multiple operations using same cmhandleId", + "type": "string" + }, + "ids": { + "description": "Id's of the cmhandles", + "type": "array" + }, + "statusCode": { + "description": "which says success or failure (0-99) are for success and (100-199) are for failure", + "type": "string" + }, + "statusMessage": { + "description": "Human readable message, Which says what the response has", + "type": "string" + }, + "responseContent": { + "description": "Contains the requested data response.", + "type": "object", + "existingJavaType": "java.lang.Object", + "additionalProperties": false + } + }, + "required": [ + "operationId", + "ids", + "statusCode", + "statusMessage" + ], + "additionalProperties": false + } + } + }, + "required": [ + "responses" + ], + "additionalProperties": false + } + }, + "required": [ + "data" + ], + "additionalProperties": false + } + } +} \ No newline at end of file -- cgit 1.2.3-korg