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/MainServiceTemplate.yaml | 46 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml') 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 cd041a4083..f917dda694 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 @@ -166,6 +166,10 @@ topology_template: capability: tosca.capabilities.Node node: nestedWithNoNovaHadDependencyToIt relationship: tosca.relationships.DependsOn + - dependency_1b01_single_1B_b_single_1b: + capability: tosca.capabilities.Node + node: nestedWithNoNovaHadDependencyToIt + relationship: tosca.relationships.DependsOn - link_b_single_1b_1b_t2_port: capability: tosca.capabilities.network.Linkable node: b_single_1b_network @@ -247,10 +251,18 @@ topology_template: capability: tosca.capabilities.Node node: nestedWithNoNovaHadDependencyToIt relationship: tosca.relationships.DependsOn + - dependency_1c102_scalling_instance_1C1_1c1_scalling_instance: + capability: tosca.capabilities.Node + node: nestedWithNoNovaHadDependencyToIt + relationship: tosca.relationships.DependsOn - link_1c1_scalling_instance_1c1_t1_port: capability: tosca.capabilities.network.Linkable node: 1c1_scalling_instance_network relationship: tosca.relationships.network.LinksTo + - dependency_1c101_scalling_instance_1C1_1c1_scalling_instance: + capability: tosca.capabilities.Node + node: nestedWithNoNovaHadDependencyToIt + relationship: tosca.relationships.DependsOn b_single_1b_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -308,10 +320,28 @@ topology_template: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo - - dependency: + - dependency_pcm_port_1: capability: tosca.capabilities.Node - node: nestedWithNoNovaHadDependencyToIt + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + - link_pcm_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + - dependency_server_pcm: + capability: tosca.capabilities.Node + node: tosca.nodes.Root relationship: tosca.relationships.DependsOn + - local_storage_server_pcm: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + - dependency_pcm_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + - link_pcm_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo abstract_1c2_catalog_instance_0: type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance directives: @@ -367,6 +397,10 @@ topology_template: capability: tosca.capabilities.Node node: nestedWithNoNovaHadDependencyToIt relationship: tosca.relationships.DependsOn + - dependency_1c2_t1_port_0_1c2_catalog_instance_1c2_t1_port: + capability: tosca.capabilities.Node + node: nestedWithNoNovaHadDependencyToIt + relationship: tosca.relationships.DependsOn - link_1c2_catalog_instance_1c2_t2_port: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network @@ -428,6 +462,10 @@ topology_template: capability: tosca.capabilities.Node node: nestedWithNoNovaHadDependencyToIt relationship: tosca.relationships.DependsOn + - dependency_1c2_t1_port_1_1c2_catalog_instance_1c2_t1_port: + capability: tosca.capabilities.Node + node: nestedWithNoNovaHadDependencyToIt + relationship: tosca.relationships.DependsOn - link_1c2_catalog_instance_1c2_t2_port: capability: tosca.capabilities.network.Linkable node: 1c2_catalog_instance_network @@ -661,6 +699,10 @@ topology_template: capability: tosca.capabilities.Node node: nestedWithNoNovaHadDependencyToIt relationship: tosca.relationships.DependsOn + - dependency_1a_single_1A_a_single_1a: + capability: tosca.capabilities.Node + node: nestedWithNoNovaHadDependencyToIt + relationship: tosca.relationships.DependsOn - link_a_single_1a_1a_t1_port: capability: tosca.capabilities.network.Linkable node: a_single_1a_network -- cgit 1.2.3-korg