From f691a83954e8fe1148d2a4386cba509bddfa95d5 Mon Sep 17 00:00:00 2001
From: siddharth0905 <siddharth.singh4@amdocs.com>
Date: Mon, 9 Apr 2018 21:40:24 +0530
Subject: 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>
---
 .../unifiedmodel/consolidation/PortTemplateConsolidationData.java    | 4 ++++
 .../translator/services/heattotosca/UnifiedCompositionService.java   | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main')

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()) {
-- 
cgit 1.2.3-korg