diff options
| author |   ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 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/twoNovaWithDiffProperties/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/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml')
1 files changed, 19 insertions, 19 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml index 172582fd24..929d3083df 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml @@ -161,6 +161,8 @@ topology_template: properties: compute_pd_server_key_name: - key_name + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -171,21 +173,19 @@ topology_template: - image_update_policy 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 @@ -195,7 +195,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 @@ -206,6 +206,8 @@ topology_template: properties: compute_pd_server_key_name: - key_name + port_pd_server_port_0_network: + - packet_internal_network compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -216,21 +218,19 @@ topology_template: - personality 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 @@ -240,7 +240,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 @@ -254,4 +254,4 @@ topology_template: - pd01_port_2 - packet_internal_network - abstract_pd_server_0 - - abstract_pd_server_1 + - abstract_pd_server_1
\ No newline at end of file |