diff options
3 files changed, 7 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java index ab261c9e4b..3863c987a6 100644 --- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java +++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java @@ -6,8 +6,8 @@ import org.togglz.core.context.FeatureContext; public enum ToggleableFeature implements Feature { - @Label("Fabric Configuration") - FABRIC_CONFIGURATION; + @Label("Default Feature") + DEFAULT_FEATURE; public boolean isActive() { return FeatureContext.getFeatureManager().isActive(this); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java index 8c36d208c6..39ee8b7b3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImpl.java @@ -361,11 +361,7 @@ public class ResourceTranslationNovaServerImpl extends ResourceTranslationBase { Optional<Resource> portResourceOp = getOrTranslatePortTemplate(translateTo, heatNetwork.get( Constants.PORT_PROPERTY_NAME), translatedId, novaNodeTemplate); - - if (ToggleableFeature.FABRIC_CONFIGURATION.isActive()) { - portResourceOp.ifPresent(portResource -> handleFabricConfiguration(translateTo, novaNodeTemplate.getType(), portResource)); - } - + portResourceOp.ifPresent(portResource -> handleFabricConfiguration(translateTo, novaNodeTemplate.getType(), portResource)); } } 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/ResourceTranslationNovaServerImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImplTest.java index b268bc2455..b19c822d11 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNovaServerImplTest.java @@ -42,8 +42,8 @@ public class ResourceTranslationNovaServerImplTest extends BaseResourceTranslati } @BeforeClass - public static void enableFabricConfigurationTagging() { - manager.enable(ToggleableFeature.FABRIC_CONFIGURATION); + public static void setUpClass() { + manager.enable(ToggleableFeature.DEFAULT_FEATURE); TestFeatureManagerProvider.setFeatureManager(manager); } @@ -172,8 +172,8 @@ public class ResourceTranslationNovaServerImplTest extends BaseResourceTranslati @AfterClass - public static void disableFabricConfiguration() { - manager.disable(ToggleableFeature.FABRIC_CONFIGURATION); + public static void tearDownClass() { + manager.disable(ToggleableFeature.DEFAULT_FEATURE); manager = null; TestFeatureManagerProvider.setFeatureManager(null); } |