From 964fd24568228c6d9d3b93925b5b27dfed911714 Mon Sep 17 00:00:00 2001 From: mpriyank Date: Fri, 13 Oct 2023 17:03:16 +0100 Subject: Merging of Subscription schemas - Added new schema from DMI Plugin to NCMP - Added new schema from NCMP to the clients - Renamed existing schemas as per the conventions - Removed the merge keyword from the schemas and naming. Still the package will have merge keyword which will eventually be removed when we remove the old code Issue-ID: CPS-1905 Issue-ID: CPS-1906 Change-Id: I1f8c35e7f6baa25346d9527d58e20bba7f0dddeb Signed-off-by: mpriyank --- .../cm-subscription-dmi-in-event-schema-1.0.0.json | 14 ++--- ...cm-subscription-dmi-out-event-schema-1.0.0.json | 43 +++++++++++++++ ...cm-subscription-ncmp-in-event-schema-1.0.0.json | 12 ++--- ...m-subscription-ncmp-out-event-schema-1.0.0.json | 63 ++++++++++++++++++++++ 4 files changed, 119 insertions(+), 13 deletions(-) create mode 100644 cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-out-event-schema-1.0.0.json create mode 100644 cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-out-event-schema-1.0.0.json diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-in-event-schema-1.0.0.json index caffb6334b..4d4d504ec8 100644 --- a/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-in-event-schema-1.0.0.json +++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-in-event-schema-1.0.0.json @@ -1,12 +1,12 @@ { "$schema": "https://json-schema.org/draft/2019-09/schema", - "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-merge-dmi-in-event-schema:1.0.0", - "$ref": "#/definitions/CmSubscriptionMergeDmiInEvent", + "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-dmi-in-event-schema:1.0.0", + "$ref": "#/definitions/CmSubscriptionDmiInEvent", "definitions": { - "CmSubscriptionMergeDmiInEvent": { + "CmSubscriptionDmiInEvent": { "description": "The payload for cm subscription merge event incoming message from NCMP.", "type": "object", - "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.ncmp_to_dmi.CmSubscriptionMergeDmiInEvent", + "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.ncmp_to_dmi.CmSubscriptionDmiInEvent", "additionalProperties": false, "properties": { "data": { @@ -19,7 +19,7 @@ }, "data": { "type": "object", - "description": "The actual data containing information about the targets and subscription", + "description": "Information about the targets and subscription", "additionalProperties": false, "properties": { "cmhandles": { @@ -59,12 +59,12 @@ "type": "object", "properties": { "datastore": { - "description": "datastore which is to be used by the subscription", + "description": "Datastore which is to be used by the subscription", "type": "string", "enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"] }, "xpath-filter": { - "description": "filter to be applied to the CM Handles through this event", + "description": "Filter to be applied to the CM Handles through this event", "type": "array", "items": { "type": "string" diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-out-event-schema-1.0.0.json new file mode 100644 index 0000000000..5ae6225be6 --- /dev/null +++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-dmi-out-event-schema-1.0.0.json @@ -0,0 +1,43 @@ +{ + "$schema": "https://json-schema.org/draft/2019-09/schema", + "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-dmi-out-event-schema:1.0.0", + "$ref": "#/definitions/CmSubscriptionDmiOutEvent", + "definitions": { + "CmSubscriptionDmiOutEvent": { + "description": "The payload for cm subscription merge event coming out from DMI Plugin.", + "type": "object", + "additionalProperties": false, + "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent", + "properties": { + "data": { + "$ref": "#/definitions/Data" + } + }, + "required": [ + "data" + ], + "title": "CmSubscriptionDmiOutEvent" + }, + "Data": { + "type": "object", + "description": "Information about the targets and subscription", + "additionalProperties": false, + "properties": { + "statusCode": { + "type": "string", + "format": "integer", + "description": "The common status as defined in CPS" + }, + "statusMessage": { + "type": "string", + "description": "The common status message as defined in CPS" + } + }, + "required": [ + "statusCode", + "statusMessage" + ], + "title": "Data" + } + } +} \ No newline at end of file diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-in-event-schema-1.0.0.json index 2742062562..ffdc2e36b7 100644 --- a/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-in-event-schema-1.0.0.json +++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-in-event-schema-1.0.0.json @@ -1,11 +1,11 @@ { - "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-merge-ncmp-in-event:1.0.0", - "$ref": "#/definitions/CmSubscriptionMergeNcmpInEvent", + "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-ncmp-in-event:1.0.0", + "$ref": "#/definitions/CmSubscriptionNcmpInEvent", "$schema": "https://json-schema.org/draft/2019-09/schema", "definitions": { - "CmSubscriptionMergeNcmpInEvent": { + "CmSubscriptionNcmpInEvent": { "description": "The payload for subscription merge event.", - "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.client_to_ncmp.CmSubscriptionMergeNcmpInEvent", + "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.client_to_ncmp.CmSubscriptionNcmpInEvent", "properties": { "data": { "properties": { @@ -30,12 +30,12 @@ "type": "object", "properties": { "datastore": { - "description": "datastore which is to be used by the subscription", + "description": "Datastore which is to be used by the subscription", "type": "string", "enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"] }, "xpath-filter": { - "description": "filter to be applied to the CM Handles through this event", + "description": "Filter to be applied to the CM Handles through this event", "type": "array", "items": { "type": "string" diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-out-event-schema-1.0.0.json new file mode 100644 index 0000000000..e5659a7b61 --- /dev/null +++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscriptionmerge/cm-subscription-ncmp-out-event-schema-1.0.0.json @@ -0,0 +1,63 @@ +{ + "$schema": "https://json-schema.org/draft/2019-09/schema", + "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-ncmp-out-event-schema:1.0.0", + "$ref": "#/definitions/CmSubscriptionNcmpOutEvent", + "definitions": { + "CmSubscriptionNcmpOutEvent": { + "type": "object", + "description": "The payload applied cm subscription merge event coming out from NCMP.", + "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.ncmp_to_client.CmSubscriptionNcmpOutEvent", + "additionalProperties": false, + "properties": { + "data": { + "$ref": "#/definitions/Data" + } + }, + "required": [ + "data" + ], + "title": "CmSubscriptionNcmpOutEvent" + }, + "Data": { + "type": "object", + "description": "Information about the targets and subscription", + "additionalProperties": false, + "properties": { + "subscriptionId": { + "type": "string", + "description": "The unique subscription id" + }, + "accepted-targets": { + "type": "array", + "description": "List of accepted targets", + "items": { + "type": "string" + } + }, + "rejected-targets": { + "type": "array", + "description": "List of rejected targets", + "items": { + "type": "string" + } + }, + "pending-targets": { + "type": "array", + "description": "List of pending targets", + "items": { + "type": "string" + } + } + }, + "required": [ + "accepted-targets", + "pending-targets", + "rejected-targets", + "subscriptionId" + ], + "title": "Data" + } + } + + +} \ No newline at end of file -- cgit 1.2.3-korg