diff options
Diffstat (limited to 'integration-tests/src')
12 files changed, 450 insertions, 19 deletions
diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/data/providers/OnboardingDataProviders.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/data/providers/OnboardingDataProviders.java index 5e2a8e9066..314e37d2fc 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/data/providers/OnboardingDataProviders.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/data/providers/OnboardingDataProviders.java @@ -138,6 +138,29 @@ public final class OnboardingDataProviders { return parametersArray; } + @DataProvider(name = "vfcList") + private static Object[][] vfcList() { + final List<String> vfcFileNameList = OnboardingUtils.getVfcFilenameList(); + if (CollectionUtils.isEmpty(vfcFileNameList)) { + fail("Could not create vfcList datasource"); + } + final String vfc1 = "1-VFC-NetworkFunction.yaml"; + final String vfc2 = "2-VFC-NetworkService.yaml"; + final List<String> vfcFiles = vfcFileNameList.stream() + .filter(filename -> filename.equals(vfc1) || filename.equals(vfc2)) + .collect(Collectors.toList()); + Collections.sort(vfcFiles); + if (CollectionUtils.isEmpty(vfcFiles) || vfcFiles.size() < 2) { + fail(String.format("Could not create vfcList datasource, one of the vfc file '%s' was not found", vfcFiles)); + } + + final String folderPath = FileHandling.getXnfRepositoryPath(XnfTypeEnum.VFC); + final Object[][] parametersArray = new Object[2][]; + parametersArray[0] = new Object[]{folderPath, vfcFiles.get(0)}; + parametersArray[1] = new Object[]{folderPath, vfcFiles.get(1)}; + return parametersArray; + } + private static Object[][] provideData(final List<String> fileNamesFromFolder, final String folderPath) { final Object[][] parametersArray = new Object[fileNamesFromFolder.size()][]; int index = 0; diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/XnfTypeEnum.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/XnfTypeEnum.java index b27e7e308b..7d7ebcd278 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/XnfTypeEnum.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/datatypes/enums/XnfTypeEnum.java @@ -7,9 +7,9 @@ * 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. @@ -20,20 +20,18 @@ package org.onap.sdc.backend.ci.tests.datatypes.enums; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter public enum XnfTypeEnum { - ETSI ("ETSI"), - VNF ("VNF"), - PNF ("PNF"), - CNF ("CNF"); + CNF("CNF"), + ETSI("ETSI"), + PNF("PNF"), + VFC("VFC"), + VNF("VNF"); private String value; - - private XnfTypeEnum(String value) { - this.value = value; - } - - public String getValue() { - return value; - } } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java index 17331e8d64..766c88734d 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java @@ -136,7 +136,8 @@ public class FileHandling { XnfTypeEnum.PNF, getPnfRepositoryPath(), XnfTypeEnum.CNF, getCnfRepositoryPath(), XnfTypeEnum.VNF, getVnfRepositoryPath(), - XnfTypeEnum.ETSI, getEtsiRepositoryPath() + XnfTypeEnum.ETSI, getEtsiRepositoryPath(), + XnfTypeEnum.VFC, getVfcRepositoryPath() )); public static String getVnfRepositoryPath() { @@ -153,6 +154,8 @@ public class FileHandling { private static String getEtsiRepositoryPath() { return getFilePath("ETSI"); } + private static String getVfcRepositoryPath() { return getFilePath("VFCs"); } + public static String getXnfRepositoryPath(XnfTypeEnum xnfTypeEnum) { return XNF_REPOSITORY_PATHS_MAP.get(xnfTypeEnum); } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtils.java index ad620ef75f..22c314494f 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtils.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/OnboardingUtils.java @@ -21,6 +21,8 @@ package org.onap.sdc.backend.ci.tests.utils.general; +import static org.onap.sdc.backend.ci.tests.utils.general.FileHandling.filterFileNamesListFromFolder; + import java.io.File; import org.onap.sdc.backend.ci.tests.datatypes.enums.XnfTypeEnum; import org.onap.sdc.backend.ci.tests.datatypes.http.HttpHeaderEnum; @@ -217,7 +219,18 @@ public class OnboardingUtils { return vnfNamesFileList.subList(filesCount/2, filesCount); } } - + + /** + * Returns VFC files from src/test/resources/Files/VFCs directory + * @return a list of VFC files + */ + public static List<String> getVfcFilenameList() { + final String filepath = FileHandling.getXnfRepositoryPath(XnfTypeEnum.VFC); + List<String> fileNamesListFromFolder = filterFileNamesListFromFolder(filepath, ".yml"); + fileNamesListFromFolder.addAll(filterFileNamesListFromFolder(filepath, ".yaml")); + return fileNamesListFromFolder; + } + /** * @return * The method returns VNF names list from Files directory under sdc-vnfs repository excluding zip files that known as failed in tosca parser diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiOnboardVnfCnfUiTests.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiOnboardVnfCnfUiTests.java index d420d46368..bbef8fbeda 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiOnboardVnfCnfUiTests.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiOnboardVnfCnfUiTests.java @@ -126,6 +126,7 @@ public class EtsiOnboardVnfCnfUiTests extends SetupCDTest { ComponentPage componentPage = loadComponentPage(); final CompositionPage compositionPage = (CompositionPage) addNodeToCompositionFlow.run(componentPage.goToComposition()) .orElseThrow(() -> new UiTestFlowRuntimeException("Missing expected return CompositionPage")); + compositionPage.isLoaded(); ExtentTestActions.takeScreenshot(Status.INFO, "node-added-to-composition", String.format("Resource '%s' was added to composition", serviceCreateData.getName())); componentPage = compositionPage.goToGeneral(); @@ -149,7 +150,7 @@ public class EtsiOnboardVnfCnfUiTests extends SetupCDTest { private ServiceCreatePage createService(final HomePage homePage, final ServiceCreateData serviceCreateData) { final CreateServiceFlow createServiceFlow = new CreateServiceFlow(webDriver, serviceCreateData); return createServiceFlow.run(homePage) - .orElseThrow(() -> new UiTestFlowRuntimeException("Missing expected return ResourceCreatePage")); + .orElseThrow(() -> new UiTestFlowRuntimeException("Missing expected return ServiceCreatePage")); } private ServiceCreateData createServiceFormData() { diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVfcUiTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVfcUiTest.java index fee4a0d9e3..6823c3eef0 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVfcUiTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVfcUiTest.java @@ -63,7 +63,7 @@ public class ImportVfcUiTest extends SetupCDTest { @BeforeClass public void beforeClass() { - filePath = FileHandling.getFilePath("importVfc/"); + filePath = FileHandling.getFilePath("VFCs/"); } @Test diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ServiceTemplateDesignUiTests.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ServiceTemplateDesignUiTests.java new file mode 100644 index 0000000000..ee453bf221 --- /dev/null +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ServiceTemplateDesignUiTests.java @@ -0,0 +1,328 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2021 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.onap.sdc.frontend.ci.tests.execute.sanity; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.fail; + +import com.aventstack.extentreports.Status; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.stream.Collectors; +import org.onap.sdc.backend.ci.tests.data.providers.OnboardingDataProviders; +import org.onap.sdc.backend.ci.tests.datatypes.enums.ComponentType; +import org.onap.sdc.backend.ci.tests.datatypes.enums.ResourceCategoryEnum; +import org.onap.sdc.backend.ci.tests.utils.general.ElementFactory; +import org.onap.sdc.frontend.ci.tests.datatypes.ComponentData; +import org.onap.sdc.frontend.ci.tests.datatypes.ResourceCreateData; +import org.onap.sdc.frontend.ci.tests.datatypes.composition.RelationshipInformation; +import org.onap.sdc.frontend.ci.tests.exception.UnzipException; +import org.onap.sdc.frontend.ci.tests.execute.setup.DriverFactory; +import org.onap.sdc.frontend.ci.tests.execute.setup.ExtentTestActions; +import org.onap.sdc.frontend.ci.tests.execute.setup.SetupCDTest; +import org.onap.sdc.frontend.ci.tests.flow.AddNodeToCompositionFlow; +import org.onap.sdc.frontend.ci.tests.flow.CreateVfFlow; +import org.onap.sdc.frontend.ci.tests.flow.CreateVfcFlow; +import org.onap.sdc.frontend.ci.tests.flow.DownloadToscaCsarFlow; +import org.onap.sdc.frontend.ci.tests.flow.composition.CreateRelationshipFlow; +import org.onap.sdc.frontend.ci.tests.flow.exception.UiTestFlowRuntimeException; +import org.onap.sdc.frontend.ci.tests.pages.ComponentPage; +import org.onap.sdc.frontend.ci.tests.pages.ResourceCreatePage; +import org.onap.sdc.frontend.ci.tests.pages.TopNavComponent; +import org.onap.sdc.frontend.ci.tests.pages.component.workspace.CompositionPage; +import org.onap.sdc.frontend.ci.tests.pages.component.workspace.ToscaArtifactsPage; +import org.onap.sdc.frontend.ci.tests.pages.home.HomePage; +import org.onap.sdc.frontend.ci.tests.utilities.FileHandling; +import org.openecomp.sdc.be.model.ComponentInstance; +import org.openqa.selenium.WebDriver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.yaml.snakeyaml.Yaml; + +public class ServiceTemplateDesignUiTests extends SetupCDTest { + + private static final Logger LOGGER = LoggerFactory.getLogger(ServiceTemplateDesignUiTests.class); + + private WebDriver webDriver; + private TopNavComponent topNavComponent; + private HomePage homePage; + private List<ResourceCreateData> vfcs = new ArrayList<>(); + private ResourceCreateData vfResourceCreateData; + private ComponentInstance networkFunctionInstance; + private ComponentInstance networkServiceInstance; + + @BeforeMethod + public void init() { + webDriver = DriverFactory.getDriver(); + topNavComponent = new TopNavComponent(webDriver); + homePage = new HomePage(webDriver); + } + + @Test(dataProviderClass = OnboardingDataProviders.class, dataProvider = "vfcList") + public void importAndCertifyVfc(final String rootFolder, final String vfcFilename) { + setLog(vfcFilename); + final String resourceName = ElementFactory.addRandomSuffixToName(ElementFactory.getResourcePrefix()); + final CreateVfcFlow createVfcFlow = createVFC(rootFolder + vfcFilename, resourceName); + vfcs.stream().filter(vfc -> vfc.getName().startsWith(resourceName)).findFirst().orElseThrow( + () -> new UiTestFlowRuntimeException(String.format("VFCs List should contain a VFC with the expected name %s", resourceName))); + final ResourceCreatePage vfcResourceCreatePage = createVfcFlow.getLandedPage() + .orElseThrow(() -> new UiTestFlowRuntimeException("Missing expected ResourceCreatePage")); + vfcResourceCreatePage.isLoaded(); + vfcResourceCreatePage.certifyComponent(); + ExtentTestActions.takeScreenshot(Status.INFO, "vfc-certified", + String.format("VFC '%s' was certified", resourceName)); + } + + @Test(dependsOnMethods = "importAndCertifyVfc") + public void runServiceDesign() throws UnzipException { + final CreateVfFlow createVfFlow = createVF(); + final AddNodeToCompositionFlow addNodeToCompositionFlow = addNodeToCompositionAndCreateRelationship(createVfFlow); + final CompositionPage compositionPage = addNodeToCompositionFlow.getLandedPage() + .orElseThrow(() -> new UiTestFlowRuntimeException("Missing expected return CompositionPage")); + compositionPage.isLoaded(); + final ComponentPage componentPage = compositionPage.goToGeneral(); + componentPage.isLoaded(); + downloadAndVerifyCsarPackage(componentPage); + } + + private CreateVfFlow createVF() { + final ResourceCreateData vfCreateData = createVfFormData(); + final CreateVfFlow createVfFlow = new CreateVfFlow(webDriver, vfCreateData); + createVfFlow.run(homePage); + return createVfFlow; + } + + private ResourceCreateData createVfFormData() { + vfResourceCreateData = new ResourceCreateData(); + vfResourceCreateData.setRandomName(ElementFactory.getResourcePrefix() + "-VF"); + vfResourceCreateData.setCategory(ResourceCategoryEnum.GENERIC_ABSTRACT.getSubCategory()); + vfResourceCreateData.setTagList(Arrays.asList(vfResourceCreateData.getName(), "createVF")); + vfResourceCreateData.setDescription("aDescription"); + vfResourceCreateData.setVendorName("EST"); + vfResourceCreateData.setVendorRelease("4.1.1"); + vfResourceCreateData.setVendorModelNumber("0001"); + return vfResourceCreateData; + } + + private CreateVfcFlow createVFC(final String vfcFullFilename, final String resourceName) { + final ResourceCreateData vfcCreateData = createVfcFormData(resourceName); + final CreateVfcFlow createVfcFlow = new CreateVfcFlow(webDriver, vfcCreateData, vfcFullFilename); + createVfcFlow.run(homePage); + ExtentTestActions.takeScreenshot(Status.INFO, "vfc-created", String.format("VFC '%s' was created", resourceName)); + assertThat(vfcs, notNullValue()); + vfcs.add(vfcCreateData); + return createVfcFlow; + } + + private ResourceCreateData createVfcFormData(final String resourceName) { + final ResourceCreateData vfcCreateData = new ResourceCreateData(); + vfcCreateData.setRandomName(resourceName); + vfcCreateData.setCategory(ResourceCategoryEnum.GENERIC_NETWORK_ELEMENTS.getSubCategory()); + vfcCreateData.setTagList(Arrays.asList(vfcCreateData.getName(), "importVFC")); + vfcCreateData.setDescription("aDescription"); + vfcCreateData.setVendorName("EST"); + vfcCreateData.setVendorRelease("4.1.1"); + vfcCreateData.setVendorModelNumber("0001"); + return vfcCreateData; + } + + private AddNodeToCompositionFlow addNodeToCompositionAndCreateRelationship(final CreateVfFlow createVfFlow) { + final ResourceCreatePage resourceCreatePage = createVfFlow.getLandedPage() + .orElseThrow(() -> new UiTestFlowRuntimeException("Expecting a ResourceCreatePage")); + resourceCreatePage.isLoaded(); + assertThat(vfcs, hasSize(2)); + final ComponentData parentComponent = new ComponentData(); + parentComponent.setName(vfResourceCreateData.getName()); + parentComponent.setVersion("0.1"); + parentComponent.setComponentType(ComponentType.RESOURCE); + + // Adds networkFunction to VF composition + final ComponentData networkFunction = new ComponentData(); + networkFunction.setName(vfcs.get(0).getName()); + networkFunction.setVersion("1.0"); + networkFunction.setComponentType(ComponentType.RESOURCE); + CompositionPage compositionPage = resourceCreatePage.goToComposition(); + compositionPage.isLoaded(); + AddNodeToCompositionFlow addNodeToCompositionFlow = addNodeToComposition(parentComponent, networkFunction, compositionPage); + networkFunctionInstance = addNodeToCompositionFlow.getCreatedComponentInstance() + .orElseThrow(() -> new UiTestFlowRuntimeException("Could not get the created component instance")); + + // Adds networkService to VF composition + final ComponentData networkService = new ComponentData(); + networkService.setName(vfcs.get(1).getName()); + networkService.setVersion("1.0"); + networkService.setComponentType(ComponentType.RESOURCE); + addNodeToCompositionFlow = addNodeToComposition(parentComponent, networkService, compositionPage); + networkServiceInstance = addNodeToCompositionFlow.getCreatedComponentInstance() + .orElseThrow(() -> new UiTestFlowRuntimeException("Could not get the created component instance")); + + // Creates a dependsOn relationship from networkServiceInstance to networkFunctionInstance + createRelationship(compositionPage, networkFunctionInstance.getName(), "tosca.capabilities.Node", + networkServiceInstance.getName(), "tosca.capabilities.Node"); + + return addNodeToCompositionFlow; + } + + public AddNodeToCompositionFlow addNodeToComposition(final ComponentData parentComponent, + final ComponentData resourceToAdd, + CompositionPage compositionPage) { + final AddNodeToCompositionFlow addNodeToCompositionFlow = new AddNodeToCompositionFlow(webDriver, parentComponent, resourceToAdd); + compositionPage = (CompositionPage) addNodeToCompositionFlow.run(compositionPage) + .orElseThrow(() -> new UiTestFlowRuntimeException("Missing expected CompositionPage")); + compositionPage.isLoaded(); + ExtentTestActions.takeScreenshot(Status.INFO, "node-added-to-composition", + String.format("Resource '%s' was added to composition", resourceToAdd.getName())); + return addNodeToCompositionFlow; + } + + /** + * Creates a DependsOn relationship between the imported VFCs + * @param compositionPage Composition Page + * @param fromComponentInstanceName VFC - Network Function + * @param fromCapability Node Capability + * @param toComponentInstanceName VFC - Network Service + * @param toRequirement Node Requirement + */ + private void createRelationship(final CompositionPage compositionPage, final String fromComponentInstanceName, + final String fromCapability, final String toComponentInstanceName, final String toRequirement) { + final RelationshipInformation relationshipInformation = + new RelationshipInformation(fromComponentInstanceName, fromCapability, toComponentInstanceName, toRequirement); + CreateRelationshipFlow createRelationshipFlow = new CreateRelationshipFlow(webDriver, relationshipInformation); + createRelationshipFlow.run(compositionPage).orElseThrow(() -> new UiTestFlowRuntimeException("Expecting a CompositionPage instance")); + ExtentTestActions.takeScreenshot(Status.INFO, "relationship", + String.format("Relationship from networkFunctionInstance '%s' to networkServiceInstanceResource '%s' was created", + fromComponentInstanceName, toComponentInstanceName)); + } + + private void downloadAndVerifyCsarPackage(final ComponentPage componentPage) throws UnzipException { + final DownloadToscaCsarFlow downloadToscaCsarFlow = downloadToscaCsar(componentPage); + final ToscaArtifactsPage toscaArtifactsPage = downloadToscaCsarFlow.getLandedPage() + .orElseThrow(() -> new UiTestFlowRuntimeException("Missing expected ToscaArtifactsPage")); + assertThat("No artifact download was found", toscaArtifactsPage.getDownloadedArtifactList(), not(empty())); + final String downloadedCsarName = toscaArtifactsPage.getDownloadedArtifactList().get(0); + checkCsarPackage(vfResourceCreateData.getName(), downloadedCsarName); + } + + /** + * Download the generated package + * + * @return DownloadToscaCsarFlow + */ + private DownloadToscaCsarFlow downloadToscaCsar(final ComponentPage componentPage) { + final DownloadToscaCsarFlow downloadToscaCsarFlow = new DownloadToscaCsarFlow(webDriver); + downloadToscaCsarFlow.run(componentPage); + return downloadToscaCsarFlow; + } + + /** + * Checks if the downloaded Tosca csar includes the node templates for the added VFCs, + * the generated service template declared “tosca_simple_yaml_1_3” as its Tosca version, + * the generated csar contains the node type definitions for the added VFCs in the Definitions directory, + * the interface template contains the relationship declaration + * @param vfResourceName VF created + * @param downloadedCsarName download Tosca CSAR filename + * @throws UnzipException + */ + private void checkCsarPackage(final String vfResourceName, final String downloadedCsarName) throws UnzipException { + final String downloadFolderPath = getConfig().getDownloadAutomationFolder(); + final Map<String, byte[]> filesFromZip = FileHandling.getFilesFromZip(downloadFolderPath, downloadedCsarName); + final String virtualFunctionName = vfResourceName.replace("-", "").toLowerCase(); + final List<String> expectedDefinitionFolderFileList = getExpectedDefinitionFolderFileList(virtualFunctionName); + final Map<String, byte[]> expectedFilesFromZipMap = filesFromZip.entrySet().parallelStream().filter(key -> expectedDefinitionFolderFileList.stream() + .anyMatch(filename -> filename.equalsIgnoreCase(key.getKey()))).collect(Collectors.toMap(Entry::getKey, Entry::getValue)); + final String vfResourceTemplateFile = "Definitions/resource-"+ virtualFunctionName +"-template.yml"; + final String generatedTemplateFile = expectedFilesFromZipMap.keySet().stream() + .filter(filename -> filename.equalsIgnoreCase(vfResourceTemplateFile)).findFirst() + .orElseThrow(() -> new UiTestFlowRuntimeException(String.format("Resource template file not found %s", vfResourceTemplateFile))); + final byte[] toscaTemplateGenerated = filesFromZip.get(generatedTemplateFile); + assertThat(toscaTemplateGenerated, is(notNullValue())); + verifyGeneratedTemplate(toscaTemplateGenerated, generatedTemplateFile); + verifyNodesRelationship(expectedFilesFromZipMap, virtualFunctionName, filesFromZip); + } + + private void verifyGeneratedTemplate(final byte[] generatedTemplateData, final String generatedTemplateFile) { + final Map<String, Object> templateYamlMap = loadYamlObject(generatedTemplateData); + final boolean hasToscaDefinitionVersionEntry = templateYamlMap.containsKey("tosca_definitions_version"); + assertThat(String.format("'%s' should contain tosca_definitions_version entry", generatedTemplateFile), hasToscaDefinitionVersionEntry, is(true)); + final String toscaVersion = (String) templateYamlMap.get("tosca_definitions_version"); + assertThat(String.format("'%s' tosca_definitions_version entry should have tosca_simple_yaml_1_3 value", generatedTemplateFile), + toscaVersion.equalsIgnoreCase("tosca_simple_yaml_1_3")); + final Map<String, Object> topologyTemplateTosca = getMapEntry(templateYamlMap, "topology_template"); + assertThat(String.format("'%s' should contain a topology_template entry", generatedTemplateFile), topologyTemplateTosca, is(notNullValue())); + final Map<String, Object> nodeTemplatesTosca = getMapEntry(topologyTemplateTosca, "node_templates"); + assertThat(String.format("'%s' should contain a node_templates entry", generatedTemplateFile), nodeTemplatesTosca, is(notNullValue())); + final List<String> nodeTemplateFound = nodeTemplatesTosca.keySet().parallelStream().filter(s -> vfcs.stream() + .anyMatch(vfc -> s.startsWith(vfc.getName()))).collect(Collectors.toList()); + assertThat(String.format("'%s' should contain the node type definitions for the added VFCs '%s'", nodeTemplatesTosca, vfcs), nodeTemplateFound, hasSize(vfcs.size())); + } + + private void verifyNodesRelationship(final Map<String, byte[]> expectedFilesFromZipMap, final String virtualFunctionName, + final Map<String, byte[]> filesFromZip) { + final String vfResourceTemplateFile = "Definitions/resource-"+ virtualFunctionName +"-template-interface.yml"; + final String interfaceTemplateFile = expectedFilesFromZipMap.keySet().stream() + .filter(filename -> filename.equalsIgnoreCase(vfResourceTemplateFile)).findFirst() + .orElseThrow(() -> new UiTestFlowRuntimeException(String.format("Resource template file not found %s", vfResourceTemplateFile))); + final byte[] toscaInterfaceTemplateGenerated = filesFromZip.get(interfaceTemplateFile); + assertThat(toscaInterfaceTemplateGenerated, is(notNullValue())); + final Map<String, Object> interfaceTemplateYamlMap = loadYamlObject(toscaInterfaceTemplateGenerated); + final Map<String, Object> nodeTypesYamlMap = getMapEntry(interfaceTemplateYamlMap, "node_types"); + assertThat(String.format("'%s' should contain a node_types entry", interfaceTemplateYamlMap), nodeTypesYamlMap, is(notNullValue())); + final String result = Arrays.asList(nodeTypesYamlMap.values()).toString(); + assertThat(String.format("'%s' should contain a capabilities entry", nodeTypesYamlMap), result.contains("capabilities"), is(true)); + assertThat(String.format("'%s' should contain a requirements entry", nodeTypesYamlMap), result.contains("requirements"), is(true)); + assertThat(String.format("'%s' should contain a relationship entry", nodeTypesYamlMap), result.contains("relationship"), is(true)); + assertThat(String.format("'%s' should contain a DependsOn relationship value", nodeTypesYamlMap), + result.contains("tosca.relationships.DependsOn"), is(true)); + } + + private List<String> getExpectedDefinitionFolderFileList(final String vfResourceName) { + final List<String> expectedDefinitionFolderFileList = new ArrayList<>(); + vfcs.forEach(vfc -> expectedDefinitionFolderFileList.add("Definitions/resource-"+ vfc.getName() +"-template.yml")); + expectedDefinitionFolderFileList.add("Definitions/resource-"+ vfResourceName +"-template.yml"); + expectedDefinitionFolderFileList.add("Definitions/resource-"+ vfResourceName +"-template-interface.yml"); + return expectedDefinitionFolderFileList; + } + + private Map<String, Object> getMapEntry(final Map<String, Object> yamlObj, final String entryName) { + try { + return (Map<String, Object>) yamlObj.get(entryName); + } catch (final Exception e) { + final String errorMsg = String.format("Could not get the '%s' entry.", entryName); + LOGGER.error(errorMsg, e); + fail(errorMsg + "Error message: " + e.getMessage()); + } + return null; + } + + private Map<String, Object> loadYamlObject(final byte[] definitionYamlFile) { + return new Yaml().load(new String(definitionYamlFile)); + } + +} diff --git a/integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml b/integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml new file mode 100644 index 0000000000..7949abfdc4 --- /dev/null +++ b/integration-tests/src/test/resources/Files/VFCs/1-VFC-NetworkFunction.yaml @@ -0,0 +1,21 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 + +node_types: + org.openecomp.resource.MyNetworkFunctionCI: + derived_from: tosca.nodes.Root + properties: + resourceType: + type: string + resourceSubtype: + type: string + required: false + attributes: + atttr_1: + type: string + default: 'Integration Test' + attr_2: + type: integer + default: 2021 + attr_3: + type: boolean + default: true diff --git a/integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml b/integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml new file mode 100644 index 0000000000..6d905c2424 --- /dev/null +++ b/integration-tests/src/test/resources/Files/VFCs/2-VFC-NetworkService.yaml @@ -0,0 +1,38 @@ +tosca_definitions_version: tosca_simple_yaml_1_3 + +node_types: + org.openecomp.resource.MyNetworkServiceCI: + derived_from: org.openecomp.resource.MyNetworkFunctionCI + description: Integration Test Network Service + properties: + resourceType: + type: string + default: 'NetworkService' + nsName: + type: string + nsdId: + type: string + nsDescription: + type: string + subsystemName: + type: string + connectionName: + type: string + tenant: + type: string + vdcName: + type: string + required: false + core_service_ip: + type: string + attributes: + service_ip: + type: string + default: "1.2.3.4" + interfaces: + Standard: + type: tosca.interfaces.node.lifecycle.Standard + create: + implementation: 'camunda/nsCreate' + delete: + implementation: 'camunda/nsDelete' diff --git a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml index 2c00cbd7e9..2c00cbd7e9 100644 --- a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-child.yml +++ b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-child.yml diff --git a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml index 679f1b64f9..679f1b64f9 100644 --- a/integration-tests/src/test/resources/Files/importVfc/org.openecomp.resource.VFC-root.yml +++ b/integration-tests/src/test/resources/Files/VFCs/org.openecomp.resource.VFC-root.yml diff --git a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml index 9a4eab1a8b..cb1370865b 100644 --- a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml +++ b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml @@ -11,7 +11,6 @@ <include name="changeInstanceNameInVfTest"/> </methods> </class> - <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.ImportVfcUiTest"/> <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.Service"> <methods> <include name="updateService"/> @@ -34,7 +33,14 @@ <include name="onboardEtsiVnfCnfFlow"/> </methods> </class> + <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.ImportVfcUiTest"/> <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.CreateServiceSubstitutionFilterTest"/> + <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.ServiceTemplateDesignUiTests"> + <methods> + <include name="importAndCertifyVfc"/> + <include name="runServiceDesign"/> + </methods> + </class> </classes> </test> </suite> |