From b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 11 Jun 2017 14:22:02 +0300 Subject: [SDC-29] rebase continue work to align source Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 66 +++++++++++++++ .../out/Nested_pd_serverServiceTemplate.yaml | 99 ++++++++++++++++++++++ 2 files changed, 165 insertions(+) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 49604b2074..a308e85feb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -26,6 +26,18 @@ node_types: status: SUPPORTED entry_schema: type: json + port_pd01_port_0_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -52,26 +64,80 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_1_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer vm_flavor_name: type: string required: true status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_1_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pd01_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_pd01_port_1_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json + port_pd01_port_1_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_image_name: type: string required: true status: SUPPORTED + port_pd01_port_1_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_pd01_port_1_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_0_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_pd01_port_1_network: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 96061d140c..e2edfa3db1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -26,6 +26,16 @@ topology_template: required: true entry_schema: type: json + port_pd01_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_network_role: + type: list + required: true + entry_schema: + type: string port_pd01_port_1_ip_requirements: type: list required: true @@ -48,22 +58,67 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_1_order: + type: list + required: true + entry_schema: + type: integer vm_flavor_name: type: string required: true + port_pd01_port_0_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_pd01_port_1_network_role: + type: list + required: true + entry_schema: + type: string + port_pd01_port_0_order: + type: list + required: true + entry_schema: + type: integer + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_pd01_port_1_mac_requirements: type: list required: true entry_schema: type: json + port_pd01_port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string vm_image_name: type: string required: true + port_pd01_port_1_exCP_naming: + type: list + required: true + entry_schema: + type: json port_pd01_port_1_network_role_tag: type: list required: true entry_schema: type: string + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_pd01_port_0_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_pd01_port_1_network: type: list required: true @@ -97,6 +152,14 @@ topology_template: pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_pd01_port_1_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pd01_port_1_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_1_ip_requirements @@ -109,6 +172,18 @@ topology_template: get_input: - port_pd01_port_1_mac_requirements - index_value + order: + get_input: + - port_pd01_port_1_order + - index_value + network_role: + get_input: + - port_pd01_port_1_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_1_subnetpoolid + - index_value network: get_input: - port_pd01_port_1_network @@ -121,14 +196,38 @@ topology_template: pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_pd01_port_0_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pd01_port_0_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_0_ip_requirements - index_value + network_role_tag: + get_input: + - port_pd01_port_0_network_role_tag + - index_value mac_requirements: get_input: - port_pd01_port_0_mac_requirements - index_value + order: + get_input: + - port_pd01_port_0_order + - index_value + network_role: + get_input: + - port_pd01_port_0_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_0_subnetpoolid + - index_value network: get_input: - port_pd01_port_0_network -- cgit 1.2.3-korg