Cm Subscription: PENDING logic handling in NCMP

- Remove PENDING state from dmi schema
- Modify ncmp out event mapper to categorize
  response per details
- Rename class and method names as well as
  in unit tests
- resolved the merge conflicts

Issue-ID: CPS-1830
Change-Id: I5b7f523f546ec9940c246bd286586fdeba2f892e
Signed-off-by: halil.cakal <halil.cakal@est.tech>
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

3 files changed, 37 insertions, 12 deletions

diff --git a/cps-ncmp-service/src/test/resources/cmSubscriptionDmiOutEvent.json b/cps-ncmp-service/src/test/resources/cmSubscriptionDmiOutEvent.json
index dfe8f50466..ae14b5ca21 100644
--- a/cps-ncmp-service/src/test/resources/cmSubscriptionDmiOutEvent.json
+++ b/cps-ncmp-service/src/test/resources/cmSubscriptionDmiOutEvent.json
@@ -13,16 +13,6 @@
         "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"
       }
     ]
   }
diff --git a/cps-ncmp-service/src/test/resources/cmSubscriptionEvent.json b/cps-ncmp-service/src/test/resources/cmSubscriptionEvent.json
new file mode 100644
index 0000000000..c38cb79211
--- /dev/null
+++ b/cps-ncmp-service/src/test/resources/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/cmSubscriptionNcmpOutEvent.json b/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent.json
index 14e8cbb4c4..856f238c6e 100644
--- a/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent.json
+++ b/cps-ncmp-service/src/test/resources/cmSubscriptionNcmpOutEvent.json
@@ -15,8 +15,12 @@
       ],
       "pending": [
         {
-          "details": "No reply from DMI yet",
-          "targets": ["CMHandle3", "CMHandle4"]
+          "details": "Some other error happened",
+          "targets": ["CMHandle4", "CMHandle5"]
+        },
+        {
+          "details": "Some error causes pending",
+          "targets": ["CMHandle3"]
         }
       ]
     }