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/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml | |
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/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml')
1 files changed, 91 insertions, 91 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index 9322fa81fc..26ab893506 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -111,47 +111,14 @@ topology_template: directives: - substitutable properties: - port_1c1_t1_port_fixed_ips: - - - ip_address: - get_input: - - myIPs - - 3 - - - ip_address: - get_input: - - myIPs - - 1 compute_1c1_scalling_instance_user_data_format: - RAW2 - RAW1 - port_1c1_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_1c1_t1_port_mac_requirements: - - mac_count_required: - is_required: false - - mac_count_required: - is_required: false port_1c1_t2_port_network_role_tag: - ppds - ppds - port_1c1_t2_port_mac_requirements: - - mac_count_required: - is_required: false - - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name - compute_1c1_scalling_instance_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name port_1c1_t1_port_ip_requirements: - - ip_version: 4 ip_count_required: @@ -163,14 +130,8 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_1c1_t2_port_name: - - 1c1_t2_port_1 - - 1c1_t2_port_0 vm_image_name: get_input: pd_image_name - compute_1c1_scalling_instance_scheduler_hints: - - group: BE_Affinity_group - - group: BE_Affinity_group compute_1c1_scalling_instance_name: - get_input: - 1c1_scalling_instance_names @@ -196,6 +157,45 @@ topology_template: port_1c1_t2_port_network: - get_input: ppds_net_name - get_input: ppds_net_name + port_1c1_t1_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 3 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_1c1_t1_port_mac_requirements: + - mac_count_required: + is_required: false + - mac_count_required: + is_required: false + port_1c1_t2_port_mac_requirements: + - mac_count_required: + is_required: false + - mac_count_required: + is_required: false + compute_1c1_scalling_instance_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + port_1c1_t2_port_name: + - 1c1_t2_port_1 + - 1c1_t2_port_0 + compute_1c1_scalling_instance_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group service_template_filter: substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml count: 2 @@ -217,6 +217,18 @@ topology_template: port_1b_t2_port_mac_requirements: - mac_count_required: is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_flavor_name: + get_input: pd_flavor_name port_1b_t1_port_ip_requirements: - - ip_version: 4 ip_count_required: @@ -225,25 +237,13 @@ topology_template: is_required: false vm_image_name: get_input: pd_image_name - compute_b_single_1b_availability_zone: - - get_input: availabilityzone_name - compute_b_single_1b_scheduler_hints: - - group: BE_Affinity_group port_1b_t1_port_mac_requirements: - mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network - port_1b_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_b_single_1b_user_data_format: - RAW - vm_flavor_name: - get_input: pd_flavor_name compute_b_single_1b_name: - get_input: - b_single_1b_names @@ -271,32 +271,32 @@ topology_template: directives: - substitutable properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: - mac_count_required: is_required: false port_1c2_t2_port_network: - 1c2_catalog_instance_network - compute_1c2_catalog_instance_availability_zone: - - get_input: availabilityzone_name compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 1 - vm_flavor_name: - get_input: pd_flavor_name port_1c2_t1_port_network: - get_input: oam_net_name port_1c2_t2_port_mac_requirements: - mac_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_1c2_catalog_instance_user_data_format: - RAW1 port_1c2_t1_port_network_role_tag: @@ -327,32 +327,32 @@ topology_template: directives: - substitutable properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_1c2_t1_port_mac_requirements: - mac_count_required: is_required: false port_1c2_t2_port_network: - 1c2_catalog_instance_network - compute_1c2_catalog_instance_availability_zone: - - get_input: availabilityzone_name compute_1c2_catalog_instance_name: - get_input: - 1c2_catalog_instance_names - 2 - vm_flavor_name: - get_input: pd_flavor_name port_1c2_t1_port_network: - get_input: oam_net_name port_1c2_t2_port_mac_requirements: - mac_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - port_1c2_t2_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_1c2_catalog_instance_user_data_format: - get_attribute: - abstract_1c2_catalog_instance_0 @@ -509,10 +509,6 @@ topology_template: directives: - substitutable properties: - compute_a_single_1a_availability_zone: - - get_input: availabilityzone_name - compute_a_single_1a_scheduler_hints: - - group: BE_Affinity_group port_1a_t1_port_ip_requirements: - - ip_version: 4 ip_count_required: @@ -538,6 +534,10 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + compute_a_single_1a_availability_zone: + - get_input: availabilityzone_name + compute_a_single_1a_scheduler_hints: + - group: BE_Affinity_group compute_a_single_1a_user_data_format: - RAW compute_a_single_1a_name: @@ -693,6 +693,18 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_b_single_1b_user_data_format: + - RAW port_1b_t2_port_mac_requirements: - mac_count_required: is_required: false @@ -706,25 +718,13 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - vm_flavor_name: - get_input: pd_flavor_name port_1b_t1_port_network_role_tag: - oam - port_1b_t1_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name port_1b_t1_port_mac_requirements: - mac_count_required: is_required: false port_1b_t2_port_network: - b_single_1b_network - compute_b_single_1b_user_data_format: - - RAW port_1b_t1_port_network: - get_input: oam_net_name compute_b_single_1b_name: |