Forward Subscription Information to DMI Plugin(s)

Note: Implemented common EventsPublisher class

Issue-ID: CPS-1431
Signed-off-by: lukegleeson <luke.gleeson@est.tech>
Change-Id: I292a95f2c990a140f5fd63622ca4eba3f8284b9e

1 files changed, 20 insertions, 5 deletions

diff --git a/cps-ncmp-events/src/main/resources/schemas/avc-subscription-event-v1.json b/cps-ncmp-events/src/main/resources/schemas/avc-subscription-event-v1.json
index 5ab446cbbe..feff48c36a 100644
--- a/cps-ncmp-events/src/main/resources/schemas/avc-subscription-event-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/avc-subscription-event-v1.json
@@ -29,6 +29,7 @@
     "event": {
       "description": "The event content.",
       "type": "object",
+      "javaType": "InnerSubscriptionEvent",
       "properties": {
         "subscription": {
           "description": "The subscription details.",
@@ -88,12 +89,26 @@
         ],
         "predicates": {
           "description": "Additional values to be added into the subscription",
-          "existingJavaType" : "java.util.Map<String,Object>",
-          "type" : "object"
-          }
+          "type" : "object",
+          "properties": {
+            "targets": {
+              "description": "CM Handles to be targeted by the subscription",
+              "type" : "array"
+            },
+            "datastore": {
+              "description": "datastore which is to be used by the subscription",
+              "type": "string"
+            },
+            "xpath-filter": {
+              "description": "filter to be applied to the CM Handles through this event",
+              "type": "string"
+            }
+          },
+          "required": ["datastore"]
         }
-      },
-      "required": [
+      }
+    },
+    "required": [
         "subscription",
         "dataType"
       ]