diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B')
4 files changed, 54 insertions, 16 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 55cb9b5ba4..d480eddc00 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -48,6 +48,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -375,6 +381,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 @@ -685,6 +692,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 @@ -1035,6 +1043,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 @@ -1243,6 +1252,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -1552,6 +1567,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/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml index 7e85a3b36c..54906d7701 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: pd_server_pd_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_port_exCP_naming replacement_policy: get_input: - port_pd_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_port_mac_requirements + order: + get_input: port_pd_server_port_order + exCP_naming: + get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: get_input: port_pd_server_port_network_role_tag - mac_requirements: - get_input: port_pd_server_port_mac_requirements - order: - get_input: port_pd_server_port_order network_role: get_input: port_pd_server_port_network_role - subnetpoolid: - get_input: port_pd_server_port_subnetpoolid fixed_ips: get_input: - port_pd_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_port_subnetpoolid network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml index c4f91c67a1..de0ad423a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml @@ -58,6 +58,11 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -81,30 +86,34 @@ topology_template: ps_server_ps_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_port_exCP_naming replacement_policy: get_input: - port_ps_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_port_mac_requirements + order: + get_input: port_ps_server_port_order + exCP_naming: + get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: get_input: port_ps_server_port_network_role_tag - mac_requirements: - get_input: port_ps_server_port_mac_requirements - order: - get_input: port_ps_server_port_order network_role: get_input: port_ps_server_port_network_role - subnetpoolid: - get_input: port_ps_server_port_subnetpoolid fixed_ips: get_input: - port_ps_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_port_subnetpoolid network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml index cb894090d9..f031518281 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml @@ -104,6 +104,8 @@ topology_template: - get_input: net vm_flavor_name: get_input: pd_server_flavor + port_pd_server_port_subinterface_indicator: + - true port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -144,6 +146,8 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor + port_ps_server_port_subinterface_indicator: + - true port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: |