diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut')
3 files changed, 215 insertions, 35 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index c2a86696e4..d18921cdfa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -34,16 +26,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true status: SUPPORTED + port_pd02_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_pd01_port_mac_requirements: type: list required: true @@ -66,25 +58,105 @@ node_types: status: SUPPORTED entry_schema: type: json + port_pd02_port_network_role: + 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 + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd02_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pd02_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd02_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pd01_port_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd02_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_pd01_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_pd02_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_pd02_port_network: + port_pd01_port_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: + port_pd02_port_network: type: list required: true status: SUPPORTED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 8bc75d63cf..1e714f26c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -100,9 +100,6 @@ topology_template: - 0 port_pd01_port_replacement_policy: - AUTO - port_pd02_port_mac_requirements: - - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd01_port_mac_requirements: @@ -118,6 +115,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + compute_pd_server_user_data_format: + - RAW + port_pd02_port_mac_requirements: + - mac_count_required: + is_required: false port_pd01_port_network: - packet_mirror_network port_pd02_port_ip_requirements: @@ -128,8 +130,6 @@ topology_template: is_required: false port_pd02_port_network: - packet_mirror_network - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 9d86566e4f..64104dc20f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/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/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,13 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -33,14 +26,14 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: list - required: true - entry_schema: - type: json vm_flavor_name: type: string required: true + port_pd02_port_network_role_tag: + type: list + required: true + entry_schema: + type: string port_pd01_port_mac_requirements: type: list required: true @@ -59,22 +52,89 @@ topology_template: required: true entry_schema: type: json + port_pd02_port_network_role: + type: list + required: true + entry_schema: + type: string + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: list + required: true + entry_schema: + type: json + port_pd01_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_pd02_port_order: + type: list + required: true + entry_schema: + type: integer + port_pd02_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pd02_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_pd01_port_network: type: list required: true entry_schema: type: string + port_pd01_port_order: + type: list + required: true + entry_schema: + type: integer + port_pd01_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pd02_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + port_pd01_port_network_role: + type: list + required: true + entry_schema: + type: string port_pd02_port_ip_requirements: type: list required: true entry_schema: type: json - port_pd02_port_network: + port_pd01_port_network_role_tag: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: + port_pd02_port_network: type: list required: true entry_schema: @@ -102,18 +162,42 @@ topology_template: pd_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_pd01_port_exCP_naming + - index_value replacement_policy: get_input: - port_pd01_port_replacement_policy - index_value + vlan_requirements: + get_input: + - port_pd01_port_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_pd01_port_network_role_tag + - index_value mac_requirements: get_input: - port_pd01_port_mac_requirements - index_value + order: + get_input: + - port_pd01_port_order + - index_value + network_role: + get_input: + - port_pd01_port_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_subnetpoolid + - index_value network: get_input: - port_pd01_port_network @@ -126,18 +210,42 @@ topology_template: pd_server_pd02_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_pd02_port_exCP_naming + - index_value replacement_policy: get_input: - port_pd02_port_replacement_policy - index_value + vlan_requirements: + get_input: + - port_pd02_port_vlan_requirements + - index_value ip_requirements: get_input: - port_pd02_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_pd02_port_network_role_tag + - index_value mac_requirements: get_input: - port_pd02_port_mac_requirements - index_value + order: + get_input: + - port_pd02_port_order + - index_value + network_role: + get_input: + - port_pd02_port_network_role + - index_value + subnetpoolid: + get_input: + - port_pd02_port_subnetpoolid + - index_value network: get_input: - port_pd02_port_network |