From abe0a3794cfdb28d2af70ce37a2b35c8a195aea4 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Wed, 9 May 2018 16:42:59 +0530 Subject: Nested Dependency issues Remove nested depends On connectivity Change-Id: I65bd9473f879fa72b453c2793f2b2406adde4513 Issue-ID: SDC-1315 Signed-off-by: siddharth0905 --- .../out/MainServiceTemplate.yaml | 8 --- .../out/MainServiceTemplate.yaml | 12 ---- .../out/MainServiceTemplate.yaml | 8 --- .../out/MainServiceTemplate.yaml | 16 ----- .../out/MainServiceTemplate.yaml | 13 ---- .../out/MainServiceTemplate.yaml | 15 +--- .../out/MainServiceTemplate.yaml | 15 +--- .../duplicateReqs/out/MainServiceTemplate.yaml | 26 +------ .../out/MainServiceTemplate.yaml | 7 +- .../out/MainServiceTemplate.yaml | 6 +- .../out/MainServiceTemplate.yaml | 7 +- .../out/MainServiceTemplate.yaml | 7 +- .../out/MainServiceTemplate.yaml | 7 +- .../out/MainServiceTemplate.yaml | 6 +- .../allConnectivities/out/MainServiceTemplate.yaml | 11 +-- .../differentNodesConnectedOut/in/main.yml | 2 +- .../out/MainServiceTemplate.yaml | 8 +-- .../out/nested_pattern4ServiceTemplate.yaml | 7 +- .../out/nested_pattern4ServiceTemplate.yaml | 6 +- .../out/nested_pattern4ServiceTemplate.yaml | 6 +- .../out/MainServiceTemplate.yaml | 83 +--------------------- .../expectedoutputfiles/MainServiceTemplate.yaml | 9 --- 22 files changed, 17 insertions(+), 268 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index b1459386a0..76b05fba29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -694,14 +694,6 @@ topology_template: network_name: get_input: net_name requirements: - - dependency: - capability: tosca.capabilities.Node - node: nestedNoUnified - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: 4p_nested - relationship: tosca.relationships.DependsOn - dependency: capability: feature_1c2_catalog_instance_1c2_t1_port node: abstract_1c2_catalog_instance_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index de39122572..0556b0b82f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -623,14 +623,6 @@ topology_template: network_name: get_input: net_name requirements: - - dependency: - capability: tosca.capabilities.Node - node: nestedNoNestedSingleComputePattern - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: 4p_nested - relationship: tosca.relationships.DependsOn - dependency: capability: feature_1c2_catalog_instance_1c2_t1_port node: abstract_1c2_catalog_instance_1 @@ -679,10 +671,6 @@ topology_template: capability: feature_a_single_1a_1a_t1_port node: abstract_a_single_1a relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt - relationship: tosca.relationships.DependsOn abstract_a_single_1a: type: org.openecomp.resource.abstract.nodes.a_single_1a directives: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index 0930c1528f..9c5f7f850b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -578,14 +578,6 @@ topology_template: network_name: get_input: net_name requirements: - - dependency: - capability: tosca.capabilities.Node - node: nestedNoUnified - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: 4p_nested - relationship: tosca.relationships.DependsOn - dependency: capability: feature_1c2_catalog_instance_1c2_t1_port node: abstract_1c2_catalog_instance_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index 58b33a492e..6741c72585 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -1518,22 +1518,6 @@ topology_template: network_name: get_input: net_name requirements: - - dependency: - capability: tosca.capabilities.Node - node: nestedNoUnified_1 - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: nestedNoUnified_2 - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: 4p_nested_1 - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: 4p_nested_2 - relationship: tosca.relationships.DependsOn - dependency: capability: feature_1c2_catalog_instance_1c201_port node: abstract_1c2_catalog_instance_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index 8269732bdf..e8dbc5af26 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -359,19 +359,6 @@ topology_template: properties: network_name: get_input: jsa_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: test_nested_all_patterns - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_no_compute - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_pattern_4 - relationship: tosca.relationships.DependsOn abstract_rd_server_1b: type: org.openecomp.resource.abstract.nodes.rd_server_1b directives: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml index edb739aa61..6d45dc1126 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml @@ -27,19 +27,6 @@ topology_template: properties: network_name: get_input: jsa_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: test_nested_all_patterns - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_no_compute - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_pattern_4 - relationship: tosca.relationships.DependsOn test_nested_pattern_4: type: org.openecomp.resource.abstract.nodes.heat.pd_server directives: @@ -106,4 +93,4 @@ topology_template: - dependsOn_network - test_nested_pattern_4 - test_nested_no_compute - - test_nested_all_patterns + - test_nested_all_patterns \ 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/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml index 0c7dc7ba78..b1d5708c5e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml @@ -40,19 +40,6 @@ topology_template: properties: network_name: get_input: jsa_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: test_nested_same_file_1 - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_same_file_2 - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: test_nested_diff_file - relationship: tosca.relationships.DependsOn test_nested_diff_file: type: org.openecomp.resource.abstract.nodes.heat.nested-other-file-1B directives: @@ -135,4 +122,4 @@ topology_template: - test_nested_same_file_1 - test_nested_same_file_2 - jsa_security_group1 - - jsa_security_group2 + - jsa_security_group2 \ 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/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index d63fd0632c..1f76f3e59b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -2290,10 +2290,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cscf_server_0: - capability: tosca.capabilities.Node - node: cscf_internal_network_0 - relationship: tosca.relationships.DependsOn oam_oam_vip_1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -2412,14 +2408,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_tdcore_server_0: - capability: tosca.capabilities.Node - node: cscf_internal_network_0 - relationship: tosca.relationships.DependsOn - - dependency_tdcore_server_0: - capability: tosca.capabilities.Node - node: cscf_internal_dpdk_network_0 - relationship: tosca.relationships.DependsOn lbd_ims_core_v6_vip_2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -2750,14 +2738,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_tdcore_server_0: - capability: tosca.capabilities.Node - node: cscf_internal_network_0 - relationship: tosca.relationships.DependsOn - - dependency_tdcore_server_0: - capability: tosca.capabilities.Node - node: cscf_internal_dpdk_network_0 - relationship: tosca.relationships.DependsOn oam_volume_1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -3503,10 +3483,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cscf_server_0: - capability: tosca.capabilities.Node - node: cscf_internal_network_0 - relationship: tosca.relationships.DependsOn lbd_internal_dpdk_vip_1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -4153,4 +4129,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - tdcore_zone_1_server_group_group + - tdcore_zone_1_server_group_group \ 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/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index f0d049faf7..323bbb3238 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -2237,11 +2237,6 @@ topology_template: get_input: oam_net_id vson_vm_names: - get_input: vson_clm_name_0 - requirements: - - dependency_vson_server_1: - capability: tosca.capabilities.Node - node: oam_net_security_group - relationship: tosca.relationships.DependsOn vson_mgt_group: type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2 directives: @@ -3428,4 +3423,4 @@ topology_template: value: vson_dbs_volume_1 vson_mon_server_group_id: description: ID of the Server Group intended for vSON MON instances. - value: UNSUPPORTED_RESOURCE_vson_mon_server_group + value: UNSUPPORTED_RESOURCE_vson_mon_server_group \ 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/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml index 788f1f05c3..dc10b5cff3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml @@ -479,10 +479,6 @@ topology_template: network_name: get_input: net_name requirements: - - dependency: - capability: tosca.capabilities.Node - node: server_pcm_001 - relationship: tosca.relationships.DependsOn - dependency: capability: feature_compute node: abstract_compute @@ -643,4 +639,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - test_shared_node_connected_in_nested + - test_shared_node_connected_in_nested \ 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/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index f26ec33021..038dc88281 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -306,11 +306,6 @@ topology_template: properties: network_name: get_input: port_net_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: server_pcm_001 - relationship: tosca.relationships.DependsOn abstract_compute: type: org.openecomp.resource.abstract.nodes.compute directives: @@ -359,4 +354,4 @@ topology_template: members: - server_pcm_001 - packet_mirror_network - - abstract_compute + - abstract_compute \ 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/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml index 91253aebb6..def85b6063 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml @@ -306,11 +306,6 @@ topology_template: properties: network_name: get_input: net_name - requirements: - - dependency: - capability: tosca.capabilities.Node - node: server_pcm_001 - relationship: tosca.relationships.DependsOn compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -380,4 +375,4 @@ topology_template: - server_pcm_001 - packet_mirror_network - compute_port_0 - - abstract_compute + - abstract_compute \ 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/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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml index 02223317d6..b97831a8e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml @@ -1323,26 +1323,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - dependency: - capability: tosca.capabilities.Node - node: security_group - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn vProbe: type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vProbeTemplate directives: @@ -1425,26 +1405,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - dependency: - capability: tosca.capabilities.Node - node: security_group - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn packet_mirror_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -1648,27 +1608,6 @@ topology_template: get_input: qrouter_volume_size_2 rpmrepository_ip_0: get_input: rpmrepository_ip_0 - requirements: - - dependency: - capability: tosca.capabilities.Node - node: security_group - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn vLB: type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate directives: @@ -1746,26 +1685,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo - - dependency: - capability: tosca.capabilities.Node - node: security_group - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn groups: FEBase_Module_group: type: org.openecomp.groups.heat.HeatStack @@ -1778,4 +1697,4 @@ topology_template: - packet_internal_network - security_group - QRouter0 - - vLB + - vLB \ 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/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml index 64646166d8..84a631b907 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml @@ -510,10 +510,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vdbe_untr_vmi 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: @@ -527,11 +523,6 @@ topology_template: get_attribute: - vdbe_untr_1_subports - count - requirements: - - dependency: - capability: tosca.capabilities.Node - node: vdbe_untr_1_subports - relationship: tosca.relationships.DependsOn groups: main_group: type: org.openecomp.groups.heat.HeatStack -- cgit 1.2.3-korg