diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-12 19:29:57 +0530 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2018-04-12 14:51:57 +0000 |
commit | d60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 (patch) | |
tree | d17143ff8d9708103d98b487700efa1bc356f850 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java | |
parent | 8da1beb7fb630954a0c7adfc7ae6fbb175877b49 (diff) |
Subinterface_indicator property issue
It should only be present under port implementation
Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java')
-rw-r--r-- | openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java | 21 |
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(), |