1 files changed, 18 insertions, 1 deletions
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
index 2d901c42..88970e74 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdnc-simulator/src/main/java/org/onap/so/sdncsimulator/controller/OperationsController.java
@@ -19,9 +19,12 @@
  */
 package org.onap.so.sdncsimulator.controller;
 
+import static org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration.DELETEVNFINSTANCE;
 import static org.onap.so.sdncsimulator.utils.Constants.OPERATIONS_URL;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.core.MediaType;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestActionEnumeration;
+import org.onap.sdnc.northbound.client.model.GenericResourceApiRequestinformationRequestInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiServiceOperationInformation;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVnfOperationInformation;
 import org.onap.so.sdncsimulator.models.InputRequest;
@@ -96,7 +99,8 @@ public class OperationsController {
             return ResponseEntity.badRequest().build();
         }
 
-        final Output output = cacheServiceProvider.putVnfOperationInformation(apiVnfOperationInformation);
+        final Output output = getOutput(apiVnfOperationInformation);
+
         final OutputRequest outputRequest = new OutputRequest(output);
 
         if (output.getResponseCode().equals(HttpStatus.OK.toString())) {
@@ -109,4 +113,17 @@ public class OperationsController {
 
     }
 
+    private Output getOutput(final GenericResourceApiVnfOperationInformation apiVnfOperationInformation) {
+        final GenericResourceApiRequestinformationRequestInformation requestInformation =
+                apiVnfOperationInformation.getRequestInformation();
+        if (requestInformation != null) {
+            final GenericResourceApiRequestActionEnumeration requestAction = requestInformation.getRequestAction();
+            if (DELETEVNFINSTANCE.equals(requestAction)) {
+                LOGGER.info("RequestAction: {} will delete vnf instance from cache ...", requestAction);
+                return cacheServiceProvider.deleteVnfOperationInformation(apiVnfOperationInformation);
+            }
+        }
+        return cacheServiceProvider.putVnfOperationInformation(apiVnfOperationInformation);
+    }
+
 }