diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities')
5 files changed, 60 insertions, 94 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5d5327b6b4..cf65048b1c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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 @@ -89,15 +87,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 @@ -463,11 +463,9 @@ node_types: constraints: - greater_or_equal: 0 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 @@ -535,15 +533,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_oam_server_scheduler_hints: type: list required: true @@ -928,11 +928,9 @@ node_types: constraints: - greater_or_equal: 0 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 @@ -992,7 +990,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements attributes: ps_server_accessIPv4: type: list diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 49797c2e91..540ba148b0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -222,14 +222,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: @@ -272,11 +273,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 @@ -313,11 +314,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_input: oam_net_name compute_oam_server_user_data_format: @@ -326,7 +327,8 @@ topology_template: - get_input: - oam_server_names - 0 - port_pd01_port_network_role_tag: oam + port_pd01_port_network_role_tag: + - oam compute_oam_server_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -469,4 +471,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group
\ 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/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index 7ae3192757..86140ff463 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -19,10 +19,8 @@ topology_template: constraints: - greater_or_equal: 0 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 @@ -78,13 +76,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_oam_server_scheduler_hints: type: list required: true @@ -99,13 +99,9 @@ topology_template: - port_pd01_port_security_groups - index_value 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: @@ -113,17 +109,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/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index 835f63e7c4..7f289a549c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/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/threeDiffComputesWithAllConnectivities/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 @@ -78,13 +76,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 @@ -122,13 +122,9 @@ topology_template: - port_pd01_port_security_groups - index_value 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: @@ -136,17 +132,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/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index 4c822803dc..1b1ba2fa31 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -39,10 +39,8 @@ topology_template: constraints: - greater_or_equal: 0 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 @@ -91,7 +89,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements node_templates: ps_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -101,33 +99,21 @@ topology_template: - port_pd01_port_security_groups - index_value 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 |