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_lbdServiceTemplate.yaml | 520 ++++++++++----------- 1 file changed, 260 insertions(+), 260 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index 4724e88180..146a882317 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -11,163 +11,145 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_ims_core_1_port_allowed_address_pairs: + port_lbd_ims_core_1_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json compute_lbd_user_data_format: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_name: - type: list - required: true - entry_schema: - type: string - port_lbd_dpdk_1_port_allowed_address_pairs: - type: list + port_lbd_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_1_port_subnetpoolid: - type: string + port_lbd_ims_core_1_port_2_order: + type: integer required: true vm_flavor_name: type: string required: true - port_lbd_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_lbd_availability_zone: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_network_role_tag: - type: string + port_lbd_dpdk_1_port_1_related_networks: + type: list required: true - port_lbd_internal_1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role: + type: string required: true vm_image_name: type: string required: true - port_lbd_dpdk_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_subnetpoolid: + type: string required: true - port_lbd_dpdk_1_port_network: + port_lbd_dpdk_1_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_network_role_tag: + type: string required: true - port_lbd_ims_core_1_port_network_role: + port_lbd_internal_1_port_0_subnetpoolid: type: string required: true - port_lbd_ims_core_1_port_related_networks: + port_lbd_ims_core_1_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_lbd_scheduler_hints: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_dpdk_1_port_1_name: type: list required: true entry_schema: - type: json - port_lbd_dpdk_1_port_name: + type: string + compute_lbd_scheduler_hints: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_exCP_naming: + type: json + port_lbd_ims_core_1_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_lbd_internal_1_port_network: + port_lbd_dpdk_1_port_1_order: + type: integer + required: true + compute_lbd_name: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_lbd_name: + port_lbd_dpdk_1_port_1_network: type: list required: true entry_schema: type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string + port_lbd_internal_1_port_0_order: + type: integer required: true - port_lbd_internal_1_port_vlan_requirements: + port_lbd_dpdk_1_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_1_network_role_tag: + type: string + required: true compute_lbd_config_drive: type: list required: true entry_schema: type: boolean - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: + port_lbd_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_lbd_internal_1_port_ip_requirements: - type: list + port_lbd_ims_core_1_port_2_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + port_lbd_ims_core_1_port_2_name: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - port_lbd_internal_1_port_related_networks: + type: string + port_lbd_internal_1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_internal_1_port_subnetpoolid: - type: string - required: true - port_lbd_ims_core_1_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_1_port_2_vlan_requirements: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_fixed_ips: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_1_port_2_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_dpdk_1_port_1_fixed_ips: type: list required: true entry_schema: @@ -179,178 +161,196 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_lbd_ims_core_1_port_network: + port_lbd_ims_core_1_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_lbd_dpdk_1_port_network_role_tag: - type: string - required: true - port_lbd_dpdk_1_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_dpdk_1_port_1_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_1_port_fixed_ips: + port_lbd_dpdk_1_port_1_network_role: + type: string + required: true + port_lbd_ims_core_1_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_network_role: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role_tag: type: string required: true - port_lbd_dpdk_1_port_ip_requirements: + port_lbd_dpdk_1_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_lbd_metadata: + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_internal_1_port_0_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_1_port_vlan_requirements: + port_lbd_internal_1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_dpdk_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_lbd_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_1_port_network_role: + type: json + port_lbd_dpdk_1_port_1_subnetpoolid: type: string required: true + port_lbd_internal_1_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_2_network: + type: list + required: true + entry_schema: + type: string node_templates: - lbd_lbd_ims_core_1_port: + lbd_lbd_dpdk_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_ims_core_1_port_mac_requirements + get_input: port_lbd_dpdk_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_lbd_ims_core_1_port_allowed_address_pairs + get_input: port_lbd_dpdk_1_port_1_allowed_address_pairs order: - get_input: port_lbd_ims_core_1_port_order + get_input: port_lbd_dpdk_1_port_1_order security_groups: get_input: - - port_lbd_ims_core_1_port_security_groups + - port_lbd_dpdk_1_port_1_security_groups - index_value exCP_naming: - get_input: port_lbd_ims_core_1_port_exCP_naming + get_input: port_lbd_dpdk_1_port_1_exCP_naming vlan_requirements: - get_input: port_lbd_ims_core_1_port_vlan_requirements + get_input: port_lbd_dpdk_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_ims_core_1_port_related_networks + get_input: port_lbd_dpdk_1_port_1_related_networks ip_requirements: - get_input: port_lbd_ims_core_1_port_ip_requirements + get_input: port_lbd_dpdk_1_port_1_ip_requirements network_role_tag: - get_input: port_lbd_ims_core_1_port_network_role_tag + get_input: port_lbd_dpdk_1_port_1_network_role_tag network_role: - get_input: port_lbd_ims_core_1_port_network_role + get_input: port_lbd_dpdk_1_port_1_network_role subnetpoolid: - get_input: port_lbd_ims_core_1_port_subnetpoolid + get_input: port_lbd_dpdk_1_port_1_subnetpoolid fixed_ips: get_input: - - port_lbd_ims_core_1_port_fixed_ips + - port_lbd_dpdk_1_port_1_fixed_ips - index_value name: get_input: - - port_lbd_ims_core_1_port_name + - port_lbd_dpdk_1_port_1_name - index_value network: get_input: - - port_lbd_ims_core_1_port_network + - port_lbd_dpdk_1_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_dpdk_1_port: + lbd_lbd_internal_1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_dpdk_1_port_mac_requirements - allowed_address_pairs: - get_input: port_lbd_dpdk_1_port_allowed_address_pairs + get_input: port_lbd_internal_1_port_0_mac_requirements order: - get_input: port_lbd_dpdk_1_port_order + get_input: port_lbd_internal_1_port_0_order security_groups: get_input: - - port_lbd_dpdk_1_port_security_groups + - port_lbd_internal_1_port_0_security_groups - index_value exCP_naming: - get_input: port_lbd_dpdk_1_port_exCP_naming + get_input: port_lbd_internal_1_port_0_exCP_naming vlan_requirements: - get_input: port_lbd_dpdk_1_port_vlan_requirements + get_input: port_lbd_internal_1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_dpdk_1_port_related_networks + get_input: port_lbd_internal_1_port_0_related_networks ip_requirements: - get_input: port_lbd_dpdk_1_port_ip_requirements + get_input: port_lbd_internal_1_port_0_ip_requirements network_role_tag: - get_input: port_lbd_dpdk_1_port_network_role_tag + get_input: port_lbd_internal_1_port_0_network_role_tag network_role: - get_input: port_lbd_dpdk_1_port_network_role - subnetpoolid: - get_input: port_lbd_dpdk_1_port_subnetpoolid + get_input: port_lbd_internal_1_port_0_network_role fixed_ips: get_input: - - port_lbd_dpdk_1_port_fixed_ips + - port_lbd_internal_1_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_lbd_internal_1_port_0_subnetpoolid name: get_input: - - port_lbd_dpdk_1_port_name + - port_lbd_internal_1_port_0_name - index_value network: get_input: - - port_lbd_dpdk_1_port_network + - port_lbd_internal_1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_internal_1_port: + lbd_lbd_ims_core_1_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_internal_1_port_mac_requirements + get_input: port_lbd_ims_core_1_port_2_mac_requirements + allowed_address_pairs: + get_input: port_lbd_ims_core_1_port_2_allowed_address_pairs order: - get_input: port_lbd_internal_1_port_order + get_input: port_lbd_ims_core_1_port_2_order security_groups: get_input: - - port_lbd_internal_1_port_security_groups + - port_lbd_ims_core_1_port_2_security_groups - index_value exCP_naming: - get_input: port_lbd_internal_1_port_exCP_naming + get_input: port_lbd_ims_core_1_port_2_exCP_naming vlan_requirements: - get_input: port_lbd_internal_1_port_vlan_requirements + get_input: port_lbd_ims_core_1_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_internal_1_port_related_networks + get_input: port_lbd_ims_core_1_port_2_related_networks ip_requirements: - get_input: port_lbd_internal_1_port_ip_requirements + get_input: port_lbd_ims_core_1_port_2_ip_requirements network_role_tag: - get_input: port_lbd_internal_1_port_network_role_tag + get_input: port_lbd_ims_core_1_port_2_network_role_tag network_role: - get_input: port_lbd_internal_1_port_network_role + get_input: port_lbd_ims_core_1_port_2_network_role + subnetpoolid: + get_input: port_lbd_ims_core_1_port_2_subnetpoolid fixed_ips: get_input: - - port_lbd_internal_1_port_fixed_ips + - port_lbd_ims_core_1_port_2_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_1_port_subnetpoolid name: get_input: - - port_lbd_internal_1_port_name + - port_lbd_ims_core_1_port_2_name - index_value network: get_input: - - port_lbd_internal_1_port_network + - port_lbd_ims_core_1_port_2_network - index_value requirements: - binding: @@ -406,87 +406,87 @@ topology_template: disk.device.iops_lbd: - lbd - disk.device.iops - network.outgoing.packets.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.packets.rate + binding_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - binding host_lbd: - lbd - host + network.outgoing.bytes_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.bytes + network.incoming.bytes.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.packets.rate + feature_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - feature disk.device.capacity_lbd: - lbd - disk.device.capacity + network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.bytes.rate + network.incoming.bytes_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.bytes + network.outpoing.packets_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outpoing.packets cpu_util_lbd: - lbd - cpu_util disk.device.read.requests_lbd: - lbd - disk.device.read.requests - attachment_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - attachment + network.outgoing.packets.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.packets.rate memory.usage_lbd: - lbd - memory.usage - binding_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - binding - network.outpoing.packets_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outpoing.packets - network.outgoing.bytes_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.bytes - network.incoming.packets_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.packets + feature_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - feature disk.read.requests_lbd: - lbd - disk.read.requests - feature_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - feature - network.incoming.bytes_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.bytes cpu.delta_lbd: - lbd - cpu.delta + attachment_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - attachment memory_lbd: - lbd - memory disk.write.bytes_lbd: - lbd - disk.write.bytes + network.incoming.bytes_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.bytes scalable_lbd: - lbd - scalable - network.incoming.bytes.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.bytes.rate - network.incoming.packets.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.packets.rate disk.device.read.requests.rate_lbd: - lbd - disk.device.read.requests.rate - network.outgoing.bytes_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.bytes disk.root.size_lbd: - lbd - disk.root.size + feature_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - feature vcpus_lbd: - lbd - vcpus disk.allocation_lbd: - lbd - disk.allocation - forwarder_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - forwarder disk.device.write.requests_lbd: - lbd - disk.device.write.requests @@ -496,75 +496,63 @@ topology_template: disk.latency_lbd: - lbd - disk.latency - network.incoming.packets_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.packets memory.resident_lbd: - lbd - memory.resident - forwarder_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - forwarder disk.read.bytes.rate_lbd: - lbd - disk.read.bytes.rate - network.incoming.bytes.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.bytes.rate + attachment_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - attachment disk.read.bytes_lbd: - lbd - disk.read.bytes - network.outgoing.packets.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.packets.rate - network.outgoing.bytes_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.bytes - forwarder_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - forwarder - network.incoming.packets.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.packets.rate - network.outpoing.packets_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port + network.incoming.bytes.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.bytes.rate + network.outpoing.packets_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 - network.outpoing.packets - attachment_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + attachment_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 - attachment - feature_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - feature + network.incoming.bytes_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.packets.rate + forwarder_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - forwarder cpu_lbd: - lbd - cpu - feature_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - feature + network.outgoing.bytes.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.bytes.rate endpoint_lbd: - lbd - endpoint disk.device.read.bytes.rate_lbd: - lbd - disk.device.read.bytes.rate + forwarder_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - forwarder disk.device.write.bytes.rate_lbd: - lbd - disk.device.write.bytes.rate + network.outgoing.bytes_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.bytes disk.iops_lbd: - lbd - disk.iops - network.outgoing.packets.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.packets.rate disk.device.usage_lbd: - lbd - disk.device.usage - binding_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - binding disk.usage_lbd: - lbd - disk.usage @@ -574,51 +562,63 @@ topology_template: disk.write.requests_lbd: - lbd - disk.write.requests - attachment_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - attachment disk.device.write.bytes_lbd: - lbd - disk.device.write.bytes - network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.bytes.rate + network.incoming.packets.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.packets.rate disk.capacity_lbd: - lbd - disk.capacity + binding_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - binding feature_lbd: - lbd - feature - network.incoming.bytes.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.bytes.rate + network.outgoing.bytes_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.bytes disk.device.latency_lbd: - lbd - disk.device.latency - network.incoming.packets_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.packets + network.outpoing.packets_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outpoing.packets disk.device.write.requests.rate_lbd: - lbd - disk.device.write.requests.rate + network.outgoing.packets.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.packets.rate binding_lbd: - lbd - binding - network.incoming.packets.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.packets.rate - network.outpoing.packets_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outpoing.packets - binding_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + forwarder_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - forwarder + network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.bytes.rate + binding_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 - binding - network.incoming.bytes_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.bytes - network.incoming.bytes_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.bytes + network.incoming.packets_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.packets + network.incoming.packets_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.packets + network.outgoing.packets.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.packets.rate + network.incoming.packets_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.packets disk.device.allocation_lbd: - lbd - disk.device.allocation @@ -626,24 +626,24 @@ topology_template: dependency_lbd: - lbd - dependency + dependency_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - dependency + link_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - link + dependency_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - dependency local_storage_lbd: - lbd - local_storage - dependency_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - dependency - dependency_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - dependency - link_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port + link_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 - link - link_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - link - link_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + dependency_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - dependency + link_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 - link - dependency_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - dependency \ No newline at end of file -- cgit 1.2.3-korg