From 1b700c8606f319cbda416a8abb70ea16dceb7a29 Mon Sep 17 00:00:00 2001 From: "Assaf, Shay (sa726r)" Date: Sun, 26 Aug 2018 11:53:35 +0300 Subject: related-networks property support as input Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403 Issue-ID: SDC-1658 Signed-off-by: Assaf, Shay (sa726r) --- .../out/nested-pcm_v0.2ServiceTemplate.yaml | 32 ++++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 2055eaa7b0..6c048bbbbd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: port_pcm_port_02_network_role_tag: type: string required: true + port_pcm_port_12_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -137,6 +142,11 @@ topology_template: port_pcm_port_12_network_role_tag: type: string required: true + port_pcm_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -162,6 +172,12 @@ topology_template: pcm_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_12_subnetpoolid + related_networks: + get_input: port_pcm_port_12_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_12_ip_requirements security_groups: @@ -171,8 +187,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_12_subnetpoolid mac_requirements: get_input: port_pcm_port_12_mac_requirements subinterface_indicator: false @@ -182,8 +196,6 @@ topology_template: get_input: port_pcm_port_12_vlan_requirements network_role_tag: get_input: port_pcm_port_12_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_12_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_02_subnetpoolid + related_networks: + get_input: port_pcm_port_02_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_02_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_02_subnetpoolid mac_requirements: get_input: port_pcm_port_02_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_port_02_vlan_requirements network_role_tag: get_input: port_pcm_port_02_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_02_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency link_pcm_port_02: - pcm_port_02 - - link + - link \ No newline at end of file -- cgit 1.2.3-korg