From 16785537a48d0ca0847b826226d7d81731dba271 Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Tue, 30 Mar 2021 10:06:04 -0400 Subject: Disable VnfDeleteValidator for non-alacarte requests. The validator will fail if there are active vf-modules for the vnf. The downstream vnf-delete macro will delete these vf-modules so the validator should not apply for this flow. Change-Id: If45c872e3b06d9dbb925bff21f7643694503c481 Issue-ID: SO-3801 Signed-off-by: Jozsef Csongvai --- .../so/apihandlerinfra/infra/rest/validators/VnfDeleteValidator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mso-api-handlers/mso-api-handler-infra/src/main') diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/VnfDeleteValidator.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/VnfDeleteValidator.java index 44bab7e087..3dc4e8e4ac 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/VnfDeleteValidator.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/validators/VnfDeleteValidator.java @@ -19,7 +19,8 @@ public class VnfDeleteValidator implements RequestValidator { @Override public boolean shouldRunFor(String requestUri, ServiceInstancesRequest request, Actions action) { return Pattern.compile("[Vv][5-8]/serviceInstances/[^/]+/vnfs/[^/]+").matcher(requestUri).matches() - && action.equals(Action.deleteInstance); + && action.equals(Action.deleteInstance) + && Boolean.TRUE.equals(request.getRequestDetails().getRequestParameters().getALaCarte()); } @Override -- cgit 1.2.3-korg