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-oam_v0.1ServiceTemplate.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/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml index 794802978f..eb4cfb9b59 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -28,6 +28,11 @@ topology_template: port_oam_port_0_network_role: type: string required: true + port_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_port_1_network_role_tag: type: string required: true @@ -150,6 +155,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments shared_security_group_id1: hidden: false immutable: false @@ -159,6 +169,12 @@ topology_template: oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_oam_port_0_subnetpoolid + related_networks: + get_input: port_oam_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_oam_port_0_ip_requirements security_groups: @@ -168,8 +184,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_oam_port_0_subnetpoolid mac_requirements: get_input: port_oam_port_0_mac_requirements subinterface_indicator: false @@ -179,8 +193,6 @@ topology_template: get_input: port_oam_port_0_vlan_requirements network_role_tag: get_input: port_oam_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_oam_port_0_order requirements: @@ -203,6 +215,12 @@ topology_template: oam_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_oam_port_1_subnetpoolid + related_networks: + get_input: port_oam_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_oam_port_1_ip_requirements security_groups: @@ -213,8 +231,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_oam_port_1_subnetpoolid mac_requirements: get_input: port_oam_port_1_mac_requirements subinterface_indicator: false @@ -224,8 +240,6 @@ topology_template: get_input: port_oam_port_1_vlan_requirements network_role_tag: get_input: port_oam_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_oam_port_1_order requirements: @@ -463,4 +477,4 @@ topology_template: - link dependency_server_oam: - server_oam - - dependency + - dependency \ No newline at end of file -- cgit 1.2.3-korg