diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java')
1 files changed, 17 insertions, 9 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/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); + } } |