Subscription Creation: NCMP to DMI CloudEvent transformation

- Add mapper to convert client event into ncmp event
- Add sample json object of ncmp version
- Change subscription event consumer to consume CloudEvents
- Change subscription event forwarder to publish CloudEvents
- Change test producer config to support CloudEvents
- Change sample subscription event json to comply with new schema
- Add more test for missing branches
- Change packages of the mappers into relevant directory

Issue-ID: CPS-1737
Change-Id: I8c9e6e7bf713a8fb530a0586dfb2bce796a462f5
Signed-off-by: halil.cakal <halil.cakal@est.tech>

2 files changed, 40 insertions, 10 deletions

diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json
index 63fca1f415..e4539fb38a 100644
--- a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json
+++ b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json
@@ -1,7 +1,5 @@
 {
-  "version": "1.0",
-  "eventType": "CREATE",
-  "event": {
+  "data": {
     "subscription": {
       "clientID": "SCO-9989752",
       "name": "cm-subscription-001"
@@ -9,15 +7,16 @@
     "dataType": {
       "dataspace": "ALL",
       "dataCategory": "CM",
-      "dataProvider": "CM-SERVICE",
-      "schemaName": "org.onap.ncmp:cm-network-avc-event.rfc8641",
-      "schemaVersion": "1.0"
+      "dataProvider": "CM-SERVICE"
     },
     "predicates": {
-      "targets" :  ["CMHandle1", "CMHandle2", "CMHandle3"],
+      "targets": [
+        "CMHandle1",
+        "CMHandle2",
+        "CMHandle3"
+      ],
       "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//"
+      "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//"
+    }
   }
-
-}
 }
\ No newline at end of file
diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEventNcmpVersion.json b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEventNcmpVersion.json
new file mode 100644
index 0000000000..f31362a1c6
--- /dev/null
+++ b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEventNcmpVersion.json
@@ -0,0 +1,31 @@
+{
+  "data": {
+    "subscription": {
+      "clientID": "SCO-9989752",
+      "name": "cm-subscription-001"
+    },
+    "dataType": {
+      "dataspace": "ALL",
+      "dataCategory": "CM",
+      "dataProvider": "CM-SERVICE"
+    },
+    "predicates": {
+      "targets":[
+        {
+          "id":"CMHandle2",
+          "additional-properties":{
+            "Books":"Novel"
+          }
+        },
+        {
+          "id":"CMHandle1",
+          "additional-properties":{
+            "Books":"Social Media"
+          }
+        }
+      ],
+      "datastore": "passthrough-running",
+      "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//"
+    }
+  }
+}
\ No newline at end of file