From 91abd701e0e2b6b35c6bc4e42b280c60be23424c Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 31 Jul 2023 20:19:20 +0100 Subject: Introduce error message for missing properties during the service import Signed-off-by: Vasyl Razinkov Change-Id: Ic0e3afaeea09ddbd0acdc31fb2fd2ad68a22cbb1 Issue-ID: SDC-4589 --- .../files/default/error-configuration.yaml | 8 ++++++++ .../components/impl/ServiceImportBusinessLogic.java | 21 +++++++++++---------- .../main/resources/config/error-configuration.yaml | 8 ++++++++ .../config/catalog-be/error-configuration.yaml | 8 ++++++++ 4 files changed, 35 insertions(+), 10 deletions(-) (limited to 'catalog-be/src') diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml index b91e378239..4a9b5d34f4 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml @@ -2918,3 +2918,11 @@ errors: message: "Error: Missing metadata in Service", messageId: "SVC4020" } + + #---------SVC4021----------------------------- + # %1 - missing properties list + MISSING_PROPERTIES_ERROR: { + code: 402, + message: "Error: Following properties are missing in CSAR:\n%1", + messageId: "SVC4021" + } diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java index ac14a3c683..c022304d8b 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportBusinessLogic.java @@ -20,7 +20,6 @@ import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; -import static org.apache.hc.core5.http.HttpStatus.SC_BAD_REQUEST; import static org.openecomp.sdc.be.components.impl.ImportUtils.findFirstToscaMapElement; import static org.openecomp.sdc.be.components.impl.ImportUtils.findFirstToscaStringElement; import static org.openecomp.sdc.be.components.impl.ImportUtils.getPropertyJsonStringValue; @@ -31,8 +30,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import fj.data.Either; -import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -53,7 +50,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.apache.commons.collections.CollectionUtils; @@ -61,8 +57,6 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.janusgraph.core.JanusGraph; -import org.janusgraph.core.JanusGraphTransaction; import org.json.simple.JSONObject; import org.openecomp.sdc.be.components.csar.CsarArtifactsAndGroupsBusinessLogic; import org.openecomp.sdc.be.components.csar.CsarBusinessLogic; @@ -175,8 +169,6 @@ import org.openecomp.sdc.common.datastructure.Wrapper; import org.openecomp.sdc.common.kpi.api.ASDCKpiApi; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.common.util.ValidationUtils; -import org.openecomp.sdc.common.zip.ZipUtils; -import org.openecomp.sdc.common.zip.exception.ZipException; import org.openecomp.sdc.exception.ResponseFormat; import org.springframework.beans.factory.annotation.Autowired; import org.yaml.snakeyaml.Yaml; @@ -852,6 +844,7 @@ public class ServiceImportBusinessLogic { if (CollectionUtils.isNotEmpty(inputs)) { final List componentInstances = component.getComponentInstances(); final String componentUniqueId = component.getUniqueId(); + List propertyMissingNames = new ArrayList<>(); for (final InputDefinition input : inputs) { boolean isSubMapProp = false; if (substitutionMappingProperties != null && !substitutionMappingProperties.isEmpty()) { @@ -861,9 +854,15 @@ public class ServiceImportBusinessLogic { if (!isSubMapProp && isInputFromComponentInstanceProperty(input.getName(), componentInstances)) { associateInputToComponentInstanceProperty(userId, input, componentInstances, componentUniqueId); } else { - associateInputToServiceProperty(userId, input, component, substitutionMappingProperties); + String propertyName = associateInputToServiceProperty(userId, input, component, substitutionMappingProperties); + if (StringUtils.isNotBlank(propertyName)) { + propertyMissingNames.add(propertyName); + } } } + if (CollectionUtils.isNotEmpty(propertyMissingNames)) { + throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.MISSING_PROPERTIES_ERROR, propertyMissingNames.toString())); + } Either, StorageOperationStatus> either = toscaOperationFacade.updateInputsToComponent(inputs, componentUniqueId); if (either.isRight()) { throw new ComponentException(ActionStatus.GENERAL_ERROR); @@ -930,7 +929,7 @@ public class ServiceImportBusinessLogic { } } - private void associateInputToServiceProperty(final String userId, + private String associateInputToServiceProperty(final String userId, final InputDefinition input, final Service component, final Map> substitutionMappingProperties) { final List properties = component.getProperties(); @@ -962,8 +961,10 @@ public class ServiceImportBusinessLogic { } } else { input.setMappedToComponentProperty(false); + return propertyNameFromInput.get(); } } + return ""; } private void updateProperty(final PropertyDefinition propertyDefinition, final InputDefinition input, final String componentUniqueId) { diff --git a/catalog-be/src/main/resources/config/error-configuration.yaml b/catalog-be/src/main/resources/config/error-configuration.yaml index ad8adce5fc..395d1ca031 100644 --- a/catalog-be/src/main/resources/config/error-configuration.yaml +++ b/catalog-be/src/main/resources/config/error-configuration.yaml @@ -2910,3 +2910,11 @@ errors: message: "Error: Missing metadata in Service", messageId: "SVC4020" } + + #---------SVC4021----------------------------- + # %1 - missing properties list + MISSING_PROPERTIES_ERROR: { + code: 402, + message: "Error: Following properties are missing in CSAR:\n%1", + messageId: "SVC4021" + } diff --git a/catalog-be/src/test/resources/config/catalog-be/error-configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/error-configuration.yaml index 11ce71d488..b4c2c7aa81 100644 --- a/catalog-be/src/test/resources/config/catalog-be/error-configuration.yaml +++ b/catalog-be/src/test/resources/config/catalog-be/error-configuration.yaml @@ -2896,3 +2896,11 @@ errors: message: "Error: Missing metadata in Service", messageId: "SVC4020" } + + #---------SVC4021----------------------------- + # %1 - missing properties list + MISSING_PROPERTIES_ERROR: { + code: 402, + message: "Error: Following properties are missing in CSAR:\n%1", + messageId: "SVC4021" + } -- cgit 1.2.3-korg