From 3c9bc7d08acb18d76af794bfe936fed7c917b284 Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Tue, 24 Nov 2020 14:44:01 -0500 Subject: Add VNF-Macro-Create and VNF-Macro-Delete These macros enable creation and deletion of a vnf with vfmodules for an existing service instance using building blocks. Also: - No longer force alaCarte=true for these use cases - Fix broken vfModule sorting logic for baseFirst/baseLast - Minor refactoring replacing String literals with constants Issue-ID: SO-3635 Signed-off-by: Jozsef Csongvai Change-Id: I16975f3561f2d978dede20679927ac3531def900 --- .../src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mso-api-handlers/mso-api-handler-infra') diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java index 9a4d0a45df..bcbc7c7ca6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceInstances.java @@ -935,8 +935,7 @@ public class ServiceInstances extends AbstractRestHandler { } if (!requestScope.equalsIgnoreCase(ModelType.service.name()) && action != Action.recreateInstance - && !(requestScope.equalsIgnoreCase(ModelType.vnf.name()) - && (action == Action.replaceInstance || action == Action.replaceInstanceRetainAssignments))) { + && !requestScope.equalsIgnoreCase(ModelType.vnf.name())) { aLaCarte = true; } else if (aLaCarte == null) { aLaCarte = false; -- cgit 1.2.3-korg