From 00e935fc6b8baae4d9b9ffef2c748202a60b66b4 Mon Sep 17 00:00:00 2001 From: avigaffa Date: Sun, 10 Sep 2017 08:58:51 +0300 Subject: Add latest bug fixes to master Change-Id: Ieddc2330ad4e093984f14a69b52f2ca5cb465a10 Issue-ID: SDC-293 Signed-off-by: avigaffa --- .../out/nested2ServiceTemplate.yaml | 59 ++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index e7feb50e7b..4a129de7ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -149,6 +149,10 @@ topology_template: capability: tosca.capabilities.Node node: test_nested3Level relationship: tosca.relationships.DependsOn + - dependency_server_nested2_pd_1b_pd_server_nested2_1b: + capability: tosca.capabilities.Node + node: test_nested3Level + relationship: tosca.relationships.DependsOn test_nested_pattern_4_nested2: type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4 directives: @@ -177,10 +181,28 @@ topology_template: floating_ip_count_required: is_required: false requirements: - - dependency: + - dependency_server_pd_pattern4: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + - local_storage_server_pd_pattern4: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + - dependency_pd_server_pattern4_port_1: capability: tosca.capabilities.Node - node: test_resourceGroup + node: tosca.nodes.Root relationship: tosca.relationships.DependsOn + - link_pd_server_pattern4_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + - dependency_pd_server_pattern4_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + - link_pd_server_pattern4_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo test_nested3Level: type: org.openecomp.resource.abstract.nodes.heat.nested3 directives: @@ -226,6 +248,29 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + requirements: + - dependency_server_pd_pattern4: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + - local_storage_server_pd_pattern4: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + - dependency_pd_server_pattern4_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + - link_pd_server_pattern4_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + - dependency_pd_server_pattern4_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + - link_pd_server_pattern4_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo abstract_ps_server_nested2_1b: type: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b directives: @@ -334,6 +379,14 @@ topology_template: capability: tosca.capabilities.Node node: test_nested3Level relationship: tosca.relationships.DependsOn + - dependency_server_nested2_1c1_cmaui_2_cmaui_1c1_nested2: + capability: tosca.capabilities.Node + node: test_nested3Level + relationship: tosca.relationships.DependsOn + - dependency_server_nested2_1c1_cmaui_1_cmaui_1c1_nested2: + capability: tosca.capabilities.Node + node: test_nested3Level + relationship: tosca.relationships.DependsOn groups: nested2_group: type: org.openecomp.groups.heat.HeatStack @@ -1498,4 +1551,4 @@ topology_template: - dependency dependency_pd_server_pattern4_port_1_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency_pd_server_pattern4_port_1 + - dependency_pd_server_pattern4_port_1 \ No newline at end of file -- cgit 1.2.3-korg