[SDC] Onboarding 1710 rebase.

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / main / java / org / openecomp / sdc / translator / services / heattotosca / ConsolidationDataUtil.java

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
index 148e754..4e92372 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
@@ -271,10 +271,7 @@ public class ConsolidationDataUtil {
         targetResource, translateTo.getContext());
     // Add resource dependency information in nodesConnectedIn if the target node
     // is a consolidation entity
-    if (isConsolidationEntity(consolidationEntityType.getTargetEntityType())
-        && HeatToToscaUtil
-        .isValidDependsOnCandidate(heatOrchestrationTemplate, sourceResource,
-            targetResource, consolidationEntityType, translationContext)) {
+    if (isConsolidationEntity(consolidationEntityType.getTargetEntityType())) {
       ConsolidationDataUtil.updateNodesConnectedIn(translateTo,
           nodeTemplateId, consolidationEntityType.getTargetEntityType(), targetResourceId,
           requirementId, requirementAssignment);
@@ -282,10 +279,7 @@ public class ConsolidationDataUtil {
 
     //Add resource dependency information in nodesConnectedOut if the source node
     //is a consolidation entity
-    if (isConsolidationEntity(consolidationEntityType.getSourceEntityType())
-        && HeatToToscaUtil
-        .isValidDependsOnCandidate(heatOrchestrationTemplate, sourceResource,
-            targetResource, consolidationEntityType, translationContext)) {
+    if (isConsolidationEntity(consolidationEntityType.getSourceEntityType())) {
       ConsolidationDataUtil.updateNodesConnectedOut(translateTo,
           requirementAssignment.getNode(), consolidationEntityType.getSourceEntityType(),
           requirementId, requirementAssignment);