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_pd_serverServiceTemplate.yaml | 142 ++++++++++----------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml index 8d7ac38bed..9969c184f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,10 +33,10 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_order: + type: integer required: true - port_pd01_port_related_networks: + port_pd01_port_1_related_networks: type: list required: true entry_schema: @@ -39,34 +44,29 @@ topology_template: vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: + port_pd01_port_1_network_role: type: string required: true - port_pd01_port_ip_requirements: + port_pd01_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_subnetpoolid: + port_pd01_port_1_subnetpoolid: type: string required: true - port_pd01_port_network_role: + vm_image_name: type: string required: true - port_pd01_port_network_role_tag: - type: string + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port_vlan_requirements: - type: list + port_pd01_port_1_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_pd_server_user_data_format: type: list required: true @@ -92,28 +92,28 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_1_subnetpoolid network: get_attribute: - pd_server @@ -132,6 +132,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + binding_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - binding memory.usage_pd_server: - pd_server - memory.usage @@ -141,18 +144,12 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes cpu_pd_server: - pd_server - cpu @@ -168,21 +165,27 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops + network.incoming.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate + attachment_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - attachment + network.outgoing.packets.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus @@ -195,12 +198,15 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - forwarder + network.incoming.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.packets disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -213,24 +219,24 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.outgoing.bytes.rate_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.incoming.bytes disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + network.outgoing.bytes_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -243,6 +249,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.outpoing.packets_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - network.outpoing.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -252,12 +261,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + feature_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -267,9 +273,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -279,9 +282,6 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -289,12 +289,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port + dependency_pd_server_pd01_port_1: + - pd_server_pd01_port_1 - dependency dependency_pd_server: - pd_server - - dependency \ No newline at end of file + - dependency + link_pd_server_pd01_port_1: + - pd_server_pd01_port_1 + - link \ No newline at end of file -- cgit 1.2.3-korg