Moving and Renaming eexisting subscription impl

      -renamed the existing subscription related packages to have 'deprecated' on its name as this shall be removed with new implementation of the subscription positive cases
      - replaced the existing schemas with the new ones

Issue-ID: CPS-1991
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
Change-Id: I8f27861b80756540477e03971c53219ea589975c

1 files changed, 36 insertions, 42 deletions

diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
index 9c0c28b2f..e5659a7b6 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
@@ -4,66 +4,60 @@
   "$ref": "#/definitions/CmSubscriptionNcmpOutEvent",
   "definitions": {
     "CmSubscriptionNcmpOutEvent": {
-      "description": "The payload for avc subscription event outcome message.",
       "type": "object",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription1_0_0.ncmp_to_client.CmSubscriptionNcmpOutEvent",
+      "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"
+          "$ref": "#/definitions/Data"
         }
       },
       "required": [
         "data"
-      ]
+      ],
+      "title": "CmSubscriptionNcmpOutEvent"
     },
-    "data": {
+    "Data": {
       "type": "object",
-      "description": "The actual data containing information about the pending and rejected targets",
+      "description": "Information about the targets and subscription",
       "additionalProperties": false,
       "properties": {
-        "statusCode": {
-          "type": "integer"
+        "subscriptionId": {
+          "type": "string",
+          "description": "The unique subscription id"
         },
-        "statusMessage": {
-          "type": "string"
+        "accepted-targets": {
+          "type": "array",
+          "description": "List of accepted targets",
+          "items": {
+            "type": "string"
+          }
         },
-        "additionalInfo": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "rejected": {
-              "$ref": "#/definitions/additionalInfoDetails"
-            },
-            "pending": {
-              "$ref": "#/definitions/additionalInfoDetails"
-            }
+        "rejected-targets": {
+          "type": "array",
+          "description": "List of rejected targets",
+          "items": {
+            "type": "string"
           }
-        }
-      },
-      "required": [
-        "statusCode",
-        "statusMessage"
-      ]
-    },
-    "additionalInfoDetails": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "description": "Details for the target cmhandles",
-        "additionalProperties": false,
-        "properties": {
-          "details": {
+        },
+        "pending-targets": {
+          "type": "array",
+          "description": "List of pending targets",
+          "items": {
             "type": "string"
-          },
-          "targets": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
           }
         }
-      }
+      },
+      "required": [
+        "accepted-targets",
+        "pending-targets",
+        "rejected-targets",
+        "subscriptionId"
+      ],
+      "title": "Data"
     }
   }
+
+
 }
\ No newline at end of file