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 | 300 ++++++++++----------- 1 file changed, 150 insertions(+), 150 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/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/computewithtwosameporttypes3/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/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml index b66be45d5e..b9772f3db6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/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/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml @@ -11,22 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pd_oam1_port_0_network_role_tag: - type: string - required: true - port_pd_oam1_port_0_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_network_role: - type: string - required: true - port_pd_oam1_port_1_ip_requirements: - type: list + port_pd_server_0_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -40,19 +27,27 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_oam1_port_1_order: - type: integer - required: true - port_pd_oam1_port_1_mac_requirements: + port_pd_server_1_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_oam1_port_1_network_role: + vm_image_name: type: string required: true - vm_image_name: + port_pd_server_0_oam_port_0_network_role_tag: type: string required: true - port_pd_oam1_port_1_network_role_tag: + port_pd_server_0_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_order: + type: integer + required: true + port_pd_server_0_oam_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1_oam_port_0_subnetpoolid: type: string required: true compute_pd_server_user_data_format: @@ -60,6 +55,20 @@ topology_template: required: true entry_schema: type: string + port_pd_server_0_oam_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_0_oam_port_0_network_role: + type: string + required: true + port_pd_server_1_oam_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_0_oam_port_0_order: + type: integer + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -67,52 +76,43 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: + port_pd_server_1_oam_port_0_network_role_tag: + type: string + required: true + port_pd_server_1_oam_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_oam1_port_0_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_1_oam_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_1_network: + port_pd_server_0_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: string - port_pd_oam1_port_1_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1_oam_port_0_network_role: type: string required: true - port_pd_oam1_port_0_order: - type: integer - required: true - port_pd_oam1_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_oam1_port_0_network: + port_pd_server_1_oam_port_0_network: type: list required: true entry_schema: type: string - port_pd_oam1_port_0_subnetpoolid: - type: string - required: true - port_pd_oam1_port_1_related_networks: + port_pd_server_0_oam_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_oam1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_oam1_port_1_vlan_requirements: + type: string + port_pd_server_1_oam_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_0_oam_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: @@ -135,62 +135,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd_oam1_port_1: + pd_server_pd_server_1_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_oam1_port_1_exCP_naming + get_input: port_pd_server_1_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_oam1_port_1_vlan_requirements + get_input: port_pd_server_1_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd_oam1_port_1_related_networks + get_input: port_pd_server_1_oam_port_0_related_networks ip_requirements: - get_input: port_pd_oam1_port_1_ip_requirements + get_input: port_pd_server_1_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd_oam1_port_1_network_role_tag + get_input: port_pd_server_1_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd_oam1_port_1_mac_requirements + get_input: port_pd_server_1_oam_port_0_mac_requirements order: - get_input: port_pd_oam1_port_1_order + get_input: port_pd_server_1_oam_port_0_order network_role: - get_input: port_pd_oam1_port_1_network_role + get_input: port_pd_server_1_oam_port_0_network_role subnetpoolid: - get_input: port_pd_oam1_port_1_subnetpoolid + get_input: port_pd_server_1_oam_port_0_subnetpoolid network: get_input: - - port_pd_oam1_port_1_network + - port_pd_server_1_oam_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd_oam1_port_0: + pd_server_pd_server_0_oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd_oam1_port_0_exCP_naming + get_input: port_pd_server_0_oam_port_0_exCP_naming vlan_requirements: - get_input: port_pd_oam1_port_0_vlan_requirements + get_input: port_pd_server_0_oam_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_pd_oam1_port_0_related_networks + get_input: port_pd_server_0_oam_port_0_related_networks ip_requirements: - get_input: port_pd_oam1_port_0_ip_requirements + get_input: port_pd_server_0_oam_port_0_ip_requirements network_role_tag: - get_input: port_pd_oam1_port_0_network_role_tag + get_input: port_pd_server_0_oam_port_0_network_role_tag mac_requirements: - get_input: port_pd_oam1_port_0_mac_requirements + get_input: port_pd_server_0_oam_port_0_mac_requirements order: - get_input: port_pd_oam1_port_0_order + get_input: port_pd_server_0_oam_port_0_order network_role: - get_input: port_pd_oam1_port_0_network_role + get_input: port_pd_server_0_oam_port_0_network_role subnetpoolid: - get_input: port_pd_oam1_port_0_subnetpoolid + get_input: port_pd_server_0_oam_port_0_subnetpoolid network: get_input: - - port_pd_oam1_port_0_network + - port_pd_server_0_oam_port_0_network - index_value requirements: - binding: @@ -206,6 +206,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -215,66 +218,51 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.packets_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.packets - network.incoming.packets_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.packets - forwarder_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - forwarder + feature_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - feature + network.incoming.bytes_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes cpu_pd_server: - pd_server - cpu - forwarder_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - forwarder - feature_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - feature cpu_util_pd_server: - pd_server - cpu_util - feature_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - feature disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate disk.read.bytes_pd_server: - pd_server - disk.read.bytes + binding_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - binding disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.packets.rate disk.iops_pd_server: - pd_server - disk.iops - network.incoming.bytes_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.bytes - network.incoming.bytes_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.bytes memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - attachment_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - attachment - attachment_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - attachment vcpus_pd_server: - pd_server - vcpus @@ -287,54 +275,54 @@ topology_template: endpoint_pd_server: - pd_server - endpoint + forwarder_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - forwarder disk.capacity_pd_server: - pd_server - disk.capacity - network.incoming.packets.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.packets.rate + network.incoming.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes.rate disk.device.allocation_pd_server: - pd_server - disk.device.allocation disk.allocation_pd_server: - pd_server - disk.allocation - network.incoming.packets.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.packets.rate binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + binding_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - binding feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage + network.outgoing.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.bytes.rate disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.incoming.bytes.rate - network.outgoing.packets.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.packets.rate - network.outgoing.bytes.rate_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.bytes.rate - network.incoming.bytes.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.incoming.bytes.rate - network.outgoing.bytes.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.bytes.rate - network.outgoing.packets.rate_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.packets.rate + network.incoming.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets + network.outgoing.bytes_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outgoing.bytes + attachment_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - attachment disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -344,9 +332,18 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes + feature_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - feature + network.incoming.bytes.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.bytes.rate disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -356,61 +353,64 @@ topology_template: host_pd_server: - pd_server - host + attachment_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - attachment + network.incoming.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outpoing.packets disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.bytes.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - network.outgoing.bytes_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outgoing.bytes - network.outgoing.bytes_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outgoing.bytes + network.incoming.packets.rate_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.incoming.packets.rate disk.device.latency_pd_server: - pd_server - disk.device.latency - network.outpoing.packets_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - network.outpoing.packets disk.latency_pd_server: - pd_server - disk.latency disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outpoing.packets_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - network.outpoing.packets - binding_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - binding - binding_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 - - binding disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - link - link_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 + link_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - link + dependency_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - dependency dependency_pd_server: - pd_server - dependency - dependency_pd_server_pd_oam1_port_0: - - pd_server_pd_oam1_port_0 + link_pd_server_pd_server_1_oam_port_0: + - pd_server_pd_server_1_oam_port_0 + - link + dependency_pd_server_pd_server_0_oam_port_0: + - pd_server_pd_server_0_oam_port_0 - dependency - dependency_pd_server_pd_oam1_port_1: - - pd_server_pd_oam1_port_1 - - dependency \ No newline at end of file -- cgit 1.2.3-korg