diff options
| author |   eleonorali <eleonoral@amdocs.com> | 2018-02-18 15:14:46 +0200 |
|---|---|---|
| committer |   Vitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com> | 2018-02-18 20:10:06 +0000 |
| commit | 3437fc9044b05d53d20c2d5ca0cb5b0705bff155 (patch) | |
| tree | 5ef362d68075e032bfd73c182aaf58f1ce11e2f8 /openecomp-be/lib | |
| parent | 04c1754116920f5b43b20f449a39cbfa7a681102 (diff) | |
SRIOV - set Toggle feautures On on Flow Test
SRIOV - set Toggle feautures On on Flow Test
Change-Id: Id22c21d698c26ea506d338114d4c599d47e4a2b1
Issue-ID: SDC-1050
Signed-off-by: eleonorali <eleonoral@amdocs.com>
Diffstat (limited to 'openecomp-be/lib')
2 files changed, 4 insertions, 25 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/BaseFullTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java index 8126d2967c..19f4d59514 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java @@ -64,23 +64,13 @@ public class BaseFullTranslationTest { @BeforeClass public static void enableToggleableFeatures(){ manager = new TestFeatureManager(ToggleableFeature.class); - if (!ToggleableFeature.FORWARDER_CAPABILITY.isActive()) { - manager.enable(ToggleableFeature.FORWARDER_CAPABILITY); - } - if (!ToggleableFeature.ANNOTATIONS.isActive()) { - manager.enable(ToggleableFeature.ANNOTATIONS); - } - if(!ToggleableFeature.VLAN_TAGGING.isActive()) { - manager.enable(ToggleableFeature.VLAN_TAGGING); - } + manager.enableAll(); } @AfterClass public static void disableToggleableFeatures() { - manager.disable(ToggleableFeature.FORWARDER_CAPABILITY); - manager.disable(ToggleableFeature.ANNOTATIONS); - manager.disable(ToggleableFeature.VLAN_TAGGING); + manager.disableAll(); 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/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 4dc1612893..e784f94df9 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 @@ -98,23 +98,12 @@ public class BaseResourceTranslationTest { @BeforeClass public static void enableToggleableFeatures(){ manager = new TestFeatureManager(ToggleableFeature.class); - if (!ToggleableFeature.FORWARDER_CAPABILITY.isActive()) { - manager.enable(ToggleableFeature.FORWARDER_CAPABILITY); - } - if(!ToggleableFeature.ANNOTATIONS.isActive()) { - manager.enable(ToggleableFeature.ANNOTATIONS); - } - if(!ToggleableFeature.VLAN_TAGGING.isActive()){ - manager.enable(ToggleableFeature.VLAN_TAGGING); - } - + manager.enableAll(); } @AfterClass public static void disableToggleableFeatures() { - manager.disable(ToggleableFeature.FORWARDER_CAPABILITY); - manager.disable(ToggleableFeature.ANNOTATIONS); - manager.disable(ToggleableFeature.VLAN_TAGGING); + manager.disableAll(); manager = null; TestFeatureManagerProvider.setFeatureManager(null); } |