diff options
author | 2017-06-11 14:22:02 +0300 | |
---|---|---|
committer | 2017-06-11 17:48:32 +0300 | |
commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation | |
parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation')
5 files changed, 382 insertions, 67 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4f96bcd484..c5923cc46b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,36 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_0: 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 @@ -405,6 +435,36 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_1: 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 @@ -427,30 +487,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 + port_pd01_port_order: + type: list + required: true status: SUPPORTED - constraints: - - greater_or_equal: 0 - compute_pd_server_availability_zone: + entry_schema: + type: integer + port_pd01_port_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_name: + port_pd01_port_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - vm_flavor_name: - 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 @@ -796,6 +862,24 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd01_port_2_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pd01_port_3_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_3_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -804,6 +888,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd01_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json compute_pd_server_availability_zone: type: list required: true @@ -844,22 +934,52 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_2_network_role: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_2_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_image_name: type: string required: true status: SUPPORTED + port_pd01_port_3_subnetpoolid: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_pd01_port_2_network: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_3_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_pd01_port_2_mac_requirements: type: list required: true status: SUPPORTED entry_schema: type: json + port_pd01_port_2_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json port_pd01_port_3_network_role_tag: type: list required: true @@ -878,6 +998,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_pd01_port_3_exCP_naming: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json requirements: - dependency_pd_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/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 393fbdc37a..873c04ebec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -233,6 +233,16 @@ topology_template: directives: - substitutable properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + vm_flavor_name: + get_attribute: + - network_policy_server + - name port_pd01_port_mac_requirements: - mac_count_required: is_required: false @@ -246,16 +256,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 - - 1 - vm_flavor_name: - get_attribute: - - network_policy_server - - name port_pd01_port_network_role_tag: - oam compute_pd_server_user_data_format: @@ -273,6 +273,16 @@ 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_attribute: + - network_policy_server + - name port_pd01_port_mac_requirements: - mac_count_required: is_required: false @@ -288,16 +298,6 @@ topology_template: - get_attribute: - network_policy_server - name - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 0 - vm_flavor_name: - get_attribute: - - network_policy_server - - name compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml index b6c4036c6d..6a96d70747 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.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/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index a0da89fcd1..1efd8dcca0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.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,26 +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: integer + port_pd01_port_subnetpoolid: type: list required: true entry_schema: type: string - compute_pd_server_name: + port_pd01_port_network_role: type: list required: true entry_schema: type: string - vm_flavor_name: - 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 @@ -77,14 +107,38 @@ 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 - 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index f9becc9b4a..fd95fdc3fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -11,6 +11,21 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_2_order: + type: list + required: true + entry_schema: + type: integer + port_pd01_port_3_network_role: + type: list + required: true + entry_schema: + type: string + port_pd01_port_3_order: + type: list + required: true + entry_schema: + type: integer index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +33,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd01_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: json compute_pd_server_availability_zone: type: list required: true @@ -51,19 +71,44 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_2_network_role: + type: list + required: true + entry_schema: + type: string + port_pd01_port_2_subnetpoolid: + type: list + required: true + entry_schema: + type: string vm_image_name: type: string required: true + port_pd01_port_3_subnetpoolid: + type: list + required: true + entry_schema: + type: string port_pd01_port_2_network: type: list required: true entry_schema: type: string + port_pd01_port_3_vlan_requirements: + type: list + required: true + entry_schema: + type: json port_pd01_port_2_mac_requirements: type: list required: true entry_schema: type: json + port_pd01_port_2_exCP_naming: + type: list + required: true + entry_schema: + type: json port_pd01_port_3_network_role_tag: type: list required: true @@ -79,6 +124,11 @@ topology_template: required: true entry_schema: type: json + port_pd01_port_3_exCP_naming: + type: list + required: true + entry_schema: + type: json node_templates: pd_server: type: org.openecomp.resource.vfc.nodes.heat.pd_server @@ -102,6 +152,14 @@ topology_template: pd_server_pd01_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_pd01_port_2_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pd01_port_2_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_2_ip_requirements @@ -114,6 +172,18 @@ topology_template: get_input: - port_pd01_port_2_mac_requirements - index_value + order: + get_input: + - port_pd01_port_2_order + - index_value + network_role: + get_input: + - port_pd01_port_2_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_2_subnetpoolid + - index_value network: get_input: - port_pd01_port_2_network @@ -126,6 +196,14 @@ topology_template: pd_server_pd01_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + exCP_naming: + get_input: + - port_pd01_port_3_exCP_naming + - index_value + vlan_requirements: + get_input: + - port_pd01_port_3_vlan_requirements + - index_value ip_requirements: get_input: - port_pd01_port_3_ip_requirements @@ -138,6 +216,18 @@ topology_template: get_input: - port_pd01_port_3_mac_requirements - index_value + order: + get_input: + - port_pd01_port_3_order + - index_value + network_role: + get_input: + - port_pd01_port_3_network_role + - index_value + subnetpoolid: + get_input: + - port_pd01_port_3_subnetpoolid + - index_value network: get_input: - port_pd01_port_3_network |