1 files changed, 14 insertions, 7 deletions
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 e8a4656adf..c4aea2b6a4 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
@@ -605,6 +605,9 @@ public class UnifiedCompositionService {
           handleNodeTypeProperties(nestedServiceTemplate,
                   portEntityConsolidationDataList, portNodeTemplate, UnifiedCompositionEntity.PORT,
                   null, context);
+          //Add subinterface_indicator property to PORT
+          addPortSubInterfaceIndicatorProperty(portNodeTemplate.getProperties(),
+              filePortConsolidationData.getPortTemplateConsolidationData(portNodeTemplateId));
         }
       }
     }
@@ -1866,6 +1869,10 @@ public class UnifiedCompositionService {
             portTemplateConsolidationDataList, computeTemplateConsolidationData,
             unifiedCompositionDataList, context);
 
+    //Add subinterface_indicator property to PORT
+    portTemplateConsolidationDataList.forEach(entity ->
+          addPortSubInterfaceIndicatorProperty(newPortNodeTemplate.getProperties(), entity));
+
     String newPortNodeTemplateId =
             getNewPortNodeTemplateId(portTemplateConsolidationData
                             .getNodeTemplateId(), connectedComputeNodeType,
@@ -2141,7 +2148,14 @@ public class UnifiedCompositionService {
     handleNodeTypeProperties(substitutionServiceTemplate,
             entityConsolidationDataList, nodeTemplate, unifiedCompositionEntity,
             computeTemplateConsolidationData, context);
+  }
 
+  private void addPortSubInterfaceIndicatorProperty(Map<String, Object> properties,
+                                                    EntityConsolidationData entityConsolidationData) {
+    if (ToggleableFeature.VLAN_TAGGING.isActive()) {
+      properties.put(SUB_INTERFACE_INDICATOR_PROPERTY,
+          ((PortTemplateConsolidationData) entityConsolidationData).isPortBoundToSubInterface());
+    }
   }
 
   private void handleNodeTemplateProperties(UnifiedCompositionTo unifiedCompositionTo,
@@ -2166,13 +2180,6 @@ public class UnifiedCompositionService {
         continue;
       }
 
-      if (unifiedCompositionEntity == UnifiedCompositionEntity.PORT
-          && entityConsolidationData instanceof PortTemplateConsolidationData
-          && ToggleableFeature.VLAN_TAGGING.isActive()) {
-        properties.put(SUB_INTERFACE_INDICATOR_PROPERTY,
-            ((PortTemplateConsolidationData) entityConsolidationData).isPortBoundToSubInterface());
-      }
-
       for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) {
         NodeType nodeTypeWithFlatHierarchy =
             HeatToToscaUtil.getNodeTypeWithFlatHierarchy(unifiedCompositionTo.getNodeTemplate().getType(),