From 68ccc45de18f41cddb79de33a245bceb3b063ffb Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 22 Jun 2017 18:23:07 +0300 Subject: [sdc] - latest code changes Change-Id: I861387094b000367218bb417624fe50d3c37f70e Signed-off-by: Tal Gitelman --- .../out/Nested_b_single_1b_0ServiceTemplate.yaml | 60 ++++++---------------- 1 file changed, 16 insertions(+), 44 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml index f167185618..28a98f316f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml @@ -40,7 +40,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_1b_t2_port_ip_requirements: type: list required: true @@ -52,10 +52,8 @@ topology_template: entry_schema: type: string port_1b_t1_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -99,17 +97,15 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_b_single_1b_user_data_format: type: list required: true entry_schema: type: string port_1b_t2_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json compute_b_single_1b_name: type: list required: true @@ -153,33 +149,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t1_port_exCP_naming - - index_value + get_input: port_1b_t1_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t1_port_vlan_requirements - - index_value + get_input: port_1b_t1_port_vlan_requirements ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: - get_input: - - port_1b_t1_port_network_role_tag - - index_value + get_input: port_1b_t1_port_network_role_tag mac_requirements: get_input: port_1b_t1_port_mac_requirements order: - get_input: - - port_1b_t1_port_order - - index_value + get_input: port_1b_t1_port_order network_role: - get_input: - - port_1b_t1_port_network_role - - index_value + get_input: port_1b_t1_port_network_role subnetpoolid: - get_input: - - port_1b_t1_port_subnetpoolid - - index_value + get_input: port_1b_t1_port_subnetpoolid network: get_attribute: - b_single_1b @@ -193,33 +177,21 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_1b_t2_port_exCP_naming - - index_value + get_input: port_1b_t2_port_exCP_naming vlan_requirements: - get_input: - - port_1b_t2_port_vlan_requirements - - index_value + get_input: port_1b_t2_port_vlan_requirements ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: - get_input: - - port_1b_t2_port_network_role_tag - - index_value + get_input: port_1b_t2_port_network_role_tag mac_requirements: get_input: port_1b_t2_port_mac_requirements order: - get_input: - - port_1b_t2_port_order - - index_value + get_input: port_1b_t2_port_order network_role: - get_input: - - port_1b_t2_port_network_role - - index_value + get_input: port_1b_t2_port_network_role subnetpoolid: - get_input: - - port_1b_t2_port_subnetpoolid - - index_value + get_input: port_1b_t2_port_subnetpoolid network: get_input: - port_1b_t2_port_network -- cgit 1.2.3-korg