1 files changed, 36 insertions, 18 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 0eacd4de3c..5d372370e3 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
@@ -19,7 +19,9 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolid
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimaps;
+
 import java.util.List;
+import java.util.Set;
 
 
 /**
@@ -27,10 +29,29 @@ import java.util.List;
  */
 public class PortTemplateConsolidationData extends EntityConsolidationData {
 
-  // key - subport type - for ResourceGroup it is the nested file name
-  // value - List of subports of that type in the port
-    private final ListMultimap<String, SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData =
-        Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
+  // key - sub-interface type - for ResourceGroup it is the nested file name
+  // value - List of sub-interfaces of that type in the port
+  private final ListMultimap<String, SubInterfaceTemplateConsolidationData> subInterfaceConsolidationData =
+      Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
+
+  private String networkRole;
+
+  public String getNetworkRole() {
+    return networkRole;
+  }
+
+  public void setNetworkRole(String networkRole) {
+    this.networkRole = networkRole;
+  }
+
+  public List<SubInterfaceTemplateConsolidationData> getSubInterfaceConsolidationData(
+      String subInterfaceType) {
+    return this.subInterfaceConsolidationData.get(subInterfaceType);
+  }
+
+  public Set<String> getAllSubInterfaceNodeTypes() {
+    return this.subInterfaceConsolidationData.keySet();
+  }
 
   public void addSubInterfaceConsolidationData(String subPortType,
                                                SubInterfaceTemplateConsolidationData
@@ -43,29 +64,26 @@ public class PortTemplateConsolidationData extends EntityConsolidationData {
         other.subInterfaceConsolidationData.keySet());
   }
 
-    public void copyMappedInto(ListMultimap<String, SubInterfaceTemplateConsolidationData> subInterfaceTypeToEntity) {
+  public void copyMappedInto(ListMultimap<String, SubInterfaceTemplateConsolidationData> subInterfaceTypeToEntity) {
     subInterfaceTypeToEntity.putAll(this.subInterfaceConsolidationData);
   }
 
-    public void copyFlatInto(List<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationDataList) {
-        subInterfaceTemplateConsolidationDataList.addAll(subInterfaceConsolidationData.values());
-    }
+  public void copyFlatInto(List<SubInterfaceTemplateConsolidationData> subInterfaceTemplateConsolidationDataList) {
+    subInterfaceTemplateConsolidationDataList.addAll(subInterfaceConsolidationData.values());
+  }
 
   public boolean isNumberOfSubInterfacesPerTypeSimilar(PortTemplateConsolidationData other) {
+    return this.subInterfaceConsolidationData.isEmpty() && other.subInterfaceConsolidationData.isEmpty()
+        || !this.subInterfaceConsolidationData.isEmpty() && !other.subInterfaceConsolidationData.isEmpty()
+          &&  this.subInterfaceConsolidationData.keySet().stream().allMatch(
+              subInterfaceType -> calculateSize(other.subInterfaceConsolidationData.get(subInterfaceType))
+                  ==  calculateSize(this.subInterfaceConsolidationData.get(subInterfaceType)));
 
-    if (this.subInterfaceConsolidationData.isEmpty() &&
-        other.subInterfaceConsolidationData.isEmpty()) {
-      return true;
-    }
-
-    return !this.subInterfaceConsolidationData.isEmpty()
-        && !other.subInterfaceConsolidationData.isEmpty()
-        && this.subInterfaceConsolidationData.keySet().stream().allMatch(subInterfaceType ->
-        calculateSize(other.subInterfaceConsolidationData.get(subInterfaceType)) ==
-            calculateSize(this.subInterfaceConsolidationData.get(subInterfaceType)));
   }
 
   private int calculateSize(List<SubInterfaceTemplateConsolidationData> subInterfaces) {
     return subInterfaces == null ? 0 : subInterfaces.size();
   }
+
+
 }
\ No newline at end of file