diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out')
4 files changed, 50 insertions, 12 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 84d7863050..72a100052d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -191,6 +197,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -506,6 +513,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_pcm_server_user_data_format: type: list required: true @@ -792,6 +805,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1117,6 +1131,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1124,6 +1139,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml index 0db0a41bd7..47887b4f3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_pcm_server_user_data_format: type: list required: true @@ -114,6 +119,10 @@ topology_template: pcm_server_pcm_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_mac_requirements + order: + get_input: port_pcm_port_order security_groups: get_input: - port_pcm_port_security_groups @@ -122,22 +131,22 @@ topology_template: get_input: port_pcm_port_exCP_naming vlan_requirements: get_input: port_pcm_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_ip_requirements network_role_tag: get_input: port_pcm_port_network_role_tag - mac_requirements: - get_input: port_pcm_port_mac_requirements - order: - get_input: port_pcm_port_order network_role: get_input: port_pcm_port_network_role - subnetpoolid: - get_input: port_pcm_port_subnetpoolid fixed_ips: get_input: - port_pcm_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_subnetpoolid network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index 8b9d88dd85..ccee6999af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -114,6 +119,10 @@ topology_template: pd_server_pcm_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_mac_requirements + order: + get_input: port_pcm_port_order security_groups: get_input: - port_pcm_port_security_groups @@ -122,22 +131,22 @@ topology_template: get_input: port_pcm_port_exCP_naming vlan_requirements: get_input: port_pcm_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_ip_requirements network_role_tag: get_input: port_pcm_port_network_role_tag - mac_requirements: - get_input: port_pcm_port_mac_requirements - order: - get_input: port_pcm_port_order network_role: get_input: port_pcm_port_network_role - subnetpoolid: - get_input: port_pcm_port_subnetpoolid fixed_ips: get_input: - port_pcm_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_subnetpoolid network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 89833ddbb7..9660d747ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -136,6 +136,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pcm_port_subinterface_indicator: + - true compute_pcm_server_user_data_format: - RAW vm_image_name: @@ -183,6 +185,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pcm_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name compute_pd_server_config_drive: |