1 files changed, 29 insertions, 6 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/ComputeTemplateConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeTemplateConsolidationData.java
index 854cf51aa2..639bcfbfcd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeTemplateConsolidationData.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/ComputeTemplateConsolidationData.java
@@ -16,10 +16,15 @@
 
 package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.collections4.MapUtils;
 import org.onap.sdc.tosca.datatypes.model.RequirementAssignment;
@@ -28,17 +33,17 @@ public class ComputeTemplateConsolidationData extends EntityConsolidationData {
     // key - volume node template id
     // value - List of requirement id and the requirement assignment on the
     // compute node which connect to this volume
-    private Map<String,List<RequirementAssignmentData>> volumes;
+    private Multimap<String, RequirementAssignmentData> volumes;
 
     // key - port type (port id excluding index),
     // value - List of connected port node template ids, with this port type
     private Map<String, List<String>> ports;
 
-    public Map<String,List<RequirementAssignmentData>> getVolumes() {
+    public Multimap<String, RequirementAssignmentData> getVolumes() {
         return volumes;
     }
 
-    public void setVolumes(Map<String,List<RequirementAssignmentData>> volumes) {
+    public void setVolumes(Multimap<String, RequirementAssignmentData> volumes) {
         this.volumes = volumes;
     }
 
@@ -60,10 +65,9 @@ public class ComputeTemplateConsolidationData extends EntityConsolidationData {
 
     public void addVolume(String requirementId, RequirementAssignment requirementAssignment) {
         if (this.volumes == null) {
-            this.volumes = new HashMap<>();
+            this.volumes = ArrayListMultimap.create();
         }
-        this.volumes.computeIfAbsent(requirementAssignment.getNode(), k -> new ArrayList<>())
-                .add(new RequirementAssignmentData(requirementId,
+        this.volumes.put(requirementAssignment.getNode(), new RequirementAssignmentData(requirementId,
                 requirementAssignment));
     }
 
@@ -80,4 +84,23 @@ public class ComputeTemplateConsolidationData extends EntityConsolidationData {
             }
         }
     }
+
+    /**
+     * Is number of port from each compute type legal.
+     *
+     * @return the boolean
+     */
+    public boolean isNumberOfPortFromEachTypeLegal() {
+        Map<String, List<String>> currPortsMap = getPorts();
+        return MapUtils.isEmpty(currPortsMap) || currPortsMap.values().stream()
+                                                             .allMatch(portList -> portList.size() == 1);
+    }
+
+    public Set<String> getPortsIds() {
+        return MapUtils.isEmpty(getPorts()) ? new HashSet<>() : getPorts().keySet();
+    }
+
+    public int getNumberOfPorts() {
+        return getPortsIds().size();
+    }
 }