1 files changed, 13 insertions, 3 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/ServiceInstanceDeleteValidator.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/ServiceInstanceDeleteValidator.java
index 0c7ba65cf4..843d94ce6c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/ServiceInstanceDeleteValidator.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/ServiceInstanceDeleteValidator.java
@@ -6,11 +6,12 @@ import java.util.regex.Pattern;
 import org.onap.so.apihandlerinfra.Action;
 import org.onap.so.apihandlerinfra.Actions;
 import org.onap.so.apihandlerinfra.infra.rest.AAIDataRetrieval;
-import org.onap.so.listener.Skip;
 import org.onap.so.serviceinstancebeans.ServiceInstancesRequest;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
-@Skip
+
+@Component
 public class ServiceInstanceDeleteValidator implements RequestValidator {
 
     @Autowired
@@ -18,8 +19,17 @@ public class ServiceInstanceDeleteValidator implements RequestValidator {
 
     @Override
     public boolean shouldRunFor(String requestUri, ServiceInstancesRequest request, Actions action) {
+        boolean isALaCarte = false;
+        if (request.getRequestDetails() != null && request.getRequestDetails().getRequestParameters() != null) {
+            if (request.getRequestDetails().getRequestParameters().getALaCarte() == null) {
+                isALaCarte = false;
+            } else {
+                isALaCarte = request.getRequestDetails().getRequestParameters().getALaCarte();
+            }
+
+        }
         return Pattern.compile("[Vv][5-8]/serviceInstances/[^/]+").matcher(requestUri).matches()
-                && action.equals(Action.deleteInstance);
+                && action.equals(Action.deleteInstance) && isALaCarte;
     }
 
     @Override