From: Joseph Keenan <joseph.keenan@est.tech>
Date: Mon, 27 Jun 2022 10:08:47 +0000 (+0000)
Subject: Merge "Introducing DELETING and DELETED Cmhandle State"
X-Git-Tag: 3.1.0~92
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=89c2f729954a4c93bebcd3b7495df8d191ba00b9;hp=9e597b73b7eba2006785034cc49294a21b6f967d;p=cps.git

Merge "Introducing DELETING and DELETED Cmhandle State"
---

diff --git a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
index 2dcc30e6e..8685034dc 100644
--- a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
@@ -62,7 +62,7 @@
         "cmhandle-state": {
           "description": "State of cmHandle.",
           "type": "string",
-          "enum": ["ADVISED", "READY", "LOCKED"]
+          "enum": ["ADVISED", "READY", "LOCKED", "DELETING", "DELETED"]
         },
         "cmhandle-properties": {
           "description": "cmHandle properties as json object.",
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleState.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleState.java
index 0c16adca9..7628c81dd 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleState.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/inventory/CmHandleState.java
@@ -21,5 +21,5 @@
 package org.onap.cps.ncmp.api.inventory;
 
 public enum CmHandleState {
-    ADVISED, READY, LOCKED
+    ADVISED, READY, LOCKED, DELETING, DELETED
 }
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/InventoryPersistenceSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/InventoryPersistenceSpec.groovy
index 578225e87..8c23b302c 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/InventoryPersistenceSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/inventory/InventoryPersistenceSpec.groovy
@@ -141,9 +141,10 @@ class InventoryPersistenceSpec extends Specification {
         then: 'update node leaves is invoked with the correct params'
             1 * mockCpsDataService.replaceNodeTree('NCMP-Admin', 'ncmp-dmi-registry', '/dmi-registry/cm-handles[@id=\'Some-Cm-Handle\']', expectedJsonData, _ as OffsetDateTime)
         where: 'the following states are used'
-            scenario | cmHandleState        || expectedJsonData
-            'READY'   | CmHandleState.READY  || '{"state":{"cm-handle-state":"READY","last-update-time":"2022-12-31T20:30:40.000+0000"}}'
-            'LOCKED'  | CmHandleState.LOCKED || '{"state":{"cm-handle-state":"LOCKED","last-update-time":"2022-12-31T20:30:40.000+0000"}}'
+            scenario    | cmHandleState          || expectedJsonData
+            'READY'     | CmHandleState.READY    || '{"state":{"cm-handle-state":"READY","last-update-time":"2022-12-31T20:30:40.000+0000"}}'
+            'LOCKED'    | CmHandleState.LOCKED   || '{"state":{"cm-handle-state":"LOCKED","last-update-time":"2022-12-31T20:30:40.000+0000"}}'
+            'DELETING'  | CmHandleState.DELETING || '{"state":{"cm-handle-state":"DELETING","last-update-time":"2022-12-31T20:30:40.000+0000"}}'
     }
 
     def 'Get Cm Handles By State'() {