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/GlobalSubstitutionTypesServiceTemplate.yaml | 14 +++++++++++++- .../out/Nested_pd_server_1bServiceTemplate.yaml | 9 ++++++++- .../out/nested_pattern5_levelTwoServiceTemplate.yaml | 15 +++++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index a80a91c227..de35f9126e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -942,6 +942,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -1385,6 +1391,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_1b_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments ps_server_1b_ips: type: string required: true @@ -1954,4 +1966,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ 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/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 40cf56b99a..17f0ff073f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -41,6 +41,11 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -151,6 +156,8 @@ topology_template: subinterface_indicator: true ip_requirements: get_input: port_pd_server_1b_port_ip_requirements + related_networks: + get_input: port_pd_server_1b_port_related_networks network_role_tag: get_input: port_pd_server_1b_port_network_role_tag network_role: @@ -359,4 +366,4 @@ topology_template: - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency + - dependency \ 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/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 0f2212017f..a27844365a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_ps_server_1b_port_1_network_role_tag: type: string required: true + port_ps_server_1b_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments ps_server_1b_ips: hidden: false immutable: false @@ -134,6 +139,11 @@ topology_template: ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_ps_server_1b_port_1_subnetpoolid + related_networks: + get_input: port_ps_server_1b_port_1_related_networks + network: packet_int_network replacement_policy: AUTO ip_requirements: get_input: port_ps_server_1b_port_1_ip_requirements @@ -144,8 +154,6 @@ topology_template: get_input: - ps_server_1b_ips - 0 - subnetpoolid: - get_input: port_ps_server_1b_port_1_subnetpoolid mac_requirements: get_input: port_ps_server_1b_port_1_mac_requirements subinterface_indicator: true @@ -155,7 +163,6 @@ topology_template: get_input: port_ps_server_1b_port_1_vlan_requirements network_role_tag: get_input: port_ps_server_1b_port_1_network_role_tag - network: packet_int_network order: get_input: port_ps_server_1b_port_1_order requirements: @@ -402,4 +409,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_server_1b_ps_1: - server_1b_ps_1 - - dependency + - dependency \ No newline at end of file -- cgit 1.2.3-korg