From 9e43b160bde937c32151c8ce5a3d07701bd31924 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Wed, 20 May 2020 14:24:40 +0100 Subject: Fix interface types creation Interface types creation logic was not interpreting some allowed TOSCA entries, that, when declared, were breaking the interface type creation. Every entry under the interface type was being considered as an interface operation, but it is possible to have "derived_from", "version", "metadata" and "description". Also it is not considering the Interface Type entries "inputs", "operations" and "notifications". Another thing is that TOSCA 1.3 changes the way operations should be declared, deprecating the previous way. Now there should be an entry "operations" with the operations entries under it, instead of having the operations entries direct under the interface type. The change allows both types, following the TOSCA rule: if operations entry is not present, then the deprecated way is considered. Change-Id: I13218bda60b29d19b9c5565cbfd63ae3250a78bf Issue-ID: SDC-3075 Signed-off-by: andre.schmid --- .../impl/InterfaceLifecycleTypeImportManager.java | 84 ++++++++++++++++------ 1 file changed, 64 insertions(+), 20 deletions(-) (limited to 'catalog-be/src/main/java') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java index f6a2e5bd3e..f1b4442e18 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java @@ -21,23 +21,28 @@ package org.openecomp.sdc.be.components.impl; import fj.data.Either; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.stream.Collectors; +import javax.annotation.Resource; +import org.apache.commons.collections.MapUtils; import org.openecomp.sdc.be.dao.api.ActionStatus; +import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields; import org.openecomp.sdc.be.impl.ComponentsUtils; import org.openecomp.sdc.be.model.InterfaceDefinition; import org.openecomp.sdc.be.model.Operation; import org.openecomp.sdc.be.model.operations.api.IInterfaceLifecycleOperation; import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus; +import org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum; import org.openecomp.sdc.common.log.wrappers.Logger; import org.openecomp.sdc.exception.ResponseFormat; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - @Component("interfaceLifecycleTypeImportManager") public class InterfaceLifecycleTypeImportManager { @@ -53,7 +58,7 @@ public class InterfaceLifecycleTypeImportManager { public Either, ResponseFormat> createLifecycleTypes(String interfaceLifecycleTypesYml) { - Either, ActionStatus> interfaces = createLifecyclyTypeFromYml(interfaceLifecycleTypesYml); + Either, ActionStatus> interfaces = createInterfaceTypeFromYml(interfaceLifecycleTypesYml); if (interfaces.isRight()) { ActionStatus status = interfaces.right().value(); ResponseFormat responseFormat = componentsUtils.getResponseFormatByGroupType(status, null); @@ -63,8 +68,8 @@ public class InterfaceLifecycleTypeImportManager { } - private Either, ActionStatus> createLifecyclyTypeFromYml(String interfaceLifecycleTypesYml) { - return commonImportManager.createElementTypesFromYml(interfaceLifecycleTypesYml, this::createLifecycleType); + private Either, ActionStatus> createInterfaceTypeFromYml(final String interfaceTypesYml) { + return commonImportManager.createElementTypesFromYml(interfaceTypesYml, this::createInterfaceDefinition); } @@ -97,20 +102,59 @@ public class InterfaceLifecycleTypeImportManager { return eitherResult; } - private InterfaceDefinition createLifecycleType(String interfaceDefinition, Map toscaJson) { - InterfaceDefinition interfaceDef = new InterfaceDefinition(); + private InterfaceDefinition createInterfaceDefinition(final String interfaceDefinition, + final Map toscaJson) { + final InterfaceDefinition interfaceDef = new InterfaceDefinition(); interfaceDef.setType(interfaceDefinition); + final Object descriptionObj = toscaJson.get(ToscaTagNamesEnum.DESCRIPTION.getElementName()); + if (descriptionObj instanceof String) { + interfaceDef.setDescription((String) descriptionObj); + } + final Object derivedFromObj = toscaJson.get(ToscaTagNamesEnum.DERIVED_FROM.getElementName()); + if (derivedFromObj instanceof String) { + interfaceDef.setDerivedFrom((String) derivedFromObj); + } + final Object versionObj = toscaJson.get(ToscaTagNamesEnum.VERSION.getElementName()); + if (versionObj instanceof String) { + interfaceDef.setVersion((String) versionObj); + } - Map operations = new HashMap<>(); - - for (Map.Entry entry : toscaJson.entrySet()) { - Operation operation = new Operation(); - Map opProp = (Map) entry.getValue(); + final Object metadataObj = toscaJson.get(ToscaTagNamesEnum.METADATA.getElementName()); + if (metadataObj instanceof Map) { + interfaceDef.setToscaPresentationValue(JsonPresentationFields.METADATA, metadataObj); + } - operation.setDescription((String) opProp.get("description")); - operations.put(entry.getKey(), operation); + final Map operationsMap; + if (toscaJson.containsKey(ToscaTagNamesEnum.OPERATIONS.getElementName())) { + operationsMap = (Map) toscaJson.get(ToscaTagNamesEnum.OPERATIONS.getElementName()); + } else { + final List entitySchemaEntryList = Arrays + .asList(ToscaTagNamesEnum.DERIVED_FROM.getElementName(), + ToscaTagNamesEnum.DESCRIPTION.getElementName(), + ToscaTagNamesEnum.VERSION.getElementName(), + ToscaTagNamesEnum.METADATA.getElementName(), + ToscaTagNamesEnum.INPUTS.getElementName(), + ToscaTagNamesEnum.NOTIFICATIONS.getElementName()); + operationsMap = toscaJson.entrySet().stream() + .filter(interfaceEntry -> !entitySchemaEntryList.contains(interfaceEntry.getKey())) + .collect(Collectors.toMap(Entry::getKey, Entry::getValue)); } - interfaceDef.setOperationsMap(operations); + interfaceDef.setOperationsMap(handleOperations(operationsMap)); return interfaceDef; } + + private Map handleOperations(final Map operationsToscaEntry) { + if (MapUtils.isEmpty(operationsToscaEntry)) { + return Collections.emptyMap(); + } + return operationsToscaEntry.entrySet().stream() + .collect(Collectors.toMap(Entry::getKey, + operationEntry -> createOperation((Map) operationEntry.getValue()))); + } + + private Operation createOperation(final Map toscaOperationMap) { + final Operation operation = new Operation(); + operation.setDescription((String) toscaOperationMap.get(ToscaTagNamesEnum.DESCRIPTION.getElementName())); + return operation; + } } -- cgit 1.2.3-korg