Change Tosca structure

change Tosca Service Template according to Tosca-spec-1.1

Change-Id: I8f689b02e0349fc8c787868661f498d7d530d445
Issue-ID: SDC-1043
Signed-off-by: talio <tali.orenbach@amdocs.com>

1 files changed, 18 insertions, 30 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 f8b9f75b8f..e9a8f58426 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
@@ -436,36 +436,24 @@ public class ToscaConverterImpl implements ToscaConverter {
     return CsarFileTypes.externalFile;
   }
 
-  private Optional<Manifest> getCsarManifest(Map<String, byte[]> csarFiles) throws IOException {
-    Optional<byte[]> manifestContent = getManifestContent(csarFiles);
-
-    if (manifestContent.isPresent()) {
-      ByteArrayInputStream byteInputStream = new ByteArrayInputStream(manifestContent.get());
-
-      return Optional.of(new Manifest(byteInputStream));
-    }
-
-    return Optional.empty();
-  }
-
-  private NodeTemplate convertNodeTemplate(Object candidateNodeTemplate) {
-    NodeTemplate nodeTemplate = new NodeTemplate();
-
-    Map<String, Object> nodeTemplateAsMap = (Map<String, Object>) candidateNodeTemplate;
-    nodeTemplate.setArtifacts((Map<String, ArtifactDefinition>) nodeTemplateAsMap.get("artifacts"));
-    nodeTemplate.setAttributes((Map<String, Object>) nodeTemplateAsMap.get("attributes"));
-    nodeTemplate.setCopy((String) nodeTemplateAsMap.get("copy"));
-    nodeTemplate.setDescription((String) nodeTemplateAsMap.get("description"));
-    nodeTemplate.setDirectives((List<String>) nodeTemplateAsMap.get("directives"));
-    nodeTemplate.setInterfaces(
-        (Map<String, InterfaceDefinition>) nodeTemplateAsMap.get("interfaces"));
-    nodeTemplate.setNode_filter((NodeFilter) nodeTemplateAsMap.get("node_filter"));
-    nodeTemplate.setProperties((Map<String, Object>) nodeTemplateAsMap.get("properties"));
-    nodeTemplate.setRequirements(
-        (List<Map<String, RequirementAssignment>>) nodeTemplateAsMap.get("requirements"));
-    nodeTemplate.setType((String) nodeTemplateAsMap.get("type"));
-    nodeTemplate.setCapabilities(
-        convertCapabilities((Map<String, Object>) nodeTemplateAsMap.get("capabilities")));
+    private NodeTemplate convertNodeTemplate(Object candidateNodeTemplate) {
+        NodeTemplate nodeTemplate = new NodeTemplate();
+
+        Map<String, Object> nodeTemplateAsMap = (Map<String, Object>) candidateNodeTemplate;
+        nodeTemplate.setArtifacts((Map<String, ArtifactDefinition>) nodeTemplateAsMap.get("artifacts"));
+        nodeTemplate.setAttributes((Map<String, Object>) nodeTemplateAsMap.get("attributes"));
+        nodeTemplate.setCopy((String) nodeTemplateAsMap.get("copy"));
+        nodeTemplate.setDescription((String) nodeTemplateAsMap.get("description"));
+        nodeTemplate.setDirectives((List<String>) nodeTemplateAsMap.get("directives"));
+        nodeTemplate.setInterfaces(
+            (Map<String, Object>) nodeTemplateAsMap.get("interfaces"));
+        nodeTemplate.setNode_filter((NodeFilter) nodeTemplateAsMap.get("node_filter"));
+        nodeTemplate.setProperties((Map<String, Object>) nodeTemplateAsMap.get("properties"));
+        nodeTemplate.setRequirements(
+            (List<Map<String, RequirementAssignment>>) nodeTemplateAsMap.get("requirements"));
+        nodeTemplate.setType((String) nodeTemplateAsMap.get("type"));
+        nodeTemplate.setCapabilities(
+            convertCapabilities((Map<String, Object>) nodeTemplateAsMap.get("capabilities")));
 
     return nodeTemplate;
   }