Move import handling to service template

Moving the handling of all import formats parsing
to ServiceTemplate class to make it generic and
reusable

Change-Id: I80595c3654a625275549a3bb3afe8ba7c9455aff
Issue-ID: SDC-2421
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>

4 files changed, 1 insertions, 75 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
index a915b9b131..f8e6759555 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+
 import org.apache.commons.io.IOUtils;
 import org.hamcrest.core.StringContains;
 import org.junit.Assert;
@@ -62,7 +63,6 @@ import org.onap.sdc.tosca.datatypes.model.Status;
 import org.onap.sdc.tosca.datatypes.model.SubstitutionMapping;
 import org.onap.sdc.tosca.datatypes.model.TopologyTemplate;
 import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
-import org.onap.sdc.tosca.services.YamlUtil;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.SdcRuntimeException;
 import org.openecomp.sdc.tosca.TestUtil;
@@ -1177,57 +1177,6 @@ public class ToscaAnalyzerServiceImplTest {
     }
 
     @Test
-    public void testConvertToscaImport() throws Exception {
-        String inputResourceName = "/mock/analyzerService/importConvertTest.yml";
-        byte[] uploadedFileData = IOUtils.toByteArray(this.getClass().getResource(inputResourceName));
-
-        ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-        ToscaAnalyzerServiceImpl toscaAnalyzerServiceImpl = new ToscaAnalyzerServiceImpl();
-        String convertServiceTemplateImport =
-                toscaAnalyzerServiceImpl.convertServiceTemplateImport(toscaExtensionYamlUtil, uploadedFileData);
-
-        Assert.assertNotNull(convertServiceTemplateImport);
-        ServiceTemplate serviceTemplate =
-                new YamlUtil().yamlToObject(convertServiceTemplateImport, ServiceTemplate.class);
-        Assert.assertNotNull(serviceTemplate.getImports().get(0).get("data"));
-        Assert.assertNotNull(serviceTemplate.getImports().get(1).get("artifacts"));
-        Assert.assertNotNull(serviceTemplate.getImports().get(2).get("capabilities"));
-        Assert.assertNotNull(serviceTemplate.getImports().get(3).get("api_interfaces"));
-        Assert.assertNotNull(serviceTemplate.getImports().get(4).get("api_util_relationships"));
-        Assert.assertNotNull(serviceTemplate.getImports().get(5).get("common"));
-        Assert.assertNotNull(serviceTemplate.getImports().get(6).get("api_util"));
-        Assert.assertNotNull(serviceTemplate.getImports().get(7).get("relationshipsExt"));
-    }
-
-    @Test
-    public void testConvertToscaImportForEmptyImport() throws Exception {
-        String inputResourceName = "/mock/analyzerService/importConvertTestNoImport.yml";
-        byte[] uploadedFileData = IOUtils.toByteArray(this.getClass().getResource(inputResourceName));
-
-        ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-        ToscaAnalyzerServiceImpl toscaAnalyzerServiceImpl = new ToscaAnalyzerServiceImpl();
-        String convertServiceTemplateImport =
-                toscaAnalyzerServiceImpl.convertServiceTemplateImport(toscaExtensionYamlUtil, uploadedFileData);
-
-        Assert.assertNotNull(convertServiceTemplateImport);
-        ServiceTemplate serviceTemplate =
-                new YamlUtil().yamlToObject(convertServiceTemplateImport, ServiceTemplate.class);
-        Assert.assertNull(serviceTemplate.getImports());
-    }
-
-    @Test
-    public void testInvalidToscaImportSection() throws Exception {
-        thrown.expect(SdcRuntimeException.class);
-        thrown.expectMessage("Invalid TOSCA import section");
-        String inputResourceName = "/mock/analyzerService/invalidToscaImport.yml";
-        byte[] uploadedFileData = IOUtils.toByteArray(this.getClass().getResource(inputResourceName));
-
-        ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
-        ToscaAnalyzerServiceImpl toscaAnalyzerServiceImpl = new ToscaAnalyzerServiceImpl();
-        toscaAnalyzerServiceImpl.convertServiceTemplateImport(toscaExtensionYamlUtil, uploadedFileData);
-    }
-
-    @Test
     public void loadValidToscaYamlFileTest() throws Exception {
         String inputResourceName = "/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml";
         byte[] uploadedFileData = IOUtils.toByteArray(this.getClass().getResource(inputResourceName));
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/importConvertTest.yml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/importConvertTest.yml
deleted file mode 100644
index 08ddc3c206..0000000000
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/importConvertTest.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1
-imports:
-- data.yml
-- artifacts.yml
-- capabilities.yml
-- ../../api/interfaces.yml
-- api/util/relationships.yml
-- common:
-    file: api/common.yaml
-- file: api/util.yaml
-- relationshipsExt.yml
-node_types:
-  tosca.nodes.Root:
-    description: The TOSCA Node Type all other TOSCA base Node Types derive from
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/importConvertTestNoImport.yml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/importConvertTestNoImport.yml
deleted file mode 100644
index 536e1367e5..0000000000
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/importConvertTestNoImport.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1
-node_types:
-  tosca.nodes.Root:
-    description: The TOSCA Node Type all other TOSCA base Node Types derive from
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/invalidToscaImport.yml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/invalidToscaImport.yml
deleted file mode 100644
index 8a5cfaa9ac..0000000000
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/invalidToscaImport.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1
-imports: abc
-node_types:
-  tosca.nodes.Root:
-    description: The TOSCA Node Type all other TOSCA base Node Types derive from
\ No newline at end of file