diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle')
4 files changed, 198 insertions, 48 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index a674d6bf46..2ef83fec70 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,36 @@ 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 + status: SUPPORTED + entry_schema: + type: string + compute_pd_server_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + status: SUPPORTED port_pd01_port_mac_requirements: type: list required: true @@ -30,36 +60,36 @@ node_types: 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 - compute_pd_server_availability_zone: + port_pd01_port_order: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_name: + type: integer + port_pd01_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - type: string + port_pd01_port_network_role: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd01_port_network_role_tag: 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 @@ -411,10 +441,12 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_ps01_port_subnetpoolid: + type: list required: true status: SUPPORTED + entry_schema: + type: string compute_ps_server_availability_zone: type: list required: true @@ -435,22 +467,44 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_mac_requirements: + port_ps01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: json - port_ps01_port_network: + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_ps01_port_order: type: list required: true status: SUPPORTED entry_schema: - type: string - vm_flavor_name: + type: integer + vm_image_name: type: string required: true status: SUPPORTED + port_ps01_port_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps01_port_mac_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_ps01_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_ps01_port_ip_requirements: type: list required: true @@ -463,6 +517,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json requirements: - dependency_ps_server: capability: tosca.capabilities.Node diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index bbbd7dadd3..645929f408 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -355,6 +355,14 @@ topology_template: directives: - substitutable properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 0 + vm_flavor_name: + get_input: pd_flavor_name port_pd01_port_mac_requirements: - mac_count_required: is_required: false @@ -368,14 +376,6 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 0 - vm_flavor_name: - get_input: pd_flavor_name port_pd01_port_network_role_tag: - oam compute_pd_server_user_data_format: @@ -397,19 +397,19 @@ topology_template: - get_input: - ps_server_names - 0 - vm_image_name: - get_input: pd_image_name compute_ps_server_availability_zone: - get_input: availabilityzone_name compute_ps_server_user_data_format: - RAW + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name port_ps01_port_mac_requirements: - mac_count_required: is_required: false port_ps01_port_network: - get_input: oam_net_name - vm_flavor_name: - get_input: pd_flavor_name port_ps01_port_ip_requirements: - - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index 74044a11c2..dd358a5dd2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,31 @@ 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 + entry_schema: + type: string + compute_pd_server_name: + type: list + required: true + entry_schema: + type: string + port_pd01_port_exCP_naming: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true port_pd01_port_mac_requirements: type: list required: true @@ -29,31 +54,31 @@ topology_template: 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 - compute_pd_server_availability_zone: + port_pd01_port_order: type: list required: true entry_schema: - type: string - compute_pd_server_name: + type: integer + port_pd01_port_subnetpoolid: type: list required: true entry_schema: type: string - vm_flavor_name: - type: string + port_pd01_port_network_role: + type: list required: true + entry_schema: + type: string port_pd01_port_network_role_tag: 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 @@ -82,6 +107,14 @@ 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 + vlan_requirements: + get_input: + - port_pd01_port_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_ip_requirements @@ -94,6 +127,18 @@ topology_template: 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index 5baa4a45ff..c16b51c98d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/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/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -16,9 +16,11 @@ topology_template: required: true entry_schema: type: string - vm_image_name: - type: string + port_ps01_port_subnetpoolid: + type: list required: true + entry_schema: + type: string compute_ps_server_availability_zone: type: list required: true @@ -36,6 +38,27 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_ps01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: json + vm_flavor_name: + type: string + required: true + port_ps01_port_order: + type: list + required: true + entry_schema: + type: integer + vm_image_name: + type: string + required: true + port_ps01_port_network_role: + type: list + required: true + entry_schema: + type: string port_ps01_port_mac_requirements: type: list required: true @@ -46,9 +69,6 @@ topology_template: required: true entry_schema: type: string - vm_flavor_name: - type: string - required: true port_ps01_port_ip_requirements: type: list required: true @@ -59,6 +79,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_exCP_naming: + type: list + required: true + entry_schema: + type: json node_templates: ps_server: type: org.openecomp.resource.vfc.nodes.heat.ps_server @@ -82,6 +107,14 @@ topology_template: ps_server_ps01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_ps01_port_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_ps01_port_vlan_requirements + - index_value ip_requirements: get_input: - port_ps01_port_ip_requirements @@ -94,6 +127,18 @@ topology_template: get_input: - port_ps01_port_mac_requirements - index_value + order: + get_input: + - port_ps01_port_order + - index_value + network_role: + get_input: + - port_ps01_port_network_role + - index_value + subnetpoolid: + get_input: + - port_ps01_port_subnetpoolid + - index_value network: get_input: - port_ps01_port_network |