From: ojasdubey <ojas.dubey@amdocs.com>
Date: Wed, 11 Apr 2018 09:54:34 +0000 (+0530)
Subject: Subinterface_indicator property create VF bug fix
X-Git-Tag: v1.2.0~170
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6a42f6fe4f1250d1a7bb4e041a725627a4cade9e;p=sdc.git

Subinterface_indicator property create VF bug fix

Added toggle to fix regression bug for create VF
when VLAN tagging is not enabled.

Change-Id: I7751ae1a7ba48315319b5522cc230ece2f46e84d
Issue-ID: SDC-1206
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
---

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
index 86a360b558..e8a4656adf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
@@ -50,6 +50,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.openecomp.config.api.Configuration;
 import org.openecomp.config.api.ConfigurationManager;
 import org.openecomp.core.utilities.CommonMethods;
+import org.openecomp.sdc.common.togglz.ToggleableFeature;
 import org.openecomp.sdc.datatypes.configuration.ImplementationConfiguration;
 import org.openecomp.sdc.heat.services.HeatConstants;
 import org.openecomp.sdc.tosca.datatypes.ToscaFunctions;
@@ -2166,7 +2167,8 @@ public class UnifiedCompositionService {
       }
 
       if (unifiedCompositionEntity == UnifiedCompositionEntity.PORT
-          && entityConsolidationData instanceof PortTemplateConsolidationData) {
+          && entityConsolidationData instanceof PortTemplateConsolidationData
+          && ToggleableFeature.VLAN_TAGGING.isActive()) {
         properties.put(SUB_INTERFACE_INDICATOR_PROPERTY,
             ((PortTemplateConsolidationData) entityConsolidationData).isPortBoundToSubInterface());
       }