summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-tosca-converter-lib
diff options
context:
space:
mode:
authortalio <tali.orenbach@amdocs.com>2018-03-15 14:46:20 +0200
committertalio <tali.orenbach@amdocs.com>2018-03-15 16:54:28 +0200
commit8b6be264a6f4b658632b7e263737eaae92e337aa (patch)
tree6b45776c5c577c77d5da25e4764b854f2a5cfc2c /openecomp-be/lib/openecomp-tosca-converter-lib
parent704247137bdba671e55c0ebde7e226fff422b608 (diff)
Interface definition
Add separate Interface definition for node type and node template Change-Id: I0c4446227dd096959158fd4a4741cb5aa043e495 Issue-ID: SDC-1043 Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-converter-lib')
-rw-r--r--openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/main/java/org/openecomp/core/impl/ToscaConverterImpl.java17
1 files changed, 1 insertions, 16 deletions
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 e9a8f58426..a625bb6fc2 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
@@ -49,7 +49,6 @@ import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.tosca.datatypes.model.ArtifactDefinition;
import org.openecomp.sdc.tosca.datatypes.model.CapabilityAssignment;
import org.openecomp.sdc.tosca.datatypes.model.Import;
-import org.openecomp.sdc.tosca.datatypes.model.InterfaceDefinition;
import org.openecomp.sdc.tosca.datatypes.model.NodeFilter;
import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
import org.openecomp.sdc.tosca.datatypes.model.NodeType;
@@ -62,18 +61,15 @@ import org.openecomp.sdc.tosca.services.ToscaUtil;
import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypesGenerator;
import org.yaml.snakeyaml.error.YAMLException;
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import java.util.jar.Manifest;
import java.util.regex.Pattern;
public class ToscaConverterImpl implements ToscaConverter {
@@ -84,8 +80,7 @@ public class ToscaConverterImpl implements ToscaConverter {
}
@Override
- public ToscaServiceModel convert(FileContentHandler fileContentHandler)
- throws IOException {
+ public ToscaServiceModel convert(FileContentHandler fileContentHandler) {
Map<String, byte[]> csarFiles = new HashMap<>(fileContentHandler.getFiles());
ToscaServiceModel toscaServiceModel = new ToscaServiceModel();
Map<String, ServiceTemplate> serviceTemplates = new HashMap<>();
@@ -197,16 +192,6 @@ public class ToscaConverterImpl implements ToscaConverter {
serviceTemplates.put(serviceTemplateName, serviceTemplate);
}
- private Optional<byte[]> getManifestContent(Map<String, byte[]> csarFiles) {
- for (Map.Entry<String, byte[]> csarFileEntry : csarFiles.entrySet()) {
- if (csarFileEntry.getKey().contains(manifestFileName)) {
- return Optional.of(csarFileEntry.getValue());
- }
- }
-
- return Optional.empty();
- }
-
private Optional<ServiceTemplate> getServiceTemplateFromCsar(String fileName,
Map<String, byte[]> csarFiles) {
byte[] fileContent = csarFiles.get(fileName);