From 6a42f6fe4f1250d1a7bb4e041a725627a4cade9e Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Wed, 11 Apr 2018 15:24:34 +0530 Subject: 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 --- .../translator/services/heattotosca/UnifiedCompositionService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()); } -- cgit 1.2.3-korg