diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-09 21:40:24 +0530 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2018-04-10 06:36:06 +0000 |
commit | f691a83954e8fe1148d2a4386cba509bddfa95d5 (patch) | |
tree | fcb53723319a55b4fbc82a8b94d2dc31000c66f0 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java | |
parent | 02ab6515cd2a2f38aa548d9c64753067a0b1daed (diff) |
Evaluate subinterface_indicator property
Corrected the condition to mark subinterface_indicator true/false
Change-Id: I3f21924defbc89a5fcd9a89ffc1ea0d28eec8c36
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')
2 files changed, 7 insertions, 2 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java index 487771b12d..2dfa3c90f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/PortTemplateConsolidationData.java @@ -50,6 +50,10 @@ public class PortTemplateConsolidationData extends EntityConsolidationData { this.networkRole = networkRole; } + public boolean isPortBoundToSubInterface() { + return !subInterfaceConsolidationData.isEmpty(); + } + public SubInterfaceTemplateConsolidationData getSubInterfaceResourceTemplateConsolidationData(Resource resource, String subInterfaceNodeTemplateId, String parentPortNodeTemplateId) { 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 639e76d646..86a360b558 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 @@ -2165,9 +2165,10 @@ public class UnifiedCompositionService { continue; } - if(unifiedCompositionEntity == UnifiedCompositionEntity.PORT + if (unifiedCompositionEntity == UnifiedCompositionEntity.PORT && entityConsolidationData instanceof PortTemplateConsolidationData) { - properties.put(SUB_INTERFACE_INDICATOR_PROPERTY, true); + properties.put(SUB_INTERFACE_INDICATOR_PROPERTY, + ((PortTemplateConsolidationData) entityConsolidationData).isPortBoundToSubInterface()); } for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) { |