1 files changed, 6 insertions, 16 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
index 64c2168241..0d8a07a41f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.sdc.tosca.datatypes.model.RequirementAssignment;
@@ -142,8 +143,8 @@ public class ConsolidationDataUtil {
         PortTemplateConsolidationData portTemplateConsolidationData =
                 filePortConsolidationData.getPortTemplateConsolidationData(portNodeTemplateId);
         if (portTemplateConsolidationData == null) {
-            portTemplateConsolidationData = getInitPortTemplateConsolidationData(portNodeTemplateId,
-                    portResourceId, portResourceType);
+            portTemplateConsolidationData = filePortConsolidationData
+                    .createPortTemplateConsolidationData(portNodeTemplateId, portResourceId, portResourceType);
             filePortConsolidationData.setPortTemplateConsolidationData(portNodeTemplateId,
                     portTemplateConsolidationData);
         }
@@ -151,18 +152,6 @@ public class ConsolidationDataUtil {
         return portTemplateConsolidationData;
     }
 
-    private static PortTemplateConsolidationData getInitPortTemplateConsolidationData(String portNodeTemplateId,
-                                                                                             String portResourceId,
-                                                                                             String portResourceType) {
-        PortTemplateConsolidationData portTemplateConsolidationData = new PortTemplateConsolidationData();
-        portTemplateConsolidationData.setNodeTemplateId(portNodeTemplateId);
-        Optional<String> portNetworkRole = HeatToToscaUtil.evaluateNetworkRoleFromResourceId(portResourceId,
-                portResourceType);
-        portNetworkRole.ifPresent(portTemplateConsolidationData::setNetworkRole);
-        return portTemplateConsolidationData;
-    }
-
-
     public static Optional<SubInterfaceTemplateConsolidationData> getSubInterfaceTemplateConsolidationData(
             TranslateTo subInterfaceTo, String subInterfaceNodeTemplateId) {
 
@@ -197,8 +186,9 @@ public class ConsolidationDataUtil {
             Optional<String> portResourceId = getSubInterfaceParentPortResourceId(parentPortNodeTemplateId,
                     subInterfaceTo);
             if (portResourceId.isPresent()) {
-                portTemplateConsolidationData = getInitPortTemplateConsolidationData(parentPortNodeTemplateId,
-                        portResourceId.get(), HeatToToscaUtil.getResourceType(portResourceId.get(), subInterfaceTo
+                portTemplateConsolidationData = filePortConsolidationData.createPortTemplateConsolidationData(
+                        parentPortNodeTemplateId, portResourceId.get(),
+                        HeatToToscaUtil.getResourceType(portResourceId.get(), subInterfaceTo
                                 .getHeatOrchestrationTemplate(), subInterfaceTo.getHeatFileName()));
             } else {
                 portTemplateConsolidationData = new PortTemplateConsolidationData();