Supporting PNFD (SOL001) mapping to Internal AID model

This maps the PNF descriptor containing etsi defined types
according to SOL001 v2.5.1 to openecomp internal model. The
transformation is done in the "Create VSP" stage. As the main
PNF type gets mapped to the outer container in internal ecomp
model, it is possible to have no "resource instances" when
importing the PNF model into the catalog. The code was updated
to allow this for PNFs.

Change-Id: I961e91746ca638d858dd468e6c82aeb57993f7a3
Issue-ID: SDC-1976
Issue-ID: SDC-2160
Signed-off-by: dermot123 <dermot.melia@est.tech>

1 files changed, 0 insertions, 105 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterImplTest.java b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterImplTest.java
deleted file mode 100644
index 45d6332e06..0000000000
--- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/java/org/openecomp/core/impl/ToscaSolConverterImplTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * -
- *  * ============LICENSE_START=======================================================
- *  *  Copyright (C) 2019  Nordix Foundation.
- *  * ================================================================================
- *  * Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  *      http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  * ============LICENSE_END=========================================================
- *
- */
-
-package org.openecomp.core.impl;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
-import org.openecomp.core.utilities.file.FileContentHandler;
-import org.openecomp.sdc.common.errors.CoreException;
-import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
-
-public class ToscaSolConverterImplTest {
-
-    private ToscaSolConverterImpl toscaSolConverter;
-    private FileContentHandler fileContentHandler;
-
-    @Before
-    public void setUp(){
-        toscaSolConverter = new ToscaSolConverterImpl();
-        fileContentHandler = new FileContentHandler();
-    }
-
-
-    @Test
-    public void testGivenSOL004WithMetadataDirectoryPackage_whenToscaSolConverterIsCalled_validToscaServiceModelIsReturned()
-            throws IOException{
-        fileContentHandler.addFile("TOSCA-Metadata/TOSCA.meta",
-                ("TOSCA-Meta-File-Version: 1.0\n " +
-                "CSAR-Version: 1.1\n" +
-                "Created-by: Ericsson\n" +
-                "Entry-Definitions: Definitions/Main.yaml\n" +
-                "Entry-Manifest: Main.mf\n" +
-                "Entry-Change-Log: Artifacts/ChangeLog.txt")
-                        .getBytes(StandardCharsets.UTF_8));
-
-        fileContentHandler.addFile("Definitions/Main.yaml", getFileResource("/toscaSOlConverter/Main.yaml"));
-        fileContentHandler.addFile("Main.mf", "".getBytes());
-        fileContentHandler.addFile("Definitions/sample_import1.yaml", getFileResource("/toscaSOlConverter/sample_import1.yaml"));
-        fileContentHandler.addFile("Definitions/sample_import2.yaml", getFileResource("/toscaSOlConverter/sample_import2.yaml"));
-        fileContentHandler.addFile("Artifacts/sample_import3.yaml", getFileResource("/toscaSOlConverter/sample_import3.yaml"));
-        fileContentHandler.addFile("Artifacts/sample_import4.yaml", getFileResource("/toscaSOlConverter/sample_import4.yaml"));
-        ToscaServiceModel toscaServiceModel = toscaSolConverter.convert(fileContentHandler);
-        FileContentHandler contentHandler = toscaServiceModel.getArtifactFiles();
-        Map<String, ServiceTemplate> serviceTemplateMap = toscaServiceModel.getServiceTemplates();
-        String entryDefinitionTemplateName = toscaServiceModel.getEntryDefinitionServiceTemplate();
-        Assert.assertTrue("Artifacts should contain external files", contentHandler.containsFile("Main.mf"));
-        Assert.assertTrue("Main service template should exist", serviceTemplateMap.containsKey("Main.yaml"));
-        Assert.assertEquals("Entry Definition name should be same as passed in TOSCA.meta",
-                "Main.yaml", entryDefinitionTemplateName);
-    }
-
-    @Test(expected = IOException.class)
-    public void testGivenMetaFileDoesNotExist_thenAnExceptionIsThrown() throws IOException{
-        toscaSolConverter.convert(fileContentHandler);
-    }
-
-    @Test(expected = CoreException.class)
-    public void testGivenInvalidServiceTemplate_thenAnExceptionIsThrown() throws IOException{
-
-        fileContentHandler.addFile("TOSCA-Metadata/TOSCA.meta",
-                ("TOSCA-Meta-File-Version: 1.0\n " +
-                        "CSAR-Version: 1.1\n" +
-                        "Created-by: Ericsson\n" +
-                        "Entry-Definitions: Definitions/Main.yaml\n" +
-                        "Entry-Manifest: Main.mf\n" +
-                        "Entry-Change-Log: Artifacts/ChangeLog.txt")
-                        .getBytes(StandardCharsets.UTF_8));
-
-        fileContentHandler.addFile("Definitions/Main.yaml", getFileResource("/toscaSOlConverter/invalidMainService.yaml"));
-        toscaSolConverter.convert(fileContentHandler);
-    }
-
-    private byte[] getFileResource(String filePath) throws IOException {
-        InputStream inputStream = ClassLoader.class.getClass().getResourceAsStream(filePath);
-        return IOUtils.toByteArray(inputStream);
-    }
-
-}
\ No newline at end of file