From 6ce1094d509195fe484761467a67a6b3757593b0 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Thu, 29 Nov 2018 20:46:49 +0530 Subject: 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 --- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 114 ++++++++++----------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 8e26dac997..fc52a3f51b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -110,35 +110,35 @@ topology_template: directives: - substitutable properties: - compute_pcm_server_availability_zone: - - get_input: availabilityzone_name - port_pcm_port_fixed_ips: + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_network_role_tag: cps + port_pcm_port_0_network: + - get_input: cps_net_name + compute_pcm_server_availability_zone: + - get_input: availabilityzone_name vm_flavor_name: get_input: pcm_flavor_name - port_pcm_port_mac_requirements: - mac_count_required: - is_required: false compute_pcm_server_name: - get_input: pcm_server_name - port_pcm_port_network: - - get_input: cps_net_name - port_pcm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_pcm_port_0_security_groups: + - - get_input: security_group_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: - - - get_input: security_group_name + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml count: 1 @@ -152,35 +152,35 @@ topology_template: directives: - substitutable properties: + port_pcm_port_1_network_role_tag: oam + port_pcm_port_1_network: + - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: pd_server_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: oam_net_ip - port_pcm_port_network_role_tag: oam vm_flavor_name: get_input: pd_flavor_name - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: mac_count_required: is_required: false - port_pcm_port_network: - - get_input: oam_net_name - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: + - ip_address: + get_input: oam_net_ip + vm_image_name: + get_input: pd_image_name + port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: pd_image_name compute_pd_server_config_drive: - true compute_pd_server_user_data_format: - RAW - port_pcm_port_security_groups: - - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -210,19 +210,19 @@ topology_template: capabilities: network.incoming.packets.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.packets.rate_pcm_server_pcm_port + - network.incoming.packets.rate_pcm_server_pcm_port_0 disk.iops_server_pd_0: - abstract_pd_server - disk.iops_pd_server network.incoming.packets.rate_pcm_port_1: - abstract_pd_server - - network.incoming.packets.rate_pd_server_pcm_port + - network.incoming.packets.rate_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_1: - abstract_pd_server - - network.outpoing.packets_pd_server_pcm_port + - network.outpoing.packets_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_0: - abstract_pcm_server - - network.outpoing.packets_pcm_server_pcm_port + - network.outpoing.packets_pcm_server_pcm_port_0 disk.write.bytes.rate_server_pd_0: - abstract_pd_server - disk.write.bytes.rate_pd_server @@ -243,19 +243,19 @@ topology_template: - memory_pd_server network.incoming.bytes_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes_pcm_server_pcm_port + - network.incoming.bytes_pcm_server_pcm_port_0 network.incoming.bytes_pcm_port_1: - abstract_pd_server - - network.incoming.bytes_pd_server_pcm_port + - network.incoming.bytes_pd_server_pcm_port_1 disk.usage_server_pcm_0: - abstract_pcm_server - disk.usage_pcm_server binding_pcm_port_0: - abstract_pcm_server - - binding_pcm_server_pcm_port + - binding_pcm_server_pcm_port_0 binding_pcm_port_1: - abstract_pd_server - - binding_pd_server_pcm_port + - binding_pd_server_pcm_port_1 vcpus_server_pcm_0: - abstract_pcm_server - vcpus_pcm_server @@ -270,34 +270,34 @@ topology_template: - feature_pcm_server network.outgoing.packets.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.packets.rate_pcm_server_pcm_port + - network.outgoing.packets.rate_pcm_server_pcm_port_0 network.outgoing.packets.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.packets.rate_pd_server_pcm_port + - network.outgoing.packets.rate_pd_server_pcm_port_1 feature_pcm_port_1: - abstract_pd_server - - feature_pd_server_pcm_port + - feature_pd_server_pcm_port_1 disk.ephemeral.size_server_pd_0: - abstract_pd_server - disk.ephemeral.size_pd_server network.outgoing.bytes_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes_pcm_server_pcm_port + - network.outgoing.bytes_pcm_server_pcm_port_0 feature_pcm_port_0: - abstract_pcm_server - - feature_pcm_server_pcm_port + - feature_pcm_server_pcm_port_0 network.outgoing.bytes_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes_pd_server_pcm_port + - network.outgoing.bytes_pd_server_pcm_port_1 cpu_server_pcm_0: - abstract_pcm_server - cpu_pcm_server attachment_pcm_port_0: - abstract_pcm_server - - attachment_pcm_server_pcm_port + - attachment_pcm_server_pcm_port_0 attachment_pcm_port_1: - abstract_pd_server - - attachment_pd_server_pcm_port + - attachment_pd_server_pcm_port_1 disk.write.bytes_server_pd_0: - abstract_pd_server - disk.write.bytes_pd_server @@ -444,10 +444,10 @@ topology_template: - cpu.delta_pcm_server forwarder_pcm_port_0: - abstract_pcm_server - - forwarder_pcm_server_pcm_port + - forwarder_pcm_server_pcm_port_0 forwarder_pcm_port_1: - abstract_pd_server - - forwarder_pd_server_pcm_port + - forwarder_pd_server_pcm_port_1 memory.resident_server_pd_0: - abstract_pd_server - memory.resident_pd_server @@ -480,10 +480,10 @@ topology_template: - disk.device.read.requests_pd_server network.outgoing.bytes.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes.rate_pd_server_pcm_port + - network.outgoing.bytes.rate_pd_server_pcm_port_1 network.incoming.packets_pcm_port_0: - abstract_pcm_server - - network.incoming.packets_pcm_server_pcm_port + - network.incoming.packets_pcm_server_pcm_port_0 disk.device.latency_server_pcm_0: - abstract_pcm_server - disk.device.latency_pcm_server @@ -495,13 +495,13 @@ topology_template: - disk.latency_pd_server network.outgoing.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes.rate_pcm_server_pcm_port + - network.outgoing.bytes.rate_pcm_server_pcm_port_0 memory.usage_server_pd_0: - abstract_pd_server - memory.usage_pd_server network.incoming.packets_pcm_port_1: - abstract_pd_server - - network.incoming.packets_pd_server_pcm_port + - network.incoming.packets_pd_server_pcm_port_1 disk.device.write.requests_server_pcm_0: - abstract_pcm_server - disk.device.write.requests_pcm_server @@ -519,10 +519,10 @@ topology_template: - os_pcm_server network.incoming.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes.rate_pcm_server_pcm_port + - network.incoming.bytes.rate_pcm_server_pcm_port_0 network.incoming.bytes.rate_pcm_port_1: - abstract_pd_server - - network.incoming.bytes.rate_pd_server_pcm_port + - network.incoming.bytes.rate_pd_server_pcm_port_1 os_server_pd_0: - abstract_pd_server - os_pd_server @@ -535,13 +535,13 @@ topology_template: - local_storage_pcm_server link_pcm_port_0: - abstract_pcm_server - - link_pcm_server_pcm_port + - link_pcm_server_pcm_port_0 link_pcm_port_1: - abstract_pd_server - - link_pd_server_pcm_port + - link_pd_server_pcm_port_1 dependency_pcm_port_0: - abstract_pcm_server - - dependency_pcm_server_pcm_port + - dependency_pcm_server_pcm_port_0 local_storage_server_pd_0: - abstract_pd_server - local_storage_pd_server @@ -550,4 +550,4 @@ topology_template: - dependency_pd_server dependency_pcm_port_1: - abstract_pd_server - - dependency_pd_server_pcm_port + - dependency_pd_server_pcm_port_1 -- cgit 1.2.3-korg