diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out')
3 files changed, 121 insertions, 31 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 33a9362697..cad5199137 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,29 +8,25 @@ node_types: org.openecomp.resource.abstract.nodes.smp: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_port_ip_requirements: + port_port_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_port_mac_requirements: + port_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - vm_image_name: - type: string - required: true - status: SUPPORTED - port_port_network: + type: string + compute_smp_name: type: list required: true status: SUPPORTED entry_schema: type: string - compute_smp_name: + port_port_subnetpoolid: type: list required: true status: SUPPORTED @@ -50,28 +46,68 @@ node_types: status: SUPPORTED entry_schema: type: string + port_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_port_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - compute_smp_metadata: + compute_smp_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - compute_smp_user_data_format: + port_port_network_role: type: list required: true status: SUPPORTED entry_schema: type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + compute_smp_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_port_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_port_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer compute_smp_scheduler_hints: type: list required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index 9a471a91a9..6b57e2663d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -55,17 +55,9 @@ topology_template: directives: - substitutable properties: - port_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_port_mac_requirements: - mac_count_required: is_required: false - vm_image_name: - get_input: image_smp_name port_port_network: - get_input: port_name compute_smp_name: @@ -74,14 +66,22 @@ topology_template: - get_input: availability_zone_0 vm_flavor_name: get_input: flavor_smp_name + compute_smp_user_data_format: + - RAW + port_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: image_smp_name compute_smp_metadata: - jx_vm_role: smp2 vnf_id: get_input: vnf_id jx_lab_name: get_input: lab_name - compute_smp_user_data_format: - - RAW port_port_replacement_policy: - AUTO compute_smp_scheduler_hints: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml index 79e0b10db2..77117043d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml @@ -11,19 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_port_ip_requirements: - type: list - required: true - entry_schema: - type: json port_port_mac_requirements: type: list required: true entry_schema: type: json - vm_image_name: - type: string - required: true port_port_network: type: list required: true @@ -34,6 +26,11 @@ topology_template: required: true entry_schema: type: string + port_port_subnetpoolid: + type: list + required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -46,24 +43,57 @@ topology_template: required: true entry_schema: type: string + port_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + port_port_network_role_tag: + type: list + required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - compute_smp_metadata: + compute_smp_user_data_format: + type: list + required: true + entry_schema: + type: string + port_port_ip_requirements: type: list required: true entry_schema: type: json - compute_smp_user_data_format: + port_port_network_role: type: list required: true entry_schema: type: string + vm_image_name: + type: string + required: true + compute_smp_metadata: + type: list + required: true + entry_schema: + type: json + port_port_exCP_naming: + type: list + required: true + entry_schema: + type: json port_port_replacement_policy: type: list required: true entry_schema: type: string + port_port_order: + type: list + required: true + entry_schema: + type: integer compute_smp_scheduler_hints: type: list required: true @@ -73,18 +103,42 @@ topology_template: smp_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_port_exCP_naming + - index_value replacement_policy: get_input: - port_port_replacement_policy - index_value + vlan_requirements: + get_input: + - port_port_vlan_requirements + - index_value ip_requirements: get_input: - port_port_ip_requirements - index_value + network_role_tag: + get_input: + - port_port_network_role_tag + - index_value mac_requirements: get_input: - port_port_mac_requirements - index_value + order: + get_input: + - port_port_order + - index_value + network_role: + get_input: + - port_port_network_role + - index_value + subnetpoolid: + get_input: + - port_port_subnetpoolid + - index_value network: get_input: - port_port_network |