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_pd_server_2ServiceTemplate.yaml | 62 +++++++++++++--------- 1 file changed, 38 insertions(+), 24 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 2ab72c8a16..7b93f4a508 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -17,16 +17,11 @@ topology_template: port_pd01_port_3_network_role: type: string required: true - port_pd01_port_3_order: - type: integer + port_pd01_port_3_related_networks: + type: list required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd01_port_2_vlan_requirements: type: list required: true @@ -53,9 +48,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port_3_network: type: list required: true @@ -78,20 +70,9 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_3_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_3_network_role_tag: - type: string - required: true compute_pd_server_user_data_format: type: list required: true @@ -102,6 +83,35 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_3_order: + type: integer + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_3_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_3_network_role_tag: + type: string + required: true port_pd01_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -133,6 +143,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_2_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_2_related_networks ip_requirements: get_input: port_pd01_port_2_ip_requirements network_role_tag: @@ -162,6 +174,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_3_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_3_related_networks ip_requirements: get_input: port_pd01_port_3_ip_requirements network_role_tag: @@ -399,4 +413,4 @@ topology_template: - dependency dependency_pd_server_pd01_port_3: - pd_server_pd01_port_3 - - dependency + - dependency \ No newline at end of file -- cgit 1.2.3-korg