Remove FC toggle

Change-Id: I22d97e1dd57c4058bc6987fa88b9485a057b47f8
Issue-ID: SDC-2099
Signed-off-by: Manzon, Inna (im453s) <im453s@intl.att.com>

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 ab261c9..3863c98 100644 (file)
--- 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 8c36d20..39ee8b7 100644 (file)
--- 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 b268bc2..b19c822 100644 (file)
--- 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);
   }