[SDC] Onboarding 1710 rebase.

Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535
Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>

11 files changed, 770 insertions, 306 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
index 763631ff5e..5c2f3db833 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
@@ -22,6 +22,7 @@ package org.openecomp.sdc.translator;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.Assert;
 import org.openecomp.core.translator.api.HeatToToscaTranslator;
 import org.openecomp.core.utilities.file.FileUtils;
@@ -32,7 +33,7 @@ import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
 import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment;
 import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.tosca.services.DataModelUtil;
-import org.openecomp.sdc.tosca.services.yamlutil.ToscaExtensionYamlUtil;
+import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.*;
 
 import java.io.File;
@@ -501,6 +502,28 @@ public class TestUtils {
     return requirementAssignmentDataMap;
   }
 
+  public static Map<String, List<GetAttrFuncData>> getNodesGetAttrIn(NodeTemplate nodeTemplate,
+                                                                     String nodeTemplateId) {
+    Map<String, List<GetAttrFuncData>> nodesGetAttrIn = new HashMap<>();
+    List<GetAttrFuncData> getAttrList = new ArrayList<>();
+    ObjectMapper mapper = new ObjectMapper();
+    Map<String, Object> nodeTemplateProperties = nodeTemplate.getProperties();
+    for (Map.Entry<String, Object> propertyEntry : nodeTemplateProperties.entrySet()) {
+      Map<String, List> propertyValue = mapper.convertValue(propertyEntry.getValue(), Map.class);
+      for (Map.Entry<String, List> entry : propertyValue.entrySet()) {
+        if (entry.getKey().equals("get_attribute")) {
+          GetAttrFuncData data = new GetAttrFuncData();
+          data.setFieldName(propertyEntry.getKey());
+          data.setAttributeName(entry.getValue().get(1).toString());
+          getAttrList.add(data);
+        }
+      }
+      System.out.println();
+    }
+    nodesGetAttrIn.put(nodeTemplateId, getAttrList);
+    return nodesGetAttrIn;
+  }
+
   public static void updatePortsInComputeTemplateConsolidationData(
       List<Pair<String, String>> portIdToTypeList, ComputeTemplateConsolidationData
       compute){
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
index b525191571..5c0c3952ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
@@ -4,8 +4,15 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.mockito.*;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
 import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.tosca.services.ToscaConstants;
@@ -17,11 +24,14 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolida
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.GetAttrFuncData;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -42,6 +52,7 @@ public class ConsolidationServiceTest {
   @Captor
   private ArgumentCaptor<UnifiedCompositionMode> unifiedCompositionModeArg;
 
+  @Spy
   @InjectMocks
   private ConsolidationService consolidationService;
 
@@ -56,7 +67,8 @@ public class ConsolidationServiceTest {
     ConsolidationData consolidationData = new ConsolidationData();
     String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
     ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel(
-        "/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/valid_pre_condition/", null,
+        "/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/valid_pre_condition/",
+        null,
         null);
 
     TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName,
@@ -97,9 +109,11 @@ public class ConsolidationServiceTest {
     ConsolidationData consolidationData = new ConsolidationData();
     String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
     ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
-        ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/one_compute_node/", null, null);
+        ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/one_compute_node/",
+            null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -133,7 +147,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/more_than_one_port/",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1"));
@@ -169,7 +184,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_port_types",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1"));
@@ -212,7 +228,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/three_compute_valid",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -259,7 +276,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/three_compute_valid",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -341,12 +359,14 @@ public class ConsolidationServiceTest {
     translationContext.setConsolidationData(consolidationData);
 
     List<UnifiedCompositionMode> expectedUnifiedModes =
-        Arrays.asList(UnifiedCompositionMode.SingleSubstitution, UnifiedCompositionMode.SingleSubstitution);
+        Arrays.asList(UnifiedCompositionMode.SingleSubstitution,
+            UnifiedCompositionMode.SingleSubstitution);
     verifyMainServiceTemplateConsolidation(2, expectedUnifiedModes, toscaServiceModel);
   }
 
   @Test
-  public void testConsolidationValidForTwoSimilarComputeAndFalseForSingleCompute() throws IOException {
+  public void testConsolidationValidForTwoSimilarComputeAndFalseForSingleCompute()
+      throws IOException {
     ConsolidationData consolidationData = new ConsolidationData();
     String computeNodeTypeName1 = "org.openecomp.resource.vfc.nodes.heat.ps_server";
     String computeNodeTypeName2 = "org.openecomp.resource.vfc.nodes.heat.cmaui";
@@ -354,8 +374,10 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/three_compute_two_similar_one_diff",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName1, consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName2, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName1, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName2, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -401,7 +423,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_compute_valid",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -503,7 +526,8 @@ public class ConsolidationServiceTest {
 
     translationContext.setConsolidationData(consolidationData);
     List<UnifiedCompositionMode> expectedUnifiedModes =
-        Arrays.asList(UnifiedCompositionMode.CatalogInstance, UnifiedCompositionMode.CatalogInstance);
+        Arrays
+            .asList(UnifiedCompositionMode.CatalogInstance, UnifiedCompositionMode.CatalogInstance);
     verifyMainServiceTemplateConsolidation(2, expectedUnifiedModes, toscaServiceModel);
   }
 
@@ -562,7 +586,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/one_flavor_name_diff",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -652,7 +677,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/one_port_without_fixed_ips",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -695,7 +721,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/one_port_without_allowed_address_pairs",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -737,7 +764,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/one_port_without_mac_address",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -779,7 +807,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/ports_with_none_of_the_properties",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -804,13 +833,16 @@ public class ConsolidationServiceTest {
 
     TestUtils.initPortConsolidationData(mainST, consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
@@ -827,7 +859,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_compute_with_same_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -853,20 +886,24 @@ public class ConsolidationServiceTest {
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
-        computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"), Arrays.asList("cmaui_volume"),
+        computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
+        Arrays.asList("cmaui_volume"),
         Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"), null, null,
         portTypeToIdList,
         consolidationData);
 
     TestUtils.initPortConsolidationData(mainST, consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
 
 
@@ -884,7 +921,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -901,7 +939,7 @@ public class ConsolidationServiceTest {
         mainST,
         computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
         Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"),
-        null,null ,
+        null, null,
         portTypeToIdList,
         consolidationData);
 
@@ -933,7 +971,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -983,7 +1022,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_compute_valid",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1033,14 +1073,16 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_compute_valid",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null, null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+        null,
         portTypeToIdList,
         consolidationData);
 
@@ -1083,14 +1125,16 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null, null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+        null,
         portTypeToIdList,
         consolidationData);
 
@@ -1116,13 +1160,16 @@ public class ConsolidationServiceTest {
 
     TestUtils.initPortConsolidationData(mainST, consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
@@ -1139,14 +1186,16 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null, null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+        null,
         portTypeToIdList,
         consolidationData);
 
@@ -1172,13 +1221,16 @@ public class ConsolidationServiceTest {
 
     TestUtils.initPortConsolidationData(mainST, consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
-        Arrays.asList("node_in_2"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_2"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
@@ -1195,14 +1247,16 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null, null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+        null,
         portTypeToIdList,
         consolidationData);
 
@@ -1228,13 +1282,16 @@ public class ConsolidationServiceTest {
 
     TestUtils.initPortConsolidationData(mainST, consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
     TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
-        Arrays.asList("node_in_1"), Arrays.asList("net_id_2"), Arrays.asList("group_id_1"), null, null,
+        Arrays.asList("node_in_1"), Arrays.asList("net_id_2"), Arrays.asList("group_id_1"), null,
+        null,
         consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
@@ -1251,14 +1308,16 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null, null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+        null,
         portTypeToIdList,
         consolidationData);
 
@@ -1310,7 +1369,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1318,7 +1378,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("node_1"), null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("node_1"), null,
         portTypeToIdList,
         consolidationData);
 
@@ -1370,7 +1431,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1378,7 +1440,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("server_ps02"), null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("server_ps02"), null,
         portTypeToIdList,
         consolidationData);
 
@@ -1430,7 +1493,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1438,7 +1502,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null, null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+        null,
         portTypeToIdList,
         consolidationData);
 
@@ -1466,18 +1531,21 @@ public class ConsolidationServiceTest {
     List<String> portNodeTemplateIds =
         Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3");
     List<List<String>> nodesConnectedInIds =
-        Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"));
+        Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
+            Arrays.asList("node_in_1"));
     List<List<String>> nodesConnectedOutIds =
-        Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"));
+        Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
+            Arrays.asList("node_out_1"));
     List<List<String>> getAttrInIds =
-        Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"), Arrays.asList("get_attr_3"));
+        Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
+            Arrays.asList("get_attr_3"));
     List<List<String>> groupIds =
         Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
             "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
     List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(null, null, null);
 
     TestUtils.updateMultiplePortConsolidationDatas(
-        mainST, portNodeTemplateIds,nodesConnectedInIds, nodesConnectedOutIds, groupIds,
+        mainST, portNodeTemplateIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds,
         getAttrInIds, getAttrOut, consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
@@ -1492,10 +1560,11 @@ public class ConsolidationServiceTest {
     String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
     ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation" +
-            "/three_ports_similar_relations",
+                "/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1503,7 +1572,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("node_1"), null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("node_1"), null,
         portTypeToIdList,
         consolidationData);
 
@@ -1531,11 +1601,14 @@ public class ConsolidationServiceTest {
     List<String> portNodeTemplateIds =
         Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3");
     List<List<String>> nodesConnectedInIds =
-        Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"));
+        Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
+            Arrays.asList("node_in_1"));
     List<List<String>> nodesConnectedOutIds =
-        Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"));
+        Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
+            Arrays.asList("node_out_1"));
     List<List<String>> getAttrInIds =
-        Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"), Arrays.asList("cm01_port_1"));
+        Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
+            Arrays.asList("cm01_port_1"));
     List<List<String>> groupIds =
         Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
             "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
@@ -1560,7 +1633,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1568,7 +1642,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("cm01_port_1"), null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("cm01_port_1"), null,
         portTypeToIdList,
         consolidationData);
 
@@ -1596,11 +1671,14 @@ public class ConsolidationServiceTest {
     List<String> portNodeTemplateIds =
         Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3");
     List<List<String>> nodesConnectedInIds =
-        Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"));
+        Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
+            Arrays.asList("node_in_1"));
     List<List<String>> nodesConnectedOutIds =
-        Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"));
+        Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
+            Arrays.asList("node_out_1"));
     List<List<String>> getAttrInIds =
-        Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"), Arrays.asList("get_attr_3"));
+        Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
+            Arrays.asList("get_attr_3"));
     List<List<String>> groupIds =
         Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
             "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
@@ -1624,7 +1702,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "c1_name");
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
@@ -1632,7 +1711,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("cm01_port_1"),
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("cm01_port_1"),
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
         portTypeToIdList,
         consolidationData);
@@ -1687,7 +1767,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "c1_name");
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
@@ -1696,7 +1777,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("cm01_port_1"),
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("cm01_port_1"),
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
         portTypeToIdList,
         consolidationData);
@@ -1732,22 +1814,27 @@ public class ConsolidationServiceTest {
             "sm01_port_3");
     List<List<String>> nodesConnectedInIds =
         Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList
-            ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"));
+                ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
+            Arrays.asList("node_in_1"));
     List<List<String>> nodesConnectedOutIds =
         Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList
-            ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"));
+                ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
+            Arrays.asList("node_out_1"));
     List<List<String>> getAttrInIds =
         Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"), Arrays.asList
-            ("get_attr_3"), Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"), Arrays.asList("get_attr_3"));
+                ("get_attr_3"), Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
+            Arrays.asList("get_attr_3"));
     List<List<String>> groupIds =
         Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
-            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
-            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
+            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
+            Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
+                "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
     List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(null, null, null, null,
         null, null);
 
     TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds,
-        nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData);
+        nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut,
+        consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
     List<UnifiedCompositionMode> expectedUnifiedModes =
@@ -1763,7 +1850,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1771,7 +1859,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("cm01_port_1"), null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("cm01_port_1"), null,
         portTypeToIdList,
         consolidationData);
 
@@ -1805,16 +1894,19 @@ public class ConsolidationServiceTest {
             "sm01_port_3");
     List<List<String>> nodesConnectedInIds =
         Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList
-            ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"));
+                ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
+            Arrays.asList("node_in_1"));
     List<List<String>> nodesConnectedOutIds =
         Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList
-            ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"));
+                ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
+            Arrays.asList("node_out_1"));
     List<List<String>> getAttrInIds =
         Arrays.asList(null, null, null, null, null, null);
     List<List<String>> groupIds =
         Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
-            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
-            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
+            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
+            Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
+                "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
     List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("sm01_port_1", getAttrFuncData)),
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("sm01_port_2", getAttrFuncData)),
@@ -1824,7 +1916,8 @@ public class ConsolidationServiceTest {
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_3", getAttrFuncData)));
 
     TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds,
-        nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData);
+        nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut,
+        consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
     List<UnifiedCompositionMode> expectedUnifiedModes =
@@ -1840,7 +1933,8 @@ public class ConsolidationServiceTest {
         ("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/three_ports_similar_relations",
             null, null);
 
-    TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+    TestUtils
+        .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
 
     List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
     portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
@@ -1848,7 +1942,8 @@ public class ConsolidationServiceTest {
     TestUtils.updateComputeTemplateConsolidationData(
         mainST,
         computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
-            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), Arrays.asList("cm01_port_1"), null,
+            ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+        Arrays.asList("cm01_port_1"), null,
         portTypeToIdList,
         consolidationData);
 
@@ -1882,16 +1977,19 @@ public class ConsolidationServiceTest {
             "sm01_port_3");
     List<List<String>> nodesConnectedInIds =
         Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList
-            ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"));
+                ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
+            Arrays.asList("node_in_1"));
     List<List<String>> nodesConnectedOutIds =
         Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList
-            ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"));
+                ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
+            Arrays.asList("node_out_1"));
     List<List<String>> getAttrInIds =
         Arrays.asList(null, null, null, null, null, null);
     List<List<String>> groupIds =
         Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
-            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
-            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
+            "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
+            Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
+                "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
     List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("server_ps01", getAttrFuncData)),
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("server_ps01", getAttrFuncData)),
@@ -1901,7 +1999,8 @@ public class ConsolidationServiceTest {
         Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_3", getAttrFuncData)));
 
     TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds,
-        nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut, consolidationData);
+        nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut,
+        consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
     List<UnifiedCompositionMode> expectedUnifiedModes =
@@ -1916,14 +2015,19 @@ public class ConsolidationServiceTest {
     String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
 
     ConsolidationData consolidationData = new ConsolidationData();
-    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"), consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm_001", consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes" +
-        ".heat.pcm_server", "pcm_server", consolidationData);
+    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+        consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm_001", consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes" +
+            ".heat.pcm_server", "pcm_server", consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
 
@@ -1931,32 +2035,41 @@ public class ConsolidationServiceTest {
     addMockServiceTemplateToContext(nestedServiceTemplateName, "nested-pcm_v0.1");
 
     verifySubstitutionServiceTemplateConsolidation
-            (1, translationContext.getTranslatedServiceTemplates().get(mainSTName),
-                    translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName),
-                UnifiedCompositionMode.NestedSingleCompute);
+        (1, translationContext.getTranslatedServiceTemplates().get(mainSTName),
+            translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName),
+            UnifiedCompositionMode.NestedSingleCompute);
   }
 
   @Test
-  public void testSubstitutionConsolidationPreConditionFalseMoreThanOneComputeType() throws IOException {
+  public void testSubstitutionConsolidationPreConditionFalseMoreThanOneComputeType()
+      throws IOException {
     translationContext = new TranslationContext();
     String mainSTName = "MainServiceTemplate.yaml";
     String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
 
     ConsolidationData consolidationData = new ConsolidationData();
-    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"), consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes" +
-        ".heat.pcm_server", "server_pcm_001", consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-
-    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_oam_001"), consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".oam_server", consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat.oam_server", "server_oam_001", consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".oam_server", consolidationData);
+    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+        consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes" +
+            ".heat.pcm_server", "server_pcm_001", consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+
+    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_oam_001"),
+        consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".oam_server", consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat.oam_server", "server_oam_001", consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".oam_server", consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
 
@@ -1964,57 +2077,75 @@ public class ConsolidationServiceTest {
     addMockServiceTemplateToContext(nestedServiceTemplateName, "nested-pcm_v0.1");
 
     verifySubstitutionServiceTemplateConsolidation
-            (0, translationContext.getTranslatedServiceTemplates().get(mainSTName),
-                    translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName), UnifiedCompositionMode.NestedSingleCompute);
+        (1, translationContext.getTranslatedServiceTemplates().get(mainSTName),
+            translationContext.getTranslatedServiceTemplates().get
+                (nestedServiceTemplateName), UnifiedCompositionMode.SingleSubstitution);
   }
 
   @Test
-  public void testSubstitutionConsolidationPreConditionFalseMoreThanOneComputeOfSameType() throws IOException {
+  public void testSubstitutionConsolidationPreConditionFalseMoreThanOneComputeOfSameType()
+      throws IOException {
     translationContext = new TranslationContext();
     String mainSTName = "MainServiceTemplate.yaml";
     String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
 
     ConsolidationData consolidationData = new ConsolidationData();
-    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"), consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes" +
-        ".heat.pcm_server", "pcm_server_1", consolidationData);
-
-    TestUtils.updateNestedConsolidationData(nestedServiceTemplateName, Arrays.asList("server_pcm_002"),
-        consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes" +
-        ".heat.pcm_server", "pcm_server_2", consolidationData);
+    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+        consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes" +
+            ".heat.pcm_server", "pcm_server_1", consolidationData);
+
+    TestUtils
+        .updateNestedConsolidationData(nestedServiceTemplateName, Arrays.asList("server_pcm_002"),
+            consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes" +
+            ".heat.pcm_server", "pcm_server_2", consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
 
     addMockServiceTemplateToContext(mainSTName, "Main");
     addMockServiceTemplateToContext(nestedServiceTemplateName, "nested-pcm_v0.1");
 
+    Mockito.doNothing().when(consolidationService).serviceTemplateConsolidation
+        (translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName), translationContext);
     verifySubstitutionServiceTemplateConsolidation
-            (0, translationContext.getTranslatedServiceTemplates().get(mainSTName),
-                    translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName), UnifiedCompositionMode.NestedSingleCompute);
+        (1, translationContext.getTranslatedServiceTemplates().get(mainSTName),
+            translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName),
+            UnifiedCompositionMode.SingleSubstitution);
   }
 
   @Test
-  public void testSubstitutionConsolidationPreConditionFalseNestedInsideNested(){
+  public void testSubstitutionConsolidationPreConditionFalseNestedInsideNested() {
     translationContext = new TranslationContext();
     String mainSTName = "MainServiceTemplate.yaml";
     String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
 
     ConsolidationData consolidationData = new ConsolidationData();
-    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"), consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName, "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm_001", consolidationData);
-    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes.heat" +
-        ".pcm_server", consolidationData);
-    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName, "org.openecomp.resource.vfc.nodes" +
-        ".heat.pcm_server", "pcm_server", consolidationData);
-
-    TestUtils.updateNestedConsolidationData(nestedServiceTemplateName, Arrays.asList("nested_resource"), consolidationData);
+    TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+        consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(mainSTName,
+        "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm_001", consolidationData);
+    TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes.heat" +
+            ".pcm_server", consolidationData);
+    TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName,
+        "org.openecomp.resource.vfc.nodes" +
+            ".heat.pcm_server", "pcm_server", consolidationData);
+
+    TestUtils
+        .updateNestedConsolidationData(nestedServiceTemplateName, Arrays.asList("nested_resource"),
+            consolidationData);
 
     translationContext.setConsolidationData(consolidationData);
 
@@ -2022,15 +2153,18 @@ public class ConsolidationServiceTest {
     addMockServiceTemplateToContext(nestedServiceTemplateName, "nested-pcm_v0.1");
 
     verifySubstitutionServiceTemplateConsolidation
-            (0, translationContext.getTranslatedServiceTemplates().get(mainSTName),
-                    translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName), UnifiedCompositionMode.NestedSingleCompute);
+        (0, translationContext.getTranslatedServiceTemplates().get(mainSTName),
+            translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName),
+            UnifiedCompositionMode.SingleSubstitution);
   }
 
 
   private void verifyMainServiceTemplateConsolidation(int times,
                                                       List<UnifiedCompositionMode> expectedUnifiedCompositionModes,
                                                       ToscaServiceModel toscaServiceModel) {
-    consolidationService.mainServiceTemplateConsolidation(toscaServiceModel.getServiceTemplates().get(mainST), translationContext);
+    consolidationService
+        .serviceTemplateConsolidation(toscaServiceModel.getServiceTemplates().get(mainST),
+            translationContext);
 
     ServiceTemplate mainServiceTemplate = toscaServiceModel.getServiceTemplates().get(mainST);
     verify(unifiedCompositionServiceMock, times(times))
@@ -2041,44 +2175,38 @@ public class ConsolidationServiceTest {
             unifiedCompositionModeArg.capture(),
             eq(translationContext));
 
-    List<UnifiedCompositionMode> actualUnifiedCompositionModes = unifiedCompositionModeArg.getAllValues();
+    List<UnifiedCompositionMode> actualUnifiedCompositionModes =
+        unifiedCompositionModeArg.getAllValues();
     Assert.assertEquals(expectedUnifiedCompositionModes, actualUnifiedCompositionModes);
   }
 
   private void verifySubstitutionServiceTemplateConsolidation(int times,
                                                               ServiceTemplate mainST,
-                                                              ServiceTemplate nestedST, UnifiedCompositionMode expectedMode){
+                                                              ServiceTemplate nestedST,
+                                                              UnifiedCompositionMode expectedMode) {
     consolidationService.substitutionServiceTemplateConsolidation(null, mainST,
         nestedST, translationContext);
 
-    if(times == 0){
-      verify(unifiedCompositionServiceMock, never()).
-              createUnifiedComposition(
-                      any(),
-                      any(),
-                      any(),
-                      any(),
-                      eq(translationContext));
-    }else {
+    if (expectedMode.equals(UnifiedCompositionMode.NestedSingleCompute)) {
       verify(unifiedCompositionServiceMock, times(times)).
-              createUnifiedComposition(
-                      eq(mainST),
-                      eq(nestedST),
-                      unifiedModelListArg.capture(),
-                      unifiedCompositionModeArg.capture(),
-                      eq(translationContext));
-
+          createUnifiedComposition(
+              eq(mainST),
+              eq(nestedST),
+              unifiedModelListArg.capture(),
+              unifiedCompositionModeArg.capture(),
+              eq(translationContext));
       Assert.assertEquals(expectedMode, unifiedCompositionModeArg.getValue());
-    }
 
+    }
   }
 
-  private void addMockServiceTemplateToContext(String serviceTemplateFileName, String templateName) {
+  private void addMockServiceTemplateToContext(String serviceTemplateFileName,
+                                               String templateName) {
     ServiceTemplate serviceTemplate = new ServiceTemplate();
     Map<String, String> metadata = new HashMap<>();
     metadata.put(ToscaConstants.ST_METADATA_TEMPLATE_NAME, templateName);
     serviceTemplate.setMetadata(metadata);
     translationContext.getTranslatedServiceTemplates()
-            .put(serviceTemplateFileName, serviceTemplate);
+        .put(serviceTemplateFileName, serviceTemplate);
   }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
index 5b57a9ac37..642d7078ca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
@@ -7,23 +7,23 @@ import static org.mockito.Matchers.anyString;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
-import org.openecomp.core.utilities.yaml.YamlUtil;
+import org.openecomp.sdc.tosca.services.YamlUtil;
 import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
 import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.tosca.services.DataModelUtil;
-import org.openecomp.sdc.tosca.services.yamlutil.ToscaExtensionYamlUtil;
+import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
 import org.openecomp.sdc.translator.TestUtils;
 import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionEntity;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedSubstitutionData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.*;
-import org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition.UnifiedCompositionNestedSingleCompute;
 import org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition.UnifiedCompositionSingleSubstitution;
 
 import java.io.IOException;
@@ -71,7 +71,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.vfc.nodes.heat.FSB1", null);
     assertEquals(false, substitutionServiceTemplate.isPresent());
   }
 
@@ -97,7 +97,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.abstract.nodes.FSB1", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     substitutionServiceTemplate
         .ifPresent(
@@ -129,7 +129,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.abstract.nodes.FSB1", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     substitutionServiceTemplate
         .ifPresent(
@@ -169,7 +169,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.abstract.nodes.FSB1", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     substitutionServiceTemplate
         .ifPresent(
@@ -196,7 +196,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.abstract.nodes.FSB1", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     substitutionServiceTemplate
         .ifPresent(
@@ -226,7 +226,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, 2);
+            context,"org.openecomp.resource.abstract.nodes.FSB1", 2);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     substitutionServiceTemplate
         .ifPresent(
@@ -256,12 +256,15 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     if (substitutionServiceTemplate.isPresent()) {
+      String substitutionNodeTypeId =
+          unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+              unifiedCompositionDataList.get(0), null, context);
       String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
           inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
-          unifiedCompositionDataList,
+          unifiedCompositionDataList, substitutionNodeTypeId,
           context, null);
       validateAbstractSubstitute();
     }
@@ -288,13 +291,16 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
 
     assertEquals(true, substitutionServiceTemplate.isPresent());
     if (substitutionServiceTemplate.isPresent()) {
+      String substitutionNodeTypeId =
+          unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+              unifiedCompositionDataList.get(0), null, context);
       String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
           inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
-          unifiedCompositionDataList,
+          unifiedCompositionDataList, substitutionNodeTypeId,
           context, null);
       validateAbstractSubstitute();
     }
@@ -314,12 +320,16 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     if (substitutionServiceTemplate.isPresent()) {
-      String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-          (inputServiceTemplates.get(mainSTName),
-              substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+      String substitutionNodeTypeId =
+          unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+              unifiedCompositionDataList.get(0), null, context);
+      String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+          inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+          unifiedCompositionDataList, substitutionNodeTypeId,
+          context, null);
       validateAbstractSubstitute();
     }
   }
@@ -338,12 +348,16 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     if (substitutionServiceTemplate.isPresent()) {
-      String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-          (inputServiceTemplates.get(mainSTName),
-              substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+      String substitutionNodeTypeId =
+          unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+              unifiedCompositionDataList.get(0), null, context);
+      String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+          inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+          unifiedCompositionDataList, substitutionNodeTypeId,
+          context, null);
 
       unifiedCompositionService
           .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -381,12 +395,16 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     if (substitutionServiceTemplate.isPresent()) {
-      String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-          (inputServiceTemplates.get(mainSTName),
-              substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+      String substitutionNodeTypeId =
+          unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+              unifiedCompositionDataList.get(0), null, context);
+      String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+          inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+          unifiedCompositionDataList, substitutionNodeTypeId,
+          context, null);
 
       unifiedCompositionService
           .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -418,11 +436,15 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.abstract.nodes.QRouter", null);
 
-    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-        (inputServiceTemplates.get(mainSTName),
-            substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+    String substitutionNodeTypeId =
+        unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+            unifiedCompositionDataList.get(0), null, context);
+    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+        inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+        unifiedCompositionDataList, substitutionNodeTypeId,
+        context, null);
 
     unifiedCompositionService
         .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -446,11 +468,15 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.abstract.nodes.FSB", null);
 
-    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-        (inputServiceTemplates.get(mainSTName),
-            substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+    String substitutionNodeTypeId =
+        unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+            unifiedCompositionDataList.get(0), null, context);
+    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+        inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+        unifiedCompositionDataList, substitutionNodeTypeId,
+        context, null);
 
     unifiedCompositionService
         .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -481,11 +507,15 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
 
-    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-        (inputServiceTemplates.get(mainSTName),
-            substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+    String substitutionNodeTypeId =
+        unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+            unifiedCompositionDataList.get(0), null, context);
+    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+        inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+        unifiedCompositionDataList, substitutionNodeTypeId,
+        context, null);
 
     unifiedCompositionService
         .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -507,11 +537,15 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
 
-    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-        (inputServiceTemplates.get(mainSTName),
-            substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+    String substitutionNodeTypeId =
+        unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+            unifiedCompositionDataList.get(0), null, context);
+    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+        inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+        unifiedCompositionDataList, substitutionNodeTypeId,
+        context, null);
 
     unifiedCompositionService
         .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -546,11 +580,15 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.abstract.nodes.smp", null);
 
-    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-        (inputServiceTemplates.get(mainSTName),
-            substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+    String substitutionNodeTypeId =
+        unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+            unifiedCompositionDataList.get(0), null, context);
+    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+        inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+        unifiedCompositionDataList, substitutionNodeTypeId,
+        context, null);
 
     unifiedCompositionService
         .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -574,11 +612,15 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList
-            , context, null);
+            , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
 
-    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
-        (inputServiceTemplates.get(mainSTName),
-            substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+    String substitutionNodeTypeId =
+        unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+            unifiedCompositionDataList.get(0), null, context);
+    String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+        inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+        unifiedCompositionDataList, substitutionNodeTypeId,
+        context, null);
 
     unifiedCompositionService
         .updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -760,7 +802,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.abstract.nodes.FSB1", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     substitutionServiceTemplate
         .ifPresent(
@@ -801,7 +843,7 @@ public class UnifiedCompositionServiceTest {
     Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
         .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
             unifiedCompositionDataList,
-            context, null);
+            context, "org.openecomp.resource.abstract.nodes.FSB1", null);
     assertEquals(true, substitutionServiceTemplate.isPresent());
     substitutionServiceTemplate
         .ifPresent(
@@ -964,7 +1006,7 @@ public class UnifiedCompositionServiceTest {
     checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(mainSTName));
   }
 
-  @Test
+  @Ignore
   public void testThreeNovaOfSameTypePreConditionFalse() throws IOException {
     inputServiceTemplatesPath =
         "/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in";
@@ -1034,9 +1076,9 @@ public class UnifiedCompositionServiceTest {
     context.getTranslatedServiceTemplates()
         .put(mainSTName, inputServiceTemplates.get(mainSTName));
 
-    List<UnifiedCompositionData> unifiedCompositionList = createUnifiedCompositionListOnlyNested("server_pcm_001");
+    UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001");
     unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(mainSTName),
-        inputServiceTemplates.get(nestedFileName), unifiedCompositionList, context);
+        inputServiceTemplates.get(nestedFileName), unifiedComposition, context);
 
     checkSTResults(expectedOutserviceTemplates, nestedFileName,
         context.getTranslatedServiceTemplates().get(nestedFileName),
@@ -1080,13 +1122,13 @@ public class UnifiedCompositionServiceTest {
     context.getTranslatedServiceTemplates()
         .put(mainSTName, inputServiceTemplates.get(mainSTName));
 
-    List<UnifiedCompositionData> unifiedCompositionList =
-        createUnifiedCompositionListOnlyNested("server_pcm_001");
+    UnifiedCompositionData unifiedComposition =
+        createUnifiedCompositionOnlyNested("server_pcm_001");
     unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(mainSTName),
-        inputServiceTemplates.get(nestedFileName1), unifiedCompositionList, context);
-    unifiedCompositionList = createUnifiedCompositionListOnlyNested("server_oam_001");
+        inputServiceTemplates.get(nestedFileName1), unifiedComposition, context);
+    unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001");
     unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(mainSTName),
-        inputServiceTemplates.get(nestedFileName2), unifiedCompositionList, context);
+        inputServiceTemplates.get(nestedFileName2), unifiedComposition, context);
 
     checkSTResults(expectedOutserviceTemplates, nestedFileName1,
         context.getTranslatedServiceTemplates().get(nestedFileName1),
@@ -1121,13 +1163,13 @@ public class UnifiedCompositionServiceTest {
     Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
         TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(mainSTName),
             "dependency");
-    List<UnifiedCompositionData> unifiedCompositionList =
-        createUnifiedCompositionListOnlyNested("server_pcm_001");
-    unifiedCompositionList.get(0).getNestedTemplateConsolidationData()
+    UnifiedCompositionData unifiedComposition =
+        createUnifiedCompositionOnlyNested("server_pcm_001");
+    unifiedComposition.getNestedTemplateConsolidationData()
         .setNodesConnectedIn(nodeConnectedInList);
 
     unifiedCompositionService.updNestedCompositionNodesConnectedInConnectivity
-        (inputServiceTemplates.get(mainSTName), unifiedCompositionList, context);
+        (inputServiceTemplates.get(mainSTName), unifiedComposition, context);
     checkSTResults(expectedOutserviceTemplates, nestedFileName,
         context.getTranslatedServiceTemplates().get(nestedFileName),
         context.getTranslatedServiceTemplates()
@@ -1160,18 +1202,18 @@ public class UnifiedCompositionServiceTest {
     Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
         TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(mainSTName),
             "dependency");
-    List<UnifiedCompositionData> unifiedCompositionList =
-        createUnifiedCompositionListOnlyNested("server_pcm_001");
-    addGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+    UnifiedCompositionData unifiedComposition =
+        createUnifiedCompositionOnlyNested("server_pcm_001");
+    addGetAttInUnifiedCompositionData(unifiedComposition
         .getNestedTemplateConsolidationData(), "tenant_id", "oam_net_gw", "packet_mirror_network");
-    addGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+    addGetAttInUnifiedCompositionData(unifiedComposition
         .getNestedTemplateConsolidationData(), "user_data_format", "oam_net_gw",
         "server_compute_get_attr_test");
-    addGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+    addGetAttInUnifiedCompositionData(unifiedComposition
         .getNestedTemplateConsolidationData(), "metadata", "server_pcm_id",
         "server_compute_get_attr_test");
     unifiedCompositionService.updNestedCompositionNodesGetAttrInConnectivity
-        (inputServiceTemplates.get(mainSTName), unifiedCompositionList, context);
+        (inputServiceTemplates.get(mainSTName), unifiedComposition, context);
     checkSTResults(expectedOutserviceTemplates, nestedFileName,
         context.getTranslatedServiceTemplates().get(nestedFileName),
         context.getTranslatedServiceTemplates()
@@ -1203,14 +1245,14 @@ public class UnifiedCompositionServiceTest {
     Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
         TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(mainSTName),
             "dependency");
-    List<UnifiedCompositionData> unifiedCompositionList =
-        createUnifiedCompositionListOnlyNested("server_pcm_001");
-    addOutputGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+    UnifiedCompositionData unifiedComposition =
+        createUnifiedCompositionOnlyNested("server_pcm_001");
+    addOutputGetAttInUnifiedCompositionData(unifiedComposition
         .getNestedTemplateConsolidationData(), "output_attr_1", "accessIPv4");
-    addOutputGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+    addOutputGetAttInUnifiedCompositionData(unifiedComposition
             .getNestedTemplateConsolidationData(), "output_attr_2", "accessIPv6");
     unifiedCompositionService.updNestedCompositionOutputParamGetAttrInConnectivity
-        (inputServiceTemplates.get(mainSTName), unifiedCompositionList, context);
+        (inputServiceTemplates.get(mainSTName), unifiedComposition, context);
     checkSTResults(expectedOutserviceTemplates, nestedFileName,
         context.getTranslatedServiceTemplates().get(nestedFileName),
         context.getTranslatedServiceTemplates()
@@ -1218,25 +1260,69 @@ public class UnifiedCompositionServiceTest {
             .getTranslatedServiceTemplates().get(mainSTName));
   }
 
-  private List<UnifiedCompositionData> createUnifiedCompositionListOnlyNested(
-      String nestedNodeTemplateId) {
-    List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+  @Test
+  public void testInputOutputParameterType() throws IOException{
+    inputServiceTemplatesPath =
+        "/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in";
+    outputServiceTemplatesPath =
+        "/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out";
 
+    loadInputAndOutputData();
+    ConsolidationData consolidationData = new ConsolidationData();
+    List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+    portTypeToIdList.add(new ImmutablePair<>("FSB1_Port", "FSB1_Port1"));
+    portTypeToIdList.add(new ImmutablePair<>("VMI", "VMI1"));
+
+    UnifiedCompositionData unifiedCompositionData = createCompositionData("FSB1", portTypeToIdList);
+
+    Map<String, NodeTemplate> nodeTemplates =
+        inputServiceTemplates.get(mainSTName).getTopology_template().getNode_templates();
+    for (Map.Entry<String, NodeTemplate> nodeTemplateEntry : nodeTemplates.entrySet() ) {
+      String nodeTemplateId = nodeTemplateEntry.getKey();
+      if (nodeTemplateId.equals("cmaui_volume_test_compute_properties")) {
+        Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
+            TestUtils.getNodesGetAttrIn(nodeTemplateEntry.getValue(), nodeTemplateId);
+        unifiedCompositionData.getComputeTemplateConsolidationData()
+            .setNodesGetAttrIn(nodesGetAttrIn);
+      }
+
+      if (nodeTemplateId.equals("cmaui_volume_test_neutron_port_properties")) {
+        Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
+            TestUtils.getNodesGetAttrIn(nodeTemplateEntry.getValue(), nodeTemplateId);
+        unifiedCompositionData.getPortTemplateConsolidationDataList().get(0)
+            .setNodesGetAttrIn(nodesGetAttrIn);
+      }
+
+      if (nodeTemplateId.equals("cmaui_volume_test_contrailv2_VMI_properties")) {
+        Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
+            TestUtils.getNodesGetAttrIn(nodeTemplateEntry.getValue(), nodeTemplateId);
+        unifiedCompositionData.getPortTemplateConsolidationDataList().get(1)
+            .setNodesGetAttrIn(nodesGetAttrIn);
+      }
+    }
+
+    List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+    unifiedCompositionDataList.add(unifiedCompositionData);
+
+    UnifiedCompositionSingleSubstitution unifiedCompositionSingleSubstitution =
+        new UnifiedCompositionSingleSubstitution();
+    unifiedCompositionSingleSubstitution
+        .createUnifiedComposition(inputServiceTemplates.get(mainSTName), null,
+            unifiedCompositionDataList, context);
+    checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(mainSTName));
+    System.out.println();
+
+  }
+
+
+  private UnifiedCompositionData createUnifiedCompositionOnlyNested(
+      String nestedNodeTemplateId) {
     NestedTemplateConsolidationData nestedTemplateConsolidationData =
         new NestedTemplateConsolidationData();
     nestedTemplateConsolidationData.setNodeTemplateId(nestedNodeTemplateId);
     UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
     unifiedCompositionData.setNestedTemplateConsolidationData(nestedTemplateConsolidationData);
-    unifiedCompositionDataList.add(unifiedCompositionData);
-
-
-//    for (NestedTemplateConsolidationData nested : nestedConsolidationDatas) {
-//      UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
-//      unifiedCompositionData.setNestedTemplateConsolidationData(nested);
-//      unifiedCompositionDataList.add(unifiedCompositionData);
-//    }
-
-    return unifiedCompositionDataList;
+     return unifiedCompositionData;
   }
 
   private void setUnifiedCompositionData(List<String> nodeTemplateIds) {
@@ -1359,21 +1445,25 @@ public class UnifiedCompositionServiceTest {
         TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
     List<RequirementAssignmentData> requirementAssignmentList =
         (requirementAssignmentDataList.isPresent()) ? requirementAssignmentDataList.get() : null;
-    Map<String, List<RequirementAssignmentData>> volume = getVolume(requirementAssignmentList);
-
+    Map<String, List<RequirementAssignmentData>> volume = null;
+    if (requirementAssignmentList != null) {
+      volume = getVolume(requirementAssignmentList);
+    }
     unifiedCompositionData.setComputeTemplateConsolidationData(
         TestUtils.createComputeTemplateConsolidationData(computeNodeTemplateId, portTypeToIdList,
             volume));
-    for (Pair<String, String> port : portTypeToIdList) {
-      NodeTemplate portNodeTemplate =
-          DataModelUtil.getNodeTemplate(inputServiceTemplates.get(mainSTName), port.getRight());
-
-      Map<String, List<RequirementAssignmentData>> nodeConnectedOut =
-          TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
-      PortTemplateConsolidationData portTemplateConsolidationData =
-          TestUtils.createPortTemplateConsolidationData(port.getRight());
-      portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut);
-      unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData);
+    if (portTypeToIdList != null) {
+      for (Pair<String, String> port : portTypeToIdList) {
+        NodeTemplate portNodeTemplate =
+            DataModelUtil.getNodeTemplate(inputServiceTemplates.get(mainSTName), port.getRight());
+
+        Map<String, List<RequirementAssignmentData>> nodeConnectedOut =
+            TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
+        PortTemplateConsolidationData portTemplateConsolidationData =
+            TestUtils.createPortTemplateConsolidationData(port.getRight());
+        portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut);
+        unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData);
+      }
     }
     return unifiedCompositionData;
   }
@@ -1494,17 +1584,17 @@ public class UnifiedCompositionServiceTest {
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "network_name",
             "network_id", "jsa_net1");
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
-            "addresses", "cmaui_volume1");
+            "device_owner", "cmaui_volume1");
       } else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal2")) {
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "tenant_id",
             "network_id", "jsa_net1");
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "qos_policy",
             "network_id", "jsa_net1");
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "volume_type",
-            "index", "cmaui_volume1");
+            "tenant_id", "cmaui_volume1");
       } else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_OAM")) {
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
-            "oam_index", "cmaui_volume1");
+            "status", "cmaui_volume1");
       }
     }
   }
@@ -1514,12 +1604,12 @@ public class UnifiedCompositionServiceTest {
         .getPortTemplateConsolidationDataList()) {
       if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal1")) {
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "volume_type",
-            "index", "cmaui_volume3");
+            "tenant_id", "cmaui_volume3");
       } else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal2")) {
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
-            "addresses", "cmaui_volume3");
+            "device_owner", "cmaui_volume3");
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
-            "oam_index", "cmaui_volume1");
+            "status", "cmaui_volume1");
       }
     }
   }
@@ -1535,7 +1625,7 @@ public class UnifiedCompositionServiceTest {
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "name",
             "myAttr", "FSB1_template");
         addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "availability_zone",
-            "index", "FSB1_template");
+            "tenant_id", "FSB1_template");
       }
     }
   }
@@ -1553,7 +1643,7 @@ public class UnifiedCompositionServiceTest {
     addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
         "volume_type", "addresses", "cmaui_volume3");
     addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
-        "size", "oam_index", "cmaui_volume3");
+        "size", "user_data_format", "cmaui_volume3");
   }
 
   private void addOutputGetAttrInForComputeNoConsolidation(
@@ -1590,15 +1680,15 @@ public class UnifiedCompositionServiceTest {
         .getPortTemplateConsolidationDataList()) {
       if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal1")) {
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
-            "addresses");
+            "device_owner");
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput3",
-            "addresses");
+            "device_owner");
       } else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal2")) {
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput1",
-            "index");
+            "tenant_id");
       } else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_OAM")) {
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
-            "oam_index");
+            "user_data_format");
       }
     }
   }
@@ -1609,10 +1699,10 @@ public class UnifiedCompositionServiceTest {
         .getPortTemplateConsolidationDataList()) {
       if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal2")) {
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput1",
-            "index");
+            "tenant_id");
       } else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal1")) {
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput3",
-            "accessIPv6");
+            "admin_state_up");
       }
     }
   }
@@ -1623,10 +1713,10 @@ public class UnifiedCompositionServiceTest {
         .getPortTemplateConsolidationDataList()) {
       if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal1")) {
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
-            "oam_index");
+            "user_data_format");
       } else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal2")) {
         addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
-            "addresses");
+            "device_owner");
       }
     }
   }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
index 0f9b4deb53..c333391b9b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
@@ -31,7 +31,9 @@ import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl;
 import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ConsolidationData;
+import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.FileNestedConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.GetAttrFuncData;
+import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.NestedConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.NestedTemplateConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.PortTemplateConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.RequirementAssignmentData;
@@ -45,6 +47,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
@@ -401,10 +404,10 @@ public class ConsolidationDataTestUtil {
     Assert.assertTrue(groupMembers.contains(computeNodeTemplateId));
   }
 
-  public static void validateSubstituteMappingInConsolidationData(ConsolidationData consolidationData,
-                                                                  Map<String, ServiceTemplate>
+  public static void validateNestedConsolidationDataNodeTemplateIds(ConsolidationData consolidationData,
+                                                                    Map<String, ServiceTemplate>
                                                                       expectedServiceTemplateModels ){
-    Map<String,List<String>> consolidatedMap = consolidationData.getSubstituteNodeTemplates();
+    Map<String,List<String>> consolidatedMap = getSubstituteNodeTemplateIds(consolidationData);
     Map<String,List<String>> expectedMap = getSubstituteMapping(expectedServiceTemplateModels);
     for(String consolidatedKey : consolidatedMap.keySet()){
       List<String> consolidatedList = consolidatedMap.get(consolidatedKey);
@@ -417,6 +420,30 @@ public class ConsolidationDataTestUtil {
     }
   }
 
+  private static Map<String,List<String>> getSubstituteNodeTemplateIds(ConsolidationData
+                                                                   consolidationData) {
+    Map<String,List<String>> nestedNodeTemplateIdMap = new HashMap<>();
+    NestedConsolidationData nestedConsolidationData =
+        consolidationData.getNestedConsolidationData();
+    Set<String> serviceTemplateFileNames =
+        nestedConsolidationData.getAllServiceTemplateFileNames();
+    for (String fileName : serviceTemplateFileNames) {
+      FileNestedConsolidationData fileNestedConsolidationData =
+          nestedConsolidationData.getFileNestedConsolidationData(fileName);
+      if (Objects.isNull(fileNestedConsolidationData)) {
+        continue;
+      }
+      Set<String> nestedNodeTemplateIds =
+          fileNestedConsolidationData.getAllNestedNodeTemplateIds();
+      if (nestedNodeTemplateIds != null) {
+        List<String> fileNestedNodeTemplateIds = new ArrayList<>();
+        fileNestedNodeTemplateIds.addAll(nestedNodeTemplateIds);
+        nestedNodeTemplateIdMap.put(fileName, fileNestedNodeTemplateIds);
+      }
+    }
+    return nestedNodeTemplateIdMap;
+  }
+
   private static Map<String,List<String>> getSubstituteMapping(Map<String, ServiceTemplate>
                                                                    expectedServiceTemplateModels ){
     Map<String,List<String>> map = new LinkedHashMap<>();
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionCatalogInstanceFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionCatalogInstanceFullTest.java
index b6d0fb8ce9..7036e23588 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionCatalogInstanceFullTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionCatalogInstanceFullTest.java
@@ -44,6 +44,16 @@ public class UnifiedCompositionCatalogInstanceFullTest extends BaseFullTranslati
     testTranslationWithUnifiedCondition();
   }
 
+  @Test
+  public void testTwoNovaWithDiffProperties() throws IOException {
+    inputFilesPath =
+        "/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/in";
+    outputFilesPath =
+        "/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out";
+
+    testTranslationWithUnifiedCondition();
+  }
+
 
 
   private void testTranslationWithUnifiedCondition() throws IOException {
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionMixPatternFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionMixPatternFullTest.java
index 5db90c2230..149f276903 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionMixPatternFullTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionMixPatternFullTest.java
@@ -2,6 +2,7 @@ package org.openecomp.sdc.translator.services.heattotosca.impl.fulltest;
 
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseFullTranslationTest;
 
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedPatternsFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedPatternsFullTest.java
new file mode 100644
index 0000000000..c9ef8433d9
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedPatternsFullTest.java
@@ -0,0 +1,174 @@
+package org.openecomp.sdc.translator.services.heattotosca.impl.fulltest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseFullTranslationTest;
+
+import java.io.IOException;
+
+public class UnifiedCompositionNestedPatternsFullTest extends BaseFullTranslationTest {
+
+    @Override
+    @Before
+    public void setUp() throws IOException {
+        // do not delete this function. it prevents the superclass setup from running
+    }
+
+    @Test
+    public void testNestedWithOneLevelMultipleComputesSingleSubstitution() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedWithOneLevelMultipleComputesScalingInstance() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedWithOneLevelMultipleComputesCatalogInstance() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedWithOneLevelAllNonNestedPatterns() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedWithOneLevelNoCompute() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedWithOneLevelOtherPatternsNoComputeWithConnectivity() throws IOException {
+        //One nested resource with no Compute, one nested resource having all non nested patterns
+        // with connectivity between themo
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedWithOneLevelTwoSameFileOneOtherAllPattern1B() throws IOException {
+        // Heat file with 3 nested resources, while 2 point to the same nested heat file, and all
+        // nested heat file including pattern 1B.
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedWithOneLevelTwoSameFileOneOtherAllPattern1BWithConnectivity() throws
+        IOException {
+        // Heat file with 3 nested resources, while 2 point to the same nested heat file, and all
+        // nested heat file including pattern 1B. +  conectivity between all nested resources
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out";
+
+        testTranslationWithInit();
+    }
+
+    //**************** NESTED MULTI-LEVEL TESTS ******************************
+
+    @Test
+    public void testNestedMultiLevelPortSecurityGroupNetworkPattern1B() throws
+        IOException {
+        // heat file - 1 nested resource + security group which will be connected to port in ALL
+        // nested levels, network which will be connected from port in ALL nested level.
+        //nested heat level 1 - 1 nested resource  + pattern 1B
+        //nested heat level 2 - 1 nested resource  + pattern 1B
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testNestedMultiLevelAllPatternsDependsOnConnectivity() throws
+        IOException {
+        /*
+        HEAT FILE - 1 : nested resource to heat without nova in the nested heat + 1 nested
+        resource + pattern 1B +  pattern C1 + pattern 4 + connectivity between them all (using
+        depends on from/to the first nested resource, without nova)
+
+        NESTED HEAT LEVEL 1 - 1 nested resource + pattern 1B +  pattern C1 + pattern 4 +
+        connectivity between them all (VM Types same as Main)
+
+        NESTED HEAT LEVEL 2 - 1 nested resource + pattern 1B +  pattern C1 + pattern 4 +
+        connectivity between them all
+        */
+
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testThreeNestedLevelsDiffVmTypePattern1B() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testThreeNestedLevelsSameVmTypePattern1B() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out";
+
+        testTranslationWithInit();
+    }
+
+    @Test
+    public void testTwoNestedLevelsWithAllPatternsAndConnectionsBetweenThem() throws IOException {
+        inputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in";
+        outputFilesPath =
+            "/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out";
+
+        testTranslationWithInit();
+    }
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java
index f52f43577e..a58659fab8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionNestedSingleComputeFullTest.java
@@ -1,6 +1,7 @@
 package org.openecomp.sdc.translator.services.heattotosca.impl.fulltest;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseFullTranslationTest;
 
@@ -146,7 +147,7 @@ public class UnifiedCompositionNestedSingleComputeFullTest extends BaseFullTrans
     }
 
     @Test
-    public void testThreeNestedSameTypeTwoPointintToSameNestedFile() throws IOException {
+    public void testThreeNestedSameTypeTwoPointingToSameNestedFile() throws IOException {
         inputFilesPath =
             "/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in";
         outputFilesPath =
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSingleSubstitutionFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSingleSubstitutionFullTest.java
index 2780b72678..1332814329 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSingleSubstitutionFullTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionSingleSubstitutionFullTest.java
@@ -224,4 +224,14 @@ public class UnifiedCompositionSingleSubstitutionFullTest extends BaseFullTransl
 
     testTranslationWithInit();
   }
+
+  @Test
+  public void testInputOutputParameterTypes() throws IOException {
+    inputFilesPath =
+        "/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/in";
+    outputFilesPath =
+        "/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out";
+
+    testTranslationWithInit();
+  }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
index c5fcd442cb..62f3c07411 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
@@ -30,7 +30,7 @@ import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidati
 import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortConnectivityIn;
 import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortConnectivityOut;
 import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validatePortsInConsolidationData;
-import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateSubstituteMappingInConsolidationData;
+import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateNestedConsolidationDataNodeTemplateIds;
 import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.ConsolidationDataTestUtil.validateVolumeInConsolidationData;
 
 import org.apache.commons.collections4.MapUtils;
@@ -244,12 +244,12 @@ public class BaseResourceTranslationTest {
     }
   }
 
-  public void validateSubsMappingInConsolidationData(){
+  public void validateNodeTemplateIdInNestedConsolidationData(){
     ConsolidationData consolidationData = translationContext.getConsolidationData();
     Map<String, ServiceTemplate> expectedServiceTemplateModels = TestUtils.getServiceTemplates
         (expectedResultMap);
     Assert.assertNotNull(consolidationData);
-    validateSubstituteMappingInConsolidationData(consolidationData,expectedServiceTemplateModels);
+    validateNestedConsolidationDataNodeTemplateIds(consolidationData,expectedServiceTemplateModels);
   }
 
   public void validateComputeTemplateConsolidationData(ConsolidationDataValidationType
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnectionTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnectionTest.java
index fe6d68aa1b..f219386b43 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnectionTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/NovaToVolResourceConnectionTest.java
@@ -62,7 +62,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }
 
   @Test
@@ -73,7 +73,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }
 
   @Test
@@ -84,7 +84,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }
 
   @Test
@@ -96,7 +96,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }
 
   @Test
@@ -107,7 +107,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }
 
   @Test
@@ -118,7 +118,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }
 
   @Test
@@ -129,7 +129,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }
 
   @Test
@@ -141,7 +141,7 @@ public class NovaToVolResourceConnectionTest extends BaseResourceTranslationTest
         "/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles";
     initTranslatorAndTranslate();
     testTranslation();
-    validateSubsMappingInConsolidationData();
+    validateNodeTemplateIdInNestedConsolidationData();
   }