Nested Dependency issues

Remove nested depends On connectivity

Change-Id: I65bd9473f879fa72b453c2793f2b2406adde4513
Issue-ID: SDC-1315
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

8 files changed, 9 insertions, 44 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml
index eba062fc34..2b17893688 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml
@@ -454,11 +454,6 @@ topology_template:
             params:
               VNF_NAME:
                 get_input: vnf_name
-      requirements:
-      - dependency:
-          capability: feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested
-          node: abstract_vdbe
-          relationship: tosca.relationships.DependsOn
     control_int_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
       properties:
@@ -567,4 +562,4 @@ topology_template:
       members:
       - fabric_int_net
       - control_int_net
-      - abstract_vdbe
+      - abstract_vdbe
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml
index d972079e92..5b190bfeaa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml
@@ -477,10 +477,6 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: control_int_net
           relationship: tosca.relationships.network.LinksTo
-      - dependency_vdbe_vdbe_untr_1_port_nested:
-          capability: tosca.capabilities.Node
-          node: control_int_net
-          relationship: tosca.relationships.DependsOn
   groups:
     main_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -490,4 +486,4 @@ topology_template:
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
       - control_int_net
-      - abstract_vdbe
+      - abstract_vdbe
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
index 1cbb297669..9b01aa7c8a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
@@ -454,11 +454,6 @@ topology_template:
             params:
               VNF_NAME:
                 get_input: vnf_name
-      requirements:
-      - dependency:
-          capability: feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1
-          node: abstract_vdbe
-          relationship: tosca.relationships.DependsOn
     control_int_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
       properties:
@@ -613,10 +608,6 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: control_int_net
           relationship: tosca.relationships.network.LinksTo
-      - dependency_vdbe_vdbe_untr_1_port_vlan1:
-          capability: tosca.capabilities.Node
-          node: control_int_net
-          relationship: tosca.relationships.DependsOn
   groups:
     main_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -634,4 +625,4 @@ topology_template:
       value:
         get_attribute:
         - abstract_vdbe
-        - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
+        - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml
index 968fffcdfc..75ff05f142 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml
@@ -205,7 +205,7 @@ resources:
     type: OS::Heat::ResourceGroup
     depends_on: test_net2
     properties:
-      count: 9
+      count: 19
       resource_def:
         type: nested.yml
         properties:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml
index b2cc3927cb..b4bd810ae8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml
@@ -763,7 +763,7 @@ topology_template:
           - pd_server_names
           - 0
         subinterface_nested_service_template_filter_count:
-        - 9
+        - 19
         vm_flavor_name:
           get_input: pd_flavor_name
         subinterface_nested_p1:
@@ -795,10 +795,6 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - dependency_pd_server_pd01_port_nested:
-          capability: tosca.capabilities.Node
-          node: test_net2
-          relationship: tosca.relationships.DependsOn
       - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
@@ -813,4 +809,4 @@ topology_template:
       - test_net2
       - test_net1
       - abstract_pd_server_0
-      - abstract_pd_server_1
+      - abstract_pd_server_1
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
index d307f6eb2a..17f8e6b3d7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
@@ -244,11 +244,6 @@ topology_template:
             params:
               VNF_NAME:
                 get_input: vnf_name
-      requirements:
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: vdbe_untr_1_subports
-          relationship: tosca.relationships.DependsOn
     vdbe_untr_1_port:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
@@ -606,4 +601,4 @@ topology_template:
       - dependency
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
index bde17d080e..0b9a7a244a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
@@ -339,10 +339,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: vdbe_untr_1_port
           relationship: tosca.relationships.network.BindsTo
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: control_int_net
-          relationship: tosca.relationships.DependsOn
     control_int_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
       properties:
@@ -559,4 +555,4 @@ topology_template:
       - dependency
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
index 17a2d85109..668cdab094 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
@@ -339,10 +339,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: vdbe_0_untr_vmi_1
           relationship: tosca.relationships.network.BindsTo
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: control_int_net
-          relationship: tosca.relationships.DependsOn
     control_int_net:
       type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
       properties:
@@ -559,4 +555,4 @@ topology_template:
       - dependency
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file