diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-05-09 16:42:59 +0530 |
---|---|---|
committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-05-14 17:13:24 +0530 |
commit | abe0a3794cfdb28d2af70ce37a2b35c8a195aea4 (patch) | |
tree | afb381c229e6f9a4421432e219d7a9a5fd9a0f8d /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute | |
parent | 71bd1d935e56d8bac4677f840188ecb397da1b2a (diff) |
Nested Dependency issues
Remove nested depends On connectivity
Change-Id: I65bd9473f879fa72b453c2793f2b2406adde4513
Issue-ID: SDC-1315
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute')
5 files changed, 5 insertions, 48 deletions
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 @@ -480,10 +480,6 @@ topology_template: 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 relationship: tosca.relationships.DependsOn @@ -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 |