From 070d7eb6dfac91df13030ca313202a064a5c6072 Mon Sep 17 00:00:00 2001 From: seanbeirne Date: Tue, 19 Dec 2023 14:18:58 +0000 Subject: Deprecate use of basic subscription model - Deprecate json files in resources Issue-ID: CPS-1973 Signed-off-by: seanbeirne Change-Id: I3bf59807f740e3e6f19af0cf0d418edb4f961328 --- .../cmSubscriptionDmiInEvent.json | 31 ++++++++++++++++++++++ .../cmSubscriptionDmiOutEvent.json | 19 +++++++++++++ .../cmSubscriptionEvent.json | 31 ++++++++++++++++++++++ .../cmSubscriptionNcmpInEvent.json | 22 +++++++++++++++ .../cmSubscriptionNcmpOutEvent.json | 28 +++++++++++++++++++ .../cmSubscriptionNcmpOutEvent2.json | 20 ++++++++++++++ 6 files changed, 151 insertions(+) create mode 100644 cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiInEvent.json create mode 100644 cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiOutEvent.json create mode 100644 cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionEvent.json create mode 100644 cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpInEvent.json create mode 100644 cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent.json create mode 100644 cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent2.json (limited to 'cps-ncmp-service/src/test/resources/deprecatedCmSubscription') diff --git a/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiInEvent.json b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiInEvent.json new file mode 100644 index 0000000000..f31362a1c6 --- /dev/null +++ b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiInEvent.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 diff --git a/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiOutEvent.json b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiOutEvent.json new file mode 100644 index 0000000000..ae14b5ca21 --- /dev/null +++ b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionDmiOutEvent.json @@ -0,0 +1,19 @@ +{ + "data": { + "clientId": "SCO-9989752", + "subscriptionName": "cm-subscription-001", + "dmiName": "dminame1", + "subscriptionStatus": [ + { + "id": "CMHandle1", + "status": "REJECTED", + "details": "Some error message from the DMI" + }, + { + "id": "CMHandle2", + "status": "REJECTED", + "details": "Some other error message from the DMI" + } + ] + } +} \ No newline at end of file diff --git a/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionEvent.json b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionEvent.json new file mode 100644 index 0000000000..c38cb79211 --- /dev/null +++ b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionEvent.json @@ -0,0 +1,31 @@ +{ + "clientId": "SCO-9989752", + "subscriptionName": "cm-subscription-001", + "cmSubscriptionStatus": [ + { + "id": "CMHandle1", + "status": "REJECTED", + "details": "Some error message from the DMI" + }, + { + "id": "CMHandle2", + "status": "REJECTED", + "details": "Some other error message from the DMI" + }, + { + "id": "CMHandle3", + "status": "PENDING", + "details": "Some error causes pending" + }, + { + "id": "CMHandle4", + "status": "PENDING", + "details": "Some other error happened" + }, + { + "id": "CMHandle5", + "status": "PENDING", + "details": "Some other error happened" + } + ] +} \ No newline at end of file diff --git a/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpInEvent.json b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpInEvent.json new file mode 100644 index 0000000000..803fa48bdf --- /dev/null +++ b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpInEvent.json @@ -0,0 +1,22 @@ +{ + "data": { + "subscription": { + "clientID": "SCO-9989752", + "name": "cm-subscription-001" + }, + "dataType": { + "dataspace": "ALL", + "dataCategory": "CM", + "dataProvider": "CM-SERVICE" + }, + "predicates": { + "targets": [ + "CMHandle1", + "CMHandle2", + "CMHandle3" + ], + "datastore": "ncmp-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 diff --git a/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent.json b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent.json new file mode 100644 index 0000000000..856f238c6e --- /dev/null +++ b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent.json @@ -0,0 +1,28 @@ +{ + "data": { + "statusCode": 104, + "statusMessage": "partially applied subscription", + "additionalInfo": { + "rejected": [ + { + "details": "Some other error message from the DMI", + "targets": ["CMHandle2"] + }, + { + "details": "Some error message from the DMI", + "targets": ["CMHandle1"] + } + ], + "pending": [ + { + "details": "Some other error happened", + "targets": ["CMHandle4", "CMHandle5"] + }, + { + "details": "Some error causes pending", + "targets": ["CMHandle3"] + } + ] + } + } +} \ No newline at end of file diff --git a/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent2.json b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent2.json new file mode 100644 index 0000000000..35ff0241df --- /dev/null +++ b/cps-ncmp-service/src/test/resources/deprecatedCmSubscription/cmSubscriptionNcmpOutEvent2.json @@ -0,0 +1,20 @@ +{ + "data": { + "statusCode": 104, + "statusMessage": "partially applied subscription", + "additionalInfo": { + "rejected": [ + { + "details": "Cm handle does not exist", + "targets": ["CMHandle1"] + } + ], + "pending": [ + { + "details": "Subscription forwarded to dmi plugin", + "targets": ["CMHandle3"] + } + ] + } + } +} \ No newline at end of file -- cgit 1.2.3-korg