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 --- .../out/Nested_ps_serverServiceTemplate.yaml | 64 ++++++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml index 3de2a46d80..87e999cf79 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml @@ -16,9 +16,11 @@ topology_template: required: true entry_schema: type: string - vm_image_name: - type: string + port_ps01_port_subnetpoolid: + type: list required: true + entry_schema: + type: string compute_ps_server_availability_zone: type: list required: true @@ -36,6 +38,27 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_ps01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_ps01_port_order: + type: list + required: true + entry_schema: + type: integer + vm_image_name: + type: string + required: true + port_ps01_port_network_role: + type: list + required: true + entry_schema: + type: string port_ps01_port_replacement_policy: type: list required: true @@ -51,14 +74,21 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string - required: true port_ps01_port_ip_requirements: type: list required: true entry_schema: type: json + port_ps01_port_network_role_tag: + type: list + required: true + entry_schema: + type: string + port_ps01_port_exCP_naming: + type: list + required: true + entry_schema: + type: json node_templates: ps_server: type: org.openecomp.resource.vfc.nodes.heat.ps_server @@ -82,18 +112,42 @@ topology_template: ps_server_ps01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_ps01_port_exCP_naming + - index_value replacement_policy: get_input: - port_ps01_port_replacement_policy - index_value + vlan_requirements: + get_input: + - port_ps01_port_vlan_requirements + - index_value ip_requirements: get_input: - port_ps01_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_ps01_port_network_role_tag + - index_value mac_requirements: get_input: - port_ps01_port_mac_requirements - index_value + order: + get_input: + - port_ps01_port_order + - index_value + network_role: + get_input: + - port_ps01_port_network_role + - index_value + subnetpoolid: + get_input: + - port_ps01_port_subnetpoolid + - index_value network: get_input: - port_ps01_port_network -- cgit 1.2.3-korg