diff options
author | 2017-06-22 18:23:07 +0300 | |
---|---|---|
committer | 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/singleSubstitution/threeSameComputesNoConsolidation | |
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/singleSubstitution/threeSameComputesNoConsolidation')
5 files changed, 82 insertions, 125 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 72d15b3a03..1f2d24b189 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -29,11 +29,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 @@ -77,15 +75,17 @@ node_types: entry_schema: type: string port_pd01_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -452,11 +452,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 @@ -510,7 +508,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 @@ -887,7 +885,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -905,9 +903,11 @@ node_types: required: true status: SUPPORTED port_pd01_port_2_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd01_port_3_ip_requirements: type: list required: true @@ -957,21 +957,21 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED port_pd01_port_2_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_3_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_pd_server_user_data_format: type: list required: true @@ -985,11 +985,9 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_3_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json requirements: - dependency_pd_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/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index bd48f71527..20bc8900a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -185,13 +185,14 @@ topology_template: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: oam + port_pd01_port_2_network_role_tag: + - oam port_pd01_port_3_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 port_pd01_port_3_mac_requirements: mac_count_required: is_required: false @@ -204,15 +205,16 @@ topology_template: port_pd01_port_2_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: oam + port_pd01_port_3_network_role_tag: + - oam compute_pd_server_user_data_format: - RAW port_pd01_port_2_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 service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -247,14 +249,15 @@ 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 port_pd01_port_network: - get_input: oam_net_name - port_pd01_port_network_role_tag: oam + port_pd01_port_network_role_tag: + - oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -286,11 +289,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 port_pd01_port_network: - get_attribute: - network_policy_server @@ -315,4 +318,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_2
\ 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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.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_0ServiceTemplate.yaml index e3df4382db..707bfc960d 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_0ServiceTemplate.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_0ServiceTemplate.yaml @@ -29,10 +29,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 @@ -68,13 +66,15 @@ topology_template: entry_schema: type: string port_pd01_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_pd01_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -104,13 +104,9 @@ 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 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: @@ -118,17 +114,11 @@ topology_template: 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/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.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_1ServiceTemplate.yaml index d4f7949e6f..340d30e52a 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_1ServiceTemplate.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_1ServiceTemplate.yaml @@ -29,10 +29,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 @@ -76,7 +74,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 @@ -106,33 +104,21 @@ 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 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/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 4d99432a64..1a38b715e5 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 @@ -37,7 +37,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_availability_zone: type: list required: true @@ -52,8 +52,10 @@ topology_template: type: string required: true port_pd01_port_2_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_pd01_port_3_ip_requirements: type: list required: true @@ -94,18 +96,18 @@ topology_template: type: list required: true entry_schema: - type: json + 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: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd01_port_3_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string compute_pd_server_user_data_format: type: list required: true @@ -117,10 +119,8 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_3_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json node_templates: pd_server: type: org.openecomp.resource.vfc.nodes.heat.pd_server @@ -145,13 +145,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_pd01_port_2_exCP_naming - - index_value + get_input: port_pd01_port_2_exCP_naming vlan_requirements: - get_input: - - port_pd01_port_2_vlan_requirements - - index_value + get_input: port_pd01_port_2_vlan_requirements ip_requirements: get_input: port_pd01_port_2_ip_requirements network_role_tag: @@ -159,17 +155,11 @@ topology_template: mac_requirements: get_input: port_pd01_port_2_mac_requirements order: - get_input: - - port_pd01_port_2_order - - index_value + get_input: port_pd01_port_2_order network_role: - get_input: - - port_pd01_port_2_network_role - - index_value + get_input: port_pd01_port_2_network_role subnetpoolid: - get_input: - - port_pd01_port_2_subnetpoolid - - index_value + get_input: port_pd01_port_2_subnetpoolid network: get_input: - port_pd01_port_2_network @@ -183,13 +173,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_pd01_port_3_exCP_naming - - index_value + get_input: port_pd01_port_3_exCP_naming vlan_requirements: - get_input: - - port_pd01_port_3_vlan_requirements - - index_value + get_input: port_pd01_port_3_vlan_requirements ip_requirements: get_input: port_pd01_port_3_ip_requirements network_role_tag: @@ -197,17 +183,11 @@ topology_template: mac_requirements: get_input: port_pd01_port_3_mac_requirements order: - get_input: - - port_pd01_port_3_order - - index_value + get_input: port_pd01_port_3_order network_role: - get_input: - - port_pd01_port_3_network_role - - index_value + get_input: port_pd01_port_3_network_role subnetpoolid: - get_input: - - port_pd01_port_3_subnetpoolid - - index_value + get_input: port_pd01_port_3_subnetpoolid network: get_input: - port_pd01_port_3_network |