diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-06-22 18:23:07 +0300 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2017-06-22 18:23:07 +0300 |
commit | 68ccc45de18f41cddb79de33a245bceb3b063ffb (patch) | |
tree | d80619a8539a8a03f68304c23eef7e3790ca63c6 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out | |
parent | 7d92498efd0ea61097b241287c004965d46b2c12 (diff) |
[sdc] - latest code changes
Change-Id: I861387094b000367218bb417624fe50d3c37f70e
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out')
4 files changed, 31 insertions, 75 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 844c82a913..2ef7b49f7e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -35,11 +35,9 @@ node_types: entry_schema: type: string port_pd01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -93,7 +91,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -476,7 +474,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -526,11 +524,9 @@ node_types: entry_schema: type: string port_ps01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json requirements: - dependency_ps_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index 131d2ef1c5..7d67ee664d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -85,7 +85,6 @@ topology_template: - 0 port_pd01_port_replacement_policy: - AUTO - - AUTO vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: @@ -94,16 +93,11 @@ topology_template: vm_image_name: get_input: pd_image_name port_pd01_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_pd01_port_network: - Network-PD-1 - Network-PD-0 @@ -142,7 +136,6 @@ topology_template: get_input: ps_image_name port_ps01_port_replacement_policy: - AUTO - - AUTO port_ps01_port_mac_requirements: mac_count_required: is_required: false @@ -150,16 +143,11 @@ topology_template: - Network-PS-0 - Network-PS-1 port_ps01_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 2 @@ -176,4 +164,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server + - abstract_ps_server
\ 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/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_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_pd_serverServiceTemplate.yaml index 04bbe7af32..848d275147 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_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_pd_serverServiceTemplate.yaml @@ -34,10 +34,8 @@ topology_template: entry_schema: type: string port_pd01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -81,7 +79,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -111,37 +109,25 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_pd01_port_exCP_naming - - index_value + get_input: port_pd01_port_exCP_naming replacement_policy: get_input: - port_pd01_port_replacement_policy - index_value vlan_requirements: - get_input: - - port_pd01_port_vlan_requirements - - index_value + get_input: port_pd01_port_vlan_requirements ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: - get_input: - - port_pd01_port_network_role_tag - - index_value + get_input: port_pd01_port_network_role_tag mac_requirements: get_input: port_pd01_port_mac_requirements order: - get_input: - - port_pd01_port_order - - index_value + get_input: port_pd01_port_order network_role: - get_input: - - port_pd01_port_network_role - - index_value + get_input: port_pd01_port_network_role subnetpoolid: - get_input: - - port_pd01_port_subnetpoolid - - index_value + get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network 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 8769a1591b..e0afd0ef14 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 @@ -42,7 +42,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_flavor_name: type: string required: true @@ -83,10 +83,8 @@ topology_template: entry_schema: type: string port_ps01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json node_templates: ps_server: type: org.openecomp.resource.vfc.nodes.heat.ps_server @@ -111,37 +109,25 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_ps01_port_exCP_naming - - index_value + get_input: port_ps01_port_exCP_naming replacement_policy: get_input: - port_ps01_port_replacement_policy - index_value vlan_requirements: - get_input: - - port_ps01_port_vlan_requirements - - index_value + get_input: port_ps01_port_vlan_requirements ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: - get_input: - - port_ps01_port_network_role_tag - - index_value + get_input: port_ps01_port_network_role_tag mac_requirements: get_input: port_ps01_port_mac_requirements order: - get_input: - - port_ps01_port_order - - index_value + get_input: port_ps01_port_order network_role: - get_input: - - port_ps01_port_network_role - - index_value + get_input: port_ps01_port_network_role subnetpoolid: - get_input: - - port_ps01_port_subnetpoolid - - index_value + get_input: port_ps01_port_subnetpoolid network: get_input: - port_ps01_port_network |