diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs')
12 files changed, 763 insertions, 516 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml index 08a713b83a..07a842e260 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -245,6 +245,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_ims_core_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_cdi_cdi_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -466,6 +471,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_cdi: type: tosca.capabilities.Scalable occurrences: @@ -1093,6 +1103,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_dpdk_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1122,6 +1137,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1158,6 +1178,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_ims_core_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets.rate_lbd_lbd_dpdk_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1616,6 +1641,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.bytes_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1934,6 +1964,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_oam_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.read.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2333,6 +2368,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_internal_2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_oam_oam_internal_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2369,6 +2409,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_oam_2_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.packets.rate_oam_oam_internal_2_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2869,6 +2914,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_dpdk_0_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3012,6 +3062,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3460,6 +3515,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_ims_core_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_cdi_cdi_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3662,6 +3722,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cdi_cdi_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED scalable_cdi: type: tosca.capabilities.Scalable occurrences: @@ -4374,6 +4439,11 @@ node_types: occurrences: - 0 - UNBOUNDED + forwarder_lbd_lbd_ims_core_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_lbd_lbd_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4473,12 +4543,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.capacity_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_dpdk_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED feature_lbd: type: tosca.capabilities.Node occurrences: @@ -5000,35 +5080,18 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.latency_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_li_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED os_cif: type: tosca.capabilities.OperatingSystem occurrences: @@ -5062,500 +5125,542 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_oam_1_port_3: + instance_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_cif: + network.incoming.bytes.rate_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_1_port_1: + network.outgoing.bytes_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_oam_1_port_3: + network.incoming.packets.rate_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_li_1_port: + feature_cif_cif_oam_1_port_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.root.size_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_oam_1_port_1: + feature_cif_cif_oam_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory.resident_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_cif: + network.outgoing.bytes_cif_cif_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_internal_1_port: + network.incoming.packets.rate_cif_cif_oam_1_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_oam_1_port_1: + network.incoming.bytes_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_cif: + network.incoming.bytes_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_oam_1_port_3: - type: tosca.capabilities.Node + disk.usage_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_cif: + disk.ephemeral.size_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cif: + disk.write.requests.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_oam_1_port_1: - type: tosca.capabilities.Node + disk.read.bytes_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_cif: + network.incoming.packets.rate_cif_cif_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_internal_1_port: + network.outgoing.packets.rate_cif_cif_internal_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_core_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.read.requests.rate_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_core_1_port: + disk.device.allocation_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cif_cif_ims_core_1_port: - type: tosca.capabilities.Attachment + disk.device.read.bytes.rate_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_oam_1_port_3: + vcpus_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_ims_li_1_port: + network.outgoing.packets.rate_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_oam_1_port_1: + network.incoming.bytes.rate_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cif_cif_oam_1_port_3: - type: tosca.capabilities.Attachment + endpoint_cif: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.usage_cif: + network.incoming.packets.rate_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_cif: + disk.device.usage_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_ims_core_1_port: + network.outpoing.packets_cif_cif_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_cif: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + attachment_cif_cif_oam_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_cif: + network.outgoing.packets.rate_cif_cif_oam_1_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cif: + network.incoming.bytes_cif_cif_oam_1_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_cif: + network.outgoing.packets.rate_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_cif: + disk.read.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_core_1_port: + disk.write.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_internal_1_port: + network.outpoing.packets_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_cif: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_cif_cif_ims_li_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_cif: + network.outpoing.packets_cif_cif_oam_1_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_oam_1_port_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - feature_cif_cif_internal_1_port: - type: tosca.capabilities.Node + disk.device.capacity_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_oam_1_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.device.allocation_cif: + network.outpoing.packets_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_cif: + network.incoming.packets.rate_cif_cif_internal_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_cif: + cpu_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_cif: + network.incoming.bytes_cif_cif_internal_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_ims_li_1_port: + network.outgoing.bytes_cif_cif_internal_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_ims_li_1_port: + disk.device.read.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - endpoint_cif: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.bytes.rate_cif_cif_ims_core_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_li_1_port: + network.incoming.packets_cif_cif_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_cif: + network.outpoing.packets_cif_cif_internal_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_cif: + feature_cif: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_cif: + cpu_util_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_core_1_port: + disk.device.write.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cif_cif_oam_1_port_1: - type: tosca.capabilities.Attachment + feature_cif_cif_ims_li_1_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_oam_1_port_3: + network.incoming.packets_cif_cif_oam_1_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_oam_1_port_3: + network.outgoing.bytes_cif_cif_oam_1_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_oam_1_port_1: + network.outgoing.bytes_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_cif: + disk.allocation_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_li_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory_cif: + network.outgoing.bytes.rate_cif_cif_internal_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_cif: + disk.device.iops_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_ims_core_1_port: + disk.device.write.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_oam_1_port_1: + network.incoming.bytes.rate_cif_cif_internal_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cif_cif_ims_core_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + attachment_cif_cif_ims_core_1_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_li_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_oam_1_port_3: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.capacity_cif: + disk.write.bytes.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_oam_1_port_3: + network.incoming.bytes_cif_cif_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_li_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_cif: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_oam_1_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_oam_1_port_3: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.capacity_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_oam_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_oam_1_port_1: + cpu.delta_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_internal_1_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_cif: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - binding_cif_cif_internal_1_port: + binding_cif_cif_oam_1_port_3: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - network.incoming.packets_cif_cif_oam_1_port_1: + feature_cif_cif_internal_1_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cif_cif_oam_1_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_cif: + disk.iops_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_internal_1_port: + disk.read.bytes.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_internal_1_port: + forwarder_cif_cif_internal_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cif: + binding_cif_cif_ims_li_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + memory_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_cif: + network.outgoing.packets.rate_cif_cif_ims_core_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_core_1_port: + network.outgoing.bytes.rate_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_core_1_port: + disk.capacity_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_cif: + network.outgoing.bytes.rate_cif_cif_oam_1_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_internal_1_port: + binding_cif_cif_internal_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets_cif_cif_oam_1_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif: - type: tosca.capabilities.Node + forwarder_cif_cif_ims_core_1_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_cif_cif_internal_1_port: - type: tosca.capabilities.Attachment + disk.device.latency_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_ims_core_1_port: + forwarder_cif_cif_ims_li_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + attachment_cif_cif_internal_1_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_cif_cif_ims_li_1_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -5943,6 +6048,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cscf_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_cscf_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6364,6 +6474,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_oam_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.packets_oam_oam_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6622,6 +6737,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_oam_oam_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_oam_oam_oam_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -6988,6 +7108,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_dpdk_0_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED vcpus_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7131,6 +7256,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_tdcore_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_tdcore_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -7774,518 +7904,561 @@ node_types: - 1 - 1 capabilities: - network.incoming.bytes.rate_cif_cif_internal_0_port: + binding_cif: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_oam_0_port_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.latency_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_cif: - type: tosca.capabilities.network.Bindable + os_cif: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - cpu_util_cif: + memory.usage_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_cif: + attachment_cif_cif_internal_0_port: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_cif: + network.incoming.packets.rate_cif_cif_ims_core_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_internal_0_port: + network.incoming.bytes.rate_cif_cif_oam_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_cif: + network.outgoing.packets.rate_cif_cif_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_cif: - type: tosca.capabilities.OperatingSystem + network.outgoing.bytes.rate_cif_cif_ims_li_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_cif: + instance_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cif_cif_internal_0_port: - type: tosca.capabilities.Attachment + forwarder_cif_cif_ims_core_0_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_0_port_3: + network.incoming.bytes_cif_cif_ims_li_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_core_0_port: + network.outgoing.bytes.rate_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_0_port_1: + network.outpoing.packets_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_internal_0_port: - type: tosca.capabilities.Node + network.outpoing.packets_cif_cif_oam_0_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_internal_0_port: + network.incoming.packets.rate_cif_cif_ims_li_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_oam_0_port_1: + network.incoming.bytes.rate_cif_cif_ims_li_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_oam_0_port_3: + disk.root.size_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_li_0_port: + memory.resident_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_cif: + network.incoming.packets_cif_cif_ims_li_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_li_0_port: - type: tosca.capabilities.Node + network.incoming.packets_cif_cif_ims_core_0_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_oam_0_port_3: + disk.usage_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_ims_li_0_port: + disk.ephemeral.size_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_oam_0_port_1: + network.outgoing.bytes_cif_cif_ims_li_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_core_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_oam_0_port_3: + disk.write.requests.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_cif: + disk.read.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_oam_0_port_3: + disk.device.read.requests.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_oam_0_port_1: + network.incoming.bytes_cif_cif_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cif_cif_ims_li_0_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_ims_li_0_port: + network.outgoing.packets.rate_cif_cif_ims_li_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_ims_li_0_port: + disk.device.allocation_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_cif: + binding_cif_cif_internal_0_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.packets.rate_cif_cif_ims_core_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cif: + disk.device.read.bytes.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_cif: + vcpus_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_internal_0_port: + network.incoming.packets.rate_cif_cif_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_li_0_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_cif: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_core_0_port: + disk.device.usage_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_oam_0_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_cif_cif_ims_li_0_port: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.usage_cif: + network.outgoing.packets.rate_cif_cif_oam_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_cif: + network.incoming.bytes_cif_cif_oam_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_cif: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.bytes_cif_cif_oam_0_port_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_cif: + network.outpoing.packets_cif_cif_ims_core_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_li_0_port: + disk.read.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cif: + disk.write.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_cif: + network.outgoing.bytes_cif_cif_ims_core_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_cif: + disk.device.capacity_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_cif: - type: tosca.capabilities.Scalable + feature_cif_cif_oam_0_port_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_cif: + network.incoming.bytes_cif_cif_ims_core_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_internal_0_port: + feature_cif_cif_oam_0_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cif_cif_ims_li_0_port: - type: tosca.capabilities.Attachment + network.incoming.packets.rate_cif_cif_oam_0_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_ims_li_0_port: + cpu_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_cif: + disk.device.read.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_internal_0_port: + forwarder_cif_cif_internal_0_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cif_cif_oam_0_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_cif_cif_oam_0_port_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_cif: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_cif_cif_oam_0_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_ims_core_0_port: + network.incoming.bytes.rate_cif_cif_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_li_0_port: + binding_cif_cif_oam_0_port_3: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - disk.device.read.bytes.rate_cif: + cpu_util_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_cif: + disk.device.write.bytes_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_internal_0_port: + network.outgoing.bytes_cif_cif_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_internal_0_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - endpoint_cif: - type: tosca.capabilities.Endpoint.Admin + network.incoming.packets_cif_cif_oam_0_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_cif: + network.incoming.packets_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_ims_li_0_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_cif: + network.outgoing.bytes_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cif_cif_oam_0_port_1: + network.outgoing.bytes_cif_cif_oam_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_oam_0_port_1: + binding_cif_cif_ims_core_0_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.allocation_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_ims_core_0_port: + disk.device.iops_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_oam_0_port_3: + disk.device.write.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_core_0_port: + network.outpoing.packets_cif_cif_internal_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_cif: + network.outgoing.packets.rate_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_cif: + disk.write.bytes.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_cif_cif_ims_core_0_port: - type: tosca.capabilities.Attachment + host_cif: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_core_0_port: + cpu.delta_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.requests_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_cif: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.write.bytes_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cif_cif_ims_li_0_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - disk.capacity_cif: + disk.device.write.bytes.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_core_0_port: + disk.iops_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_oam_0_port_1: + disk.read.bytes.rate_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_li_0_port: + network.incoming.bytes.rate_cif_cif_ims_core_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_cif: + disk.write.requests_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_core_0_port: - type: tosca.capabilities.Node + memory_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_oam_0_port_3: - type: tosca.capabilities.Node + attachment_cif_cif_ims_core_0_port: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_ims_core_0_port: + network.outgoing.bytes.rate_cif_cif_ims_core_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_cif_cif_oam_0_port_1: - type: tosca.capabilities.Node + disk.capacity_cif: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_oam_0_port_3: + network.outgoing.bytes.rate_cif_cif_oam_0_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_oam_0_port_1: + network.outpoing.packets_cif_cif_ims_li_0_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cif_cif_ims_core_0_port: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -8299,12 +8472,6 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cif: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.latency_cif: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -8329,18 +8496,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cif: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_cif_cif_oam_0_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.cscf: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -8707,6 +8862,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_cscf_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED cpu.delta_cscf_server_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml index 1f222c16d4..fc9676cc7a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml @@ -281,6 +281,9 @@ topology_template: network.incoming.bytes.rate_cdi_cdi_internal_0_port: - cdi_cdi_internal_0_port - network.incoming.bytes.rate + forwarder_cdi_cdi_ims_core_0_port: + - cdi_cdi_ims_core_0_port + - forwarder network.outgoing.bytes_cdi_cdi_internal_0_port: - cdi_cdi_internal_0_port - network.outgoing.bytes @@ -392,6 +395,9 @@ topology_template: disk.allocation_cdi: - cdi - disk.allocation + forwarder_cdi_cdi_internal_0_port: + - cdi_cdi_internal_0_port + - forwarder scalable_cdi: - cdi - scalable 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_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml index 2e6c581f05..b543f90372 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml @@ -296,6 +296,9 @@ topology_template: disk.device.write.requests.rate_cdi: - cdi - disk.device.write.requests.rate + forwarder_cdi_cdi_ims_core_1_port: + - cdi_cdi_ims_core_1_port + - forwarder network.incoming.bytes_cdi_cdi_ims_core_1_port: - cdi_cdi_ims_core_1_port - network.incoming.bytes @@ -398,6 +401,9 @@ topology_template: network.outpoing.packets_cdi_cdi_ims_core_1_port: - cdi_cdi_ims_core_1_port - network.outpoing.packets + forwarder_cdi_cdi_internal_1_port: + - cdi_cdi_internal_1_port + - forwarder scalable_cdi: - cdi - scalable 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_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml index 23bb1c8257..3c3da4e997 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml @@ -554,27 +554,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cif capabilities: - network.incoming.bytes.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.bytes.rate - binding_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - binding binding_cif: - cif - binding - cpu_util_cif: - - cif - - cpu_util disk.device.read.requests_cif: - cif - disk.device.read.requests - disk.device.write.bytes_cif: - - cif - - disk.device.write.bytes - network.outgoing.bytes_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outgoing.bytes disk.latency_cif: - cif - disk.latency @@ -596,54 +581,30 @@ topology_template: network.incoming.bytes.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.bytes.rate - feature_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - feature network.outgoing.packets.rate_cif_cif_internal_0_port: - cif_cif_internal_0_port - network.outgoing.packets.rate - network.incoming.packets_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - network.incoming.packets - network.incoming.packets_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - network.incoming.packets network.outgoing.bytes.rate_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.outgoing.bytes.rate instance_cif: - cif - instance - feature_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - feature - network.outgoing.bytes_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - network.outgoing.bytes + forwarder_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - forwarder network.incoming.bytes_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.incoming.bytes - network.outgoing.bytes_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - network.outgoing.bytes - binding_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - binding network.outgoing.bytes.rate_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outgoing.bytes.rate - disk.allocation_cif: - - cif - - disk.allocation network.outpoing.packets_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outpoing.packets network.outpoing.packets_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outpoing.packets - disk.device.iops_cif: - - cif - - disk.device.iops network.incoming.packets.rate_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.incoming.packets.rate @@ -653,33 +614,18 @@ topology_template: disk.root.size_cif: - cif - disk.root.size - disk.device.write.requests_cif: - - cif - - disk.device.write.requests memory.resident_cif: - cif - memory.resident - network.outpoing.packets_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outpoing.packets network.incoming.packets_cif_cif_ims_li_0_port: - cif_cif_ims_li_0_port - network.incoming.packets network.incoming.packets_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.incoming.packets - network.outgoing.packets.rate_cif_cif_oam_0_port_3: - - cif_cif_oam_0_port_3 - - network.outgoing.packets.rate disk.usage_cif: - cif - disk.usage - disk.write.bytes.rate_cif: - - cif - - disk.write.bytes.rate - host_cif: - - cif - - host disk.ephemeral.size_cif: - cif - disk.ephemeral.size @@ -689,15 +635,9 @@ topology_template: disk.write.requests.rate_cif: - cif - disk.write.requests.rate - cpu.delta_cif: - - cif - - cpu.delta disk.read.bytes_cif: - cif - disk.read.bytes - scalable_cif: - - cif - - scalable disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate @@ -719,9 +659,6 @@ topology_template: network.outgoing.packets.rate_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.outgoing.packets.rate - binding_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - binding disk.device.read.bytes.rate_cif: - cif - disk.device.read.bytes.rate @@ -731,72 +668,39 @@ topology_template: network.incoming.packets.rate_cif_cif_internal_0_port: - cif_cif_internal_0_port - network.incoming.packets.rate - disk.device.write.bytes.rate_cif: - - cif - - disk.device.write.bytes.rate endpoint_cif: - cif - endpoint disk.device.usage_cif: - cif - disk.device.usage - disk.iops_cif: - - cif - - disk.iops - disk.read.bytes.rate_cif: - - cif - - disk.read.bytes.rate + forwarder_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - forwarder network.outgoing.packets.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outgoing.packets.rate network.incoming.bytes_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.bytes - network.incoming.bytes.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.bytes.rate network.incoming.bytes_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.incoming.bytes network.outpoing.packets_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.outpoing.packets - disk.write.requests_cif: - - cif - - disk.write.requests - memory_cif: - - cif - - memory - attachment_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - attachment - network.outgoing.bytes.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outgoing.bytes.rate disk.read.requests_cif: - cif - disk.read.requests disk.write.bytes_cif: - cif - disk.write.bytes - disk.capacity_cif: - - cif - - disk.capacity network.outgoing.bytes_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port - network.outgoing.bytes - network.outgoing.bytes.rate_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - network.outgoing.bytes.rate - network.outpoing.packets_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outpoing.packets disk.device.capacity_cif: - cif - disk.device.capacity - feature_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - feature feature_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - feature @@ -815,15 +719,132 @@ topology_template: cpu_cif: - cif - cpu + disk.device.read.bytes_cif: + - cif + - disk.device.read.bytes + forwarder_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - forwarder + forwarder_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - forwarder + forwarder_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - forwarder + feature_cif: + - cif + - feature + binding_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - binding + network.incoming.bytes.rate_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - network.incoming.bytes.rate + binding_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - binding + cpu_util_cif: + - cif + - cpu_util + disk.device.write.bytes_cif: + - cif + - disk.device.write.bytes + network.outgoing.bytes_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - network.outgoing.bytes + feature_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - feature + network.incoming.packets_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - network.incoming.packets + network.incoming.packets_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - network.incoming.packets + feature_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - feature + network.outgoing.bytes_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - network.outgoing.bytes + network.outgoing.bytes_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - network.outgoing.bytes + binding_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - binding + disk.allocation_cif: + - cif + - disk.allocation + disk.device.iops_cif: + - cif + - disk.device.iops + disk.device.write.requests_cif: + - cif + - disk.device.write.requests + network.outpoing.packets_cif_cif_internal_0_port: + - cif_cif_internal_0_port + - network.outpoing.packets + network.outgoing.packets.rate_cif_cif_oam_0_port_3: + - cif_cif_oam_0_port_3 + - network.outgoing.packets.rate + disk.write.bytes.rate_cif: + - cif + - disk.write.bytes.rate + host_cif: + - cif + - host + cpu.delta_cif: + - cif + - cpu.delta + scalable_cif: + - cif + - scalable + binding_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - binding + disk.device.write.bytes.rate_cif: + - cif + - disk.device.write.bytes.rate + disk.iops_cif: + - cif + - disk.iops + disk.read.bytes.rate_cif: + - cif + - disk.read.bytes.rate + network.incoming.bytes.rate_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - network.incoming.bytes.rate + disk.write.requests_cif: + - cif + - disk.write.requests + memory_cif: + - cif + - memory + attachment_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - attachment + network.outgoing.bytes.rate_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - network.outgoing.bytes.rate + disk.capacity_cif: + - cif + - disk.capacity + network.outgoing.bytes.rate_cif_cif_oam_0_port_1: + - cif_cif_oam_0_port_1 + - network.outgoing.bytes.rate + network.outpoing.packets_cif_cif_ims_li_0_port: + - cif_cif_ims_li_0_port + - network.outpoing.packets + feature_cif_cif_ims_core_0_port: + - cif_cif_ims_core_0_port + - feature attachment_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - attachment attachment_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - attachment - disk.device.read.bytes_cif: - - cif - - disk.device.read.bytes disk.device.latency_cif: - cif - disk.device.latency @@ -836,12 +857,6 @@ topology_template: network.outgoing.bytes.rate_cif_cif_internal_0_port: - cif_cif_internal_0_port - network.outgoing.bytes.rate - feature_cif: - - cif - - feature - binding_cif_cif_oam_0_port_1: - - cif_cif_oam_0_port_1 - - binding requirements: link_cif_cif_ims_core_0_port: - cif_cif_ims_core_0_port 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_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml index 2d5ae8c10f..f1e5cf1023 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml @@ -557,21 +557,12 @@ topology_template: binding_cif: - cif - binding - cpu_util_cif: - - cif - - cpu_util disk.device.read.requests_cif: - cif - disk.device.read.requests - disk.device.write.bytes_cif: - - cif - - disk.device.write.bytes disk.latency_cif: - cif - disk.latency - feature_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - feature os_cif: - cif - os @@ -590,63 +581,33 @@ topology_template: feature_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - feature - network.incoming.packets_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - network.incoming.packets instance_cif: - cif - instance network.incoming.bytes.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.bytes.rate - network.outgoing.bytes_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - network.outgoing.bytes network.outgoing.bytes_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outgoing.bytes - network.outgoing.bytes_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - network.outgoing.bytes - disk.allocation_cif: - - cif - - disk.allocation - network.outgoing.bytes.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.outgoing.bytes.rate network.incoming.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.packets.rate - disk.device.iops_cif: - - cif - - disk.device.iops feature_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - feature disk.root.size_cif: - cif - disk.root.size - disk.device.write.requests_cif: - - cif - - disk.device.write.requests feature_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - feature memory.resident_cif: - cif - memory.resident - network.incoming.bytes.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.bytes.rate - binding_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - binding network.outgoing.bytes_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.outgoing.bytes - attachment_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - attachment network.incoming.packets.rate_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.packets.rate @@ -656,30 +617,15 @@ topology_template: network.incoming.bytes_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.bytes - attachment_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - attachment disk.usage_cif: - cif - disk.usage - disk.write.bytes.rate_cif: - - cif - - disk.write.bytes.rate - network.incoming.bytes_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.bytes - host_cif: - - cif - - host disk.ephemeral.size_cif: - cif - disk.ephemeral.size disk.write.requests.rate_cif: - cif - disk.write.requests.rate - cpu.delta_cif: - - cif - - cpu.delta disk.read.bytes_cif: - cif - disk.read.bytes @@ -689,21 +635,9 @@ topology_template: network.outgoing.packets.rate_cif_cif_internal_1_port: - cif_cif_internal_1_port - network.outgoing.packets.rate - scalable_cif: - - cif - - scalable disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate - binding_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - binding - feature_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - feature - binding_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - binding disk.device.allocation_cif: - cif - disk.device.allocation @@ -713,9 +647,6 @@ topology_template: vcpus_cif: - cif - vcpus - disk.device.write.bytes.rate_cif: - - cif - - disk.device.write.bytes.rate network.outgoing.packets.rate_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outgoing.packets.rate @@ -731,12 +662,6 @@ topology_template: disk.device.usage_cif: - cif - disk.device.usage - disk.iops_cif: - - cif - - disk.iops - disk.read.bytes.rate_cif: - - cif - - disk.read.bytes.rate network.outpoing.packets_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.outpoing.packets @@ -752,36 +677,15 @@ topology_template: network.outgoing.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outgoing.packets.rate - disk.write.requests_cif: - - cif - - disk.write.requests - binding_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - binding - memory_cif: - - cif - - memory disk.read.requests_cif: - cif - disk.read.requests - network.outgoing.packets.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.outgoing.packets.rate - network.outgoing.bytes.rate_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - network.outgoing.bytes.rate disk.write.bytes_cif: - cif - disk.write.bytes network.outpoing.packets_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outpoing.packets - disk.capacity_cif: - - cif - - disk.capacity - network.outgoing.bytes.rate_cif_cif_oam_1_port_3: - - cif_cif_oam_1_port_3 - - network.outgoing.bytes.rate network.outgoing.bytes.rate_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.outgoing.bytes.rate @@ -797,12 +701,6 @@ topology_template: network.incoming.packets.rate_cif_cif_internal_1_port: - cif_cif_internal_1_port - network.incoming.packets.rate - binding_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - binding - network.incoming.packets_cif_cif_oam_1_port_1: - - cif_cif_oam_1_port_1 - - network.incoming.packets cpu_cif: - cif - cpu @@ -815,30 +713,147 @@ topology_template: disk.device.read.bytes_cif: - cif - disk.device.read.bytes - disk.device.latency_cif: - - cif - - disk.device.latency network.outgoing.bytes.rate_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.outgoing.bytes.rate network.incoming.packets_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.incoming.packets - disk.device.write.requests.rate_cif: - - cif - - disk.device.write.requests.rate network.outpoing.packets_cif_cif_internal_1_port: - cif_cif_internal_1_port - network.outpoing.packets feature_cif: - cif - feature - attachment_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - attachment network.incoming.bytes.rate_cif_cif_ims_core_1_port: - cif_cif_ims_core_1_port - network.incoming.bytes.rate + cpu_util_cif: + - cif + - cpu_util + disk.device.write.bytes_cif: + - cif + - disk.device.write.bytes + feature_cif_cif_ims_li_1_port: + - cif_cif_ims_li_1_port + - feature + network.incoming.packets_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - network.incoming.packets + network.outgoing.bytes_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - network.outgoing.bytes + network.outgoing.bytes_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - network.outgoing.bytes + disk.allocation_cif: + - cif + - disk.allocation + network.outgoing.bytes.rate_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - network.outgoing.bytes.rate + disk.device.iops_cif: + - cif + - disk.device.iops + disk.device.write.requests_cif: + - cif + - disk.device.write.requests + network.incoming.bytes.rate_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - network.incoming.bytes.rate + binding_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - binding + attachment_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - attachment + attachment_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - attachment + disk.write.bytes.rate_cif: + - cif + - disk.write.bytes.rate + network.incoming.bytes_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - network.incoming.bytes + host_cif: + - cif + - host + forwarder_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - forwarder + forwarder_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - forwarder + cpu.delta_cif: + - cif + - cpu.delta + scalable_cif: + - cif + - scalable + binding_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - binding + feature_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - feature + binding_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - binding + disk.device.write.bytes.rate_cif: + - cif + - disk.device.write.bytes.rate + disk.iops_cif: + - cif + - disk.iops + disk.read.bytes.rate_cif: + - cif + - disk.read.bytes.rate + forwarder_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - forwarder + disk.write.requests_cif: + - cif + - disk.write.requests + binding_cif_cif_ims_li_1_port: + - cif_cif_ims_li_1_port + - binding + memory_cif: + - cif + - memory + network.outgoing.packets.rate_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - network.outgoing.packets.rate + network.outgoing.bytes.rate_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - network.outgoing.bytes.rate + disk.capacity_cif: + - cif + - disk.capacity + network.outgoing.bytes.rate_cif_cif_oam_1_port_3: + - cif_cif_oam_1_port_3 + - network.outgoing.bytes.rate + binding_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - binding + network.incoming.packets_cif_cif_oam_1_port_1: + - cif_cif_oam_1_port_1 + - network.incoming.packets + forwarder_cif_cif_ims_core_1_port: + - cif_cif_ims_core_1_port + - forwarder + disk.device.latency_cif: + - cif + - disk.device.latency + forwarder_cif_cif_ims_li_1_port: + - cif_cif_ims_li_1_port + - forwarder + disk.device.write.requests.rate_cif: + - cif + - disk.device.write.requests.rate + attachment_cif_cif_internal_1_port: + - cif_cif_internal_1_port + - attachment network.incoming.packets_cif_cif_ims_li_1_port: - cif_cif_ims_li_1_port - network.incoming.packets 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 240c27f5b5..a2c4af5daf 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 @@ -454,6 +454,9 @@ topology_template: 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 @@ -469,6 +472,9 @@ topology_template: 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 @@ -487,6 +493,9 @@ topology_template: 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 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_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml index 6a66369963..64e5bdd8eb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml @@ -502,6 +502,9 @@ topology_template: binding_lbd_lbd_dpdk_0_port: - lbd_lbd_dpdk_0_port - binding + forwarder_lbd_lbd_ims_core_0_port: + - lbd_lbd_ims_core_0_port + - forwarder network.outgoing.bytes_lbd_lbd_internal_0_port: - lbd_lbd_internal_0_port - network.outgoing.bytes @@ -553,9 +556,15 @@ topology_template: disk.device.write.bytes_lbd: - lbd - disk.device.write.bytes + forwarder_lbd_lbd_internal_0_port: + - lbd_lbd_internal_0_port + - forwarder disk.capacity_lbd: - lbd - disk.capacity + forwarder_lbd_lbd_dpdk_0_port: + - lbd_lbd_dpdk_0_port + - forwarder feature_lbd: - lbd - feature 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_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml index 4919d3bcb4..ec7944d0f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml @@ -302,6 +302,9 @@ topology_template: disk.read.bytes_oam: - oam - disk.read.bytes + forwarder_oam_oam_oam_0_port: + - oam_oam_oam_0_port + - forwarder network.incoming.packets_oam_oam_internal_0_port: - oam_oam_internal_0_port - network.incoming.packets @@ -434,6 +437,9 @@ topology_template: network.incoming.bytes.rate_oam_oam_oam_0_port: - oam_oam_oam_0_port - network.incoming.bytes.rate + forwarder_oam_oam_internal_0_port: + - oam_oam_internal_0_port + - forwarder network.incoming.bytes_oam_oam_oam_0_port: - oam_oam_oam_0_port - network.incoming.bytes 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_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml index 71b1bb62c8..f9da32d654 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml @@ -296,6 +296,9 @@ topology_template: disk.device.write.bytes_oam: - oam - disk.device.write.bytes + forwarder_oam_oam_internal_1_port: + - oam_oam_internal_1_port + - forwarder disk.read.bytes_oam: - oam - disk.read.bytes @@ -458,6 +461,9 @@ topology_template: disk.write.bytes_oam: - oam - disk.write.bytes + forwarder_oam_oam_oam_1_port: + - oam_oam_oam_1_port + - forwarder disk.read.requests_oam: - oam - disk.read.requests 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_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml index f3ee061109..21a53aedc7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml @@ -356,6 +356,9 @@ topology_template: network.outgoing.bytes.rate_oam_oam_internal_2_port: - oam_oam_internal_2_port - network.outgoing.bytes.rate + forwarder_oam_oam_internal_2_port: + - oam_oam_internal_2_port + - forwarder network.outpoing.packets_oam_oam_internal_2_port: - oam_oam_internal_2_port - network.outpoing.packets @@ -374,6 +377,9 @@ topology_template: network.incoming.bytes_oam_oam_oam_2_port: - oam_oam_oam_2_port - network.incoming.bytes + forwarder_oam_oam_oam_2_port: + - oam_oam_oam_2_port + - forwarder network.outgoing.packets.rate_oam_oam_internal_2_port: - oam_oam_internal_2_port - network.outgoing.packets.rate 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_cscfServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml index f6b8a5d5b3..658b0d62a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml @@ -354,6 +354,9 @@ topology_template: disk.write.bytes_cscf_server_0: - cscf_server_0 - disk.write.bytes + forwarder_cscf_internal_0_port_0: + - cscf_internal_0_port_0 + - forwarder cpu.delta_cscf_server_0: - cscf_server_0 - cpu.delta 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_tdcoreServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml index aa2336cd01..65e2fb86e9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml @@ -380,6 +380,9 @@ topology_template: network.incoming.packets_tdcore_dpdk_0_port_1: - tdcore_dpdk_0_port_1 - network.incoming.packets + forwarder_tdcore_dpdk_0_port_1: + - tdcore_dpdk_0_port_1 + - forwarder vcpus_tdcore_server_0: - tdcore_server_0 - vcpus @@ -452,6 +455,9 @@ topology_template: disk.write.bytes.rate_tdcore_server_0: - tdcore_server_0 - disk.write.bytes.rate + forwarder_tdcore_internal_0_port_0: + - tdcore_internal_0_port_0 + - forwarder disk.device.capacity_tdcore_server_0: - tdcore_server_0 - disk.device.capacity |