diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp')
3 files changed, 66 insertions, 67 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java index 126c38833a..2ef72acd8e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java @@ -1,25 +1,35 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ +/* + * Copyright © 2016-2017 European Support Limited + * * 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. - * ============LICENSE_END========================================================= */ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation; +import static org.junit.Assert.assertEquals; +import static org.openecomp.sdc.common.utils.SdcCommon.MANIFEST_NAME; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateComputeConnectivityIn; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateComputeConnectivityOut; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateDependsOnInConsolidationData; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateGetAttr; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateGroupsInConsolidationData; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateNestedConsolidationData; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateNestedConsolidationDataNodeTemplateIds; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortConnectivityIn; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortConnectivityOut; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortsInConsolidationData; +import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateVolumeInConsolidationData; + import org.apache.commons.collections4.MapUtils; import org.junit.AfterClass; import org.junit.Assert; @@ -33,7 +43,6 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.common.togglz.ToggleableFeature; -import org.openecomp.sdc.common.utils.SdcCommon; import org.openecomp.sdc.datatypes.error.ErrorLevel; import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.heat.datatypes.manifest.FileData; @@ -70,19 +79,6 @@ import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import static org.junit.Assert.assertEquals; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateComputeConnectivityIn; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateComputeConnectivityOut; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateDependsOnInConsolidationData; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateGetAttr; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateGroupsInConsolidationData; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateNestedConsolidationData; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateNestedConsolidationDataNodeTemplateIds; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortConnectivityIn; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortConnectivityOut; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortsInConsolidationData; -import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateVolumeInConsolidationData; - public class BaseResourceTranslationTest { @@ -110,8 +106,10 @@ public class BaseResourceTranslationTest { @AfterClass public static void disableForwarderFeature() { - manager.disable(ToggleableFeature.FORWARDER_CAPABILITY); - manager = null; + if (manager != null) { + manager.disable(ToggleableFeature.FORWARDER_CAPABILITY); + manager = null; + } TestFeatureManagerProvider.setFeatureManager(null); } @@ -223,7 +221,6 @@ public class BaseResourceTranslationTest { fileContent = FileUtils.toByteArray(fis); - String MANIFEST_NAME = SdcCommon.MANIFEST_NAME; if (file.getName().equals(MANIFEST_NAME)) { addManifest(translationContext, MANIFEST_NAME, fileContent); } else { @@ -253,8 +250,8 @@ public class BaseResourceTranslationTest { translationContext.addFile(name, content); } - private static void addFilesFromManifestToTranslationContextManifestFilesMap(TranslationContext translationContext, List<FileData> fileDataListFromManifest) { - + private static void addFilesFromManifestToTranslationContextManifestFilesMap( + TranslationContext translationContext, List<FileData> fileDataListFromManifest) { for (FileData fileFromManfiest : fileDataListFromManifest) { translationContext.addManifestFile(fileFromManfiest.getFile(), fileFromManfiest.getType()); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java index a6944bacad..a6876fa00f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java @@ -1,35 +1,31 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ +/* + * Copyright © 2016-2017 European Support Limited + * * 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. - * ============LICENSE_END========================================================= */ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation; +import org.junit.AfterClass; import org.junit.Before; -import org.junit.Ignore; +import org.junit.BeforeClass; import org.junit.Test; +import org.openecomp.sdc.common.togglz.ToggleableFeature; +import org.togglz.testing.TestFeatureManager; +import org.togglz.testing.TestFeatureManagerProvider; import java.io.IOException; -/** - * @author SHIRIA - * @since December 06, 2016. - */ public class ContrailV2VlanToInterfaceResourceConnectionTest extends BaseResourceTranslationTest { @Override @@ -38,8 +34,13 @@ public class ContrailV2VlanToInterfaceResourceConnectionTest extends BaseResourc // do not delete this function. it prevents the superclass setup from running } - //todo - remove the ignore once we will support VMI as sub port - @Ignore + @BeforeClass + public static void enableVLANTagging() { + manager = new TestFeatureManager(ToggleableFeature.class); + manager.enable(ToggleableFeature.VLAN_TAGGING); + TestFeatureManagerProvider.setFeatureManager(manager); + } + @Test public void testTranslateVlanToInterfaceNestedConnection() throws Exception { inputFilesPath = @@ -50,28 +51,21 @@ public class ContrailV2VlanToInterfaceResourceConnectionTest extends BaseResourc testTranslation(); } - //todo - remove the ignore once we will support VMI as sub port - @Ignore @Test public void testTranslateVlanToNetMultiNestedConnection() throws Exception { inputFilesPath = "/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/inputfiles"; outputFilesPath = - "/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles"; + "/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels" + + "/expectedoutputfiles"; initTranslatorAndTranslate(); testTranslation(); } - //todo - remove the ignore once we will support VMI as sub port - @Ignore - @Test - public void testTranslateVTSBCVendorHeat() throws Exception { - inputFilesPath = - "/mock/services/heattotosca/subInterfaceToInterfaceConnection/vTSBC/inputfiles"; - outputFilesPath = - "/mock/services/heattotosca/subInterfaceToInterfaceConnection/vTSBC/expectedoutputfiles"; - initTranslatorAndTranslate(); - testTranslation(); + @AfterClass + public static void disableVLANTagging() { + manager.disable(ToggleableFeature.VLAN_TAGGING); + manager = null; + TestFeatureManagerProvider.setFeatureManager(null); } - } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java index 796bb82dbd..0776692e03 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java @@ -20,16 +20,16 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.openecomp.sdc.common.togglz.ToggleableFeature; +import org.togglz.testing.TestFeatureManagerProvider; import java.io.IOException; -/** - * @author SHIRIA - * @since December 04, 2016. - */ public class ResourceTranslationContrailV2VlanSubInterfaceImplTest extends BaseResourceTranslationTest { @Override @@ -38,8 +38,12 @@ public class ResourceTranslationContrailV2VlanSubInterfaceImplTest extends // do not delete this function. it prevents the superclass setup from running } - //todo - remove the ignore once we will support VMI as sub port - @Ignore + @BeforeClass + public static void enableVLANTagging() { + manager.enable(ToggleableFeature.VLAN_TAGGING); + TestFeatureManagerProvider.setFeatureManager(manager); + } + @Test public void testTranslateVlanSubInterfaceWithGetResource() throws Exception { inputFilesPath = "/mock/services/heattotosca/contrailv2Vlan/oneInterface/inputfiles"; @@ -48,15 +52,19 @@ public class ResourceTranslationContrailV2VlanSubInterfaceImplTest extends testTranslation(); } - //todo - remove the ignore once we will support VMI as sub port - @Ignore @Test public void testTranslateVlanSubInterfaceWithListOfInterfaceAndNetworks() throws Exception { inputFilesPath = "/mock/services/heattotosca/contrailv2Vlan/listInterface/inputfiles"; outputFilesPath = - "/mock/services/heattotosca/contrailv2Vlan/listInterface/expectedoutputfiles"; + "/mock/services/heattotosca/contrailv2Vlan/listInterface/expectedoutputfiles"; initTranslatorAndTranslate(); testTranslation(); } + @AfterClass + public static void disableVLANTagging() { + manager.disable(ToggleableFeature.VLAN_TAGGING); + manager = null; + TestFeatureManagerProvider.setFeatureManager(null); + } } |