2 files changed, 43 insertions, 39 deletions
diff --git a/src/test/resources/avcSubscriptionCreationEvent.json b/src/test/resources/avcSubscriptionCreationEvent.json
deleted file mode 100644
index 8fa10045..00000000
--- a/src/test/resources/avcSubscriptionCreationEvent.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "data": {
-    "dataType": {
-      "dataCategory": "CM",
-      "dataProvider": "CM-SERVICE",
-      "dataspace": "ALL"
-    },
-    "predicates": {
-      "datastore": "passthrough-running",
-      "targets": [
-        {
-          "id": "CMHandle1",
-          "additional-properties": {
-            "prop1": "prop-value"
-          }
-        },
-        {
-          "id": "CMHandle2",
-          "additional-properties": {
-            "prop-x": "prop-valuex",
-            "prop-p": "prop-valuep"
-          }
-        },
-        {
-          "id": "CMHandle3",
-          "additional-properties": {
-            "prop-y": "prop-valuey"
-          }
-        }
-      ],
-      "datastore-xpath-filter": "//_3gpp-nr-nrm-gnbdufunction:GNBDUFunction/_3gpp-nr-nrm-nrcelldu:NRCellDU/ | //_3gpp-nr-nrm-gnbcuupfunction:GNBCUUPFunction// | //_3gpp-nr-nrm-gnbcucpfunction:GNBCUCPFunction/_3gpp-nr-nrm-nrcelldu:NRCellCU// | //_3gpp-nr-nrm-nrsectorcarrier:NRSectorCarrier//"
-    },
-    "subscription": {
-      "clientID": "SCO-9989752",
-      "name": "cm-subscription-001",
-      "isTagged": false
-    }
-  }
-}
-\ No newline at end of file
diff --git a/src/test/resources/cmNotificationSubscriptionCreationEvent.json b/src/test/resources/cmNotificationSubscriptionCreationEvent.json
new file mode 100644
index 00000000..3b780976
--- /dev/null
+++ b/src/test/resources/cmNotificationSubscriptionCreationEvent.json
@@ -0,0 +1,43 @@
+{
+  "data": {
+    "cmhandles": [
+      {
+        "cmhandleId": "CMHandle1",
+        "private-properties": {
+          "prop1": "prop-value"
+        }
+      },
+      {
+        "cmhandleId": "CMHandle2",
+        "private-properties": {
+          "prop-x": "prop-valuex",
+          "prop-p": "prop-valuep"
+        }
+      },
+      {
+        "cmhandleId": "CMHandle3",
+        "private-properties": {
+          "prop-y": "prop-valuey"
+        }
+      }
+    ],
+    "predicates": [
+      {
+        "targetFilter": [
+          "CMHandle1",
+          "CMHandle2",
+          "CMHandle3"
+        ],
+        "scopeFilter": {
+          "datastore": "ncmp-datastore:passthrough-running",
+          "xpath-filter": [
+            "//_3gpp-nr-nrm-gnbdufunction:GNBDUFunction/_3gpp-nr-nrm-nrcelldu:NRCellDU/",
+            "//_3gpp-nr-nrm-gnbcuupfunction:GNBCUUPFunction//",
+            "//_3gpp-nr-nrm-gnbcucpfunction:GNBCUCPFunction/_3gpp-nr-nrm-nrcelldu:NRCellCU//",
+            "//_3gpp-nr-nrm-nrsectorcarrier:NRSectorCarrier//"
+          ]
+        }
+      }
+    ]
+  }
+}
+\ No newline at end of file