diff options
author | 2018-11-29 20:46:49 +0530 | |
---|---|---|
committer | 2018-12-02 09:47:45 +0000 | |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml')
1 files changed, 28 insertions, 28 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml index 616ac37069..3085b13d81 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml @@ -141,6 +141,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -149,21 +151,19 @@ topology_template: - 2 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: diff_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: diff_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -173,7 +173,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -182,6 +182,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -190,21 +192,19 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -214,7 +214,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -223,6 +223,8 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -231,21 +233,19 @@ topology_template: - 1 vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false - vm_image_name: - get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_internal_network + vm_image_name: + get_input: pd_image_name compute_pd_server_user_data_format: - RAW + port_pd_server_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -255,7 +255,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_pd01_port: + - link_pd_server_pd_server_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -269,4 +269,4 @@ topology_template: - packet_internal_network - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_2
\ No newline at end of file |