Subscription Creation: Fixes for code review after demo
- Change missleading subscription details in testware
- Change datastore check to comply with CPS enum
- Remove redundant CloudConstructionException
- Change exception handling in cloud event mappers
to avoid loss of information
- Remove exception handling from scheduler service
as discussed in the meeting
Issue-ID: CPS-1732
Change-Id: I9fee2eafd4db97a0eed80e39219463c904f5a980
Signed-off-by: halil.cakal <halil.cakal@est.tech>
diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json
index e4539fb..803fa48 100644
--- a/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json
+++ b/cps-ncmp-service/src/test/resources/avcSubscriptionCreationEvent.json
@@ -15,7 +15,7 @@
"CMHandle2",
"CMHandle3"
],
- "datastore": "passthrough-running",
+ "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//"
}
}
diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionEventResponse.json b/cps-ncmp-service/src/test/resources/avcSubscriptionEventResponse.json
index 52ca1df..dfe8f50 100644
--- a/cps-ncmp-service/src/test/resources/avcSubscriptionEventResponse.json
+++ b/cps-ncmp-service/src/test/resources/avcSubscriptionEventResponse.json
@@ -7,37 +7,22 @@
{
"id": "CMHandle1",
"status": "REJECTED",
- "details": "Faulty subscription format for target(s)"
+ "details": "Some error message from the DMI"
},
{
"id": "CMHandle2",
"status": "REJECTED",
- "details": "Faulty subscription format for target(s)"
+ "details": "Some other error message from the DMI"
},
{
"id": "CMHandle3",
- "status": "REJECTED",
- "details": "Faulty subscription format for target(s)"
+ "status": "PENDING",
+ "details": "No reply from DMI yet"
},
{
"id": "CMHandle4",
- "status": "REJECTED",
- "details": "Target(s) do not exist"
- },
- {
- "id": "CMHandle5",
"status": "PENDING",
- "details": "EMS or node connectivity issues, retrying"
- },
- {
- "id": "CMHandle6",
- "status": "PENDING",
- "details": "EMS or node connectivity issues, retrying"
- },
- {
- "id": "CMHandle7",
- "status": "PENDING",
- "details": "EMS or node connectivity issues, retrying"
+ "details": "No reply from DMI yet"
}
]
}
diff --git a/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json b/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json
index 2d83bdd..14e8cbb 100644
--- a/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json
+++ b/cps-ncmp-service/src/test/resources/avcSubscriptionOutcomeEvent.json
@@ -5,18 +5,18 @@
"additionalInfo": {
"rejected": [
{
- "details": "Target(s) do not exist",
- "targets": ["CMHandle4"]
+ "details": "Some other error message from the DMI",
+ "targets": ["CMHandle2"]
},
{
- "details": "Faulty subscription format for target(s)",
- "targets": ["CMHandle1", "CMHandle2", "CMHandle3"]
+ "details": "Some error message from the DMI",
+ "targets": ["CMHandle1"]
}
],
"pending": [
{
- "details": "EMS or node connectivity issues, retrying",
- "targets": ["CMHandle5", "CMHandle6", "CMHandle7"]
+ "details": "No reply from DMI yet",
+ "targets": ["CMHandle3", "CMHandle4"]
}
]
}