From 2fe802a8bdda1e628c4558f9079439893e7bd52e Mon Sep 17 00:00:00 2001 From: mpriyank Date: Tue, 8 Aug 2023 15:27:18 +0100 Subject: Refactoring Subscription Create LCM use case - Client to NCMP: CmSubscriptionNcmpInEvent - NCMP to DMI: CmSubscriptionDmiInEvent - DMI to NCMP: CmSubscriptionDmiOutEvent - NCMP to Client: CmSubscriptionNcmpOutEvent - code package changed from avcsubscription to cmsubscription - Other classes name as per the events naming above - Test classes refactored - NO LOGIC changes incorporated in this patch Issue-ID: CPS-1831 Change-Id: Id5ad5f799007deaaf6d6fc0f402c130339263d09 Signed-off-by: mpriyank --- .../resources/avcSubscriptionCreationEvent.json | 22 --------------- .../avcSubscriptionCreationEventNcmpVersion.json | 31 ---------------------- .../resources/avcSubscriptionEventResponse.json | 29 -------------------- .../resources/avcSubscriptionOutcomeEvent.json | 24 ----------------- .../resources/avcSubscriptionOutcomeEvent2.json | 20 -------------- .../test/resources/cmSubscriptionDmiInEvent.json | 31 ++++++++++++++++++++++ .../test/resources/cmSubscriptionDmiOutEvent.json | 29 ++++++++++++++++++++ .../test/resources/cmSubscriptionNcmpInEvent.json | 22 +++++++++++++++ .../test/resources/cmSubscriptionNcmpOutEvent.json | 24 +++++++++++++++++ .../resources/cmSubscriptionNcmpOutEvent2.json | 20 ++++++++++++++ 10 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json delete mode 100644 cps-ncmp-service/src/test/resources/avcSubscriptionCreationEventNcmpVersion.json delete mode 100644 cps-ncmp-service/src/test/resources/avcSubscriptionEventResponse.json delete mode 100644 cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json delete mode 100644 cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent2.json create mode 100644 cps-ncmp-service/src/test/resources/cmSubscriptionDmiInEvent.json create mode 100644 cps-ncmp-service/src/test/resources/cmSubscriptionDmiOutEvent.json create mode 100644 cps-ncmp-service/src/test/resources/cmSubscriptionNcmpInEvent.json create mode 100644 cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent.json create mode 100644 cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent2.json (limited to 'cps-ncmp-service/src/test/resources') diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json deleted file mode 100644 index 803fa48bdf..0000000000 --- a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "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/avcSubscriptionCreationEventNcmpVersion.json b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEventNcmpVersion.json deleted file mode 100644 index f31362a1c6..0000000000 --- a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEventNcmpVersion.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "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/avcSubscriptionEventResponse.json b/cps-ncmp-service/src/test/resources/avcSubscriptionEventResponse.json deleted file mode 100644 index dfe8f50466..0000000000 --- a/cps-ncmp-service/src/test/resources/avcSubscriptionEventResponse.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "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" - }, - { - "id": "CMHandle3", - "status": "PENDING", - "details": "No reply from DMI yet" - }, - { - "id": "CMHandle4", - "status": "PENDING", - "details": "No reply from DMI yet" - } - ] - } -} \ No newline at end of file diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json b/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json deleted file mode 100644 index 14e8cbb4c4..0000000000 --- a/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "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": "No reply from DMI yet", - "targets": ["CMHandle3", "CMHandle4"] - } - ] - } - } -} \ No newline at end of file diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent2.json b/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent2.json deleted file mode 100644 index 35ff0241df..0000000000 --- a/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 diff --git a/cps-ncmp-service/src/test/resources/cmSubscriptionDmiInEvent.json b/cps-ncmp-service/src/test/resources/cmSubscriptionDmiInEvent.json new file mode 100644 index 0000000000..f31362a1c6 --- /dev/null +++ b/cps-ncmp-service/src/test/resources/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/cmSubscriptionDmiOutEvent.json b/cps-ncmp-service/src/test/resources/cmSubscriptionDmiOutEvent.json new file mode 100644 index 0000000000..dfe8f50466 --- /dev/null +++ b/cps-ncmp-service/src/test/resources/cmSubscriptionDmiOutEvent.json @@ -0,0 +1,29 @@ +{ + "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" + }, + { + "id": "CMHandle3", + "status": "PENDING", + "details": "No reply from DMI yet" + }, + { + "id": "CMHandle4", + "status": "PENDING", + "details": "No reply from DMI yet" + } + ] + } +} \ No newline at end of file diff --git a/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpInEvent.json b/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpInEvent.json new file mode 100644 index 0000000000..803fa48bdf --- /dev/null +++ b/cps-ncmp-service/src/test/resources/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/cmSubscriptionNcmpOutEvent.json b/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent.json new file mode 100644 index 0000000000..14e8cbb4c4 --- /dev/null +++ b/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent.json @@ -0,0 +1,24 @@ +{ + "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": "No reply from DMI yet", + "targets": ["CMHandle3", "CMHandle4"] + } + ] + } + } +} \ No newline at end of file diff --git a/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent2.json b/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent2.json new file mode 100644 index 0000000000..35ff0241df --- /dev/null +++ b/cps-ncmp-service/src/test/resources/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