dynamic ports

ignore "depends_on" from / to nested entities, and adding tests

Issue - Id : SDC-576

Change-Id: I4788df058ca3b6ea436e54b3a05ceed97135327b
Signed-off-by: talio <tali.orenbach@amdocs.com>

1 files changed, 29 insertions, 16 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java
index 4e219dae4d..fab9114252 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationTypesConnectivity.java
@@ -23,34 +23,47 @@ public class ConsolidationTypesConnectivity {
         .put(ConsolidationEntityType.VOLUME, getIgnoredVolumeRelationships());
     entityToEntitiesWithoutRelationship
         .put(ConsolidationEntityType.VFC_NESTED, getIgnoredVfcNestedRelationships());
+    entityToEntitiesWithoutRelationship.
+        put(ConsolidationEntityType.NESTED, getIgnoredNestedRelationships());
   }
 
   private static Set<ConsolidationEntityType> getIgnoredComputeRelationships(){
-        return Stream.of(ConsolidationEntityType.COMPUTE,
-            ConsolidationEntityType.VOLUME,
-            ConsolidationEntityType.PORT,
-            ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
+    return Stream.of(ConsolidationEntityType.COMPUTE,
+        ConsolidationEntityType.VOLUME,
+        ConsolidationEntityType.PORT,
+        ConsolidationEntityType.NESTED,
+        ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
   }
 
   private static Set<ConsolidationEntityType> getIgnoredPortRelationships(){
-        return Stream.of(ConsolidationEntityType.COMPUTE,
-            ConsolidationEntityType.VOLUME,
-            ConsolidationEntityType.PORT,
-            ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
+    return Stream.of(ConsolidationEntityType.COMPUTE,
+        ConsolidationEntityType.VOLUME,
+        ConsolidationEntityType.PORT,
+        ConsolidationEntityType.NESTED,
+        ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
   }
 
   private static Set<ConsolidationEntityType> getIgnoredVolumeRelationships(){
-        return Stream.of(ConsolidationEntityType.COMPUTE,
-            ConsolidationEntityType.VOLUME,
-            ConsolidationEntityType.PORT,
-            ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
+    return Stream.of(ConsolidationEntityType.COMPUTE,
+        ConsolidationEntityType.VOLUME,
+        ConsolidationEntityType.PORT,
+        ConsolidationEntityType.NESTED,
+        ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
   }
 
   private static Set<ConsolidationEntityType> getIgnoredVfcNestedRelationships(){
-        return Stream.of(ConsolidationEntityType.COMPUTE,
-            ConsolidationEntityType.VOLUME,
-            ConsolidationEntityType.PORT,
-            ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
+    return Stream.of(ConsolidationEntityType.COMPUTE,
+        ConsolidationEntityType.VOLUME,
+        ConsolidationEntityType.PORT,
+        ConsolidationEntityType.NESTED,
+        ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
+  }
+
+  private static Set<ConsolidationEntityType> getIgnoredNestedRelationships(){
+    return Stream.of(ConsolidationEntityType.COMPUTE,
+        ConsolidationEntityType.PORT,
+        ConsolidationEntityType.NESTED,
+        ConsolidationEntityType.VFC_NESTED).collect(Collectors.toSet());
   }
 
   public static boolean isDependsOnRelationshipValid(ConsolidationEntityType source,