From 56e535b98ea753d7b64dfbdb9d64d380457eaba5 Mon Sep 17 00:00:00 2001 From: kooper Date: Tue, 12 Mar 2019 09:47:48 +0000 Subject: Get manifest location from Meta file Change-Id: Ibdf3e3c0a5c045d19e207c7e48f3404ff099fb3c Issue-ID: SDC-2152 Signed-off-by: kooper --- .../openecomp/core/impl/ToscaConverterImpl.java | 52 ++++++++++++++++------ 1 file changed, 38 insertions(+), 14 deletions(-) (limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core') diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java index 7e5e2031f9..2d4acdc87f 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java @@ -17,7 +17,16 @@ package org.openecomp.core.impl; import org.apache.commons.collections.MapUtils; -import org.onap.sdc.tosca.datatypes.model.*; +import org.onap.sdc.tosca.datatypes.model.ArtifactDefinition; +import org.onap.sdc.tosca.datatypes.model.CapabilityAssignment; +import org.onap.sdc.tosca.datatypes.model.Import; +import org.onap.sdc.tosca.datatypes.model.NodeFilter; +import org.onap.sdc.tosca.datatypes.model.NodeTemplate; +import org.onap.sdc.tosca.datatypes.model.NodeType; +import org.onap.sdc.tosca.datatypes.model.ParameterDefinition; +import org.onap.sdc.tosca.datatypes.model.RequirementAssignment; +import org.onap.sdc.tosca.datatypes.model.ServiceTemplate; +import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping; import org.openecomp.core.converter.ServiceTemplateReaderService; import org.openecomp.core.converter.ToscaConverter; import org.openecomp.core.converter.datatypes.Constants; @@ -36,19 +45,34 @@ import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypes import org.yaml.snakeyaml.error.YAMLException; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.regex.Pattern; -import static org.openecomp.core.converter.datatypes.Constants.*; -import static org.openecomp.core.impl.GlobalSubstitutionServiceTemplate.*; +import static org.openecomp.core.converter.datatypes.Constants.ONAP_INDEX; +import static org.openecomp.core.converter.datatypes.Constants.capabilities; +import static org.openecomp.core.converter.datatypes.Constants.inputs; +import static org.openecomp.core.converter.datatypes.Constants.nodeType; +import static org.openecomp.core.converter.datatypes.Constants.definitionsDir; +import static org.openecomp.core.converter.datatypes.Constants.globalStName; +import static org.openecomp.core.converter.datatypes.Constants.globalSubstitution; +import static org.openecomp.core.converter.datatypes.Constants.mainStName; +import static org.openecomp.core.converter.datatypes.Constants.openecompHeatIndex; +import static org.openecomp.core.converter.datatypes.Constants.outputs; +import static org.openecomp.core.converter.datatypes.Constants.requirements; +import static org.openecomp.core.impl.GlobalSubstitutionServiceTemplate.GLOBAL_SUBSTITUTION_SERVICE_FILE_NAME; +import static org.openecomp.core.impl.GlobalSubstitutionServiceTemplate.HEAT_INDEX_IMPORT_FILE; +import static org.openecomp.core.impl.GlobalSubstitutionServiceTemplate.ONAP_INDEX_IMPORT_FILE; +import static org.openecomp.sdc.tosca.csar.CSARConstants.TOSCA_META_ORIG_PATH_FILE_NAME; +import static org.openecomp.sdc.tosca.csar.CSARConstants.TOSCA_META_PATH_FILE_NAME; public class ToscaConverterImpl implements ToscaConverter { - private static final String ORIGINAL = ".original"; - public ToscaConverterImpl() { - - } - @Override public ToscaServiceModel convert(FileContentHandler fileContentHandler) { Map csarFiles = new HashMap<>(fileContentHandler.getFiles()); @@ -86,9 +110,9 @@ public class ToscaConverterImpl implements ToscaConverter { } private void handleMetadataFile(Map csarFiles) { - byte[] bytes = csarFiles.remove(metadataFile); + byte[] bytes = csarFiles.remove(TOSCA_META_PATH_FILE_NAME); if (bytes != null) { - csarFiles.put(metadataFile + ORIGINAL, bytes); + csarFiles.put(TOSCA_META_ORIG_PATH_FILE_NAME, bytes); } } @@ -129,8 +153,8 @@ public class ToscaConverterImpl implements ToscaConverter { addGlobalServiceTemplates(globalServiceTemplates, serviceTemplates); toscaServiceModel.setEntryDefinitionServiceTemplate(mainStName); toscaServiceModel.setServiceTemplates(serviceTemplates); - externalFilesHandler.addFile(metadataFile + ORIGINAL, - csarFiles.get(metadataFile + ORIGINAL)); + externalFilesHandler.addFile(TOSCA_META_ORIG_PATH_FILE_NAME, + csarFiles.get(TOSCA_META_ORIG_PATH_FILE_NAME)); toscaServiceModel.setArtifactFiles(externalFilesHandler); if(MapUtils.isNotEmpty(globalSubstitutionServiceTemplate.getNode_types())) { @@ -437,7 +461,7 @@ public class ToscaConverterImpl implements ToscaConverter { } private boolean isMetadataFile(String fileName) { - return fileName.equals(metadataFile); + return fileName.equals(TOSCA_META_PATH_FILE_NAME); } private boolean isGlobalServiceTemplate(String fileName) { -- cgit 1.2.3-korg