diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute')
26 files changed, 5493 insertions, 5493 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 9172dc400f..fc2a5b73f2 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 @@ -8,70 +8,56 @@ node_types: org.openecomp.resource.abstract.nodes.cdi: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cdi_internal_0_port_network_role: + port_cdi_internal_0_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_cdi_ims_core_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_0_port_ip_requirements: + port_cdi_internal_0_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_cdi_internal_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_0_port_name: - type: list + type: json + port_cdi_ims_core_0_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_cdi_internal_0_port_exCP_naming: + port_cdi_ims_core_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cdi_ims_core_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_cdi_internal_0_port_allowed_address_pairs: + port_cdi_ims_core_0_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cdi_internal_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cdi_internal_0_port_subnetpoolid: + type: string + vm_image_name: type: string required: true status: SUPPORTED - vm_image_name: - type: string + port_cdi_internal_0_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cdi_scheduler_hints: type: list required: true @@ -84,62 +70,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_0_port_ip_requirements: + compute_cdi_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_network_role_tag: - type: string + type: string + port_cdi_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_cdi_user_data_format: + compute_cdi_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_internal_0_port_name: - type: list + port_cdi_ims_core_0_port_1_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cdi_ims_core_0_port_order: - type: integer + port_cdi_internal_0_port_0_network_role_tag: + type: string required: true status: SUPPORTED - compute_cdi_availability_zone: + port_cdi_internal_0_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cdi_ims_core_0_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_cdi_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cdi_internal_0_port_network: + type: boolean + port_cdi_internal_0_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cdi_internal_0_port_fixed_ips: - type: list + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_cdi_config_drive: + port_cdi_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -148,76 +130,81 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cdi_internal_0_port_security_groups: - type: list + port_cdi_ims_core_0_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json - port_cdi_ims_core_0_port_security_groups: + port_cdi_ims_core_0_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cdi_ims_core_0_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_cdi_ims_core_0_port_1_ip_requirements: + type: list required: true status: SUPPORTED - port_cdi_ims_core_0_port_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_0_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_cdi_internal_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_1_fixed_ips: + type: list required: true status: SUPPORTED - port_cdi_internal_0_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_0_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cdi_ims_core_0_port_allowed_address_pairs: + type: string + port_cdi_ims_core_0_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string + port_cdi_internal_0_port_0_network_role: + type: string + required: true + status: SUPPORTED compute_cdi_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_cdi_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cdi_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - port_cdi_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_0_port_1_allowed_address_pairs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_ims_core_0_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_cdi_ims_core_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED requirements: - - dependency_cdi_cdi_ims_core_0_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cdi_cdi_ims_core_0_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_cdi: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -232,43 +219,39 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cdi_cdi_internal_0_port: + - dependency_cdi_cdi_ims_core_0_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdi_cdi_internal_0_port: + - link_cdi_cdi_ims_core_0_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - capabilities: - attachment_cdi_cdi_internal_0_port: - type: tosca.capabilities.Attachment + - dependency_cdi_cdi_internal_0_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_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. + - link_cdi_cdi_internal_0_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo 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. + capabilities: + feature_cdi_cdi_internal_0_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cdi_cdi_internal_0_port: + network.outgoing.bytes.rate_cdi_cdi_ims_core_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: @@ -299,56 +282,57 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_cdi: + network.incoming.packets_cdi_cdi_internal_0_port_0: 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_cdi: + disk.device.write.requests.rate_cdi: 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_cdi: + disk.write.bytes.rate_cdi: 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_util_cdi: + network.outpoing.packets_cdi_cdi_ims_core_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 - cpu.delta_cdi: + disk.ephemeral.size_cdi: 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_cdi_cdi_internal_0_port: + cpu_util_cdi: 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_cdi_cdi_internal_0_port: + cpu.delta_cdi: 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_cdi: + network.incoming.packets_cdi_cdi_ims_core_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 - feature_cdi_cdi_ims_core_0_port: - type: tosca.capabilities.Node + disk.device.write.bytes_cdi: + 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 @@ -369,19 +353,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cdi_cdi_internal_0_port_0: + 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_cdi: 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_cdi_cdi_ims_core_0_port: + network.incoming.packets.rate_cdi_cdi_ims_core_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.outpoing.packets_cdi_cdi_internal_0_port: + network.outgoing.bytes.rate_cdi_cdi_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -393,7 +383,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cdi_cdi_ims_core_0_port: + network.outgoing.packets.rate_cdi_cdi_ims_core_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: @@ -405,6 +395,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cdi_cdi_ims_core_0_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED endpoint_cdi: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -416,25 +411,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cdi_cdi_ims_core_0_port: + memory.resident_cdi: 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_cdi: + disk.latency_cdi: 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_cdi: + disk.read.bytes.rate_cdi: 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_cdi: + network.outgoing.bytes_cdi_cdi_ims_core_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.bytes_cdi_cdi_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -458,34 +459,38 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cdi_cdi_ims_core_0_port: + network.incoming.packets.rate_cdi_cdi_internal_0_port_0: 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_cdi_cdi_internal_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + disk.allocation_cdi: + 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.incoming.packets.rate_cdi_cdi_internal_0_port: + network.incoming.bytes.rate_cdi_cdi_ims_core_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.allocation_cdi: + forwarder_cdi_cdi_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_cdi_cdi_internal_0_port_0: 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_cdi_cdi_internal_0_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_cdi_cdi_internal_0_port_0: + 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 @@ -511,17 +516,27 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cdi_cdi_ims_core_0_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.iops_cdi: 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_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. + binding_cdi_cdi_internal_0_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.usage_cdi: type: org.openecomp.capabilities.metric.Ceilometer @@ -529,6 +544,16 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_cdi_cdi_internal_0_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_cdi_cdi_ims_core_0_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -541,9 +566,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cdi_cdi_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. + forwarder_cdi_cdi_ims_core_0_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -558,11 +582,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cdi_cdi_internal_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -581,50 +600,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cdi_cdi_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 - binding_cdi_cdi_ims_core_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED instance_cdi: 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_cdi_cdi_ims_core_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.allocation_cdi: + network.incoming.bytes_cdi_cdi_internal_0_port_0: 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_cdi_cdi_ims_core_0_port: + network.incoming.bytes_cdi_cdi_ims_core_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.requests_cdi: + disk.device.allocation_cdi: 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_cdi_cdi_ims_core_0_port: + disk.write.requests_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -633,201 +633,179 @@ node_types: org.openecomp.resource.abstract.nodes.lbd: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_lbd_ims_core_1_port_allowed_address_pairs: + port_lbd_ims_core_1_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json compute_lbd_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_1_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_lbd_dpdk_1_port_allowed_address_pairs: - type: list + port_lbd_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_1_port_subnetpoolid: - type: string + port_lbd_ims_core_1_port_2_order: + type: integer required: true status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_lbd_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED compute_lbd_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_1_port_network_role_tag: - type: string + port_lbd_dpdk_1_port_1_related_networks: + type: list required: true status: SUPPORTED - port_lbd_internal_1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role: + type: string required: true status: SUPPORTED vm_image_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_ims_core_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - port_lbd_dpdk_1_port_network: + port_lbd_dpdk_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_network_role_tag: + type: string required: true status: SUPPORTED - port_lbd_ims_core_1_port_network_role: + port_lbd_internal_1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_lbd_ims_core_1_port_related_networks: + port_lbd_ims_core_1_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_lbd_scheduler_hints: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_dpdk_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_dpdk_1_port_name: + type: string + compute_lbd_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_1_port_exCP_naming: + type: json + port_lbd_ims_core_1_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_lbd_internal_1_port_network: + port_lbd_dpdk_1_port_1_order: + type: integer + required: true + status: SUPPORTED + compute_lbd_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - compute_lbd_name: + port_lbd_dpdk_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string + port_lbd_internal_1_port_0_order: + type: integer required: true status: SUPPORTED - port_lbd_internal_1_port_vlan_requirements: + port_lbd_dpdk_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED compute_lbd_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_lbd_ims_core_1_port_ip_requirements: + port_lbd_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_ims_core_1_port_2_network_role: + type: string required: true status: SUPPORTED - port_lbd_internal_1_port_ip_requirements: + port_lbd_ims_core_1_port_2_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + type: string + port_lbd_internal_1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_lbd_internal_1_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_1_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_internal_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_lbd_ims_core_1_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_1_port_2_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_1_port_fixed_ips: - type: list + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_fixed_ips: + port_lbd_dpdk_1_port_1_fixed_ips: type: list required: true status: SUPPORTED @@ -841,95 +819,117 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_lbd_ims_core_1_port_network: + port_lbd_ims_core_1_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_1_port_network_role_tag: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_dpdk_1_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_dpdk_1_port_1_network_role: type: string required: true status: SUPPORTED - port_lbd_dpdk_1_port_security_groups: + port_lbd_ims_core_1_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_dpdk_1_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_1_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_network_role: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_internal_1_port_0_security_groups: + type: list required: true status: SUPPORTED - port_lbd_dpdk_1_port_ip_requirements: + entry_schema: + type: json + port_lbd_internal_1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_dpdk_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_lbd_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_dpdk_1_port_vlan_requirements: + port_lbd_dpdk_1_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_lbd_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_1_port_network_role: - type: string + type: string + port_lbd_ims_core_1_port_2_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_lbd_lbd_ims_core_1_port: + - dependency_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_ims_core_1_port: + - link_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_dpdk_1_port: + - dependency_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_dpdk_1_port: + - link_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_internal_1_port: + - dependency_lbd_lbd_ims_core_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_internal_1_port: + - link_lbd_lbd_ims_core_1_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -980,11 +980,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_lbd_lbd_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. + binding_lbd_lbd_dpdk_1_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED host_lbd: type: tosca.capabilities.Container @@ -993,126 +995,123 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_lbd: + network.outgoing.bytes_lbd_lbd_internal_1_port_0: 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_util_lbd: + network.incoming.bytes.rate_lbd_lbd_dpdk_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.requests_lbd: + network.incoming.packets.rate_lbd_lbd_dpdk_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 - attachment_lbd_lbd_ims_core_1_port: - type: tosca.capabilities.Attachment + feature_lbd_lbd_internal_1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory.usage_lbd: + disk.device.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 - binding_lbd_lbd_dpdk_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.outpoing.packets_lbd_lbd_ims_core_1_port: + network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port_2: 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_lbd_lbd_ims_core_1_port: + network.incoming.bytes_lbd_lbd_ims_core_1_port_2: 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_lbd_lbd_internal_1_port: + network.outpoing.packets_lbd_lbd_dpdk_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.requests_lbd: + cpu_util_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 - feature_lbd_lbd_internal_1_port: - type: tosca.capabilities.Node + disk.device.read.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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_lbd_lbd_ims_core_1_port: + network.outgoing.packets.rate_lbd_lbd_dpdk_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 - cpu.delta_lbd: + memory.usage_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 - memory_lbd: + feature_lbd_lbd_ims_core_1_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.read.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. occurrences: - 1 - UNBOUNDED - disk.write.bytes_lbd: + cpu.delta_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 - scalable_lbd: - type: tosca.capabilities.Scalable + attachment_lbd_lbd_internal_1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_lbd_lbd_dpdk_1_port: + memory_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 - network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port: + disk.write.bytes_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 - network.incoming.packets.rate_lbd_lbd_ims_core_1_port: + network.incoming.bytes_lbd_lbd_dpdk_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.requests.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. + scalable_lbd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_lbd_lbd_dpdk_1_port: + disk.device.read.requests.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. occurrences: @@ -1124,6 +1123,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_lbd_lbd_dpdk_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED vcpus_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1136,11 +1140,6 @@ 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. @@ -1158,38 +1157,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_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. - occurrences: - - 1 - - UNBOUNDED memory.resident_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_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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_lbd_lbd_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.bytes.rate_lbd_lbd_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. + attachment_lbd_lbd_ims_core_1_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1199,42 +1180,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_lbd_lbd_internal_1_port: + network.incoming.bytes.rate_lbd_lbd_ims_core_1_port_2: 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_lbd_lbd_internal_1_port: + network.outpoing.packets_lbd_lbd_internal_1_port_0: 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_ims_core_1_port: - type: org.openecomp.capabilities.Forwarder + attachment_lbd_lbd_dpdk_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_lbd_lbd_dpdk_1_port: + network.incoming.bytes_lbd_lbd_internal_1_port_0: 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_lbd_lbd_dpdk_1_port: + network.incoming.packets.rate_lbd_lbd_internal_1_port_0: 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_lbd_lbd_internal_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - feature_lbd_lbd_dpdk_1_port: - type: tosca.capabilities.Node + forwarder_lbd_lbd_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1244,8 +1220,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_lbd_lbd_ims_core_1_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_lbd_lbd_internal_1_port_0: + 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 @@ -1260,19 +1237,24 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_lbd_lbd_ims_core_1_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.write.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. occurrences: - 1 - UNBOUNDED - disk.iops_lbd: + network.outgoing.bytes_lbd_lbd_dpdk_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.packets.rate_lbd_lbd_dpdk_1_port: + disk.iops_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: @@ -1284,14 +1266,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_lbd_lbd_ims_core_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.usage_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1310,18 +1284,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_lbd_lbd_dpdk_1_port: - type: tosca.capabilities.Attachment + disk.device.write.bytes_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 - disk.device.write.bytes_lbd: + network.incoming.bytes.rate_lbd_lbd_internal_1_port_0: 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_lbd_lbd_ims_core_1_port: + network.incoming.packets.rate_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1333,12 +1308,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_lbd_lbd_internal_1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED feature_lbd: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_lbd_lbd_ims_core_1_port: + network.outgoing.bytes_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1350,7 +1333,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_lbd_lbd_ims_core_1_port: + network.outpoing.packets_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1362,24 +1345,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_lbd_lbd_internal_1_port_0: + 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_lbd: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_lbd_lbd_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. + forwarder_lbd_lbd_dpdk_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outpoing.packets_lbd_lbd_internal_1_port: + network.outgoing.bytes.rate_lbd_lbd_dpdk_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 - binding_lbd_lbd_internal_1_port: + binding_lbd_lbd_ims_core_1_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1387,13 +1375,25 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.bytes_lbd_lbd_internal_1_port: + network.incoming.packets_lbd_lbd_dpdk_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_lbd_lbd_internal_1_port_0: 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_lbd_lbd_dpdk_1_port: + network.outgoing.packets.rate_lbd_lbd_ims_core_1_port_2: + 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_lbd_lbd_ims_core_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1408,56 +1408,36 @@ node_types: org.openecomp.resource.abstract.nodes.oam_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_internal_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_oam_internal_1_port_related_networks: + port_oam_oam_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_oam_internal_1_port_network_role: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_oam_oam_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_oam_oam_1_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair vm_flavor_name: type: string required: true status: SUPPORTED - port_oam_oam_1_port_ip_requirements: + port_oam_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_network_role_tag: + port_oam_oam_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_oam_oam_1_port_security_groups: + port_oam_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string vm_image_name: type: string required: true @@ -1468,46 +1448,38 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_oam_internal_1_port_network: - type: list + port_oam_oam_1_port_1_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_oam_oam_1_port_fixed_ips: - type: list + port_oam_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_1_port_related_networks: - type: list + port_oam_oam_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_vlan_requirements: + port_oam_oam_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_1_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_1_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_order: - type: integer + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_oam_oam_1_port_network: - type: list + port_oam_internal_1_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1516,64 +1488,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_internal_1_port_allowed_address_pairs: + port_oam_oam_1_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_1_network_role: + type: string + required: true + status: SUPPORTED compute_oam_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_internal_1_port_exCP_naming: + port_oam_oam_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_internal_1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_oam_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_oam_internal_1_port_name: + port_oam_internal_1_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam_oam_1_port_name: + type: string + port_oam_oam_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_internal_1_port_order: - type: integer + port_oam_internal_1_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_oam_oam_1_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_1_port_subnetpoolid: - type: string + compute_oam_scheduler_hints: + type: list required: true status: SUPPORTED - compute_oam_scheduler_hints: + entry_schema: + type: json + port_oam_internal_1_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json + port_oam_internal_1_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_availability_zone: type: list required: true @@ -1586,46 +1576,43 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_oam_oam_1_port_1_security_groups: + type: list required: true status: SUPPORTED + entry_schema: + type: json compute_oam_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_oam_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network: + type: list required: true status: SUPPORTED - port_oam_oam_1_port_network_role: - type: string + entry_schema: + type: string + port_oam_oam_1_port_1_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_oam_oam_internal_1_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_oam_oam_internal_1_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_oam_oam_oam_1_port: + - dependency_oam_oam_oam_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_oam_1_port: + - link_oam_oam_oam_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1645,6 +1632,19 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_oam_oam_internal_1_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_oam_oam_internal_1_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 capabilities: cpu_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -1652,63 +1652,55 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam_oam_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. + feature_oam_oam_internal_1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam_oam_1_port: + disk.usage_oam: 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_oam_oam_internal_1_port: + memory.resident_oam: 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.usage_oam: + disk.device.write.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. occurrences: - 1 - UNBOUNDED - memory.resident_oam: + 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. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_oam: + network.incoming.bytes_oam_oam_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 - forwarder_oam_oam_internal_1_port: - type: org.openecomp.capabilities.Forwarder + scalable_oam: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.read.bytes_oam: + network.outgoing.bytes_oam_oam_internal_1_port_0: 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_oam_oam_internal_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - scalable_oam: - type: tosca.capabilities.Scalable + network.incoming.bytes_oam_oam_internal_1_port_0: + 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 @@ -1723,7 +1715,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_oam_1_port: + network.incoming.packets.rate_oam_oam_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: @@ -1735,6 +1727,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_oam_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 binding_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -1746,7 +1744,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_oam_1_port: + network.outgoing.bytes.rate_oam_oam_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: @@ -1770,81 +1768,86 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam_internal_1_port: + disk.ephemeral.size_oam: 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_oam: + network.outgoing.bytes_oam_oam_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_oam_oam_oam_1_port: + disk.write.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. occurrences: - 1 - UNBOUNDED - disk.write.requests_oam: + network.incoming.packets_oam_oam_internal_1_port_0: 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_oam_oam_oam_1_port: - type: tosca.capabilities.Attachment + disk.capacity_oam: + 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.capacity_oam: + network.incoming.bytes.rate_oam_oam_internal_1_port_0: 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_oam: + network.outgoing.packets.rate_oam_oam_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_oam_oam_internal_1_port: + instance_oam: 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_oam: + network.outpoing.packets_oam_oam_internal_1_port_0: 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_oam_oam_oam_1_port: + disk.root.size_oam: 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_oam_oam_oam_1_port: - type: tosca.capabilities.Node + binding_oam_oam_internal_1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_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. + attachment_oam_oam_internal_1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam_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. + binding_oam_oam_oam_1_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED memory_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -1864,13 +1867,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_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_oam_oam_oam_1_port: + network.outgoing.packets.rate_oam_oam_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1900,20 +1897,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam_internal_1_port: + network.incoming.packets.rate_oam_oam_internal_1_port_0: 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_oam_oam_internal_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_oam_oam_oam_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. + forwarder_oam_oam_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1929,11 +1920,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam_internal_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.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. @@ -1952,6 +1938,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_oam_oam_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.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. @@ -1970,19 +1961,22 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_oam_internal_1_port: + network.outgoing.bytes.rate_oam_oam_internal_1_port_0: 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_oam_oam_oam_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + forwarder_oam_oam_oam_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 + - UNBOUNDED + network.incoming.packets_oam_oam_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 cpu_util_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -2007,14 +2001,20 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_oam_oam_oam_1_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.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. occurrences: - 1 - UNBOUNDED - forwarder_oam_oam_oam_1_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes.rate_oam_oam_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 @@ -2033,58 +2033,40 @@ node_types: org.openecomp.resource.abstract.nodes.oam_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_oam_2_port_network_role_tag: + port_oam_internal_2_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_oam_2_port_related_networks: + port_oam_internal_2_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_oam_2_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_oam_oam_2_port_name: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_oam_internal_2_port_name: + port_oam_internal_2_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_oam_2_port_network_role: - type: string - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_oam_internal_2_port_mac_requirements: + port_oam_internal_2_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_oam_oam_2_port_subnetpoolid: + port_oam_internal_2_port_0_network_role: type: string required: true status: SUPPORTED - port_oam_internal_2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_oam_oam_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_allowed_address_pairs: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair vm_image_name: type: string required: true @@ -2095,50 +2077,56 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_oam_oam_2_port_vlan_requirements: + port_oam_internal_2_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_2_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_2_port_1_order: + type: integer + required: true + status: SUPPORTED + port_oam_oam_2_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_2_port_network: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_2_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_2_port_network_role_tag: + type: json + port_oam_oam_2_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_oam_internal_2_port_order: - type: integer + port_oam_oam_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_oam_internal_2_port_fixed_ips: + port_oam_internal_2_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_2_port_network_role: - type: string - required: true - status: SUPPORTED - port_oam_oam_2_port_fixed_ips: + type: json + port_oam_oam_2_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED index_value: @@ -2149,62 +2137,76 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_internal_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - port_oam_oam_2_port_network: + compute_oam_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - compute_oam_user_data_format: + port_oam_internal_2_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_2_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_2_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: json - port_oam_oam_2_port_ip_requirements: + type: string + port_oam_internal_2_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_2_port_vlan_requirements: + port_oam_internal_2_port_0_order: + type: integer + required: true + status: SUPPORTED + port_oam_oam_2_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_2_port_order: - type: integer + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_2_port_1_network_role: + type: string required: true status: SUPPORTED - port_oam_internal_2_port_related_networks: + port_oam_oam_2_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string compute_oam_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_oam_internal_2_port_ip_requirements: + port_oam_internal_2_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_oam_oam_2_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_oam_availability_zone: type: list required: true @@ -2217,12 +2219,10 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_oam_2_port_allowed_address_pairs: - type: list + port_oam_internal_2_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair compute_oam_name: type: list required: true @@ -2230,46 +2230,46 @@ node_types: entry_schema: type: string requirements: - - dependency_oam_oam_internal_2_port: + - dependency_oam: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_internal_2_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_oam: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_oam_oam_oam_2_port: + - 0 + - UNBOUNDED + - dependency_oam_oam_oam_2_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_oam_2_port: + - link_oam_oam_oam_2_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_oam: + - dependency_oam_oam_internal_2_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_oam: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_oam_oam_internal_2_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED + - 1 + - 1 capabilities: cpu_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -2277,48 +2277,54 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_oam_2_port: + disk.usage_oam: 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_oam_oam_oam_2_port: + feature_oam_oam_internal_2_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory.resident_oam: 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.usage_oam: + disk.device.write.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. occurrences: - 1 - UNBOUNDED - memory.resident_oam: + 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. occurrences: - 1 - UNBOUNDED - feature_oam_oam_internal_2_port: - type: tosca.capabilities.Node + network.incoming.bytes_oam_oam_oam_2_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_oam_oam_oam_2_port: + network.outgoing.bytes.rate_oam_oam_internal_2_port_0: 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_oam: + network.outgoing.bytes_oam_oam_internal_2_port_0: 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_oam: + network.incoming.bytes_oam_oam_internal_2_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2346,18 +2352,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_oam_oam_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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.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. - occurrences: - - 1 - - UNBOUNDED binding_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -2381,60 +2375,58 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_oam_oam_oam_2_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_oam: + disk.device.allocation_oam: 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_oam_oam_internal_2_port: + network.incoming.packets_oam_oam_oam_2_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_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_oam_oam_2_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_oam: + disk.ephemeral.size_oam: 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_oam_oam_oam_2_port: + disk.write.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. occurrences: - 1 - UNBOUNDED - instance_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_oam_oam_2_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_internal_2_port: + disk.capacity_oam: 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_oam_oam_internal_2_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes.rate_oam_oam_oam_2_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.outpoing.packets_oam_oam_internal_2_port: + instance_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2446,6 +2438,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_oam_oam_2_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED memory_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2464,55 +2464,47 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam_oam_2_port: + attachment_oam_oam_internal_2_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests.rate_oam: 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_oam_oam_oam_2_port: + forwarder_oam_oam_internal_2_port_0: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_internal_2_port: + disk.write.requests.rate_oam: 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_oam_oam_oam_2_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - disk.device.read.requests.rate_oam: + disk.device.latency_oam: 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_oam_oam_oam_2_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_oam: + network.incoming.packets.rate_oam_oam_internal_2_port_0: 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_oam: + disk.device.iops_oam: 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_oam: + network.outpoing.packets_oam_oam_oam_2_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: @@ -2543,24 +2535,16 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.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. - occurrences: - - 1 - - UNBOUNDED endpoint_oam: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_oam_oam_internal_2_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + network.incoming.packets.rate_oam_oam_oam_2_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: - - 0 + - 1 - UNBOUNDED disk.device.read.requests_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -2580,12 +2564,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam_internal_2_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_oam_oam_oam_2_port: + network.outgoing.bytes.rate_oam_oam_oam_2_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: @@ -2608,41 +2587,56 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_oam_oam_2_port: - type: tosca.capabilities.Attachment + disk.latency_oam: + 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_oam: + network.incoming.packets_oam_oam_internal_2_port_0: 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_oam_oam_oam_2_port: + network.outgoing.packets.rate_oam_oam_internal_2_port_0: 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_oam_oam_internal_2_port: + disk.write.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. occurrences: - 1 - UNBOUNDED - disk.write.bytes_oam: + network.outgoing.bytes_oam_oam_oam_2_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_oam_oam_oam_2_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_oam_oam_internal_2_port: + network.incoming.bytes.rate_oam_oam_internal_2_port_0: 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_oam_oam_internal_2_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - 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. @@ -2655,6 +2649,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_oam_internal_2_port_0: + 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 org.openecomp.resource.abstract.nodes.heat.tdcore_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -3324,44 +3324,58 @@ node_types: org.openecomp.resource.abstract.nodes.cdi_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cdi_internal_1_port_order: - type: integer + port_cdi_ims_core_1_port_1_fixed_ips: + type: list required: true status: SUPPORTED - port_cdi_ims_core_1_port_security_groups: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cdi_internal_1_port_network_role_tag: + port_cdi_ims_core_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - port_cdi_internal_1_port_related_networks: + port_cdi_ims_core_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_cdi_internal_1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - vm_flavor_name: - type: string + port_cdi_ims_core_1_port_1_security_groups: + type: list required: true status: SUPPORTED - port_cdi_ims_core_1_port_order: - type: integer + entry_schema: + type: json + port_cdi_ims_core_1_port_1_network_role_tag: + type: string required: true status: SUPPORTED - port_cdi_internal_1_port_security_groups: + port_cdi_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cdi_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_ims_core_1_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_image_name: type: string required: true @@ -3372,84 +3386,54 @@ node_types: status: SUPPORTED entry_schema: type: json - port_cdi_ims_core_1_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_cdi_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cdi_ims_core_1_port_name: + compute_cdi_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_1_port_subnetpoolid: + port_cdi_ims_core_1_port_1_network_role: type: string required: true status: SUPPORTED - compute_cdi_user_data_format: + port_cdi_ims_core_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_1_port_network: + port_cdi_internal_1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_cdi_availability_zone: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cdi_internal_1_port_network: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cdi_ims_core_1_port_ip_requirements: - type: list + port_cdi_ims_core_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_internal_1_port_allowed_address_pairs: + compute_cdi_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string compute_cdi_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_cdi_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cdi_ims_core_1_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3458,77 +3442,93 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cdi_ims_core_1_port_vlan_requirements: - type: list + port_cdi_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_1_port_network_role: + port_cdi_internal_1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_cdi_internal_1_port_vlan_requirements: + port_cdi_ims_core_1_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_cdi_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cdi_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cdi_internal_1_port_ip_requirements: + port_cdi_ims_core_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_ims_core_1_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_cdi_metadata: + type: string + port_cdi_ims_core_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cdi_internal_1_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_internal_1_port_0_allowed_address_pairs: + type: list required: true status: SUPPORTED - port_cdi_internal_1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_cdi_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + compute_cdi_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_cdi_internal_1_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_cdi_internal_1_port_0_order: + type: integer required: true status: SUPPORTED requirements: - - dependency_cdi_cdi_internal_1_port: + - dependency_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdi_cdi_internal_1_port: + - link_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3548,31 +3548,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cdi_cdi_ims_core_1_port: + - dependency_cdi_cdi_ims_core_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdi_cdi_ims_core_1_port: + - link_cdi_cdi_ims_core_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outpoing.packets_cdi_cdi_internal_1_port: + network.incoming.bytes_cdi_cdi_ims_core_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_cdi_cdi_ims_core_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_cdi: type: tosca.capabilities.Container valid_source_types: @@ -3592,53 +3587,42 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cdi: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cdi_cdi_internal_1_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_cdi: + network.outgoing.bytes.rate_cdi_cdi_ims_core_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 - forwarder_cdi_cdi_ims_core_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_cdi_cdi_ims_core_1_port: + disk.write.requests.rate_cdi: 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_cdi_cdi_ims_core_1_port: + network.incoming.packets_cdi_cdi_internal_1_port_0: 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_cdi_cdi_internal_1_port: + disk.device.write.requests.rate_cdi: 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_cdi_cdi_internal_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes.rate_cdi: 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_cdi_cdi_internal_1_port: + network.outpoing.packets_cdi_cdi_ims_core_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: @@ -3656,12 +3640,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_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. - occurrences: - - 1 - - UNBOUNDED cpu.delta_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3674,15 +3652,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_cdi_cdi_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. + forwarder_cdi_cdi_ims_core_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -3709,34 +3680,12 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cdi_cdi_ims_core_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_cdi_cdi_internal_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED vcpus_cdi: 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_cdi_cdi_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.device.read.requests_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3754,18 +3703,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cdi_cdi_ims_core_1_port: - type: tosca.capabilities.Attachment + memory.resident_cdi: + 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_cdi: + disk.latency_cdi: 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_cdi: + network.incoming.bytes_cdi_cdi_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3795,26 +3745,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_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. + forwarder_cdi_cdi_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.allocation_cdi: + network.incoming.packets.rate_cdi_cdi_internal_1_port_0: 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_cdi_cdi_ims_core_1_port: + disk.allocation_cdi: 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_cdi_cdi_internal_1_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_cdi_cdi_internal_1_port_0: + 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 @@ -3828,6 +3778,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_cdi_cdi_internal_1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3840,26 +3798,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_cdi: + attachment_cdi_cdi_ims_core_1_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_cdi_cdi_ims_core_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.usage_cdi: + disk.iops_cdi: 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_cdi_cdi_ims_core_1_port: + attachment_cdi_cdi_internal_1_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.usage_cdi: 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_cdi_cdi_internal_1_port: - type: tosca.capabilities.Node + network.outpoing.packets_cdi_cdi_internal_1_port_0: + 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 @@ -3875,9 +3844,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cdi_cdi_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. + feature_cdi_cdi_ims_core_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -3887,18 +3855,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cdi_cdi_ims_core_1_port: + network.incoming.bytes.rate_cdi_cdi_internal_1_port_0: 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_cdi_cdi_internal_1_port: + network.outgoing.bytes.rate_cdi_cdi_internal_1_port_0: 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_cdi_cdi_ims_core_1_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED binding_cdi: type: tosca.capabilities.network.Bindable occurrences: @@ -3922,13 +3898,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_cdi_cdi_ims_core_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_cdi_cdi_ims_core_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 instance_cdi: 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_cdi_cdi_internal_1_port: + network.incoming.packets.rate_cdi_cdi_ims_core_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: @@ -3940,6 +3928,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_cdi_cdi_internal_1_port_0: + 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_cdi_cdi_ims_core_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_cdi: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3949,51 +3949,55 @@ node_types: org.openecomp.resource.abstract.nodes.lbd_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_lbd_internal_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED compute_lbd_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_ims_core_0_port_2_ip_requirements: + type: list required: true status: SUPPORTED - port_lbd_dpdk_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_related_networks: + type: list required: true status: SUPPORTED - port_lbd_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_lbd_dpdk_0_port_related_networks: + port_lbd_internal_0_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - compute_lbd_availability_zone: + port_lbd_dpdk_0_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_0_port_allowed_address_pairs: + compute_lbd_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_0_port_subnetpoolid: + type: string + port_lbd_dpdk_0_port_1_network_role_tag: type: string required: true status: SUPPORTED @@ -4001,180 +4005,162 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_network: + port_lbd_ims_core_0_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_allowed_address_pairs: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_internal_0_port_name: + type: json + port_lbd_ims_core_0_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_0_port_network_role_tag: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_ims_core_0_port_2_subnetpoolid: type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_related_networks: + port_lbd_dpdk_0_port_1_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_lbd_dpdk_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED compute_lbd_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_lbd_dpdk_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_ip_requirements: + port_lbd_ims_core_0_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_0_port_network: + type: json + port_lbd_dpdk_0_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_network_role: + type: string required: true status: SUPPORTED - compute_lbd_name: + port_lbd_internal_0_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_0_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_vlan_requirements: - type: list + port_lbd_internal_0_port_0_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_config_drive: - type: list + port_lbd_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: boolean - port_lbd_internal_0_port_related_networks: + port_lbd_dpdk_0_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_0_port_fixed_ips: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_0_port_security_groups: - type: list + port_lbd_ims_core_0_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json - port_lbd_dpdk_0_port_security_groups: + port_lbd_dpdk_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_dpdk_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_0_port_name: + type: boolean + port_lbd_internal_0_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: + type: json + port_lbd_ims_core_0_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_network_role: - type: string + port_lbd_ims_core_0_port_2_order: + type: integer required: true status: SUPPORTED - port_lbd_dpdk_0_port_network: + port_lbd_dpdk_0_port_1_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_0_port_1_order: + type: integer required: true status: SUPPORTED - port_lbd_internal_0_port_order: - type: integer + port_lbd_ims_core_0_port_2_name: + type: list required: true status: SUPPORTED - port_lbd_dpdk_0_port_network_role: + entry_schema: + type: string + port_lbd_dpdk_0_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_2_allowed_address_pairs: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -4183,69 +4169,83 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_lbd_ims_core_0_port_fixed_ips: + port_lbd_ims_core_0_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_internal_0_port_fixed_ips: + type: string + port_lbd_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_lbd_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_lbd_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED compute_lbd_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_internal_0_port_ip_requirements: + port_lbd_dpdk_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string requirements: - - dependency_lbd_lbd_ims_core_0_port: + - dependency_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_ims_core_0_port: + - link_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_dpdk_0_port: + - dependency_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_dpdk_0_port: + - link_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_lbd_lbd_internal_0_port: + - dependency_lbd_lbd_ims_core_0_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_lbd_lbd_internal_0_port: + - link_lbd_lbd_ims_core_0_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -4272,127 +4272,158 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_lbd_lbd_ims_core_0_port: - type: tosca.capabilities.Attachment + disk.write.requests.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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_lbd_lbd_ims_core_0_port: + disk.write.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. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_lbd: + instance_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 - disk.write.bytes.rate_lbd: + binding_lbd_lbd_dpdk_0_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.iops_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 + host_lbd: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_lbd_lbd_internal_0_port_0: 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_lbd_lbd_internal_0_port: + disk.device.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 - instance_lbd: + network.outgoing.bytes.rate_lbd_lbd_ims_core_0_port_2: 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_lbd_lbd_internal_0_port: + network.outgoing.packets.rate_lbd_lbd_dpdk_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.iops_lbd: + cpu_util_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 - network.outgoing.bytes_lbd_lbd_ims_core_0_port: + disk.device.read.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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_lbd_lbd_ims_core_0_port: + network.outpoing.packets_lbd_lbd_dpdk_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_lbd_lbd_dpdk_0_port: + memory.usage_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 - network.incoming.bytes_lbd_lbd_dpdk_0_port: + network.incoming.packets.rate_lbd_lbd_dpdk_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_lbd: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.bytes.rate_lbd_lbd_dpdk_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.capacity_lbd: + feature_lbd_lbd_internal_0_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_lbd_lbd_ims_core_0_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.read.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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_lbd_lbd_ims_core_0_port: + network.incoming.packets_lbd_lbd_dpdk_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 - cpu_util_lbd: + network.incoming.packets.rate_lbd_lbd_ims_core_0_port_2: 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_lbd: + cpu.delta_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 - network.outpoing.packets_lbd_lbd_internal_0_port: + memory_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 - memory.usage_lbd: + network.outpoing.packets_lbd_lbd_ims_core_0_port_2: 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_lbd_lbd_dpdk_0_port: + disk.write.bytes_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 - binding_lbd_lbd_internal_0_port: + binding_lbd_lbd_internal_0_port_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -4400,66 +4431,60 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.read.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. + scalable_lbd: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_lbd: + network.incoming.bytes.rate_lbd_lbd_internal_0_port_0: 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_lbd_lbd_ims_core_0_port: + network.outgoing.bytes_lbd_lbd_ims_core_0_port_2: 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_lbd: + disk.device.read.requests.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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_lbd_lbd_dpdk_0_port: + disk.root.size_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 - disk.write.bytes_lbd: + network.outgoing.bytes.rate_lbd_lbd_dpdk_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_lbd_lbd_internal_0_port: + network.outgoing.packets.rate_lbd_lbd_ims_core_0_port_2: 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_lbd: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_lbd: + vcpus_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 - disk.root.size_lbd: + network.incoming.packets_lbd_lbd_internal_0_port_0: 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_lbd: + network.outgoing.packets.rate_lbd_lbd_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -4471,8 +4496,8 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_lbd_lbd_dpdk_0_port: - type: tosca.capabilities.Attachment + forwarder_lbd_lbd_dpdk_0_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4482,6 +4507,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_lbd_lbd_ims_core_0_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED os_lbd: type: tosca.capabilities.OperatingSystem occurrences: @@ -4499,66 +4532,55 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_lbd: + network.incoming.packets_lbd_lbd_ims_core_0_port_2: 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_lbd: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_lbd_lbd_internal_0_port: + disk.read.bytes_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 - network.outgoing.bytes.rate_lbd_lbd_internal_0_port: + network.incoming.bytes.rate_lbd_lbd_ims_core_0_port_2: 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_lbd_lbd_ims_core_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + attachment_lbd_lbd_ims_core_0_port_2: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - network.incoming.packets_lbd_lbd_dpdk_0_port: + network.incoming.bytes_lbd_lbd_internal_0_port_0: 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_lbd_lbd_internal_0_port: + network.incoming.packets.rate_lbd_lbd_internal_0_port_0: 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_lbd_lbd_dpdk_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - forwarder_lbd_lbd_ims_core_0_port: - type: org.openecomp.capabilities.Forwarder + network.outpoing.packets_lbd_lbd_internal_0_port_0: + 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_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. + forwarder_lbd_lbd_ims_core_0_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -4568,51 +4590,45 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_lbd: - type: tosca.capabilities.Endpoint.Admin + attachment_lbd_lbd_dpdk_0_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_lbd: + network.outgoing.bytes.rate_lbd_lbd_internal_0_port_0: 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_lbd_lbd_internal_0_port: - type: tosca.capabilities.Node + endpoint_lbd: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_lbd: + disk.device.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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_lbd_lbd_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. + forwarder_lbd_lbd_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_lbd_lbd_ims_core_0_port: + disk.device.write.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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_lbd_lbd_dpdk_0_port: + network.outgoing.bytes_lbd_lbd_dpdk_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 - attachment_lbd_lbd_internal_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.iops_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4637,12 +4653,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_lbd_lbd_dpdk_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_lbd: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -4655,8 +4665,8 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_lbd_lbd_internal_0_port: - type: org.openecomp.capabilities.Forwarder + attachment_lbd_lbd_internal_0_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -4666,13 +4676,14 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_lbd_lbd_dpdk_0_port: - type: org.openecomp.capabilities.Forwarder + feature_lbd: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_lbd: - type: tosca.capabilities.Node + network.incoming.bytes_lbd_lbd_ims_core_0_port_2: + 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 @@ -4693,17 +4704,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_lbd_lbd_dpdk_0_port: + feature_lbd_lbd_dpdk_0_port_1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_lbd_lbd_ims_core_0_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_lbd_lbd_ims_core_0_port: + network.incoming.bytes_lbd_lbd_dpdk_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: @@ -4715,12 +4721,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_lbd_lbd_dpdk_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 org.openecomp.resource.abstract.nodes.cif_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -4730,18 +4730,30 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_ims_core_1_port_security_groups: - type: list + port_cif_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json port_cif_oam_1_port_3_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_1_port_2_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4752,10 +4764,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_internal_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true @@ -4770,6 +4778,14 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_core_1_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cif_internal_1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_image_name: type: string required: true @@ -4790,70 +4806,54 @@ node_types: type: string required: true status: SUPPORTED - compute_cif_scheduler_hints: + port_cif_internal_1_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cif_ims_li_1_port_order: - type: integer + type: org.openecomp.datatypes.heat.network.AddressPair + compute_cif_scheduler_hints: + type: list required: true status: SUPPORTED + entry_schema: + type: json port_cif_oam_1_port_3_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_1_port_security_groups: + port_cif_ims_core_1_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_name: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string port_cif_oam_1_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_internal_1_port_order: + port_cif_internal_1_port_0_order: type: integer required: true status: SUPPORTED - port_cif_ims_core_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cif_ims_li_1_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_cif_ims_li_1_port_subnetpoolid: + port_cif_ims_li_1_port_4_network_role_tag: type: string required: true status: SUPPORTED - port_cif_ims_core_1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_1_port_allowed_address_pairs: + port_cif_internal_1_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_3_security_groups: type: list required: true @@ -4866,59 +4866,63 @@ node_types: status: SUPPORTED entry_schema: type: json - port_cif_ims_li_1_port_network_role: + port_cif_internal_1_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_cif_ims_core_1_port_order: - type: integer + port_cif_ims_core_1_port_2_allowed_address_pairs: + type: list required: true status: SUPPORTED - port_cif_oam_1_port_3_order: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_1_port_4_order: type: integer required: true status: SUPPORTED - port_cif_internal_1_port_vlan_requirements: + port_cif_ims_core_1_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cif_internal_1_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_1_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json + port_cif_oam_1_port_3_order: + type: integer + required: true + status: SUPPORTED port_cif_oam_1_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_1_port_network: + port_cif_oam_1_port_3_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cif_ims_core_1_port_network: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cif_oam_1_port_3_fixed_ips: + port_cif_ims_li_1_port_4_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_exCP_naming: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -4926,10 +4930,12 @@ node_types: type: string required: true status: SUPPORTED - port_cif_internal_1_port_network_role: - type: string + port_cif_ims_core_1_port_2_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_cif_oam_1_port_1_ip_requirements: type: list required: true @@ -4940,11 +4946,7 @@ node_types: type: integer required: true status: SUPPORTED - port_cif_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_core_1_port_vlan_requirements: + port_cif_ims_li_1_port_4_vlan_requirements: type: list required: true status: SUPPORTED @@ -4954,10 +4956,6 @@ node_types: type: string required: true status: SUPPORTED - port_cif_internal_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED compute_cif_name: type: list required: true @@ -4980,62 +4978,58 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cif_internal_1_port_ip_requirements: + port_cif_ims_core_1_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_name: + type: string + port_cif_ims_li_1_port_4_network_role: + type: string + required: true + status: SUPPORTED + port_cif_internal_1_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cif_internal_1_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_ims_li_1_port_fixed_ips: + port_cif_ims_li_1_port_4_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_li_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_li_1_port_ip_requirements: + port_cif_ims_li_1_port_4_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_1_port_fixed_ips: + type: json + port_cif_ims_li_1_port_4_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_allowed_address_pairs: + type: string + port_cif_internal_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_1_port_1_network_role_tag: type: string required: true @@ -5044,28 +5038,22 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_ims_core_1_port_ip_requirements: + port_cif_oam_1_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_network: - type: list + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_core_1_port_2_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cif_oam_1_port_1_related_networks: + port_cif_internal_1_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_core_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -5074,48 +5062,60 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_cif_internal_1_port_fixed_ips: + port_cif_ims_core_1_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_name: + type: org.openecomp.datatypes.network.VlanRequirements + compute_cif_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_cif_config_drive: + type: boolean + port_cif_ims_core_1_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_li_1_port_4_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_li_1_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED port_cif_oam_1_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cif_oam_1_port_3_name: + port_cif_ims_li_1_port_4_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_cif_ims_li_1_port_related_networks: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_network_role_tag: - type: string + port_cif_internal_1_port_0_network: + type: list required: true status: SUPPORTED - port_cif_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: string + port_cif_oam_1_port_3_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_cif_oam_1_port_1_security_groups: type: list required: true @@ -5128,8 +5128,8 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_1_port_network_role: - type: string + port_cif_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED port_cif_oam_1_port_3_network_role_tag: @@ -5151,66 +5151,66 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cif_cif_ims_li_1_port: + - dependency_cif_cif_ims_li_1_port_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_li_1_port: + - link_cif_cif_ims_li_1_port_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_internal_1_port: + - dependency_cif_cif_oam_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_internal_1_port: + - link_cif_cif_oam_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_1_port_1: + - dependency_cif_cif_oam_1_port_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_1_port_1: + - link_cif_cif_oam_1_port_3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_ims_core_1_port: + - dependency_cif_cif_internal_1_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_core_1_port: + - link_cif_cif_internal_1_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_1_port_3: + - dependency_cif_cif_ims_core_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_1_port_3: + - link_cif_cif_ims_core_1_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -5228,6 +5228,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cif_cif_ims_li_1_port_4: + 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. @@ -5245,8 +5251,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cif_cif_ims_li_1_port: - type: tosca.capabilities.Attachment + network.outgoing.bytes_cif_cif_internal_1_port_0: + 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 @@ -5256,13 +5263,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.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. + attachment_cif_cif_internal_1_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_core_1_port: + feature_cif_cif_internal_1_port_0: type: tosca.capabilities.Node occurrences: - 1 @@ -5273,18 +5279,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_1_port_1: + network.outgoing.bytes.rate_cif_cif_ims_core_1_port_2: 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_ims_li_1_port_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + 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 + binding_cif_cif_internal_1_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + forwarder_cif_cif_ims_li_1_port_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED 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. @@ -5313,31 +5337,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_core_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_3: + network.outpoing.packets_cif_cif_ims_core_1_port_2: 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.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 - network.incoming.bytes_cif_cif_oam_1_port_1: + 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.usage_cif: + network.incoming.bytes.rate_cif_cif_ims_li_1_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5349,25 +5373,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_cif: + network.incoming.bytes.rate_cif_cif_internal_1_port_0: 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.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 - network.incoming.packets.rate_cif_cif_ims_core_1_port: + 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.outgoing.packets.rate_cif_cif_internal_1_port: + network.outgoing.packets.rate_cif_cif_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5379,31 +5403,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_cif: + network.incoming.packets_cif_cif_internal_1_port_0: 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.outgoing.packets.rate_cif_cif_ims_core_1_port_2: 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.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.outgoing.packets.rate_cif_cif_ims_li_1_port: + 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.bytes.rate_cif_cif_ims_li_1_port: + 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: @@ -5414,9 +5438,8 @@ node_types: occurrences: - 1 - UNBOUNDED - 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. + attachment_cif_cif_ims_core_1_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -5426,7 +5449,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_core_1_port: + network.outpoing.packets_cif_cif_internal_1_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5455,25 +5478,25 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_cif: + network.outpoing.packets_cif_cif_ims_li_1_port_4: 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: + network.incoming.packets.rate_cif_cif_ims_core_1_port_2: 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_1_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 - network.outgoing.bytes.rate_cif_cif_ims_li_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: @@ -5497,25 +5520,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cif_cif_internal_1_port: + network.incoming.bytes_cif_cif_ims_core_1_port_2: 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. + forwarder_cif_cif_internal_1_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_internal_1_port: + network.outgoing.bytes_cif_cif_ims_li_1_port_4: 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: + 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: @@ -5527,53 +5549,47 @@ node_types: occurrences: - 1 - UNBOUNDED - 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. + feature_cif: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_ims_core_1_port: + network.incoming.packets.rate_cif_cif_ims_li_1_port_4: 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: + 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 - feature_cif: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_cif_cif_ims_core_1_port: + network.incoming.bytes_cif_cif_ims_li_1_port_4: 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_util_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 - 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. + attachment_cif_cif_ims_li_1_port_4: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_cif_cif_ims_li_1_port: - type: tosca.capabilities.Node + 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.packets_cif_cif_oam_1_port_3: + network.outgoing.packets.rate_cif_cif_ims_li_1_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -5591,13 +5607,12 @@ node_types: occurrences: - 1 - 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. + feature_cif_cif_ims_core_1_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_internal_1_port: + 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: @@ -5615,25 +5630,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cif_cif_internal_1_port: + network.outgoing.bytes_cif_cif_ims_core_1_port_2: 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 - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - attachment_cif_cif_ims_core_1_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED attachment_cif_cif_oam_1_port_3: type: tosca.capabilities.Attachment occurrences: @@ -5645,12 +5647,6 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 host_cif: type: tosca.capabilities.Container valid_source_types: @@ -5674,11 +5670,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_core_1_port_2: + 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 occurrences: - 1 - UNBOUNDED + network.incoming.packets_cif_cif_ims_li_1_port_4: + 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: @@ -5687,8 +5695,9 @@ node_types: occurrences: - 0 - UNBOUNDED - feature_cif_cif_internal_1_port: - type: tosca.capabilities.Node + network.incoming.packets_cif_cif_ims_core_1_port_2: + 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 @@ -5700,36 +5709,45 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.bytes.rate_cif: + network.incoming.bytes_cif_cif_internal_1_port_0: 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: + 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 - disk.read.bytes.rate_cif: + network.outgoing.bytes.rate_cif_cif_internal_1_port_0: 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_cif_cif_internal_1_port: - type: org.openecomp.capabilities.Forwarder + binding_cif_cif_ims_core_1_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - 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. occurrences: - 1 - UNBOUNDED - disk.write.requests_cif: + 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 - binding_cif_cif_ims_li_1_port: + binding_cif_cif_ims_li_1_port_4: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -5737,78 +5755,60 @@ node_types: occurrences: - 0 - UNBOUNDED - memory_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 - network.outgoing.packets.rate_cif_cif_ims_core_1_port: + network.incoming.packets.rate_cif_cif_internal_1_port_0: 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: + 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.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_ims_core_1_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_oam_1_port_3: + 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 - binding_cif_cif_internal_1_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.packets_cif_cif_oam_1_port_1: + 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 - forwarder_cif_cif_ims_core_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_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 - forwarder_cif_cif_ims_li_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - disk.device.write.requests.rate_cif: + 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 - 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.packets_cif_cif_ims_li_1_port: + 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: @@ -6347,62 +6347,68 @@ node_types: org.openecomp.resource.abstract.nodes.oam: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_oam_oam_0_port_name: + port_oam_oam_0_port_1_network_role: + type: string + required: true + status: SUPPORTED + port_oam_oam_0_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_internal_0_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_oam_internal_0_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_oam_internal_0_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + vm_flavor_name: type: string required: true status: SUPPORTED - port_oam_oam_0_port_fixed_ips: + port_oam_internal_0_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_0_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_oam_oam_0_port_vlan_requirements: + port_oam_oam_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_0_port_mac_requirements: + port_oam_internal_0_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_oam_internal_0_port_ip_requirements: + port_oam_oam_0_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_oam_oam_0_port_order: - type: integer - required: true - status: SUPPORTED - port_oam_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_oam_oam_0_port_1_order: + type: integer + required: true + status: SUPPORTED vm_image_name: type: string required: true @@ -6413,46 +6419,48 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_oam_oam_0_port_network_role: + port_oam_oam_0_port_1_allowed_address_pairs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_internal_0_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_oam_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_oam_internal_0_port_name: + port_oam_internal_0_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_oam_0_port_allowed_address_pairs: + port_oam_oam_0_port_1_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_security_groups: + type: string + port_oam_oam_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_oam_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_oam_internal_0_port_fixed_ips: + port_oam_oam_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_oam_oam_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -6461,7 +6469,11 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_oam_oam_0_port_related_networks: + port_oam_internal_0_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_oam_internal_0_port_0_related_networks: type: list required: true status: SUPPORTED @@ -6473,32 +6485,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_oam_oam_0_port_network: + port_oam_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_oam_oam_0_port_1_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_oam_internal_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_oam_internal_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_oam_oam_0_port_ip_requirements: + port_oam_internal_0_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_oam_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_subnetpoolid: + type: string required: true status: SUPPORTED compute_oam_scheduler_hints: @@ -6507,18 +6511,10 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_internal_0_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_vlan_requirements: - type: list + port_oam_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_availability_zone: type: list required: true @@ -6537,34 +6533,25 @@ node_types: status: SUPPORTED entry_schema: type: string - port_oam_oam_0_port_security_groups: + port_oam_internal_0_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_0_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED requirements: - - dependency_oam_oam_oam_0_port: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_oam_oam_oam_0_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_oam_oam_internal_0_port: + - dependency_oam_oam_internal_0_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_oam_internal_0_port: + - link_oam_oam_internal_0_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -6584,31 +6571,30 @@ node_types: occurrences: - 0 - UNBOUNDED - capabilities: - cpu_oam: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - dependency_oam_oam_oam_0_port_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - attachment_oam_oam_oam_0_port: - type: tosca.capabilities.Attachment + - link_oam_oam_oam_0_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED - network.incoming.packets_oam_oam_oam_0_port: + - 1 + capabilities: + cpu_oam: 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_oam_oam_oam_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + feature_oam_oam_internal_0_port_0: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED disk.usage_oam: type: org.openecomp.capabilities.metric.Ceilometer @@ -6628,39 +6614,32 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_oam_internal_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - 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. occurrences: - 1 - UNBOUNDED - forwarder_oam_oam_oam_0_port: - type: org.openecomp.capabilities.Forwarder + network.incoming.bytes_oam_oam_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_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. + scalable_oam: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam_internal_0_port: + network.outgoing.bytes_oam_oam_internal_0_port_0: 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_oam: - type: tosca.capabilities.Scalable + network.incoming.bytes_oam_oam_internal_0_port_0: + 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 @@ -6681,6 +6660,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_oam_oam_oam_0_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_oam: type: tosca.capabilities.network.Bindable occurrences: @@ -6692,7 +6676,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_oam_internal_0_port: + network.outgoing.bytes.rate_oam_oam_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -6710,47 +6694,47 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_oam: + network.incoming.packets_oam_oam_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.outpoing.packets_oam_oam_internal_0_port: + disk.device.allocation_oam: 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_oam_oam_oam_0_port: - type: tosca.capabilities.Node + forwarder_oam_oam_oam_0_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_oam_oam_0_port: + disk.ephemeral.size_oam: 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_oam: + disk.write.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. occurrences: - 1 - UNBOUNDED - attachment_oam_oam_internal_0_port: + attachment_oam_oam_oam_0_port_1: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.write.requests_oam: + disk.capacity_oam: 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.capacity_oam: + network.incoming.bytes.rate_oam_oam_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: @@ -6762,20 +6746,36 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_oam_oam_internal_0_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.root.size_oam: 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_oam_oam_internal_0_port: + binding_oam_oam_oam_0_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.packets.rate_oam_oam_internal_0_port_0: 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_oam_oam_internal_0_port: - type: tosca.capabilities.Node + attachment_oam_oam_internal_0_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -6797,55 +6797,54 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_oam_internal_0_port: + disk.device.read.requests.rate_oam: 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_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. + forwarder_oam_oam_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_oam: + disk.write.requests.rate_oam: 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_oam: + disk.device.latency_oam: 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_oam: + disk.device.iops_oam: 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_oam_oam_internal_0_port: + vcpus_oam: 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_oam: + disk.device.write.requests.rate_oam: 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_oam: + network.incoming.packets.rate_oam_oam_internal_0_port_0: 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_oam: + network.incoming.packets.rate_oam_oam_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: @@ -6864,6 +6863,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_oam_internal_0_port_0: + 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_oam: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -6875,95 +6880,90 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_oam_oam_0_port: + disk.iops_oam: 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_oam: + disk.read.bytes.rate_oam: 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_oam: + network.outgoing.bytes.rate_oam_oam_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_oam_oam_internal_0_port: + network.outpoing.packets_oam_oam_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.rate_oam_oam_oam_0_port: + cpu_util_oam: 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_oam_oam_internal_0_port: - type: org.openecomp.capabilities.Forwarder + os_oam: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_oam_oam_0_port: + memory.usage_oam: 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_util_oam: + disk.latency_oam: 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_oam: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - memory.usage_oam: + network.outgoing.packets.rate_oam_oam_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_oam: + network.incoming.packets_oam_oam_internal_0_port_0: 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_oam_oam_oam_0_port: + disk.write.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. occurrences: - 1 - UNBOUNDED - disk.write.bytes_oam: + network.outgoing.bytes_oam_oam_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.read.requests_oam: + network.incoming.bytes.rate_oam_oam_internal_0_port_0: 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_oam: + 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. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_oam_oam_0_port: + disk.device.capacity_oam: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -7623,12 +7623,10 @@ node_types: org.openecomp.resource.abstract.nodes.cif: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_cif_ims_core_0_port_network: - type: list + port_cif_internal_0_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string port_cif_oam_0_port_1_name: type: list required: true @@ -7641,44 +7639,56 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_oam_0_port_1_fixed_ips: + port_cif_internal_0_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_0_port_related_networks: + type: json + port_cif_internal_0_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cif_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cif_internal_0_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_0_port_network_role: - type: string + port_cif_oam_0_port_1_fixed_ips: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_li_0_port_4_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_cif_internal_0_port_name: + port_cif_ims_core_0_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_0_port_1_order: type: integer required: true status: SUPPORTED - port_cif_internal_0_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_core_0_port_network_role: - type: string + port_cif_oam_0_port_3_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED port_cif_oam_0_port_1_exCP_naming: @@ -7691,10 +7701,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_oam_0_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED vm_image_name: type: string required: true @@ -7711,69 +7717,71 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_0_port_related_networks: + port_cif_ims_li_0_port_4_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_li_0_port_fixed_ips: + port_cif_ims_li_0_port_4_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string compute_cif_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: type: json + port_cif_ims_li_0_port_4_subnetpoolid: + type: string + required: true + status: SUPPORTED port_cif_oam_0_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cif_internal_0_port_network_role: - type: string + port_cif_internal_0_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_cif_ims_li_0_port_ip_requirements: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: string compute_cif_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_cif_oam_0_port_3_subnetpoolid: - type: string + port_cif_internal_0_port_0_order: + type: integer required: true status: SUPPORTED - port_cif_ims_li_0_port_name: - type: list + port_cif_oam_0_port_3_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_cif_ims_core_0_port_fixed_ips: - type: list + port_cif_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_0_port_order: + port_cif_ims_li_0_port_4_order: type: integer required: true status: SUPPORTED @@ -7785,30 +7793,20 @@ node_types: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_network_role: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cif_internal_0_port_subnetpoolid: + port_cif_ims_core_0_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_security_groups: + port_cif_ims_core_0_port_2_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_3_related_networks: type: list required: true @@ -7819,40 +7817,18 @@ node_types: type: string required: true status: SUPPORTED - port_cif_ims_core_0_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_cif_oam_0_port_3_order: type: integer required: true status: SUPPORTED - port_cif_internal_0_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_cif_ims_core_0_port_order: - type: integer - required: true - status: SUPPORTED port_cif_oam_0_port_3_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_cif_ims_core_0_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_internal_0_port_0_network_role_tag: + type: string required: true status: SUPPORTED port_cif_oam_0_port_1_network: @@ -7861,16 +7837,22 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_ims_li_0_port_security_groups: + port_cif_ims_li_0_port_4_network_role: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_0_port_4_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_cif_ims_li_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_name: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_cif_oam_0_port_3_vlan_requirements: type: list required: true @@ -7883,10 +7865,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_internal_0_port_order: - type: integer - required: true - status: SUPPORTED compute_cif_availability_zone: type: list required: true @@ -7897,74 +7875,68 @@ node_types: type: string required: true status: SUPPORTED - port_cif_oam_0_port_3_mac_requirements: + port_cif_ims_li_0_port_4_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_ims_core_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json + port_cif_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_cif_oam_0_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_cif_oam_0_port_3_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_0_port_network_role_tag: + port_cif_internal_0_port_0_network_role: type: string required: true status: SUPPORTED - port_cif_ims_li_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_cif_ims_li_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_cif_internal_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_cif_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_cif_ims_li_0_port_network: + port_cif_internal_0_port_0_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_ims_li_0_port_related_networks: + port_cif_ims_li_0_port_4_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_internal_0_port_security_groups: - type: list + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_ims_core_0_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json - port_cif_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cif_ims_li_0_port_4_fixed_ips: + type: list required: true status: SUPPORTED - port_cif_ims_li_0_port_network_role_tag: - type: string + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_allowed_address_pairs: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -7979,57 +7951,85 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_0_port_fixed_ips: + port_cif_internal_0_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_cif_ims_core_0_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_0_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_cif_ims_core_0_port_2_network_role: + type: string + required: true + status: SUPPORTED compute_cif_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_cif_oam_0_port_3_name: + port_cif_ims_li_0_port_4_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_ims_li_0_port_vlan_requirements: + port_cif_ims_core_0_port_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_0_port_2_order: + type: integer + required: true + status: SUPPORTED + port_cif_oam_0_port_3_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string port_cif_oam_0_port_3_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_cif_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_ims_core_0_port_2_fixed_ips: + type: list required: true status: SUPPORTED - port_cif_internal_0_port_allowed_address_pairs: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_0_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_oam_0_port_3_ip_requirements: + port_cif_ims_li_0_port_4_network_role_tag: + type: string + required: true + status: SUPPORTED + port_cif_ims_li_0_port_4_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_0_port_ip_requirements: + type: json + port_cif_oam_0_port_3_ip_requirements: type: list required: true status: SUPPORTED @@ -8050,66 +8050,66 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cif_cif_internal_0_port: + - dependency_cif_cif_ims_li_0_port_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_internal_0_port: + - link_cif_cif_ims_li_0_port_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_ims_li_0_port: + - dependency_cif_cif_oam_0_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_li_0_port: + - link_cif_cif_oam_0_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_ims_core_0_port: + - dependency_cif_cif_internal_0_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_ims_core_0_port: + - link_cif_cif_internal_0_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_0_port_1: + - dependency_cif_cif_oam_0_port_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_0_port_1: + - link_cif_cif_oam_0_port_3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_cif_cif_oam_0_port_3: + - dependency_cif_cif_ims_core_0_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cif_cif_oam_0_port_3: + - link_cif_cif_ims_core_0_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -8121,12 +8121,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_cif_cif_ims_li_0_port_4: + type: tosca.capabilities.Node + 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 + network.outgoing.bytes.rate_cif_cif_ims_li_0_port_4: + 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. @@ -8144,18 +8155,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cif_cif_internal_0_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_cif_cif_oam_0_port_3: + network.outgoing.bytes_cif_cif_internal_0_port_0: 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.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: @@ -8167,32 +8173,25 @@ node_types: occurrences: - 1 - UNBOUNDED - 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. + attachment_cif_cif_internal_0_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_ims_li_0_port: + 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.outgoing.bytes.rate_cif_cif_ims_core_0_port_2: 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_cif_cif_ims_core_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - 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. + feature_cif_cif_internal_0_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -8214,37 +8213,24 @@ node_types: occurrences: - 1 - UNBOUNDED - 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.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 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 - 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. + forwarder_cif_cif_internal_0_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - network.incoming.packets_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 - network.incoming.packets_cif_cif_ims_core_0_port: + network.outgoing.bytes_cif_cif_ims_li_0_port_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8256,13 +8242,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_cif: + network.incoming.packets.rate_cif_cif_ims_li_0_port_4: 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.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: @@ -8286,30 +8272,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cif_cif_internal_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 - attachment_cif_cif_ims_li_0_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.outgoing.packets.rate_cif_cif_ims_li_0_port: + 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 - disk.device.allocation_cif: + network.incoming.bytes_cif_cif_internal_0_port_0: 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: + endpoint_cif: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + binding_cif_cif_ims_core_0_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -8317,73 +8309,55 @@ node_types: 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.read.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 - vcpus_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 - network.incoming.packets.rate_cif_cif_internal_0_port: + 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 - endpoint_cif: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.device.usage_cif: + network.outpoing.packets_cif_cif_ims_li_0_port_4: 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_cif_cif_ims_li_0_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_cif_cif_oam_0_port_1: + 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 - network.incoming.bytes_cif_cif_oam_0_port_1: + network.incoming.packets.rate_cif_cif_ims_core_0_port_2: 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: - 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_core_0_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cif_cif_ims_core_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.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. + forwarder_cif_cif_ims_core_0_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8393,7 +8367,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_ims_core_0_port: + network.outpoing.packets_cif_cif_ims_core_0_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8410,12 +8384,6 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 feature_cif_cif_oam_0_port_1: type: tosca.capabilities.Node occurrences: @@ -8439,14 +8407,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_cif: + network.outgoing.bytes_cif_cif_ims_core_0_port_2: 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_cif_cif_internal_0_port: - type: org.openecomp.capabilities.Forwarder + 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 @@ -8455,16 +8424,46 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_li_0_port_4: + 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_cif_cif_oam_0_port_3: type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_cif_cif_ims_core_0_port_2: + 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_0_port_2: + 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_internal_0_port_0: + 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 occurrences: - 1 - UNBOUNDED + network.incoming.packets_cif_cif_ims_li_0_port_4: + 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_1: type: tosca.capabilities.network.Bindable valid_source_types: @@ -8473,12 +8472,6 @@ node_types: occurrences: - 0 - UNBOUNDED - 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_oam_0_port_3: type: tosca.capabilities.network.Bindable valid_source_types: @@ -8499,53 +8492,51 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_cif_cif_internal_0_port: + network.incoming.bytes_cif_cif_ims_li_0_port_4: 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 - occurrences: - - 1 - - UNBOUNDED 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 + attachment_cif_cif_ims_li_0_port_4: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED 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 - feature_cif_cif_ims_li_0_port: - type: tosca.capabilities.Node + 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.bytes_cif_cif_oam_0_port_3: + 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.outgoing.bytes_cif_cif_oam_0_port_1: + network.outgoing.packets.rate_cif_cif_ims_li_0_port_4: 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 - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + feature_cif_cif_ims_core_0_port_2: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED disk.allocation_cif: type: org.openecomp.capabilities.metric.Ceilometer @@ -8559,13 +8550,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_cif: + network.incoming.bytes_cif_cif_ims_core_0_port_2: 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: + 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: @@ -8601,56 +8592,57 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cif_cif_ims_li_0_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.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 - disk.iops_cif: + network.outgoing.bytes.rate_cif_cif_internal_0_port_0: 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: + 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.rate_cif_cif_ims_core_0_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 - disk.write.requests_cif: + network.outpoing.packets_cif_cif_internal_0_port_0: 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: + binding_cif_cif_ims_li_0_port_4: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.packets.rate_cif_cif_internal_0_port_0: 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 + 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 - network.outgoing.bytes.rate_cif_cif_ims_core_0_port: + 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: @@ -8668,14 +8660,16 @@ node_types: occurrences: - 1 - UNBOUNDED - 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. + binding_cif_cif_internal_0_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - feature_cif_cif_ims_core_0_port: - type: tosca.capabilities.Node + forwarder_cif_cif_ims_li_0_port_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -8695,7 +8689,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cif_cif_internal_0_port: + network.incoming.bytes.rate_cif_cif_internal_0_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -8707,7 +8701,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cif_cif_internal_0_port: + network.outgoing.packets.rate_cif_cif_internal_0_port_0: + 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_0_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -9227,4 +9227,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index 992afcd3c6..cd6075a9f2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -1849,31 +1849,31 @@ topology_template: node: oam_oam_vip_1_port relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_internal_0_port + capability: attachment_oam_oam_internal_0_port_0 node: abstract_oam relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_oam_0_port + capability: attachment_oam_oam_oam_0_port_1 node: abstract_oam relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_internal_1_port + capability: attachment_oam_oam_internal_1_port_0 node: abstract_oam_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_oam_1_port + capability: attachment_oam_oam_oam_1_port_1 node: abstract_oam_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_internal_2_port + capability: attachment_oam_oam_internal_2_port_0 node: abstract_oam_2 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_oam_oam_2_port + capability: attachment_oam_oam_oam_2_port_1 node: abstract_oam_2 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_internal_0_port + capability: attachment_cif_cif_internal_0_port_0 node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: @@ -1881,7 +1881,7 @@ topology_template: node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_core_0_port + capability: attachment_cif_cif_ims_core_0_port_2 node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: @@ -1889,11 +1889,11 @@ topology_template: node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_li_0_port + capability: attachment_cif_cif_ims_li_0_port_4 node: abstract_cif relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_internal_1_port + capability: attachment_cif_cif_internal_1_port_0 node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: @@ -1901,7 +1901,7 @@ topology_template: node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_core_1_port + capability: attachment_cif_cif_ims_core_1_port_2 node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: @@ -1909,47 +1909,47 @@ topology_template: node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cif_cif_ims_li_1_port + capability: attachment_cif_cif_ims_li_1_port_4 node: abstract_cif_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_internal_0_port + capability: attachment_lbd_lbd_internal_0_port_0 node: abstract_lbd_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_dpdk_0_port + capability: attachment_lbd_lbd_dpdk_0_port_1 node: abstract_lbd_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_ims_core_0_port + capability: attachment_lbd_lbd_ims_core_0_port_2 node: abstract_lbd_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_internal_1_port + capability: attachment_lbd_lbd_internal_1_port_0 node: abstract_lbd relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_dpdk_1_port + capability: attachment_lbd_lbd_dpdk_1_port_1 node: abstract_lbd relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_lbd_lbd_ims_core_1_port + capability: attachment_lbd_lbd_ims_core_1_port_2 node: abstract_lbd relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_internal_0_port + capability: attachment_cdi_cdi_internal_0_port_0 node: abstract_cdi relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_ims_core_0_port + capability: attachment_cdi_cdi_ims_core_0_port_1 node: abstract_cdi relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_internal_1_port + capability: attachment_cdi_cdi_internal_1_port_0 node: abstract_cdi_1 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdi_cdi_ims_core_1_port + capability: attachment_cdi_cdi_ims_core_1_port_1 node: abstract_cdi_1 relationship: org.openecomp.relationships.AttachesTo - port: @@ -2071,66 +2071,59 @@ topology_template: directives: - substitutable properties: - port_cdi_ims_core_1_port_security_groups: + port_cdi_ims_core_1_port_1_fixed_ips: + - ip_address: + get_input: cdi_ims_core_v6_ip_1 + port_cdi_internal_1_port_0_security_groups: - - cscf_RSG vm_flavor_name: get_input: cdi_flavor_name - port_cdi_internal_1_port_security_groups: + port_cdi_ims_core_1_port_1_security_groups: - - cscf_RSG - port_cdi_ims_core_1_port_mac_requirements: - mac_count_required: + port_cdi_ims_core_1_port_1_network_role_tag: ims_core + port_cdi_ims_core_1_port_1_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: - group: cdi_server_group_group - port_cdi_ims_core_1_port_fixed_ips: - - ip_address: - get_input: cdi_ims_core_v6_ip_1 compute_cdi_name: - get_input: cdi_name_1 - port_cdi_ims_core_1_port_network_role_tag: ims_core - port_cdi_ims_core_1_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: cdi_name_1 - $DEL: - get_input: vcscf_name_delimeter compute_cdi_user_data_format: - RAW - port_cdi_ims_core_1_port_network: + port_cdi_ims_core_1_port_1_network: - get_input: ims_core_net_id + port_cdi_internal_1_port_0_fixed_ips: + - ip_address: + get_input: cdi_internal_ip_1 + - ip_address: + get_input: cdi_internal_v6_ip_1 compute_cdi_availability_zone: - get_input: availability_zone_1 - port_cdi_internal_1_port_network: - - cscf_internal_network_0 - port_cdi_ims_core_1_port_ip_requirements: + compute_cdi_config_drive: + - true + port_cdi_ims_core_1_port_1_allowed_address_pairs: + - ip_address: + get_input: cdi_ims_core_v6_vip_0 + port_cdi_internal_1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cdi_internal_1_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 - compute_cdi_config_drive: - - true - port_cdi_internal_1_port_mac_requirements: + port_cdi_internal_1_port_0_mac_requirements: mac_count_required: is_required: false - port_cdi_ims_core_1_port_allowed_address_pairs: - - ip_address: - get_input: cdi_ims_core_v6_vip_0 - port_cdi_internal_1_port_fixed_ips: - - ip_address: - get_input: cdi_internal_ip_1 - - ip_address: - get_input: cdi_internal_v6_ip_1 - port_cdi_internal_1_port_name: + port_cdi_internal_1_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -2138,17 +2131,22 @@ topology_template: get_input: cdi_name_1 $DEL: get_input: vcscf_name_delimeter - port_cdi_internal_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: + port_cdi_ims_core_1_port_1_mac_requirements: + mac_count_required: is_required: false + port_cdi_ims_core_1_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: cdi_name_1 + $DEL: + get_input: vcscf_name_delimeter + port_cdi_internal_1_port_0_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2159,6 +2157,8 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_cdi_internal_1_port_0_network: + - cscf_internal_network_0 service_template_filter: substitute_service_template: Nested_cdi_1ServiceTemplate.yaml count: 1 @@ -2168,11 +2168,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cdi_cdi_internal_1_port: + - link_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cdi_cdi_internal_1_port: + - dependency_cdi_cdi_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -2483,38 +2483,40 @@ topology_template: directives: - substitutable properties: - port_lbd_ims_core_1_port_allowed_address_pairs: - - ip_address: - get_input: lbd_ims_core_v6_vip_0 + port_lbd_ims_core_1_port_2_security_groups: + - - cscf_RSG compute_lbd_user_data_format: - RAW - port_lbd_internal_1_port_name: - - str_replace: - template: $PREFIX$DELeth0 - params: - $PREFIX: - get_input: lbd_name_1 - $DEL: - get_input: vcscf_name_delimeter - port_lbd_dpdk_1_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 - vm_flavor_name: - get_input: lbd_flavor_name - port_lbd_ims_core_1_port_mac_requirements: + port_lbd_ims_core_1_port_2_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: lbd_flavor_name compute_lbd_availability_zone: - get_input: availability_zone_1 vm_image_name: get_input: lbd_image_name - port_lbd_dpdk_1_port_network: - - cscf_internal_dpdk_network_0 - port_lbd_ims_core_1_port_name: + port_lbd_internal_1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_lbd_dpdk_1_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_internal_1_port_0_network: + - cscf_internal_network_0 + port_lbd_ims_core_1_port_2_network_role_tag: ims_core + port_lbd_ims_core_1_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_dpdk_1_port_1_name: - str_replace: - template: $PREFIX$DELeth2 + template: $PREFIX$DELeth1 params: $PREFIX: get_input: lbd_name_1 @@ -2522,62 +2524,44 @@ topology_template: get_input: vcscf_name_delimeter compute_lbd_scheduler_hints: - group: lbd_server_group_group - port_lbd_dpdk_1_port_name: + compute_lbd_name: + - get_input: lbd_name_1 + port_lbd_dpdk_1_port_1_network: + - cscf_internal_dpdk_network_0 + compute_lbd_config_drive: + - true + port_lbd_ims_core_1_port_2_name: - str_replace: - template: $PREFIX$DELeth1 + template: $PREFIX$DELeth2 params: $PREFIX: get_input: lbd_name_1 $DEL: get_input: vcscf_name_delimeter - port_lbd_internal_1_port_network: - - cscf_internal_network_0 - port_lbd_internal_1_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_name: - - get_input: lbd_name_1 - port_lbd_ims_core_1_port_network_role_tag: ims_core - compute_lbd_config_drive: - - true - port_lbd_ims_core_1_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_dpdk_1_port_mac_requirements: + port_lbd_internal_1_port_0_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_1 + port_lbd_ims_core_1_port_2_allowed_address_pairs: + - ip_address: + get_input: lbd_ims_core_v6_vip_0 + port_lbd_dpdk_1_port_1_mac_requirements: mac_count_required: is_required: false - port_lbd_internal_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_internal_1_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_1_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_1_port_fixed_ips: + port_lbd_dpdk_1_port_1_fixed_ips: - ip_address: - get_input: lbd_ims_core_v6_ip_1 - port_lbd_internal_1_port_fixed_ips: + get_input: lbd_internal_dpdk_ip_1 + port_lbd_ims_core_1_port_2_fixed_ips: - ip_address: - get_input: lbd_internal_ip_1 - port_lbd_ims_core_1_port_network: - - get_input: ims_core_net_id - port_lbd_dpdk_1_port_security_groups: + get_input: lbd_ims_core_v6_ip_1 + port_lbd_dpdk_1_port_1_security_groups: + - - cscf_RSG + port_lbd_dpdk_1_port_1_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_lbd_internal_1_port_0_security_groups: - - cscf_RSG - port_lbd_dpdk_1_port_fixed_ips: - - ip_address: - get_input: lbd_internal_dpdk_ip_1 - port_lbd_dpdk_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -2588,6 +2572,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_lbd_internal_1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_internal_1_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: lbd_name_1 + $DEL: + get_input: vcscf_name_delimeter + port_lbd_ims_core_1_port_2_network: + - get_input: ims_core_net_id service_template_filter: substitute_service_template: Nested_lbdServiceTemplate.yaml count: 1 @@ -2597,19 +2597,19 @@ topology_template: - service_template_filter - index_value requirements: - - link_lbd_lbd_internal_1_port: + - link_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_internal_1_port: + - dependency_lbd_lbd_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn - - link_lbd_lbd_dpdk_1_port: + - link_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.network.Linkable node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_dpdk_1_port: + - dependency_lbd_lbd_dpdk_1_port_1: capability: tosca.capabilities.Node node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.DependsOn @@ -2757,7 +2757,7 @@ topology_template: directives: - substitutable properties: - port_cdi_internal_0_port_ip_requirements: + port_cdi_internal_0_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -2770,35 +2770,50 @@ topology_template: is_required: false vm_flavor_name: get_input: cdi_flavor_name - port_cdi_ims_core_0_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: cdi_name_0 - $DEL: - get_input: vcscf_name_delimeter - port_cdi_internal_0_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 + port_cdi_ims_core_0_port_1_security_groups: + - - cscf_RSG + port_cdi_ims_core_0_port_1_network: + - get_input: ims_core_net_id vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: - group: cdi_server_group_group compute_cdi_name: - get_input: cdi_name_0 - port_cdi_ims_core_0_port_ip_requirements: + compute_cdi_user_data_format: + - RAW + port_cdi_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false + compute_cdi_availability_zone: + - get_input: availability_zone_0 + port_cdi_ims_core_0_port_1_network_role_tag: ims_core + compute_cdi_config_drive: + - true + port_cdi_internal_0_port_0_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_cdi_internal_0_port_0_security_groups: + - - cscf_RSG + port_cdi_internal_0_port_0_network: + - cscf_internal_network_0 + port_cdi_ims_core_0_port_1_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cdi_ims_core_0_port_network_role_tag: ims_core - compute_cdi_user_data_format: - - RAW - port_cdi_internal_0_port_name: + port_cdi_internal_0_port_0_fixed_ips: + - ip_address: + get_input: cdi_internal_ip_0 + - ip_address: + get_input: cdi_internal_v6_ip_0 + port_cdi_ims_core_0_port_1_fixed_ips: + - ip_address: + get_input: cdi_ims_core_v6_ip_0 + port_cdi_internal_0_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -2806,32 +2821,14 @@ topology_template: get_input: cdi_name_0 $DEL: get_input: vcscf_name_delimeter - compute_cdi_availability_zone: - - get_input: availability_zone_0 - port_cdi_ims_core_0_port_network: - - get_input: ims_core_net_id - port_cdi_internal_0_port_network: - - cscf_internal_network_0 - port_cdi_internal_0_port_fixed_ips: - - ip_address: - get_input: cdi_internal_ip_0 - - ip_address: - get_input: cdi_internal_v6_ip_0 - compute_cdi_config_drive: - - true - port_cdi_internal_0_port_security_groups: - - - cscf_RSG - port_cdi_ims_core_0_port_security_groups: - - - cscf_RSG - port_cdi_ims_core_0_port_fixed_ips: - - ip_address: - get_input: cdi_ims_core_v6_ip_0 - port_cdi_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cdi_ims_core_0_port_allowed_address_pairs: - - ip_address: - get_input: cdi_ims_core_v6_vip_0 + port_cdi_ims_core_0_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: cdi_name_0 + $DEL: + get_input: vcscf_name_delimeter compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2842,7 +2839,10 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_cdi_ims_core_0_port_mac_requirements: + port_cdi_ims_core_0_port_1_allowed_address_pairs: + - ip_address: + get_input: cdi_ims_core_v6_vip_0 + port_cdi_ims_core_0_port_1_mac_requirements: mac_count_required: is_required: false service_template_filter: @@ -2854,11 +2854,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cdi_cdi_internal_0_port: + - link_cdi_cdi_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cdi_cdi_internal_0_port: + - dependency_cdi_cdi_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -2895,67 +2895,66 @@ topology_template: directives: - substitutable properties: - port_oam_internal_1_port_security_groups: - - - cscf_RSG - port_oam_oam_1_port_allowed_address_pairs: - - ip_address: - get_input: oam_oam_vip_0 vm_flavor_name: get_input: oam_flavor_name - port_oam_oam_1_port_ip_requirements: + port_oam_internal_1_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_oam_1_port_network_role_tag: oam - port_oam_oam_1_port_security_groups: - - - cscf_RSG + port_oam_oam_1_port_1_network_role_tag: oam + port_oam_internal_1_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: oam_name_1 + $DEL: + get_input: vcscf_name_delimeter vm_image_name: get_input: oam_image_name compute_oam_config_drive: - true - port_oam_internal_1_port_network: - - cscf_internal_network_0 - port_oam_oam_1_port_fixed_ips: + port_oam_internal_1_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_oam_1_port_1_allowed_address_pairs: - ip_address: - get_input: oam_oam_ip_1 - port_oam_internal_1_port_ip_requirements: + get_input: oam_oam_vip_0 + port_oam_oam_1_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_oam_1_port_network: - - get_input: oam_net_id - port_oam_internal_1_port_allowed_address_pairs: + compute_oam_user_data_format: + - RAW + port_oam_oam_1_port_1_mac_requirements: + mac_count_required: + is_required: false + port_oam_internal_1_port_0_allowed_address_pairs: - ip_address: 0.0.0.0/1 - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 - compute_oam_user_data_format: - - RAW - port_oam_internal_1_port_name: + port_oam_oam_1_port_1_network: + - get_input: oam_net_id + port_oam_oam_1_port_1_name: - str_replace: - template: $PREFIX$DELeth0 + template: $PREFIX$DELeth1 params: $PREFIX: get_input: oam_name_1 $DEL: get_input: vcscf_name_delimeter - port_oam_internal_1_port_fixed_ips: + port_oam_internal_1_port_0_fixed_ips: - ip_address: get_input: oam_internal_ip_1 - port_oam_oam_1_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: oam_name_1 - $DEL: - get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group + port_oam_internal_1_port_0_security_groups: + - - cscf_RSG compute_oam_availability_zone: - get_input: availability_zone_1 compute_oam_metadata: @@ -2968,14 +2967,15 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_oam_internal_1_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_oam_1_port_1_security_groups: + - - cscf_RSG compute_oam_name: - get_input: oam_name_1 - port_oam_oam_1_port_mac_requirements: - mac_count_required: - is_required: false + port_oam_internal_1_port_0_network: + - cscf_internal_network_0 + port_oam_oam_1_port_1_fixed_ips: + - ip_address: + get_input: oam_oam_ip_1 service_template_filter: substitute_service_template: Nested_oam_1ServiceTemplate.yaml count: 1 @@ -2985,11 +2985,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_oam_internal_1_port: + - link_oam_oam_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_oam_oam_internal_1_port: + - dependency_oam_oam_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -2998,18 +2998,9 @@ topology_template: directives: - substitutable properties: - port_oam_oam_2_port_network_role_tag: oam - port_oam_oam_2_port_security_groups: - - - cscf_RSG - port_oam_oam_2_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: oam_name_2 - $DEL: - get_input: vcscf_name_delimeter - port_oam_internal_2_port_name: + vm_flavor_name: + get_input: oam_flavor_name + port_oam_internal_2_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -3017,51 +3008,63 @@ topology_template: get_input: oam_name_2 $DEL: get_input: vcscf_name_delimeter - vm_flavor_name: - get_input: oam_flavor_name - port_oam_internal_2_port_mac_requirements: + port_oam_internal_2_port_0_mac_requirements: mac_count_required: is_required: false + port_oam_oam_2_port_1_allowed_address_pairs: + - ip_address: + get_input: oam_oam_vip_0 vm_image_name: get_input: oam_image_name compute_oam_config_drive: - true - port_oam_internal_2_port_allowed_address_pairs: + port_oam_internal_2_port_0_allowed_address_pairs: - ip_address: 0.0.0.0/1 - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 - port_oam_internal_2_port_network: - - cscf_internal_network_0 - port_oam_internal_2_port_fixed_ips: - - ip_address: - get_input: oam_internal_ip_2 - port_oam_oam_2_port_fixed_ips: + port_oam_oam_2_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_oam_oam_2_port_1_security_groups: + - - cscf_RSG + port_oam_oam_2_port_1_network_role_tag: oam + port_oam_internal_2_port_0_security_groups: + - - cscf_RSG + port_oam_oam_2_port_1_fixed_ips: - ip_address: get_input: oam_oam_ip_2 - port_oam_oam_2_port_mac_requirements: - mac_count_required: - is_required: false - port_oam_oam_2_port_network: - - get_input: oam_net_id compute_oam_user_data_format: - RAW - port_oam_internal_2_port_security_groups: - - - cscf_RSG - port_oam_oam_2_port_ip_requirements: + port_oam_internal_2_port_0_fixed_ips: + - ip_address: + get_input: oam_internal_ip_2 + port_oam_internal_2_port_0_network: + - cscf_internal_network_0 + port_oam_internal_2_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_oam_oam_2_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: oam_name_2 + $DEL: + get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group - port_oam_internal_2_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_oam_oam_2_port_1_mac_requirements: + mac_count_required: is_required: false + port_oam_oam_2_port_1_network: + - get_input: oam_net_id compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_metadata: @@ -3074,9 +3077,6 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_oam_oam_2_port_allowed_address_pairs: - - ip_address: - get_input: oam_oam_vip_0 compute_oam_name: - get_input: oam_name_2 service_template_filter: @@ -3088,11 +3088,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_oam_internal_2_port: + - link_oam_oam_internal_2_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_oam_oam_internal_2_port: + - dependency_oam_oam_internal_2_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -3171,35 +3171,36 @@ topology_template: directives: - substitutable properties: - port_oam_oam_0_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: oam_name_0 - $DEL: - get_input: vcscf_name_delimeter - port_oam_oam_0_port_fixed_ips: - - ip_address: - get_input: oam_oam_ip_0 - vm_flavor_name: - get_input: oam_flavor_name - port_oam_oam_0_port_mac_requirements: - mac_count_required: - is_required: false - port_oam_internal_0_port_ip_requirements: + port_oam_oam_0_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_internal_0_port_network: + port_oam_internal_0_port_0_fixed_ips: + - ip_address: + get_input: oam_internal_ip_0 + vm_flavor_name: + get_input: oam_flavor_name + port_oam_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false + port_oam_oam_0_port_1_fixed_ips: + - ip_address: + get_input: oam_oam_ip_0 + port_oam_internal_0_port_0_network: - cscf_internal_network_0 vm_image_name: get_input: oam_image_name compute_oam_config_drive: - true - port_oam_internal_0_port_name: + port_oam_oam_0_port_1_allowed_address_pairs: + - ip_address: + get_input: oam_oam_vip_0 + port_oam_oam_0_port_1_mac_requirements: + mac_count_required: + is_required: false + port_oam_internal_0_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -3207,35 +3208,30 @@ topology_template: get_input: oam_name_0 $DEL: get_input: vcscf_name_delimeter - port_oam_oam_0_port_allowed_address_pairs: - - ip_address: - get_input: oam_oam_vip_0 - port_oam_internal_0_port_security_groups: + port_oam_oam_0_port_1_network: + - get_input: oam_net_id + port_oam_internal_0_port_0_security_groups: + - - cscf_RSG + port_oam_oam_0_port_1_security_groups: - - cscf_RSG - port_oam_internal_0_port_fixed_ips: - - ip_address: - get_input: oam_internal_ip_0 - port_oam_oam_0_port_network_role_tag: oam compute_oam_user_data_format: - RAW - port_oam_oam_0_port_network: - - get_input: oam_net_id - port_oam_oam_0_port_ip_requirements: + port_oam_oam_0_port_1_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: oam_name_0 + $DEL: + get_input: vcscf_name_delimeter + port_oam_internal_0_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_oam_internal_0_port_mac_requirements: - mac_count_required: - is_required: false compute_oam_scheduler_hints: - group: oam_server_group_group - port_oam_internal_0_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_metadata: @@ -3250,8 +3246,12 @@ topology_template: get_input: vf_module_name compute_oam_name: - get_input: oam_name_0 - port_oam_oam_0_port_security_groups: - - - cscf_RSG + port_oam_internal_0_port_0_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_oam_oam_0_port_1_network_role_tag: oam service_template_filter: substitute_service_template: Nested_oamServiceTemplate.yaml count: 1 @@ -3261,11 +3261,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_oam_oam_internal_0_port: + - link_oam_oam_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_oam_oam_internal_0_port: + - dependency_oam_oam_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -3276,93 +3276,91 @@ topology_template: properties: compute_lbd_user_data_format: - RAW + port_lbd_ims_core_0_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: lbd_flavor_name + port_lbd_dpdk_0_port_1_network: + - cscf_internal_dpdk_network_0 compute_lbd_availability_zone: - get_input: availability_zone_0 - port_lbd_dpdk_0_port_allowed_address_pairs: - - ip_address: 0.0.0.0/1 - - ip_address: 128.0.0.0/1 - - ip_address: ::/1 - - ip_address: 8000::/1 vm_image_name: get_input: lbd_image_name - port_lbd_dpdk_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_ims_core_0_port_network: - - get_input: ims_core_net_id - port_lbd_ims_core_0_port_mac_requirements: - mac_count_required: - is_required: false - port_lbd_ims_core_0_port_allowed_address_pairs: - - ip_address: - get_input: lbd_ims_core_v6_vip_0 - port_lbd_internal_0_port_name: + port_lbd_internal_0_port_0_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_1_name: - str_replace: - template: $PREFIX$DELeth0 + template: $PREFIX$DELeth1 params: $PREFIX: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter - port_lbd_ims_core_0_port_network_role_tag: ims_core - compute_lbd_scheduler_hints: - - group: lbd_server_group_group - port_lbd_internal_0_port_mac_requirements: + port_lbd_dpdk_0_port_1_mac_requirements: mac_count_required: is_required: false - port_lbd_ims_core_0_port_ip_requirements: - - ip_version: 6 + compute_lbd_scheduler_hints: + - group: lbd_server_group_group + port_lbd_ims_core_0_port_2_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_1_fixed_ips: + - ip_address: + get_input: lbd_internal_dpdk_ip_0 + port_lbd_internal_0_port_0_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_0 + port_lbd_ims_core_0_port_2_fixed_ips: + - ip_address: + get_input: lbd_ims_core_v6_ip_0 + compute_lbd_name: + - get_input: lbd_name_0 + port_lbd_dpdk_0_port_1_ip_requirements: + - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_lbd_internal_0_port_network: - - cscf_internal_network_0 - port_lbd_dpdk_0_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_name: - - get_input: lbd_name_0 - port_lbd_ims_core_0_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_0_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter compute_lbd_config_drive: - true - port_lbd_dpdk_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_dpdk_ip_0 - port_lbd_internal_0_port_security_groups: + port_lbd_dpdk_0_port_1_security_groups: - - cscf_RSG - port_lbd_dpdk_0_port_security_groups: - - - cscf_RSG - port_lbd_dpdk_0_port_name: + port_lbd_ims_core_0_port_2_network_role_tag: ims_core + port_lbd_dpdk_0_port_1_allowed_address_pairs: + - ip_address: 0.0.0.0/1 + - ip_address: 128.0.0.0/1 + - ip_address: ::/1 + - ip_address: 8000::/1 + port_lbd_ims_core_0_port_2_name: - str_replace: - template: $PREFIX$DELeth1 + template: $PREFIX$DELeth2 params: $PREFIX: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter - port_lbd_dpdk_0_port_network: - - cscf_internal_dpdk_network_0 - port_lbd_ims_core_0_port_fixed_ips: - - ip_address: - get_input: lbd_ims_core_v6_ip_0 - port_lbd_internal_0_port_fixed_ips: + port_lbd_internal_0_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_ims_core_0_port_2_allowed_address_pairs: - ip_address: - get_input: lbd_internal_ip_0 + get_input: lbd_ims_core_v6_vip_0 + port_lbd_ims_core_0_port_2_network: + - get_input: ims_core_net_id + port_lbd_internal_0_port_0_network: + - cscf_internal_network_0 + port_lbd_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false + port_lbd_ims_core_0_port_2_mac_requirements: + mac_count_required: + is_required: false compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -3373,12 +3371,14 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_lbd_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_lbd_internal_0_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter service_template_filter: substitute_service_template: Nested_lbd_1ServiceTemplate.yaml count: 1 @@ -3388,19 +3388,19 @@ topology_template: - service_template_filter - index_value requirements: - - link_lbd_lbd_internal_0_port: + - link_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_internal_0_port: + - dependency_lbd_lbd_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn - - link_lbd_lbd_dpdk_0_port: + - link_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.network.Linkable node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_lbd_lbd_dpdk_0_port: + - dependency_lbd_lbd_dpdk_0_port_1: capability: tosca.capabilities.Node node: cscf_internal_dpdk_network_0 relationship: tosca.relationships.DependsOn @@ -3579,8 +3579,6 @@ topology_template: directives: - substitutable properties: - port_cif_ims_core_0_port_network: - - get_input: ims_core_net_id port_cif_oam_0_port_1_name: - str_replace: template: $PREFIX$DELeth1 @@ -3592,19 +3590,19 @@ topology_template: port_cif_oam_0_port_1_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_0 + port_cif_internal_0_port_0_security_groups: + - - cscf_RSG port_cif_oam_0_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_0 vm_flavor_name: get_input: cif_flavor_name - port_cif_internal_0_port_name: - - str_replace: - template: $PREFIX$DELeth0 - params: - $PREFIX: - get_input: cif_name_0 - $DEL: - get_input: vcscf_name_delimeter + port_cif_ims_core_0_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_image_name: get_input: cif_image_name compute_cif_user_data_format: @@ -3615,19 +3613,31 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_li_0_port_fixed_ips: - - ip_address: - get_input: cif_ims_li_v6_ip_0 + port_cif_ims_li_0_port_4_name: + - str_replace: + template: $PREFIX$DELeth4 + params: + $PREFIX: + get_input: cif_name_0 + $DEL: + get_input: vcscf_name_delimeter compute_cif_scheduler_hints: - group: cif_server_group_group port_cif_oam_0_port_1_security_groups: - - cscf_RSG - port_cif_ims_li_0_port_ip_requirements: + port_cif_internal_0_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_cif_ims_core_0_port_2_network: + - get_input: ims_core_net_id compute_cif_metadata: - vf_module_id: get_input: vf_module_id @@ -3638,21 +3648,22 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_cif_ims_li_0_port_name: - - str_replace: - template: $PREFIX$DELeth4 - params: - $PREFIX: - get_input: cif_name_0 - $DEL: - get_input: vcscf_name_delimeter - port_cif_ims_core_0_port_fixed_ips: - - ip_address: - get_input: cif_ims_core_v6_ip_0 + port_cif_internal_0_port_0_mac_requirements: + mac_count_required: + is_required: false port_cif_oam_0_port_3_network_role_tag: oam - port_cif_ims_core_0_port_security_groups: + port_cif_ims_core_0_port_2_network_role_tag: ims_core + port_cif_oam_0_port_3_security_groups: - - cscf_RSG - port_cif_ims_core_0_port_name: + port_cif_oam_0_port_1_network: + - get_input: oam_net_id + port_cif_ims_li_0_port_4_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cif_ims_core_0_port_2_name: - str_replace: template: $PREFIX$DELeth2 params: @@ -3660,59 +3671,54 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter - port_cif_internal_0_port_network: - - cscf_internal_network_0 - port_cif_oam_0_port_3_security_groups: - - - cscf_RSG - port_cif_ims_core_0_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_cif_ims_li_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_oam_0_port_1_network: - - get_input: oam_net_id - port_cif_ims_li_0_port_security_groups: - - - cscf_RSG compute_cif_name: - get_input: cif_name_0 compute_cif_availability_zone: - get_input: availability_zone_0 port_cif_oam_0_port_1_network_role_tag: oam + port_cif_ims_li_0_port_4_mac_requirements: + mac_count_required: + is_required: false + port_cif_ims_core_0_port_2_security_groups: + - - cscf_RSG + port_cif_ims_core_0_port_2_mac_requirements: + mac_count_required: + is_required: false port_cif_oam_0_port_3_mac_requirements: mac_count_required: is_required: false - port_cif_ims_core_0_port_allowed_address_pairs: - - ip_address: - get_input: cif_ims_core_v6_vip_0 port_cif_oam_0_port_3_fixed_ips: - ip_address: get_input: cif_oam_ip_2 - port_cif_ims_core_0_port_network_role_tag: ims_core - port_cif_ims_li_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_allowed_address_pairs: + - ip_address: + get_input: cif_ims_core_v6_vip_0 + port_cif_internal_0_port_0_name: + - str_replace: + template: $PREFIX$DELeth0 + params: + $PREFIX: + get_input: cif_name_0 + $DEL: + get_input: vcscf_name_delimeter + port_cif_ims_li_0_port_4_allowed_address_pairs: - ip_address: get_input: cif_ims_li_v6_vip_0 - port_cif_internal_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_ims_li_0_port_network: - - get_input: ims_li_v6_net_id - port_cif_internal_0_port_security_groups: - - - cscf_RSG - port_cif_ims_li_0_port_network_role_tag: ims_li_v6 - port_cif_oam_0_port_3_allowed_address_pairs: + port_cif_ims_li_0_port_4_fixed_ips: - ip_address: - get_input: cif_oam_vip_1 - port_cif_internal_0_port_fixed_ips: + get_input: cif_ims_li_v6_ip_0 + port_cif_internal_0_port_0_allowed_address_pairs: - ip_address: - get_input: cif_internal_ip_0 + get_input: cif_internal_vip_0 + port_cif_oam_0_port_3_allowed_address_pairs: - ip_address: - get_input: cif_internal_v6_ip_0 + get_input: cif_oam_vip_1 + port_cif_internal_0_port_0_network: + - cscf_internal_network_0 compute_cif_config_drive: - true + port_cif_ims_li_0_port_4_network: + - get_input: ims_li_v6_net_id port_cif_oam_0_port_3_name: - str_replace: template: $PREFIX$DELeth3 @@ -3723,32 +3729,26 @@ topology_template: get_input: vcscf_name_delimeter port_cif_oam_0_port_3_network: - get_input: oam_net_id - port_cif_ims_core_0_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_internal_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_fixed_ips: - ip_address: - get_input: cif_internal_vip_0 + get_input: cif_ims_core_v6_ip_0 + port_cif_internal_0_port_0_fixed_ips: + - ip_address: + get_input: cif_internal_ip_0 + - ip_address: + get_input: cif_internal_v6_ip_0 port_cif_oam_0_port_1_mac_requirements: mac_count_required: is_required: false + port_cif_ims_li_0_port_4_network_role_tag: ims_li_v6 + port_cif_ims_li_0_port_4_security_groups: + - - cscf_RSG port_cif_oam_0_port_3_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_internal_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_cifServiceTemplate.yaml count: 1 @@ -3758,11 +3758,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cif_cif_internal_0_port: + - link_cif_cif_internal_0_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cif_cif_internal_0_port: + - dependency_cif_cif_internal_0_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn @@ -3779,8 +3779,15 @@ topology_template: get_input: cif_name_1 $DEL: get_input: vcscf_name_delimeter - port_cif_ims_core_1_port_security_groups: - - - cscf_RSG + port_cif_ims_core_1_port_2_mac_requirements: + mac_count_required: + is_required: false + port_cif_ims_li_1_port_4_mac_requirements: + mac_count_required: + is_required: false + port_cif_ims_core_1_port_2_fixed_ips: + - ip_address: + get_input: cif_ims_core_v6_ip_1 port_cif_oam_1_port_1_mac_requirements: mac_count_required: is_required: false @@ -3795,6 +3802,9 @@ topology_template: port_cif_oam_1_port_3_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_1 + port_cif_internal_1_port_0_allowed_address_pairs: + - ip_address: + get_input: cif_internal_vip_0 compute_cif_scheduler_hints: - group: cif_server_group_group port_cif_oam_1_port_3_ip_requirements: @@ -3803,19 +3813,22 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_cif_internal_1_port_security_groups: - - - cscf_RSG + port_cif_ims_li_1_port_4_name: + - str_replace: + template: $PREFIX$DELeth4 + params: + $PREFIX: + get_input: cif_name_1 + $DEL: + get_input: vcscf_name_delimeter port_cif_oam_1_port_1_network: - get_input: oam_net_id - port_cif_ims_core_1_port_network_role_tag: ims_core - port_cif_ims_li_1_port_security_groups: - - - cscf_RSG - port_cif_ims_li_1_port_allowed_address_pairs: + port_cif_ims_li_1_port_4_network_role_tag: ims_li_v6 + port_cif_internal_1_port_0_fixed_ips: - ip_address: - get_input: cif_ims_li_v6_vip_0 - port_cif_internal_1_port_allowed_address_pairs: + get_input: cif_internal_ip_1 - ip_address: - get_input: cif_internal_vip_0 + get_input: cif_internal_v6_ip_1 port_cif_oam_1_port_3_security_groups: - - cscf_RSG compute_cif_metadata: @@ -3828,49 +3841,47 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_cif_ims_core_1_port_2_allowed_address_pairs: + - ip_address: + get_input: cif_ims_core_v6_vip_0 + port_cif_ims_core_1_port_2_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_cif_ims_core_1_port_2_security_groups: + - - cscf_RSG port_cif_oam_1_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_1 - port_cif_internal_1_port_network: - - cscf_internal_network_0 - port_cif_ims_core_1_port_network: - - get_input: ims_core_net_id port_cif_oam_1_port_3_fixed_ips: - ip_address: get_input: cif_oam_ip_3 + port_cif_ims_li_1_port_4_allowed_address_pairs: + - ip_address: + get_input: cif_ims_li_v6_vip_0 + port_cif_ims_core_1_port_2_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + get_input: cif_name_1 + $DEL: + get_input: vcscf_name_delimeter port_cif_oam_1_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_core_1_port_mac_requirements: - mac_count_required: - is_required: false compute_cif_name: - get_input: cif_name_1 compute_cif_availability_zone: - get_input: availability_zone_1 - port_cif_internal_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_cif_ims_li_1_port_name: - - str_replace: - template: $PREFIX$DELeth4 - params: - $PREFIX: - get_input: cif_name_1 - $DEL: - get_input: vcscf_name_delimeter - port_cif_internal_1_port_name: + port_cif_ims_core_1_port_2_network: + - get_input: ims_core_net_id + port_cif_internal_1_port_0_name: - str_replace: template: $PREFIX$DELeth0 params: @@ -3878,54 +3889,41 @@ topology_template: get_input: cif_name_1 $DEL: get_input: vcscf_name_delimeter - port_cif_ims_li_1_port_fixed_ips: - - ip_address: - get_input: cif_ims_li_v6_ip_1 - port_cif_internal_1_port_mac_requirements: - mac_count_required: - is_required: false - port_cif_ims_li_1_port_mac_requirements: - mac_count_required: + port_cif_ims_li_1_port_4_security_groups: + - - cscf_RSG + port_cif_ims_li_1_port_4_network: + - get_input: ims_li_v6_net_id + port_cif_internal_1_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false - port_cif_ims_li_1_port_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_core_1_port_fixed_ips: - - ip_address: - get_input: cif_ims_core_v6_ip_1 - port_cif_ims_core_1_port_allowed_address_pairs: - - ip_address: - get_input: cif_ims_core_v6_vip_0 port_cif_oam_1_port_1_network_role_tag: oam port_cif_oam_1_port_3_mac_requirements: mac_count_required: is_required: false - port_cif_ims_core_1_port_ip_requirements: + port_cif_ims_core_1_port_2_network_role_tag: ims_core + port_cif_internal_1_port_0_security_groups: + - - cscf_RSG + compute_cif_config_drive: + - true + port_cif_ims_li_1_port_4_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_cif_ims_li_1_port_network: - - get_input: ims_li_v6_net_id - port_cif_internal_1_port_fixed_ips: - - ip_address: - get_input: cif_internal_ip_1 + port_cif_ims_li_1_port_4_fixed_ips: - ip_address: - get_input: cif_internal_v6_ip_1 - port_cif_ims_core_1_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: cif_name_1 - $DEL: - get_input: vcscf_name_delimeter - compute_cif_config_drive: - - true + get_input: cif_ims_li_v6_ip_1 + port_cif_internal_1_port_0_network: + - cscf_internal_network_0 port_cif_oam_1_port_3_name: - str_replace: template: $PREFIX$DELeth3 @@ -3934,12 +3932,14 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter - port_cif_ims_li_1_port_network_role_tag: ims_li_v6 port_cif_oam_1_port_1_security_groups: - - cscf_RSG port_cif_oam_1_port_1_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_0 + port_cif_internal_1_port_0_mac_requirements: + mac_count_required: + is_required: false port_cif_oam_1_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_cif_1ServiceTemplate.yaml @@ -3950,11 +3950,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_cif_cif_internal_1_port: + - link_cif_cif_internal_1_port_0: capability: tosca.capabilities.network.Linkable node: cscf_internal_network_0 relationship: tosca.relationships.network.LinksTo - - dependency_cif_cif_internal_1_port: + - dependency_cif_cif_internal_1_port_0: capability: tosca.capabilities.Node node: cscf_internal_network_0 relationship: tosca.relationships.DependsOn 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 e41c99a6c8..76b51beb75 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 @@ -11,57 +11,46 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cdi_internal_0_port_network_role: + port_cdi_internal_0_port_0_subnetpoolid: type: string required: true - port_cdi_ims_core_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_0_port_ip_requirements: + port_cdi_internal_0_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_cdi_internal_0_port_vlan_requirements: + port_cdi_ims_core_0_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_0_port_name: - type: list + type: json + port_cdi_ims_core_0_port_1_order: + type: integer required: true - entry_schema: - type: string - port_cdi_internal_0_port_exCP_naming: + port_cdi_ims_core_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cdi_ims_core_0_port_network_role: - type: string - required: true - port_cdi_internal_0_port_allowed_address_pairs: + port_cdi_ims_core_0_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cdi_internal_0_port_network_role_tag: - type: string - required: true - port_cdi_internal_0_port_subnetpoolid: - type: string - required: true + type: string vm_image_name: type: string required: true + port_cdi_internal_0_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_cdi_scheduler_hints: type: list required: true @@ -72,52 +61,48 @@ topology_template: required: true entry_schema: type: string - port_cdi_ims_core_0_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_0_port_network_role_tag: - type: string - required: true compute_cdi_user_data_format: type: list required: true entry_schema: type: string - port_cdi_internal_0_port_name: - type: list - required: true - entry_schema: - type: string - port_cdi_ims_core_0_port_order: - type: integer + port_cdi_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true compute_cdi_availability_zone: type: list required: true entry_schema: type: string - port_cdi_ims_core_0_port_network: + port_cdi_ims_core_0_port_1_network_role_tag: + type: string + required: true + port_cdi_internal_0_port_0_network_role_tag: + type: string + required: true + port_cdi_internal_0_port_0_related_networks: type: list required: true entry_schema: - type: string - port_cdi_internal_0_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_cdi_config_drive: type: list required: true entry_schema: - type: string - port_cdi_internal_0_port_fixed_ips: + type: boolean + port_cdi_internal_0_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_cdi_config_drive: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cdi_internal_0_port_0_security_groups: type: list required: true entry_schema: - type: boolean + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -125,97 +110,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cdi_internal_0_port_security_groups: + port_cdi_ims_core_0_port_1_subnetpoolid: + type: string + required: true + port_cdi_ims_core_0_port_1_related_networks: type: list required: true entry_schema: - type: json - port_cdi_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_internal_0_port_0_network: type: list required: true entry_schema: - type: json - port_cdi_ims_core_0_port_fixed_ips: + type: string + port_cdi_ims_core_0_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cdi_ims_core_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_0_port_0_fixed_ips: + type: list required: true - port_cdi_internal_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_1_fixed_ips: + type: list required: true - port_cdi_internal_0_port_related_networks: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_0_port_0_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cdi_ims_core_0_port_allowed_address_pairs: + type: string + port_cdi_ims_core_0_port_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string + port_cdi_internal_0_port_0_network_role: + type: string + required: true compute_cdi_metadata: type: list required: true entry_schema: type: json - port_cdi_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cdi_internal_0_port_0_order: + type: integer required: true - port_cdi_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_0_port_1_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_ims_core_0_port_1_network_role: + type: string + required: true + port_cdi_ims_core_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true node_templates: - cdi_cdi_ims_core_0_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_cdi_ims_core_0_port_mac_requirements - allowed_address_pairs: - get_input: port_cdi_ims_core_0_port_allowed_address_pairs - order: - get_input: port_cdi_ims_core_0_port_order - security_groups: - get_input: - - port_cdi_ims_core_0_port_security_groups - - index_value - exCP_naming: - get_input: port_cdi_ims_core_0_port_exCP_naming - vlan_requirements: - get_input: port_cdi_ims_core_0_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_cdi_ims_core_0_port_related_networks - ip_requirements: - get_input: port_cdi_ims_core_0_port_ip_requirements - network_role_tag: - get_input: port_cdi_ims_core_0_port_network_role_tag - network_role: - get_input: port_cdi_ims_core_0_port_network_role - subnetpoolid: - get_input: port_cdi_ims_core_0_port_subnetpoolid - fixed_ips: - get_input: - - port_cdi_ims_core_0_port_fixed_ips - - index_value - name: - get_input: - - port_cdi_ims_core_0_port_name - - index_value - network: - get_input: - - port_cdi_ims_core_0_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: cdi - relationship: tosca.relationships.network.BindsTo cdi: type: org.openecomp.resource.vfc.compute.nodes.heat.cdi properties: @@ -247,45 +202,90 @@ topology_template: get_input: - compute_cdi_user_data_format - index_value - cdi_cdi_internal_0_port: + cdi_cdi_ims_core_0_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_cdi_ims_core_0_port_1_mac_requirements + allowed_address_pairs: + get_input: port_cdi_ims_core_0_port_1_allowed_address_pairs + order: + get_input: port_cdi_ims_core_0_port_1_order + security_groups: + get_input: + - port_cdi_ims_core_0_port_1_security_groups + - index_value + exCP_naming: + get_input: port_cdi_ims_core_0_port_1_exCP_naming + vlan_requirements: + get_input: port_cdi_ims_core_0_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_cdi_ims_core_0_port_1_related_networks + ip_requirements: + get_input: port_cdi_ims_core_0_port_1_ip_requirements + network_role_tag: + get_input: port_cdi_ims_core_0_port_1_network_role_tag + network_role: + get_input: port_cdi_ims_core_0_port_1_network_role + subnetpoolid: + get_input: port_cdi_ims_core_0_port_1_subnetpoolid + fixed_ips: + get_input: + - port_cdi_ims_core_0_port_1_fixed_ips + - index_value + name: + get_input: + - port_cdi_ims_core_0_port_1_name + - index_value + network: + get_input: + - port_cdi_ims_core_0_port_1_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: cdi + relationship: tosca.relationships.network.BindsTo + cdi_cdi_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cdi_internal_0_port_mac_requirements + get_input: port_cdi_internal_0_port_0_mac_requirements allowed_address_pairs: - get_input: port_cdi_internal_0_port_allowed_address_pairs + get_input: port_cdi_internal_0_port_0_allowed_address_pairs order: - get_input: port_cdi_internal_0_port_order + get_input: port_cdi_internal_0_port_0_order security_groups: get_input: - - port_cdi_internal_0_port_security_groups + - port_cdi_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_cdi_internal_0_port_exCP_naming + get_input: port_cdi_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_cdi_internal_0_port_vlan_requirements + get_input: port_cdi_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cdi_internal_0_port_related_networks + get_input: port_cdi_internal_0_port_0_related_networks ip_requirements: - get_input: port_cdi_internal_0_port_ip_requirements + get_input: port_cdi_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_cdi_internal_0_port_network_role_tag + get_input: port_cdi_internal_0_port_0_network_role_tag network_role: - get_input: port_cdi_internal_0_port_network_role + get_input: port_cdi_internal_0_port_0_network_role subnetpoolid: - get_input: port_cdi_internal_0_port_subnetpoolid + get_input: port_cdi_internal_0_port_0_subnetpoolid fixed_ips: get_input: - - port_cdi_internal_0_port_fixed_ips + - port_cdi_internal_0_port_0_fixed_ips - index_value name: get_input: - - port_cdi_internal_0_port_name + - port_cdi_internal_0_port_0_name - index_value network: get_input: - - port_cdi_internal_0_port_network + - port_cdi_internal_0_port_0_network - index_value requirements: - binding: @@ -295,21 +295,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cdi capabilities: - attachment_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - attachment - 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 - network.outgoing.packets.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.packets.rate + feature_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - feature + network.outgoing.bytes.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.bytes.rate host_cdi: - cdi - host @@ -322,12 +313,18 @@ topology_template: disk.write.requests.rate_cdi: - cdi - disk.write.requests.rate + network.incoming.packets_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.packets disk.device.write.requests.rate_cdi: - cdi - disk.device.write.requests.rate disk.write.bytes.rate_cdi: - cdi - disk.write.bytes.rate + network.outpoing.packets_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outpoing.packets disk.ephemeral.size_cdi: - cdi - disk.ephemeral.size @@ -337,18 +334,12 @@ topology_template: cpu.delta_cdi: - cdi - cpu.delta - network.incoming.bytes_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.bytes - network.outgoing.bytes.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outgoing.bytes.rate + network.incoming.packets_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.packets disk.device.write.bytes_cdi: - cdi - disk.device.write.bytes - feature_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - feature disk.device.read.requests.rate_cdi: - cdi - disk.device.read.requests.rate @@ -358,33 +349,36 @@ topology_template: os_cdi: - cdi - os + network.incoming.bytes.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.bytes.rate memory.usage_cdi: - cdi - memory.usage - network.outgoing.bytes.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port + network.incoming.packets.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.packets.rate + network.outgoing.bytes.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - network.outgoing.bytes.rate - network.outpoing.packets_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.outpoing.packets vcpus_cdi: - cdi - vcpus - network.incoming.packets_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.packets + network.outgoing.packets.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.packets.rate disk.device.read.requests_cdi: - cdi - disk.device.read.requests + feature_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - feature endpoint_cdi: - cdi - endpoint disk.read.requests_cdi: - cdi - disk.read.requests - network.incoming.bytes.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.bytes.rate memory.resident_cdi: - cdi - memory.resident @@ -394,6 +388,12 @@ topology_template: disk.read.bytes.rate_cdi: - cdi - disk.read.bytes.rate + network.outgoing.bytes_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.outgoing.bytes + network.outgoing.bytes_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outgoing.bytes memory_cdi: - cdi - memory @@ -403,21 +403,24 @@ topology_template: disk.device.write.requests_cdi: - cdi - disk.device.write.requests - network.outgoing.packets.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outgoing.packets.rate - binding_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - binding - network.incoming.packets.rate_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + network.incoming.packets.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - network.incoming.packets.rate disk.allocation_cdi: - cdi - disk.allocation - forwarder_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + network.incoming.bytes.rate_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.bytes.rate + forwarder_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - forwarder + network.outgoing.packets.rate_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outgoing.packets.rate + network.outpoing.packets_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.outpoing.packets scalable_cdi: - cdi - scalable @@ -430,33 +433,39 @@ topology_template: disk.device.usage_cdi: - cdi - disk.device.usage + binding_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - binding disk.iops_cdi: - cdi - disk.iops - network.incoming.packets_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - network.incoming.packets + binding_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - binding disk.usage_cdi: - cdi - disk.usage + attachment_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - attachment + attachment_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - attachment disk.device.write.bytes.rate_cdi: - cdi - disk.device.write.bytes.rate disk.read.bytes_cdi: - cdi - disk.read.bytes - network.incoming.bytes_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.bytes + forwarder_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - forwarder disk.capacity_cdi: - cdi - disk.capacity binding_cdi: - cdi - binding - feature_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port - - feature disk.device.read.bytes_cdi: - cdi - disk.device.read.bytes @@ -466,46 +475,37 @@ topology_template: disk.device.latency_cdi: - cdi - disk.device.latency - network.incoming.packets.rate_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.incoming.packets.rate - binding_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - binding instance_cdi: - cdi - instance - attachment_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - attachment + network.incoming.bytes_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - network.incoming.bytes + network.incoming.bytes_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 + - network.incoming.bytes disk.device.allocation_cdi: - cdi - disk.device.allocation - network.outgoing.bytes_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outgoing.bytes disk.write.requests_cdi: - cdi - disk.write.requests - network.outpoing.packets_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - network.outpoing.packets requirements: local_storage_cdi: - cdi - local_storage - link_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port + link_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 - link - dependency_cdi_cdi_ims_core_0_port: - - cdi_cdi_ims_core_0_port - - dependency - link_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + link_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 - link + dependency_cdi_cdi_internal_0_port_0: + - cdi_cdi_internal_0_port_0 + - dependency dependency_cdi: - cdi - dependency - dependency_cdi_cdi_internal_0_port: - - cdi_cdi_internal_0_port + dependency_cdi_cdi_ims_core_0_port_1: + - cdi_cdi_ims_core_0_port_1 - dependency
\ No newline at end of file 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 d6d9cfe8dd..50473b042d 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 @@ -11,108 +11,95 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cdi_internal_1_port_order: - type: integer - required: true - port_cdi_ims_core_1_port_security_groups: + port_cdi_ims_core_1_port_1_fixed_ips: type: list required: true entry_schema: - type: json - port_cdi_internal_1_port_network_role_tag: - type: string - required: true - port_cdi_internal_1_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json + port_cdi_ims_core_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true vm_flavor_name: type: string required: true - port_cdi_ims_core_1_port_order: + port_cdi_ims_core_1_port_1_order: type: integer required: true - port_cdi_internal_1_port_security_groups: + port_cdi_internal_1_port_0_related_networks: type: list required: true entry_schema: - type: json - port_cdi_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - compute_cdi_scheduler_hints: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_ims_core_1_port_1_security_groups: type: list required: true entry_schema: type: json - port_cdi_ims_core_1_port_fixed_ips: - type: list + port_cdi_ims_core_1_port_1_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_cdi_name: + port_cdi_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_cdi_ims_core_1_port_network_role_tag: - type: string - required: true - port_cdi_ims_core_1_port_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_ims_core_1_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_cdi_ims_core_1_port_subnetpoolid: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true - compute_cdi_user_data_format: + compute_cdi_scheduler_hints: type: list required: true entry_schema: - type: string - port_cdi_ims_core_1_port_network: + type: json + compute_cdi_name: type: list required: true entry_schema: type: string - compute_cdi_availability_zone: + compute_cdi_user_data_format: type: list required: true entry_schema: type: string - port_cdi_internal_1_port_network: + port_cdi_ims_core_1_port_1_network_role: + type: string + required: true + port_cdi_ims_core_1_port_1_network: type: list required: true entry_schema: type: string - port_cdi_ims_core_1_port_ip_requirements: + port_cdi_internal_1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_internal_1_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_internal_1_port_0_network_role: + type: string + required: true + port_cdi_ims_core_1_port_1_subnetpoolid: + type: string + required: true + compute_cdi_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: string compute_cdi_config_drive: type: list required: true entry_schema: type: boolean - port_cdi_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cdi_ims_core_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -120,96 +107,109 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cdi_ims_core_1_port_vlan_requirements: - type: list + port_cdi_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_ims_core_1_port_network_role: + port_cdi_internal_1_port_0_subnetpoolid: type: string required: true - port_cdi_internal_1_port_vlan_requirements: + port_cdi_ims_core_1_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cdi_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_internal_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cdi_internal_1_port_0_name: type: list required: true entry_schema: type: string - port_cdi_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_cdi_ims_core_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_cdi_internal_1_port_ip_requirements: + port_cdi_ims_core_1_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cdi_ims_core_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cdi_ims_core_1_port_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_cdi_metadata: + type: string + port_cdi_ims_core_1_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_cdi_internal_1_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + port_cdi_internal_1_port_0_allowed_address_pairs: + type: list required: true - port_cdi_internal_1_port_network_role: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cdi_internal_1_port_0_network_role_tag: type: string required: true - port_cdi_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + compute_cdi_metadata: + type: list + required: true + entry_schema: + type: json + port_cdi_internal_1_port_0_network: + type: list + required: true + entry_schema: + type: string + port_cdi_internal_1_port_0_order: + type: integer required: true node_templates: - cdi_cdi_internal_1_port: + cdi_cdi_internal_1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cdi_internal_1_port_mac_requirements + get_input: port_cdi_internal_1_port_0_mac_requirements allowed_address_pairs: - get_input: port_cdi_internal_1_port_allowed_address_pairs + get_input: port_cdi_internal_1_port_0_allowed_address_pairs order: - get_input: port_cdi_internal_1_port_order + get_input: port_cdi_internal_1_port_0_order security_groups: get_input: - - port_cdi_internal_1_port_security_groups + - port_cdi_internal_1_port_0_security_groups - index_value exCP_naming: - get_input: port_cdi_internal_1_port_exCP_naming + get_input: port_cdi_internal_1_port_0_exCP_naming vlan_requirements: - get_input: port_cdi_internal_1_port_vlan_requirements + get_input: port_cdi_internal_1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cdi_internal_1_port_related_networks + get_input: port_cdi_internal_1_port_0_related_networks ip_requirements: - get_input: port_cdi_internal_1_port_ip_requirements + get_input: port_cdi_internal_1_port_0_ip_requirements network_role_tag: - get_input: port_cdi_internal_1_port_network_role_tag + get_input: port_cdi_internal_1_port_0_network_role_tag network_role: - get_input: port_cdi_internal_1_port_network_role + get_input: port_cdi_internal_1_port_0_network_role subnetpoolid: - get_input: port_cdi_internal_1_port_subnetpoolid + get_input: port_cdi_internal_1_port_0_subnetpoolid fixed_ips: get_input: - - port_cdi_internal_1_port_fixed_ips + - port_cdi_internal_1_port_0_fixed_ips - index_value name: get_input: - - port_cdi_internal_1_port_name + - port_cdi_internal_1_port_0_name - index_value network: get_input: - - port_cdi_internal_1_port_network + - port_cdi_internal_1_port_0_network - index_value requirements: - binding: @@ -247,45 +247,45 @@ topology_template: get_input: - compute_cdi_user_data_format - index_value - cdi_cdi_ims_core_1_port: + cdi_cdi_ims_core_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cdi_ims_core_1_port_mac_requirements + get_input: port_cdi_ims_core_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_cdi_ims_core_1_port_allowed_address_pairs + get_input: port_cdi_ims_core_1_port_1_allowed_address_pairs order: - get_input: port_cdi_ims_core_1_port_order + get_input: port_cdi_ims_core_1_port_1_order security_groups: get_input: - - port_cdi_ims_core_1_port_security_groups + - port_cdi_ims_core_1_port_1_security_groups - index_value exCP_naming: - get_input: port_cdi_ims_core_1_port_exCP_naming + get_input: port_cdi_ims_core_1_port_1_exCP_naming vlan_requirements: - get_input: port_cdi_ims_core_1_port_vlan_requirements + get_input: port_cdi_ims_core_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cdi_ims_core_1_port_related_networks + get_input: port_cdi_ims_core_1_port_1_related_networks ip_requirements: - get_input: port_cdi_ims_core_1_port_ip_requirements + get_input: port_cdi_ims_core_1_port_1_ip_requirements network_role_tag: - get_input: port_cdi_ims_core_1_port_network_role_tag + get_input: port_cdi_ims_core_1_port_1_network_role_tag network_role: - get_input: port_cdi_ims_core_1_port_network_role + get_input: port_cdi_ims_core_1_port_1_network_role subnetpoolid: - get_input: port_cdi_ims_core_1_port_subnetpoolid + get_input: port_cdi_ims_core_1_port_1_subnetpoolid fixed_ips: get_input: - - port_cdi_ims_core_1_port_fixed_ips + - port_cdi_ims_core_1_port_1_fixed_ips - index_value name: get_input: - - port_cdi_ims_core_1_port_name + - port_cdi_ims_core_1_port_1_name - index_value network: get_input: - - port_cdi_ims_core_1_port_network + - port_cdi_ims_core_1_port_1_network - index_value requirements: - binding: @@ -295,12 +295,9 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.cdi_1 capabilities: - network.outpoing.packets_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outpoing.packets - feature_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - feature + network.incoming.bytes_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.bytes host_cdi: - cdi - host @@ -310,54 +307,42 @@ topology_template: disk.device.iops_cdi: - cdi - disk.device.iops + feature_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - feature + network.outgoing.bytes.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outgoing.bytes.rate disk.write.requests.rate_cdi: - cdi - disk.write.requests.rate + network.incoming.packets_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.incoming.packets 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 - network.outgoing.bytes.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.outgoing.bytes.rate - network.outgoing.bytes_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outgoing.bytes - attachment_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - attachment disk.write.bytes.rate_cdi: - cdi - disk.write.bytes.rate - network.outgoing.packets.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outgoing.packets.rate + network.outpoing.packets_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outpoing.packets disk.ephemeral.size_cdi: - cdi - disk.ephemeral.size cpu_util_cdi: - cdi - cpu_util - network.incoming.bytes.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.incoming.bytes.rate cpu.delta_cdi: - cdi - cpu.delta disk.device.write.bytes_cdi: - cdi - disk.device.write.bytes - network.outgoing.bytes_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.outgoing.bytes - network.incoming.packets.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.incoming.packets.rate + forwarder_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - forwarder disk.device.read.requests.rate_cdi: - cdi - disk.device.read.requests.rate @@ -370,18 +355,9 @@ topology_template: memory.usage_cdi: - cdi - memory.usage - binding_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - binding - binding_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - binding vcpus_cdi: - cdi - vcpus - network.incoming.bytes_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.incoming.bytes disk.device.read.requests_cdi: - cdi - disk.device.read.requests @@ -391,15 +367,15 @@ topology_template: disk.read.requests_cdi: - cdi - disk.read.requests - attachment_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - attachment memory.resident_cdi: - cdi - memory.resident disk.latency_cdi: - cdi - disk.latency + network.incoming.bytes_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.incoming.bytes disk.read.bytes.rate_cdi: - cdi - disk.read.bytes.rate @@ -412,60 +388,72 @@ topology_template: disk.device.write.requests_cdi: - cdi - disk.device.write.requests - network.incoming.packets_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.incoming.packets + forwarder_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - forwarder + network.incoming.packets.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.incoming.packets.rate disk.allocation_cdi: - cdi - disk.allocation - 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 + network.outgoing.packets.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outgoing.packets.rate scalable_cdi: - cdi - scalable feature_cdi: - cdi - feature + binding_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - binding cpu_cdi: - cdi - cpu disk.device.usage_cdi: - cdi - disk.device.usage + attachment_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - attachment + network.incoming.bytes.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.bytes.rate disk.iops_cdi: - cdi - disk.iops + attachment_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - attachment disk.usage_cdi: - cdi - disk.usage - network.incoming.packets.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.incoming.packets.rate - feature_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - feature + network.outpoing.packets_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outpoing.packets disk.device.write.bytes.rate_cdi: - cdi - disk.device.write.bytes.rate disk.read.bytes_cdi: - cdi - disk.read.bytes - network.outgoing.bytes.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.outgoing.bytes.rate + feature_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - feature disk.capacity_cdi: - cdi - disk.capacity - network.outgoing.packets.rate_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port + network.incoming.bytes.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 - network.incoming.bytes.rate + network.outgoing.bytes.rate_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outgoing.bytes.rate + binding_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - binding binding_cdi: - cdi - binding @@ -478,15 +466,27 @@ topology_template: disk.device.latency_cdi: - cdi - disk.device.latency + network.outgoing.packets.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outgoing.packets.rate + network.incoming.packets_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.packets instance_cdi: - cdi - instance - network.incoming.packets_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - network.incoming.packets + network.incoming.packets.rate_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.incoming.packets.rate disk.device.allocation_cdi: - cdi - disk.device.allocation + network.outgoing.bytes_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 + - network.outgoing.bytes + network.outgoing.bytes_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - network.outgoing.bytes disk.write.requests_cdi: - cdi - disk.write.requests @@ -494,18 +494,18 @@ topology_template: local_storage_cdi: - cdi - local_storage - link_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port + link_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 - link - link_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port + link_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 - link - dependency_cdi_cdi_internal_1_port: - - cdi_cdi_internal_1_port - - dependency - dependency_cdi_cdi_ims_core_1_port: - - cdi_cdi_ims_core_1_port - - dependency dependency_cdi: - cdi + - dependency + dependency_cdi_cdi_ims_core_1_port_1: + - cdi_cdi_ims_core_1_port_1 + - dependency + dependency_cdi_cdi_internal_1_port_0: + - cdi_cdi_internal_1_port_0 - dependency
\ No newline at end of file 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 56fd1defd7..4aa7e9083d 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 @@ -11,11 +11,9 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_cif_ims_core_0_port_network: - type: list + port_cif_internal_0_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string port_cif_oam_0_port_1_name: type: list required: true @@ -26,37 +24,47 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_0_port_0_security_groups: + type: list + required: true + entry_schema: + type: json + port_cif_internal_0_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_cif_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_internal_0_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_1_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_0_port_related_networks: + port_cif_ims_li_0_port_4_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_0_port_network_role: - type: string - required: true vm_flavor_name: type: string required: true - port_cif_internal_0_port_name: + port_cif_ims_core_0_port_2_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_0_port_1_order: type: integer required: true - port_cif_internal_0_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_core_0_port_network_role: - type: string + port_cif_oam_0_port_3_exCP_naming: + type: org.openecomp.datatypes.Naming required: true port_cif_oam_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming @@ -66,9 +74,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_oam_0_port_3_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_image_name: type: string required: true @@ -82,58 +87,59 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_0_port_related_networks: + port_cif_ims_li_0_port_4_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_ims_li_0_port_fixed_ips: + port_cif_ims_li_0_port_4_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string compute_cif_scheduler_hints: type: list required: true entry_schema: type: json + port_cif_ims_li_0_port_4_subnetpoolid: + type: string + required: true port_cif_oam_0_port_1_security_groups: type: list required: true entry_schema: type: json - port_cif_internal_0_port_network_role: - type: string - required: true - port_cif_ims_li_0_port_ip_requirements: + port_cif_internal_0_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_network: + type: list + required: true + entry_schema: + type: string compute_cif_metadata: type: list required: true entry_schema: type: json + port_cif_internal_0_port_0_order: + type: integer + required: true port_cif_oam_0_port_3_subnetpoolid: type: string required: true - port_cif_ims_li_0_port_name: - type: list - required: true - entry_schema: - type: string - port_cif_ims_core_0_port_fixed_ips: - type: list + port_cif_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_0_port_order: + port_cif_ims_li_0_port_4_order: type: integer required: true port_cif_oam_0_port_3_network_role: @@ -142,25 +148,17 @@ topology_template: port_cif_oam_0_port_3_network_role_tag: type: string required: true - port_cif_ims_core_0_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_cif_oam_0_port_1_network_role: type: string required: true - port_cif_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_internal_0_port_subnetpoolid: + port_cif_ims_core_0_port_2_network_role_tag: type: string required: true - port_cif_ims_core_0_port_security_groups: + port_cif_ims_core_0_port_2_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_3_related_networks: type: list required: true @@ -169,48 +167,35 @@ topology_template: port_cif_oam_0_port_1_subnetpoolid: type: string required: true - port_cif_ims_core_0_port_name: - type: list - required: true - entry_schema: - type: string port_cif_oam_0_port_3_order: type: integer required: true - port_cif_internal_0_port_network: - type: list - required: true - entry_schema: - type: string - port_cif_ims_core_0_port_order: - type: integer - required: true port_cif_oam_0_port_3_security_groups: type: list required: true entry_schema: type: json - port_cif_ims_core_0_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_internal_0_port_0_network_role_tag: + type: string required: true port_cif_oam_0_port_1_network: type: list required: true entry_schema: type: string - port_cif_ims_li_0_port_security_groups: + port_cif_ims_li_0_port_4_network_role: + type: string + required: true + port_cif_ims_li_0_port_4_ip_requirements: type: list required: true entry_schema: - type: json - port_cif_ims_li_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_2_name: + type: list required: true + entry_schema: + type: string port_cif_oam_0_port_3_vlan_requirements: type: list required: true @@ -221,9 +206,6 @@ topology_template: required: true entry_schema: type: string - port_cif_internal_0_port_order: - type: integer - required: true compute_cif_availability_zone: type: list required: true @@ -232,60 +214,56 @@ topology_template: port_cif_oam_0_port_1_network_role_tag: type: string required: true - port_cif_oam_0_port_3_mac_requirements: + port_cif_ims_li_0_port_4_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cif_ims_core_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json + port_cif_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cif_oam_0_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_cif_oam_0_port_3_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_0_port_network_role_tag: + port_cif_internal_0_port_0_network_role: type: string required: true - port_cif_ims_li_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_ims_li_0_port_allowed_address_pairs: + port_cif_ims_core_0_port_2_allowed_address_pairs: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_0_port_subnetpoolid: - type: string - required: true - port_cif_internal_0_port_network_role_tag: - type: string - required: true - port_cif_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_li_0_port_network: + port_cif_internal_0_port_0_name: type: list required: true entry_schema: type: string - port_cif_ims_li_0_port_related_networks: + port_cif_ims_li_0_port_4_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_internal_0_port_security_groups: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_ims_core_0_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_ims_li_0_port_4_fixed_ips: type: list required: true entry_schema: - type: json - port_cif_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_ims_li_0_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_allowed_address_pairs: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -298,48 +276,70 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_0_port_fixed_ips: + port_cif_internal_0_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_cif_ims_core_0_port_2_subnetpoolid: + type: string + required: true + port_cif_ims_li_0_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_ims_core_0_port_2_network_role: + type: string + required: true compute_cif_config_drive: type: list required: true entry_schema: type: boolean - port_cif_oam_0_port_3_name: + port_cif_ims_li_0_port_4_network: type: list required: true entry_schema: type: string - port_cif_ims_li_0_port_vlan_requirements: + port_cif_ims_core_0_port_2_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_0_port_2_order: + type: integer + required: true + port_cif_oam_0_port_3_name: + type: list + required: true + entry_schema: + type: string port_cif_oam_0_port_3_network: type: list required: true entry_schema: type: string - port_cif_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_cif_ims_core_0_port_2_fixed_ips: + type: list required: true - port_cif_internal_0_port_allowed_address_pairs: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_0_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cif_oam_0_port_3_ip_requirements: + port_cif_ims_li_0_port_4_network_role_tag: + type: string + required: true + port_cif_ims_li_0_port_4_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_0_port_ip_requirements: + type: json + port_cif_oam_0_port_3_ip_requirements: type: list required: true entry_schema: @@ -376,225 +376,225 @@ topology_template: get_input: - compute_cif_user_data_format - index_value - cif_cif_internal_0_port: + cif_cif_ims_li_0_port_4: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_internal_0_port_mac_requirements + get_input: port_cif_ims_li_0_port_4_mac_requirements allowed_address_pairs: - get_input: port_cif_internal_0_port_allowed_address_pairs + get_input: port_cif_ims_li_0_port_4_allowed_address_pairs order: - get_input: port_cif_internal_0_port_order + get_input: port_cif_ims_li_0_port_4_order security_groups: get_input: - - port_cif_internal_0_port_security_groups + - port_cif_ims_li_0_port_4_security_groups - index_value exCP_naming: - get_input: port_cif_internal_0_port_exCP_naming + get_input: port_cif_ims_li_0_port_4_exCP_naming vlan_requirements: - get_input: port_cif_internal_0_port_vlan_requirements + get_input: port_cif_ims_li_0_port_4_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_internal_0_port_related_networks + get_input: port_cif_ims_li_0_port_4_related_networks ip_requirements: - get_input: port_cif_internal_0_port_ip_requirements + get_input: port_cif_ims_li_0_port_4_ip_requirements network_role_tag: - get_input: port_cif_internal_0_port_network_role_tag + get_input: port_cif_ims_li_0_port_4_network_role_tag network_role: - get_input: port_cif_internal_0_port_network_role + get_input: port_cif_ims_li_0_port_4_network_role subnetpoolid: - get_input: port_cif_internal_0_port_subnetpoolid + get_input: port_cif_ims_li_0_port_4_subnetpoolid fixed_ips: get_input: - - port_cif_internal_0_port_fixed_ips + - port_cif_ims_li_0_port_4_fixed_ips - index_value name: get_input: - - port_cif_internal_0_port_name + - port_cif_ims_li_0_port_4_name - index_value network: get_input: - - port_cif_internal_0_port_network + - port_cif_ims_li_0_port_4_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_ims_li_0_port: + cif_cif_oam_0_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_li_0_port_mac_requirements + get_input: port_cif_oam_0_port_1_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_li_0_port_allowed_address_pairs + get_input: port_cif_oam_0_port_1_allowed_address_pairs order: - get_input: port_cif_ims_li_0_port_order + get_input: port_cif_oam_0_port_1_order security_groups: get_input: - - port_cif_ims_li_0_port_security_groups + - port_cif_oam_0_port_1_security_groups - index_value exCP_naming: - get_input: port_cif_ims_li_0_port_exCP_naming + get_input: port_cif_oam_0_port_1_exCP_naming vlan_requirements: - get_input: port_cif_ims_li_0_port_vlan_requirements + get_input: port_cif_oam_0_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_li_0_port_related_networks + get_input: port_cif_oam_0_port_1_related_networks ip_requirements: - get_input: port_cif_ims_li_0_port_ip_requirements + get_input: port_cif_oam_0_port_1_ip_requirements network_role_tag: - get_input: port_cif_ims_li_0_port_network_role_tag + get_input: port_cif_oam_0_port_1_network_role_tag network_role: - get_input: port_cif_ims_li_0_port_network_role + get_input: port_cif_oam_0_port_1_network_role subnetpoolid: - get_input: port_cif_ims_li_0_port_subnetpoolid + get_input: port_cif_oam_0_port_1_subnetpoolid fixed_ips: get_input: - - port_cif_ims_li_0_port_fixed_ips + - port_cif_oam_0_port_1_fixed_ips - index_value name: get_input: - - port_cif_ims_li_0_port_name + - port_cif_oam_0_port_1_name - index_value network: get_input: - - port_cif_ims_li_0_port_network + - port_cif_oam_0_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_ims_core_0_port: + cif_cif_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_core_0_port_mac_requirements + get_input: port_cif_internal_0_port_0_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_core_0_port_allowed_address_pairs + get_input: port_cif_internal_0_port_0_allowed_address_pairs order: - get_input: port_cif_ims_core_0_port_order + get_input: port_cif_internal_0_port_0_order security_groups: get_input: - - port_cif_ims_core_0_port_security_groups + - port_cif_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_cif_ims_core_0_port_exCP_naming + get_input: port_cif_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_cif_ims_core_0_port_vlan_requirements + get_input: port_cif_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_core_0_port_related_networks + get_input: port_cif_internal_0_port_0_related_networks ip_requirements: - get_input: port_cif_ims_core_0_port_ip_requirements + get_input: port_cif_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_cif_ims_core_0_port_network_role_tag + get_input: port_cif_internal_0_port_0_network_role_tag network_role: - get_input: port_cif_ims_core_0_port_network_role + get_input: port_cif_internal_0_port_0_network_role subnetpoolid: - get_input: port_cif_ims_core_0_port_subnetpoolid + get_input: port_cif_internal_0_port_0_subnetpoolid fixed_ips: get_input: - - port_cif_ims_core_0_port_fixed_ips + - port_cif_internal_0_port_0_fixed_ips - index_value name: get_input: - - port_cif_ims_core_0_port_name + - port_cif_internal_0_port_0_name - index_value network: get_input: - - port_cif_ims_core_0_port_network + - port_cif_internal_0_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_0_port_1: + cif_cif_oam_0_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_0_port_1_mac_requirements + get_input: port_cif_oam_0_port_3_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_0_port_1_allowed_address_pairs + get_input: port_cif_oam_0_port_3_allowed_address_pairs order: - get_input: port_cif_oam_0_port_1_order + get_input: port_cif_oam_0_port_3_order security_groups: get_input: - - port_cif_oam_0_port_1_security_groups + - port_cif_oam_0_port_3_security_groups - index_value exCP_naming: - get_input: port_cif_oam_0_port_1_exCP_naming + get_input: port_cif_oam_0_port_3_exCP_naming vlan_requirements: - get_input: port_cif_oam_0_port_1_vlan_requirements + get_input: port_cif_oam_0_port_3_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_0_port_1_related_networks + get_input: port_cif_oam_0_port_3_related_networks ip_requirements: - get_input: port_cif_oam_0_port_1_ip_requirements + get_input: port_cif_oam_0_port_3_ip_requirements network_role_tag: - get_input: port_cif_oam_0_port_1_network_role_tag + get_input: port_cif_oam_0_port_3_network_role_tag network_role: - get_input: port_cif_oam_0_port_1_network_role + get_input: port_cif_oam_0_port_3_network_role subnetpoolid: - get_input: port_cif_oam_0_port_1_subnetpoolid + get_input: port_cif_oam_0_port_3_subnetpoolid fixed_ips: get_input: - - port_cif_oam_0_port_1_fixed_ips + - port_cif_oam_0_port_3_fixed_ips - index_value name: get_input: - - port_cif_oam_0_port_1_name + - port_cif_oam_0_port_3_name - index_value network: get_input: - - port_cif_oam_0_port_1_network + - port_cif_oam_0_port_3_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_0_port_3: + cif_cif_ims_core_0_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_0_port_3_mac_requirements + get_input: port_cif_ims_core_0_port_2_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_0_port_3_allowed_address_pairs + get_input: port_cif_ims_core_0_port_2_allowed_address_pairs order: - get_input: port_cif_oam_0_port_3_order + get_input: port_cif_ims_core_0_port_2_order security_groups: get_input: - - port_cif_oam_0_port_3_security_groups + - port_cif_ims_core_0_port_2_security_groups - index_value exCP_naming: - get_input: port_cif_oam_0_port_3_exCP_naming + get_input: port_cif_ims_core_0_port_2_exCP_naming vlan_requirements: - get_input: port_cif_oam_0_port_3_vlan_requirements + get_input: port_cif_ims_core_0_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_0_port_3_related_networks + get_input: port_cif_ims_core_0_port_2_related_networks ip_requirements: - get_input: port_cif_oam_0_port_3_ip_requirements + get_input: port_cif_ims_core_0_port_2_ip_requirements network_role_tag: - get_input: port_cif_oam_0_port_3_network_role_tag + get_input: port_cif_ims_core_0_port_2_network_role_tag network_role: - get_input: port_cif_oam_0_port_3_network_role + get_input: port_cif_ims_core_0_port_2_network_role subnetpoolid: - get_input: port_cif_oam_0_port_3_subnetpoolid + get_input: port_cif_ims_core_0_port_2_subnetpoolid fixed_ips: get_input: - - port_cif_oam_0_port_3_fixed_ips + - port_cif_ims_core_0_port_2_fixed_ips - index_value name: get_input: - - port_cif_oam_0_port_3_name + - port_cif_ims_core_0_port_2_name - index_value network: get_input: - - port_cif_oam_0_port_3_network + - port_cif_ims_core_0_port_2_network - index_value requirements: - binding: @@ -607,9 +607,15 @@ topology_template: binding_cif: - cif - binding + feature_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - feature disk.device.read.requests_cif: - cif - disk.device.read.requests + network.outgoing.bytes.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outgoing.bytes.rate disk.latency_cif: - cif - disk.latency @@ -619,33 +625,27 @@ topology_template: memory.usage_cif: - cif - memory.usage - attachment_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - attachment + network.outgoing.bytes_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outgoing.bytes network.incoming.bytes.rate_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.incoming.bytes.rate - network.incoming.packets.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.packets.rate network.incoming.bytes.rate_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.bytes.rate - network.outgoing.packets.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outgoing.packets.rate - network.outgoing.bytes.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outgoing.bytes.rate + attachment_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - attachment instance_cif: - cif - instance - 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.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outgoing.bytes.rate + feature_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - feature network.outgoing.bytes.rate_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - network.outgoing.bytes.rate @@ -655,33 +655,27 @@ topology_template: network.outpoing.packets_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.outpoing.packets - network.incoming.packets.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.incoming.packets.rate - network.incoming.bytes.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.incoming.bytes.rate disk.root.size_cif: - cif - disk.root.size + forwarder_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - forwarder memory.resident_cif: - cif - memory.resident - 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.bytes_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outgoing.bytes disk.usage_cif: - cif - disk.usage + network.incoming.packets.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.packets.rate disk.ephemeral.size_cif: - cif - disk.ephemeral.size - network.outgoing.bytes_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outgoing.bytes disk.write.requests.rate_cif: - cif - disk.write.requests.rate @@ -691,72 +685,63 @@ topology_template: disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate - network.incoming.bytes_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.bytes - attachment_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - attachment - network.outgoing.packets.rate_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - network.outgoing.packets.rate disk.device.allocation_cif: - cif - disk.device.allocation - binding_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - binding - network.outgoing.packets.rate_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outgoing.packets.rate disk.device.read.bytes.rate_cif: - cif - disk.device.read.bytes.rate vcpus_cif: - cif - vcpus - network.incoming.packets.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.packets.rate + network.incoming.bytes_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.bytes endpoint_cif: - cif - endpoint + binding_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - binding disk.device.usage_cif: - cif - disk.device.usage - 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.outpoing.packets_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outpoing.packets 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 + network.incoming.packets.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.packets.rate + attachment_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - attachment disk.read.requests_cif: - cif - disk.read.requests + forwarder_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - forwarder disk.write.bytes_cif: - cif - disk.write.bytes - network.outgoing.bytes_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.outgoing.bytes + network.outpoing.packets_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outpoing.packets disk.device.capacity_cif: - cif - disk.device.capacity feature_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - feature - network.incoming.bytes_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - network.incoming.bytes feature_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - feature @@ -769,27 +754,39 @@ topology_template: cpu_cif: - cif - cpu + network.outgoing.bytes_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outgoing.bytes 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 + network.incoming.bytes.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.bytes.rate forwarder_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - forwarder + network.incoming.bytes.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.bytes.rate + network.outgoing.packets.rate_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.outgoing.packets.rate + network.incoming.packets_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.packets feature_cif: - cif - feature + network.incoming.packets_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.packets 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 @@ -799,42 +796,42 @@ topology_template: 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.bytes_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.incoming.bytes network.incoming.packets_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - network.incoming.packets + attachment_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - attachment 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 + network.outgoing.packets.rate_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - network.outgoing.packets.rate + feature_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - feature disk.allocation_cif: - cif - disk.allocation disk.device.iops_cif: - cif - disk.device.iops + network.incoming.bytes_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.bytes 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 @@ -850,45 +847,45 @@ topology_template: 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 + network.outgoing.bytes.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outgoing.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 + network.outpoing.packets_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outpoing.packets + binding_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - binding + network.incoming.packets.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.packets.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 + binding_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - binding + forwarder_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - forwarder attachment_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - attachment @@ -898,49 +895,52 @@ topology_template: disk.device.latency_cif: - cif - disk.device.latency - network.incoming.packets_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.incoming.packets + network.incoming.bytes.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_cif: - cif - disk.device.write.requests.rate - network.outgoing.bytes.rate_cif_cif_internal_0_port: - - cif_cif_internal_0_port - - network.outgoing.bytes.rate + network.outgoing.packets.rate_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 + - network.outgoing.packets.rate + network.incoming.packets_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - network.incoming.packets requirements: - link_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port + link_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - link + link_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 - link - dependency_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - dependency dependency_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - dependency + dependency_cif_cif_ims_li_0_port_4: + - cif_cif_ims_li_0_port_4 + - dependency dependency_cif: - cif - dependency - dependency_cif_cif_ims_core_0_port: - - cif_cif_ims_core_0_port - - dependency dependency_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - dependency local_storage_cif: - cif - local_storage - dependency_cif_cif_internal_0_port: - - cif_cif_internal_0_port + dependency_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 - dependency - link_cif_cif_ims_li_0_port: - - cif_cif_ims_li_0_port - - link link_cif_cif_oam_0_port_1: - cif_cif_oam_0_port_1 - link - link_cif_cif_internal_0_port: - - cif_cif_internal_0_port + dependency_cif_cif_ims_core_0_port_2: + - cif_cif_ims_core_0_port_2 + - dependency + link_cif_cif_internal_0_port_0: + - cif_cif_internal_0_port_0 - link link_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - - link
\ No newline at end of file + - link 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 ae63110bf0..87e2c0eaa7 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 @@ -16,16 +16,25 @@ topology_template: required: true entry_schema: type: string - port_cif_ims_core_1_port_security_groups: - type: list + port_cif_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cif_ims_li_1_port_4_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_cif_ims_li_1_port_4_subnetpoolid: + type: string required: true - entry_schema: - type: json port_cif_oam_1_port_3_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cif_ims_core_1_port_2_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -34,9 +43,6 @@ topology_template: required: true entry_schema: type: string - port_cif_internal_1_port_subnetpoolid: - type: string - required: true vm_flavor_name: type: string required: true @@ -48,6 +54,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_core_1_port_2_subnetpoolid: + type: string + required: true + port_cif_internal_1_port_0_network_role_tag: + type: string + required: true vm_image_name: type: string required: true @@ -64,58 +76,45 @@ topology_template: port_cif_oam_1_port_1_subnetpoolid: type: string required: true + port_cif_internal_1_port_0_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair compute_cif_scheduler_hints: type: list required: true entry_schema: type: json - port_cif_ims_li_1_port_order: - type: integer - required: true port_cif_oam_1_port_3_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cif_internal_1_port_security_groups: + port_cif_ims_core_1_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_cif_ims_li_1_port_4_name: type: list required: true entry_schema: - type: json + type: string port_cif_oam_1_port_1_network: type: list required: true entry_schema: type: string - port_cif_internal_1_port_order: + port_cif_internal_1_port_0_order: type: integer required: true - port_cif_ims_core_1_port_network_role_tag: - type: string - required: true - port_cif_ims_li_1_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_cif_ims_li_1_port_subnetpoolid: + port_cif_ims_li_1_port_4_network_role_tag: type: string required: true - port_cif_ims_core_1_port_related_networks: + port_cif_internal_1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_internal_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_cif_oam_1_port_3_security_groups: type: list required: true @@ -126,57 +125,62 @@ topology_template: required: true entry_schema: type: json - port_cif_ims_li_1_port_network_role: + port_cif_internal_1_port_0_subnetpoolid: type: string required: true - port_cif_ims_core_1_port_order: - type: integer + port_cif_ims_core_1_port_2_allowed_address_pairs: + type: list required: true - port_cif_oam_1_port_3_order: + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_network_role: + type: string + required: true + port_cif_ims_li_1_port_4_order: type: integer required: true - port_cif_internal_1_port_vlan_requirements: + port_cif_ims_core_1_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_cif_internal_1_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_1_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: json + port_cif_oam_1_port_3_order: + type: integer + required: true port_cif_oam_1_port_1_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_internal_1_port_network: + port_cif_oam_1_port_3_fixed_ips: type: list required: true entry_schema: - type: string - port_cif_ims_core_1_port_network: - type: list + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_network_role: + type: string required: true - entry_schema: - type: string - port_cif_oam_1_port_3_fixed_ips: + port_cif_ims_li_1_port_4_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_exCP_naming: + type: org.openecomp.datatypes.heat.network.AddressPair + port_cif_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_cif_oam_1_port_3_network_role: type: string required: true - port_cif_internal_1_port_network_role: - type: string + port_cif_ims_core_1_port_2_name: + type: list required: true + entry_schema: + type: string port_cif_oam_1_port_1_ip_requirements: type: list required: true @@ -185,10 +189,7 @@ topology_template: port_cif_oam_1_port_1_order: type: integer required: true - port_cif_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_core_1_port_vlan_requirements: + port_cif_ims_li_1_port_4_vlan_requirements: type: list required: true entry_schema: @@ -196,9 +197,6 @@ topology_template: port_cif_oam_1_port_1_network_role: type: string required: true - port_cif_internal_1_port_network_role_tag: - type: string - required: true compute_cif_name: type: list required: true @@ -217,76 +215,68 @@ topology_template: port_cif_oam_1_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cif_internal_1_port_ip_requirements: + port_cif_ims_core_1_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_name: + type: string + port_cif_ims_li_1_port_4_network_role: + type: string + required: true + port_cif_internal_1_port_0_related_networks: type: list required: true entry_schema: - type: string - port_cif_internal_1_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_name: type: list required: true entry_schema: type: string - port_cif_ims_li_1_port_fixed_ips: + port_cif_ims_li_1_port_4_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_li_1_port_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_cif_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_li_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_cif_ims_li_1_port_ip_requirements: + port_cif_ims_li_1_port_4_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_core_1_port_fixed_ips: + type: json + port_cif_ims_li_1_port_4_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_allowed_address_pairs: + type: string + port_cif_internal_1_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.network.IpRequirements port_cif_oam_1_port_1_network_role_tag: type: string required: true port_cif_oam_1_port_3_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cif_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_cif_ims_li_1_port_network: - type: list - required: true - entry_schema: - type: string port_cif_oam_1_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_core_1_port_subnetpoolid: + port_cif_ims_core_1_port_2_network_role_tag: type: string required: true + port_cif_internal_1_port_0_security_groups: + type: list + required: true + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -294,40 +284,50 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_cif_internal_1_port_fixed_ips: + port_cif_ims_core_1_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cif_ims_core_1_port_name: + type: org.openecomp.datatypes.network.VlanRequirements + compute_cif_config_drive: type: list required: true entry_schema: - type: string - compute_cif_config_drive: + type: boolean + port_cif_ims_core_1_port_2_related_networks: type: list required: true entry_schema: - type: boolean + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_cif_ims_li_1_port_4_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_li_1_port_4_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true port_cif_oam_1_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cif_oam_1_port_3_name: + port_cif_ims_li_1_port_4_fixed_ips: type: list required: true entry_schema: - type: string - port_cif_ims_li_1_port_related_networks: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_ims_core_1_port_2_order: + type: integer + required: true + port_cif_internal_1_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_cif_ims_li_1_port_network_role_tag: - type: string - required: true - port_cif_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: string + port_cif_oam_1_port_3_name: + type: list required: true + entry_schema: + type: string port_cif_oam_1_port_1_security_groups: type: list required: true @@ -338,8 +338,8 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_cif_ims_core_1_port_network_role: - type: string + port_cif_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true port_cif_oam_1_port_3_network_role_tag: type: string @@ -376,225 +376,225 @@ topology_template: get_input: - compute_cif_user_data_format - index_value - cif_cif_ims_li_1_port: + cif_cif_ims_li_1_port_4: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_li_1_port_mac_requirements + get_input: port_cif_ims_li_1_port_4_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_li_1_port_allowed_address_pairs + get_input: port_cif_ims_li_1_port_4_allowed_address_pairs order: - get_input: port_cif_ims_li_1_port_order + get_input: port_cif_ims_li_1_port_4_order security_groups: get_input: - - port_cif_ims_li_1_port_security_groups + - port_cif_ims_li_1_port_4_security_groups - index_value exCP_naming: - get_input: port_cif_ims_li_1_port_exCP_naming + get_input: port_cif_ims_li_1_port_4_exCP_naming vlan_requirements: - get_input: port_cif_ims_li_1_port_vlan_requirements + get_input: port_cif_ims_li_1_port_4_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_li_1_port_related_networks + get_input: port_cif_ims_li_1_port_4_related_networks ip_requirements: - get_input: port_cif_ims_li_1_port_ip_requirements + get_input: port_cif_ims_li_1_port_4_ip_requirements network_role_tag: - get_input: port_cif_ims_li_1_port_network_role_tag + get_input: port_cif_ims_li_1_port_4_network_role_tag network_role: - get_input: port_cif_ims_li_1_port_network_role + get_input: port_cif_ims_li_1_port_4_network_role subnetpoolid: - get_input: port_cif_ims_li_1_port_subnetpoolid + get_input: port_cif_ims_li_1_port_4_subnetpoolid fixed_ips: get_input: - - port_cif_ims_li_1_port_fixed_ips + - port_cif_ims_li_1_port_4_fixed_ips - index_value name: get_input: - - port_cif_ims_li_1_port_name + - port_cif_ims_li_1_port_4_name - index_value network: get_input: - - port_cif_ims_li_1_port_network + - port_cif_ims_li_1_port_4_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_internal_1_port: + cif_cif_oam_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_internal_1_port_mac_requirements + get_input: port_cif_oam_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_cif_internal_1_port_allowed_address_pairs + get_input: port_cif_oam_1_port_1_allowed_address_pairs order: - get_input: port_cif_internal_1_port_order + get_input: port_cif_oam_1_port_1_order security_groups: get_input: - - port_cif_internal_1_port_security_groups + - port_cif_oam_1_port_1_security_groups - index_value exCP_naming: - get_input: port_cif_internal_1_port_exCP_naming + get_input: port_cif_oam_1_port_1_exCP_naming vlan_requirements: - get_input: port_cif_internal_1_port_vlan_requirements + get_input: port_cif_oam_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_internal_1_port_related_networks + get_input: port_cif_oam_1_port_1_related_networks ip_requirements: - get_input: port_cif_internal_1_port_ip_requirements + get_input: port_cif_oam_1_port_1_ip_requirements network_role_tag: - get_input: port_cif_internal_1_port_network_role_tag + get_input: port_cif_oam_1_port_1_network_role_tag network_role: - get_input: port_cif_internal_1_port_network_role + get_input: port_cif_oam_1_port_1_network_role subnetpoolid: - get_input: port_cif_internal_1_port_subnetpoolid + get_input: port_cif_oam_1_port_1_subnetpoolid fixed_ips: get_input: - - port_cif_internal_1_port_fixed_ips + - port_cif_oam_1_port_1_fixed_ips - index_value name: get_input: - - port_cif_internal_1_port_name + - port_cif_oam_1_port_1_name - index_value network: get_input: - - port_cif_internal_1_port_network + - port_cif_oam_1_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_1_port_1: + cif_cif_oam_1_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_1_port_1_mac_requirements + get_input: port_cif_oam_1_port_3_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_1_port_1_allowed_address_pairs + get_input: port_cif_oam_1_port_3_allowed_address_pairs order: - get_input: port_cif_oam_1_port_1_order + get_input: port_cif_oam_1_port_3_order security_groups: get_input: - - port_cif_oam_1_port_1_security_groups + - port_cif_oam_1_port_3_security_groups - index_value exCP_naming: - get_input: port_cif_oam_1_port_1_exCP_naming + get_input: port_cif_oam_1_port_3_exCP_naming vlan_requirements: - get_input: port_cif_oam_1_port_1_vlan_requirements + get_input: port_cif_oam_1_port_3_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_1_port_1_related_networks + get_input: port_cif_oam_1_port_3_related_networks ip_requirements: - get_input: port_cif_oam_1_port_1_ip_requirements + get_input: port_cif_oam_1_port_3_ip_requirements network_role_tag: - get_input: port_cif_oam_1_port_1_network_role_tag + get_input: port_cif_oam_1_port_3_network_role_tag network_role: - get_input: port_cif_oam_1_port_1_network_role + get_input: port_cif_oam_1_port_3_network_role subnetpoolid: - get_input: port_cif_oam_1_port_1_subnetpoolid + get_input: port_cif_oam_1_port_3_subnetpoolid fixed_ips: get_input: - - port_cif_oam_1_port_1_fixed_ips + - port_cif_oam_1_port_3_fixed_ips - index_value name: get_input: - - port_cif_oam_1_port_1_name + - port_cif_oam_1_port_3_name - index_value network: get_input: - - port_cif_oam_1_port_1_network + - port_cif_oam_1_port_3_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_ims_core_1_port: + cif_cif_internal_1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_ims_core_1_port_mac_requirements + get_input: port_cif_internal_1_port_0_mac_requirements allowed_address_pairs: - get_input: port_cif_ims_core_1_port_allowed_address_pairs + get_input: port_cif_internal_1_port_0_allowed_address_pairs order: - get_input: port_cif_ims_core_1_port_order + get_input: port_cif_internal_1_port_0_order security_groups: get_input: - - port_cif_ims_core_1_port_security_groups + - port_cif_internal_1_port_0_security_groups - index_value exCP_naming: - get_input: port_cif_ims_core_1_port_exCP_naming + get_input: port_cif_internal_1_port_0_exCP_naming vlan_requirements: - get_input: port_cif_ims_core_1_port_vlan_requirements + get_input: port_cif_internal_1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_ims_core_1_port_related_networks + get_input: port_cif_internal_1_port_0_related_networks ip_requirements: - get_input: port_cif_ims_core_1_port_ip_requirements + get_input: port_cif_internal_1_port_0_ip_requirements network_role_tag: - get_input: port_cif_ims_core_1_port_network_role_tag + get_input: port_cif_internal_1_port_0_network_role_tag network_role: - get_input: port_cif_ims_core_1_port_network_role + get_input: port_cif_internal_1_port_0_network_role subnetpoolid: - get_input: port_cif_ims_core_1_port_subnetpoolid + get_input: port_cif_internal_1_port_0_subnetpoolid fixed_ips: get_input: - - port_cif_ims_core_1_port_fixed_ips + - port_cif_internal_1_port_0_fixed_ips - index_value name: get_input: - - port_cif_ims_core_1_port_name + - port_cif_internal_1_port_0_name - index_value network: get_input: - - port_cif_ims_core_1_port_network + - port_cif_internal_1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: cif relationship: tosca.relationships.network.BindsTo - cif_cif_oam_1_port_3: + cif_cif_ims_core_1_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_cif_oam_1_port_3_mac_requirements + get_input: port_cif_ims_core_1_port_2_mac_requirements allowed_address_pairs: - get_input: port_cif_oam_1_port_3_allowed_address_pairs + get_input: port_cif_ims_core_1_port_2_allowed_address_pairs order: - get_input: port_cif_oam_1_port_3_order + get_input: port_cif_ims_core_1_port_2_order security_groups: get_input: - - port_cif_oam_1_port_3_security_groups + - port_cif_ims_core_1_port_2_security_groups - index_value exCP_naming: - get_input: port_cif_oam_1_port_3_exCP_naming + get_input: port_cif_ims_core_1_port_2_exCP_naming vlan_requirements: - get_input: port_cif_oam_1_port_3_vlan_requirements + get_input: port_cif_ims_core_1_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_cif_oam_1_port_3_related_networks + get_input: port_cif_ims_core_1_port_2_related_networks ip_requirements: - get_input: port_cif_oam_1_port_3_ip_requirements + get_input: port_cif_ims_core_1_port_2_ip_requirements network_role_tag: - get_input: port_cif_oam_1_port_3_network_role_tag + get_input: port_cif_ims_core_1_port_2_network_role_tag network_role: - get_input: port_cif_oam_1_port_3_network_role + get_input: port_cif_ims_core_1_port_2_network_role subnetpoolid: - get_input: port_cif_oam_1_port_3_subnetpoolid + get_input: port_cif_ims_core_1_port_2_subnetpoolid fixed_ips: get_input: - - port_cif_oam_1_port_3_fixed_ips + - port_cif_ims_core_1_port_2_fixed_ips - index_value name: get_input: - - port_cif_oam_1_port_3_name + - port_cif_ims_core_1_port_2_name - index_value network: get_input: - - port_cif_oam_1_port_3_network + - port_cif_ims_core_1_port_2_network - index_value requirements: - binding: @@ -610,6 +610,9 @@ topology_template: disk.device.read.requests_cif: - cif - disk.device.read.requests + network.outgoing.bytes.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outgoing.bytes.rate disk.latency_cif: - cif - disk.latency @@ -619,27 +622,36 @@ topology_template: memory.usage_cif: - cif - memory.usage - attachment_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - attachment + network.outgoing.bytes_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.outgoing.bytes network.incoming.bytes.rate_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.bytes.rate - network.incoming.packets_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.packets - feature_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port + attachment_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - attachment + feature_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - feature instance_cif: - cif - instance + network.outgoing.bytes.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outgoing.bytes.rate + feature_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - feature 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_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.outgoing.bytes + binding_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - binding + forwarder_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - forwarder network.incoming.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.packets.rate @@ -655,39 +667,45 @@ topology_template: memory.resident_cif: - cif - memory.resident - network.outgoing.bytes_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.outgoing.bytes network.incoming.packets.rate_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.packets.rate - network.incoming.bytes_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.incoming.bytes + network.outpoing.packets_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outpoing.packets network.incoming.bytes_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.incoming.bytes disk.usage_cif: - cif - disk.usage + network.incoming.bytes.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.bytes.rate disk.ephemeral.size_cif: - cif - disk.ephemeral.size + network.incoming.bytes.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.bytes.rate disk.write.requests.rate_cif: - cif - disk.write.requests.rate disk.read.bytes_cif: - cif - disk.read.bytes - network.incoming.packets.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.packets.rate - network.outgoing.packets.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port + network.outgoing.packets.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - network.outgoing.packets.rate disk.device.read.requests.rate_cif: - cif - disk.device.read.requests.rate + network.incoming.packets_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.packets + network.outgoing.packets.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outgoing.packets.rate disk.device.allocation_cif: - cif - disk.device.allocation @@ -697,23 +715,17 @@ topology_template: vcpus_cif: - cif - vcpus - network.outgoing.packets.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.incoming.bytes.rate endpoint_cif: - cif - endpoint - network.incoming.packets.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.incoming.packets.rate + attachment_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - attachment disk.device.usage_cif: - cif - disk.device.usage - network.outpoing.packets_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port + network.outpoing.packets_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - network.outpoing.packets attachment_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 @@ -727,18 +739,18 @@ topology_template: network.outgoing.packets.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outgoing.packets.rate + network.outpoing.packets_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outpoing.packets + network.incoming.packets.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.packets.rate disk.read.requests_cif: - cif - disk.read.requests 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 - network.outgoing.bytes.rate_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - network.outgoing.bytes.rate network.outpoing.packets_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.outpoing.packets @@ -748,84 +760,72 @@ topology_template: network.outpoing.packets_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outpoing.packets - network.incoming.packets.rate_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.packets.rate + network.incoming.bytes_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.bytes + forwarder_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - forwarder + network.outgoing.bytes_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outgoing.bytes cpu_cif: - cif - cpu - network.incoming.bytes_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.incoming.bytes - network.outgoing.bytes_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.outgoing.bytes disk.device.read.bytes_cif: - cif - disk.device.read.bytes - 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 - network.outpoing.packets_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - network.outpoing.packets feature_cif: - cif - feature - network.incoming.bytes.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.incoming.bytes.rate + network.incoming.packets.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.packets.rate cpu_util_cif: - cif - cpu_util + network.incoming.bytes_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.bytes disk.device.write.bytes_cif: - cif - disk.device.write.bytes - feature_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - feature + attachment_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - attachment network.incoming.packets_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - network.incoming.packets + network.outgoing.packets.rate_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.outgoing.packets.rate 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 + feature_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - feature 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 + network.outgoing.bytes_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.outgoing.bytes 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 @@ -838,42 +838,57 @@ topology_template: cpu.delta_cif: - cif - cpu.delta + network.incoming.bytes.rate_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.bytes.rate scalable_cif: - cif - scalable + network.incoming.packets_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - network.incoming.packets 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 + network.incoming.packets_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - network.incoming.packets binding_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - binding + network.incoming.bytes_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.bytes disk.device.write.bytes.rate_cif: - cif - disk.device.write.bytes.rate + network.outgoing.bytes.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.outgoing.bytes.rate + binding_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - binding 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 + binding_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - binding disk.write.requests_cif: - cif - disk.write.requests - binding_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - binding + network.incoming.packets.rate_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - network.incoming.packets.rate memory_cif: - cif - memory - network.outgoing.packets.rate_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - network.outgoing.packets.rate + forwarder_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - forwarder network.outgoing.bytes.rate_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - network.outgoing.bytes.rate @@ -883,64 +898,49 @@ topology_template: 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 requirements: - dependency_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port - - dependency + link_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 + - link dependency_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - dependency + dependency_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - dependency + link_cif_cif_ims_li_1_port_4: + - cif_cif_ims_li_1_port_4 + - link dependency_cif: - cif - dependency - dependency_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - dependency local_storage_cif: - cif - local_storage - link_cif_cif_internal_1_port: - - cif_cif_internal_1_port - - link - link_cif_cif_ims_li_1_port: - - cif_cif_ims_li_1_port - - link dependency_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - dependency - dependency_cif_cif_internal_1_port: - - cif_cif_internal_1_port + dependency_cif_cif_internal_1_port_0: + - cif_cif_internal_1_port_0 - dependency link_cif_cif_oam_1_port_1: - cif_cif_oam_1_port_1 - link - link_cif_cif_ims_core_1_port: - - cif_cif_ims_core_1_port + dependency_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 + - dependency + link_cif_cif_ims_core_1_port_2: + - cif_cif_ims_core_1_port_2 - link link_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - - link
\ No newline at end of file + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index 4724e88180..146a882317 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -11,163 +11,145 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_ims_core_1_port_allowed_address_pairs: + port_lbd_ims_core_1_port_2_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: json compute_lbd_user_data_format: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_name: - type: list - required: true - entry_schema: - type: string - port_lbd_dpdk_1_port_allowed_address_pairs: - type: list + port_lbd_ims_core_1_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_1_port_subnetpoolid: - type: string + port_lbd_ims_core_1_port_2_order: + type: integer required: true vm_flavor_name: type: string required: true - port_lbd_internal_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_ims_core_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true compute_lbd_availability_zone: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_network_role_tag: - type: string + port_lbd_dpdk_1_port_1_related_networks: + type: list required: true - port_lbd_internal_1_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role: + type: string required: true vm_image_name: type: string required: true - port_lbd_dpdk_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_subnetpoolid: + type: string required: true - port_lbd_dpdk_1_port_network: + port_lbd_dpdk_1_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_1_port_order: - type: integer + port_lbd_ims_core_1_port_2_network_role_tag: + type: string required: true - port_lbd_ims_core_1_port_network_role: + port_lbd_internal_1_port_0_subnetpoolid: type: string required: true - port_lbd_ims_core_1_port_related_networks: + port_lbd_ims_core_1_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_lbd_scheduler_hints: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_dpdk_1_port_1_name: type: list required: true entry_schema: - type: json - port_lbd_dpdk_1_port_name: + type: string + compute_lbd_scheduler_hints: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_exCP_naming: + type: json + port_lbd_ims_core_1_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_lbd_internal_1_port_network: + port_lbd_dpdk_1_port_1_order: + type: integer + required: true + compute_lbd_name: type: list required: true entry_schema: type: string - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - compute_lbd_name: + port_lbd_dpdk_1_port_1_network: type: list required: true entry_schema: type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string + port_lbd_internal_1_port_0_order: + type: integer required: true - port_lbd_internal_1_port_vlan_requirements: + port_lbd_dpdk_1_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_1_network_role_tag: + type: string + required: true compute_lbd_config_drive: type: list required: true entry_schema: type: boolean - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: + port_lbd_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_internal_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_lbd_internal_1_port_ip_requirements: - type: list + port_lbd_ims_core_1_port_2_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + port_lbd_ims_core_1_port_2_name: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - port_lbd_internal_1_port_related_networks: + type: string + port_lbd_internal_1_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_internal_1_port_subnetpoolid: - type: string - required: true - port_lbd_ims_core_1_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_1_port_2_vlan_requirements: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_fixed_ips: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_1_port_2_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_dpdk_1_port_1_fixed_ips: type: list required: true entry_schema: @@ -179,178 +161,196 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_lbd_ims_core_1_port_network: + port_lbd_ims_core_1_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_lbd_dpdk_1_port_network_role_tag: - type: string - required: true - port_lbd_dpdk_1_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_dpdk_1_port_1_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_1_port_fixed_ips: + port_lbd_dpdk_1_port_1_network_role: + type: string + required: true + port_lbd_ims_core_1_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_1_port_network_role: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_1_port_0_network_role_tag: type: string required: true - port_lbd_dpdk_1_port_ip_requirements: + port_lbd_dpdk_1_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_lbd_metadata: + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_internal_1_port_0_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_1_port_vlan_requirements: + port_lbd_internal_1_port_0_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_dpdk_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + compute_lbd_metadata: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_1_port_network_role: + type: json + port_lbd_dpdk_1_port_1_subnetpoolid: type: string required: true + port_lbd_internal_1_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_0_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_2_network: + type: list + required: true + entry_schema: + type: string node_templates: - lbd_lbd_ims_core_1_port: + lbd_lbd_dpdk_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_ims_core_1_port_mac_requirements + get_input: port_lbd_dpdk_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_lbd_ims_core_1_port_allowed_address_pairs + get_input: port_lbd_dpdk_1_port_1_allowed_address_pairs order: - get_input: port_lbd_ims_core_1_port_order + get_input: port_lbd_dpdk_1_port_1_order security_groups: get_input: - - port_lbd_ims_core_1_port_security_groups + - port_lbd_dpdk_1_port_1_security_groups - index_value exCP_naming: - get_input: port_lbd_ims_core_1_port_exCP_naming + get_input: port_lbd_dpdk_1_port_1_exCP_naming vlan_requirements: - get_input: port_lbd_ims_core_1_port_vlan_requirements + get_input: port_lbd_dpdk_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_ims_core_1_port_related_networks + get_input: port_lbd_dpdk_1_port_1_related_networks ip_requirements: - get_input: port_lbd_ims_core_1_port_ip_requirements + get_input: port_lbd_dpdk_1_port_1_ip_requirements network_role_tag: - get_input: port_lbd_ims_core_1_port_network_role_tag + get_input: port_lbd_dpdk_1_port_1_network_role_tag network_role: - get_input: port_lbd_ims_core_1_port_network_role + get_input: port_lbd_dpdk_1_port_1_network_role subnetpoolid: - get_input: port_lbd_ims_core_1_port_subnetpoolid + get_input: port_lbd_dpdk_1_port_1_subnetpoolid fixed_ips: get_input: - - port_lbd_ims_core_1_port_fixed_ips + - port_lbd_dpdk_1_port_1_fixed_ips - index_value name: get_input: - - port_lbd_ims_core_1_port_name + - port_lbd_dpdk_1_port_1_name - index_value network: get_input: - - port_lbd_ims_core_1_port_network + - port_lbd_dpdk_1_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_dpdk_1_port: + lbd_lbd_internal_1_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_dpdk_1_port_mac_requirements - allowed_address_pairs: - get_input: port_lbd_dpdk_1_port_allowed_address_pairs + get_input: port_lbd_internal_1_port_0_mac_requirements order: - get_input: port_lbd_dpdk_1_port_order + get_input: port_lbd_internal_1_port_0_order security_groups: get_input: - - port_lbd_dpdk_1_port_security_groups + - port_lbd_internal_1_port_0_security_groups - index_value exCP_naming: - get_input: port_lbd_dpdk_1_port_exCP_naming + get_input: port_lbd_internal_1_port_0_exCP_naming vlan_requirements: - get_input: port_lbd_dpdk_1_port_vlan_requirements + get_input: port_lbd_internal_1_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_dpdk_1_port_related_networks + get_input: port_lbd_internal_1_port_0_related_networks ip_requirements: - get_input: port_lbd_dpdk_1_port_ip_requirements + get_input: port_lbd_internal_1_port_0_ip_requirements network_role_tag: - get_input: port_lbd_dpdk_1_port_network_role_tag + get_input: port_lbd_internal_1_port_0_network_role_tag network_role: - get_input: port_lbd_dpdk_1_port_network_role - subnetpoolid: - get_input: port_lbd_dpdk_1_port_subnetpoolid + get_input: port_lbd_internal_1_port_0_network_role fixed_ips: get_input: - - port_lbd_dpdk_1_port_fixed_ips + - port_lbd_internal_1_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_lbd_internal_1_port_0_subnetpoolid name: get_input: - - port_lbd_dpdk_1_port_name + - port_lbd_internal_1_port_0_name - index_value network: get_input: - - port_lbd_dpdk_1_port_network + - port_lbd_internal_1_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_internal_1_port: + lbd_lbd_ims_core_1_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_internal_1_port_mac_requirements + get_input: port_lbd_ims_core_1_port_2_mac_requirements + allowed_address_pairs: + get_input: port_lbd_ims_core_1_port_2_allowed_address_pairs order: - get_input: port_lbd_internal_1_port_order + get_input: port_lbd_ims_core_1_port_2_order security_groups: get_input: - - port_lbd_internal_1_port_security_groups + - port_lbd_ims_core_1_port_2_security_groups - index_value exCP_naming: - get_input: port_lbd_internal_1_port_exCP_naming + get_input: port_lbd_ims_core_1_port_2_exCP_naming vlan_requirements: - get_input: port_lbd_internal_1_port_vlan_requirements + get_input: port_lbd_ims_core_1_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_internal_1_port_related_networks + get_input: port_lbd_ims_core_1_port_2_related_networks ip_requirements: - get_input: port_lbd_internal_1_port_ip_requirements + get_input: port_lbd_ims_core_1_port_2_ip_requirements network_role_tag: - get_input: port_lbd_internal_1_port_network_role_tag + get_input: port_lbd_ims_core_1_port_2_network_role_tag network_role: - get_input: port_lbd_internal_1_port_network_role + get_input: port_lbd_ims_core_1_port_2_network_role + subnetpoolid: + get_input: port_lbd_ims_core_1_port_2_subnetpoolid fixed_ips: get_input: - - port_lbd_internal_1_port_fixed_ips + - port_lbd_ims_core_1_port_2_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_1_port_subnetpoolid name: get_input: - - port_lbd_internal_1_port_name + - port_lbd_ims_core_1_port_2_name - index_value network: get_input: - - port_lbd_internal_1_port_network + - port_lbd_ims_core_1_port_2_network - index_value requirements: - binding: @@ -406,87 +406,87 @@ topology_template: disk.device.iops_lbd: - lbd - disk.device.iops - network.outgoing.packets.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.packets.rate + binding_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - binding host_lbd: - lbd - host + network.outgoing.bytes_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.bytes + network.incoming.bytes.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.packets.rate + feature_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - feature disk.device.capacity_lbd: - lbd - disk.device.capacity + network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.bytes.rate + network.incoming.bytes_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.bytes + network.outpoing.packets_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outpoing.packets cpu_util_lbd: - lbd - cpu_util disk.device.read.requests_lbd: - lbd - disk.device.read.requests - attachment_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - attachment + network.outgoing.packets.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.packets.rate memory.usage_lbd: - lbd - memory.usage - binding_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - binding - network.outpoing.packets_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outpoing.packets - network.outgoing.bytes_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.bytes - network.incoming.packets_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.packets + feature_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - feature disk.read.requests_lbd: - lbd - disk.read.requests - feature_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - feature - network.incoming.bytes_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.bytes cpu.delta_lbd: - lbd - cpu.delta + attachment_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - attachment memory_lbd: - lbd - memory disk.write.bytes_lbd: - lbd - disk.write.bytes + network.incoming.bytes_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.bytes scalable_lbd: - lbd - scalable - network.incoming.bytes.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.bytes.rate - network.incoming.packets.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.packets.rate disk.device.read.requests.rate_lbd: - lbd - disk.device.read.requests.rate - network.outgoing.bytes_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.bytes disk.root.size_lbd: - lbd - disk.root.size + feature_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - feature vcpus_lbd: - lbd - vcpus disk.allocation_lbd: - lbd - disk.allocation - forwarder_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - forwarder disk.device.write.requests_lbd: - lbd - disk.device.write.requests @@ -496,75 +496,63 @@ topology_template: disk.latency_lbd: - lbd - disk.latency - network.incoming.packets_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.packets memory.resident_lbd: - lbd - memory.resident - forwarder_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - forwarder disk.read.bytes.rate_lbd: - lbd - disk.read.bytes.rate - network.incoming.bytes.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.bytes.rate - network.outgoing.bytes.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.bytes.rate + attachment_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - attachment disk.read.bytes_lbd: - lbd - disk.read.bytes - network.outgoing.packets.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.packets.rate - network.outgoing.bytes_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outgoing.bytes - forwarder_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - forwarder - network.incoming.packets.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.packets.rate - network.outpoing.packets_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port + network.incoming.bytes.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.bytes.rate + network.outpoing.packets_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 - network.outpoing.packets - attachment_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + attachment_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 - attachment - feature_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - feature + network.incoming.bytes_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.bytes + network.incoming.packets.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.packets.rate + forwarder_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - forwarder cpu_lbd: - lbd - cpu - feature_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - feature + network.outgoing.bytes.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.bytes.rate endpoint_lbd: - lbd - endpoint disk.device.read.bytes.rate_lbd: - lbd - disk.device.read.bytes.rate + forwarder_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - forwarder disk.device.write.bytes.rate_lbd: - lbd - disk.device.write.bytes.rate + network.outgoing.bytes_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.bytes disk.iops_lbd: - lbd - disk.iops - network.outgoing.packets.rate_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.outgoing.packets.rate disk.device.usage_lbd: - lbd - disk.device.usage - binding_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - binding disk.usage_lbd: - lbd - disk.usage @@ -574,51 +562,63 @@ topology_template: disk.write.requests_lbd: - lbd - disk.write.requests - attachment_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - attachment disk.device.write.bytes_lbd: - lbd - disk.device.write.bytes - network.outgoing.bytes.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.bytes.rate + network.incoming.packets.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.packets.rate disk.capacity_lbd: - lbd - disk.capacity + binding_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - binding feature_lbd: - lbd - feature - network.incoming.bytes.rate_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.bytes.rate + network.outgoing.bytes_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.bytes disk.device.latency_lbd: - lbd - disk.device.latency - network.incoming.packets_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - network.incoming.packets + network.outpoing.packets_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outpoing.packets disk.device.write.requests.rate_lbd: - lbd - disk.device.write.requests.rate + network.outgoing.packets.rate_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.outgoing.packets.rate binding_lbd: - lbd - binding - network.incoming.packets.rate_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.packets.rate - network.outpoing.packets_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.outpoing.packets - binding_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + forwarder_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - forwarder + network.outgoing.bytes.rate_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.outgoing.bytes.rate + binding_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 - binding - network.incoming.bytes_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - network.incoming.bytes - network.incoming.bytes_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - network.incoming.bytes + network.incoming.packets_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - network.incoming.packets + network.incoming.packets_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - network.incoming.packets + network.outgoing.packets.rate_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.outgoing.packets.rate + network.incoming.packets_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - network.incoming.packets disk.device.allocation_lbd: - lbd - disk.device.allocation @@ -626,24 +626,24 @@ topology_template: dependency_lbd: - lbd - dependency + dependency_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - dependency + link_lbd_lbd_dpdk_1_port_1: + - lbd_lbd_dpdk_1_port_1 + - link + dependency_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 + - dependency local_storage_lbd: - lbd - local_storage - dependency_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port - - dependency - dependency_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port - - dependency - link_lbd_lbd_ims_core_1_port: - - lbd_lbd_ims_core_1_port + link_lbd_lbd_internal_1_port_0: + - lbd_lbd_internal_1_port_0 - link - link_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - link - link_lbd_lbd_internal_1_port: - - lbd_lbd_internal_1_port + dependency_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 + - dependency + link_lbd_lbd_ims_core_1_port_2: + - lbd_lbd_ims_core_1_port_2 - link - dependency_lbd_lbd_dpdk_1_port: - - lbd_lbd_dpdk_1_port - - dependency
\ No newline at end of file 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 52f88a0642..9cace7c332 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 @@ -11,121 +11,128 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_internal_0_port_network_role_tag: - type: string - required: true compute_lbd_user_data_format: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_lbd_ims_core_0_port_2_ip_requirements: + type: list required: true - port_lbd_dpdk_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_related_networks: + type: list required: true - port_lbd_internal_0_port_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_lbd_dpdk_0_port_related_networks: + port_lbd_internal_0_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - compute_lbd_availability_zone: + port_lbd_dpdk_0_port_1_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_allowed_address_pairs: + compute_lbd_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_dpdk_0_port_subnetpoolid: + type: string + port_lbd_dpdk_0_port_1_network_role_tag: type: string required: true vm_image_name: type: string required: true - port_lbd_dpdk_0_port_ip_requirements: + port_lbd_ims_core_0_port_2_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_order: - type: integer - required: true - port_lbd_ims_core_0_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_internal_0_port_0_security_groups: type: list required: true entry_schema: - type: string - port_lbd_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_lbd_ims_core_0_port_allowed_address_pairs: + type: json + port_lbd_ims_core_0_port_2_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_internal_0_port_name: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_ims_core_0_port_2_subnetpoolid: + type: string + required: true + port_lbd_dpdk_0_port_1_name: type: list required: true entry_schema: type: string - port_lbd_ims_core_0_port_network_role_tag: - type: string + port_lbd_dpdk_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_0_port_related_networks: + compute_lbd_scheduler_hints: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - compute_lbd_scheduler_hints: + type: json + port_lbd_ims_core_0_port_2_security_groups: type: list required: true entry_schema: type: json - port_lbd_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_dpdk_0_port_1_fixed_ips: + type: list required: true - port_lbd_dpdk_0_port_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_network_role: + type: string required: true - port_lbd_ims_core_0_port_ip_requirements: + port_lbd_internal_0_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_0_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_2_fixed_ips: type: list required: true entry_schema: - type: string - port_lbd_dpdk_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps compute_lbd_name: type: list required: true entry_schema: type: string - port_lbd_ims_core_0_port_security_groups: - type: list + port_lbd_internal_0_port_0_network_role: + type: string required: true - entry_schema: - type: json - port_lbd_ims_core_0_port_name: + port_lbd_internal_0_port_0_order: + type: integer + required: true + port_lbd_dpdk_0_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_lbd_internal_0_port_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_0_subnetpoolid: + type: string + required: true + port_lbd_ims_core_0_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_dpdk_0_port_1_vlan_requirements: type: list required: true entry_schema: @@ -135,64 +142,46 @@ topology_template: required: true entry_schema: type: boolean - port_lbd_internal_0_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_lbd_dpdk_0_port_fixed_ips: - type: list + port_lbd_internal_0_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_0_port_security_groups: + port_lbd_dpdk_0_port_1_security_groups: type: list required: true entry_schema: type: json - port_lbd_dpdk_0_port_security_groups: - type: list + port_lbd_ims_core_0_port_2_network_role_tag: + type: string required: true - entry_schema: - type: json - port_lbd_dpdk_0_port_vlan_requirements: - type: list + port_lbd_ims_core_0_port_2_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_0_port_name: + port_lbd_dpdk_0_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true - port_lbd_ims_core_0_port_network_role: - type: string + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_dpdk_0_port_1_order: + type: integer required: true - port_lbd_dpdk_0_port_network: + port_lbd_ims_core_0_port_2_name: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_network_role_tag: + port_lbd_dpdk_0_port_1_subnetpoolid: type: string required: true - port_lbd_internal_0_port_order: - type: integer - required: true - port_lbd_dpdk_0_port_network_role: - type: string - required: true - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_2_allowed_address_pairs: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair index_value: type: integer description: Index value of this substitution service template runtime instance @@ -200,157 +189,168 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_lbd_ims_core_0_port_fixed_ips: + port_lbd_ims_core_0_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_0_port_fixed_ips: + type: string + port_lbd_internal_0_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: string + port_lbd_internal_0_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_ims_core_0_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_lbd_metadata: type: list required: true entry_schema: type: json - port_lbd_internal_0_port_ip_requirements: + port_lbd_dpdk_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_dpdk_0_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_internal_0_port_0_name: + type: list + required: true + entry_schema: + type: string node_templates: - lbd_lbd_ims_core_0_port: + lbd_lbd_dpdk_0_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_ims_core_0_port_mac_requirements + get_input: port_lbd_dpdk_0_port_1_mac_requirements allowed_address_pairs: - get_input: port_lbd_ims_core_0_port_allowed_address_pairs + get_input: port_lbd_dpdk_0_port_1_allowed_address_pairs order: - get_input: port_lbd_ims_core_0_port_order + get_input: port_lbd_dpdk_0_port_1_order security_groups: get_input: - - port_lbd_ims_core_0_port_security_groups + - port_lbd_dpdk_0_port_1_security_groups - index_value exCP_naming: - get_input: port_lbd_ims_core_0_port_exCP_naming + get_input: port_lbd_dpdk_0_port_1_exCP_naming vlan_requirements: - get_input: port_lbd_ims_core_0_port_vlan_requirements + get_input: port_lbd_dpdk_0_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_ims_core_0_port_related_networks + get_input: port_lbd_dpdk_0_port_1_related_networks ip_requirements: - get_input: port_lbd_ims_core_0_port_ip_requirements + get_input: port_lbd_dpdk_0_port_1_ip_requirements network_role_tag: - get_input: port_lbd_ims_core_0_port_network_role_tag + get_input: port_lbd_dpdk_0_port_1_network_role_tag network_role: - get_input: port_lbd_ims_core_0_port_network_role + get_input: port_lbd_dpdk_0_port_1_network_role subnetpoolid: - get_input: port_lbd_ims_core_0_port_subnetpoolid + get_input: port_lbd_dpdk_0_port_1_subnetpoolid fixed_ips: get_input: - - port_lbd_ims_core_0_port_fixed_ips + - port_lbd_dpdk_0_port_1_fixed_ips - index_value name: get_input: - - port_lbd_ims_core_0_port_name + - port_lbd_dpdk_0_port_1_name - index_value network: get_input: - - port_lbd_ims_core_0_port_network + - port_lbd_dpdk_0_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_dpdk_0_port: + lbd_lbd_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_dpdk_0_port_mac_requirements - allowed_address_pairs: - get_input: port_lbd_dpdk_0_port_allowed_address_pairs + get_input: port_lbd_internal_0_port_0_mac_requirements order: - get_input: port_lbd_dpdk_0_port_order + get_input: port_lbd_internal_0_port_0_order security_groups: get_input: - - port_lbd_dpdk_0_port_security_groups + - port_lbd_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_lbd_dpdk_0_port_exCP_naming + get_input: port_lbd_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_lbd_dpdk_0_port_vlan_requirements + get_input: port_lbd_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_dpdk_0_port_related_networks + get_input: port_lbd_internal_0_port_0_related_networks ip_requirements: - get_input: port_lbd_dpdk_0_port_ip_requirements + get_input: port_lbd_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_lbd_dpdk_0_port_network_role_tag + get_input: port_lbd_internal_0_port_0_network_role_tag network_role: - get_input: port_lbd_dpdk_0_port_network_role - subnetpoolid: - get_input: port_lbd_dpdk_0_port_subnetpoolid + get_input: port_lbd_internal_0_port_0_network_role fixed_ips: get_input: - - port_lbd_dpdk_0_port_fixed_ips + - port_lbd_internal_0_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_lbd_internal_0_port_0_subnetpoolid name: get_input: - - port_lbd_dpdk_0_port_name + - port_lbd_internal_0_port_0_name - index_value network: get_input: - - port_lbd_dpdk_0_port_network + - port_lbd_internal_0_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: lbd relationship: tosca.relationships.network.BindsTo - lbd_lbd_internal_0_port: + lbd_lbd_ims_core_0_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_lbd_internal_0_port_mac_requirements + get_input: port_lbd_ims_core_0_port_2_mac_requirements + allowed_address_pairs: + get_input: port_lbd_ims_core_0_port_2_allowed_address_pairs order: - get_input: port_lbd_internal_0_port_order + get_input: port_lbd_ims_core_0_port_2_order security_groups: get_input: - - port_lbd_internal_0_port_security_groups + - port_lbd_ims_core_0_port_2_security_groups - index_value exCP_naming: - get_input: port_lbd_internal_0_port_exCP_naming + get_input: port_lbd_ims_core_0_port_2_exCP_naming vlan_requirements: - get_input: port_lbd_internal_0_port_vlan_requirements + get_input: port_lbd_ims_core_0_port_2_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_lbd_internal_0_port_related_networks + get_input: port_lbd_ims_core_0_port_2_related_networks ip_requirements: - get_input: port_lbd_internal_0_port_ip_requirements + get_input: port_lbd_ims_core_0_port_2_ip_requirements network_role_tag: - get_input: port_lbd_internal_0_port_network_role_tag + get_input: port_lbd_ims_core_0_port_2_network_role_tag network_role: - get_input: port_lbd_internal_0_port_network_role + get_input: port_lbd_ims_core_0_port_2_network_role + subnetpoolid: + get_input: port_lbd_ims_core_0_port_2_subnetpoolid fixed_ips: get_input: - - port_lbd_internal_0_port_fixed_ips + - port_lbd_ims_core_0_port_2_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_0_port_subnetpoolid name: get_input: - - port_lbd_internal_0_port_name + - port_lbd_ims_core_0_port_2_name - index_value network: get_input: - - port_lbd_internal_0_port_network + - port_lbd_ims_core_0_port_2_network - index_value requirements: - binding: @@ -394,111 +394,126 @@ topology_template: disk.ephemeral.size_lbd: - lbd - disk.ephemeral.size - attachment_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - attachment - network.incoming.bytes.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.bytes.rate disk.write.requests.rate_lbd: - lbd - disk.write.requests.rate disk.write.bytes.rate_lbd: - lbd - disk.write.bytes.rate - network.incoming.packets.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.incoming.packets.rate instance_lbd: - lbd - instance - network.incoming.packets_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.incoming.packets + binding_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - binding disk.device.iops_lbd: - lbd - disk.device.iops - network.outgoing.bytes_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outgoing.bytes - network.outgoing.bytes.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outgoing.bytes.rate - network.outgoing.packets.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outgoing.packets.rate - network.incoming.bytes_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.bytes host_lbd: - lbd - host + network.outgoing.bytes_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outgoing.bytes disk.device.capacity_lbd: - lbd - disk.device.capacity - network.incoming.bytes_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.bytes + network.outgoing.bytes.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.outgoing.packets.rate cpu_util_lbd: - lbd - cpu_util disk.device.read.requests_lbd: - lbd - disk.device.read.requests - network.outpoing.packets_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port + network.outpoing.packets_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 - network.outpoing.packets memory.usage_lbd: - lbd - memory.usage - network.outgoing.bytes_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outgoing.bytes - binding_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - binding + network.incoming.packets.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.packets.rate + network.incoming.bytes.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.bytes.rate + feature_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - feature + feature_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - feature disk.read.requests_lbd: - lbd - disk.read.requests + network.incoming.packets_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.packets + network.incoming.packets.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.incoming.packets.rate cpu.delta_lbd: - lbd - cpu.delta - network.outpoing.packets_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outpoing.packets memory_lbd: - lbd - memory - network.incoming.packets.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.packets.rate + network.outpoing.packets_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outpoing.packets disk.write.bytes_lbd: - lbd - disk.write.bytes - network.outgoing.packets.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.outgoing.packets.rate + binding_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - binding scalable_lbd: - lbd - scalable + network.incoming.bytes.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.bytes.rate + network.outgoing.bytes_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outgoing.bytes disk.device.read.requests.rate_lbd: - lbd - disk.device.read.requests.rate disk.root.size_lbd: - lbd - disk.root.size + network.outgoing.bytes.rate_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.outgoing.bytes.rate + network.outgoing.packets.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.outgoing.packets.rate vcpus_lbd: - lbd - vcpus + network.incoming.packets_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.packets + network.outgoing.packets.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outgoing.packets.rate disk.allocation_lbd: - lbd - disk.allocation - attachment_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - attachment + forwarder_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - forwarder disk.device.write.requests_lbd: - lbd - disk.device.write.requests + binding_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - binding os_lbd: - lbd - os @@ -508,63 +523,57 @@ topology_template: memory.resident_lbd: - lbd - memory.resident + network.incoming.packets_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.incoming.packets disk.read.bytes.rate_lbd: - lbd - disk.read.bytes.rate disk.read.bytes_lbd: - lbd - disk.read.bytes - network.incoming.bytes_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.incoming.bytes - network.outgoing.bytes.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.outgoing.bytes.rate - binding_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - binding - network.incoming.packets_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.packets - network.incoming.bytes.rate_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port + network.incoming.bytes.rate_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 - network.incoming.bytes.rate - 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 + attachment_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - attachment + network.incoming.bytes_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.bytes + network.incoming.packets.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.incoming.packets.rate + network.outpoing.packets_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outpoing.packets + forwarder_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 - forwarder - network.outgoing.bytes_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - network.outgoing.bytes cpu_lbd: - lbd - cpu + attachment_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - attachment + network.outgoing.bytes.rate_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - network.outgoing.bytes.rate endpoint_lbd: - lbd - endpoint disk.device.read.bytes.rate_lbd: - lbd - disk.device.read.bytes.rate - feature_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - feature + forwarder_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - forwarder disk.device.write.bytes.rate_lbd: - lbd - disk.device.write.bytes.rate - network.incoming.packets.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.packets.rate - network.incoming.packets_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.incoming.packets - network.incoming.bytes.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.incoming.bytes.rate - attachment_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - attachment + network.outgoing.bytes_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.outgoing.bytes disk.iops_lbd: - lbd - disk.iops @@ -577,27 +586,24 @@ topology_template: disk.device.read.bytes_lbd: - lbd - disk.device.read.bytes - network.outpoing.packets_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outpoing.packets disk.write.requests_lbd: - lbd - disk.write.requests disk.device.write.bytes_lbd: - lbd - disk.device.write.bytes - forwarder_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - forwarder + attachment_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - attachment disk.capacity_lbd: - lbd - disk.capacity - forwarder_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - forwarder feature_lbd: - lbd - feature + network.incoming.bytes_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - network.incoming.bytes disk.device.latency_lbd: - lbd - disk.device.latency @@ -607,43 +613,37 @@ topology_template: binding_lbd: - lbd - binding - feature_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port + feature_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 - feature - feature_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - feature - network.outgoing.packets.rate_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port - - network.outgoing.packets.rate + network.incoming.bytes_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - network.incoming.bytes disk.device.allocation_lbd: - lbd - disk.device.allocation - network.outgoing.bytes.rate_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - network.outgoing.bytes.rate requirements: - dependency_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - dependency - link_lbd_lbd_dpdk_0_port: - - lbd_lbd_dpdk_0_port - - link dependency_lbd: - lbd - dependency - dependency_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - dependency - dependency_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port + dependency_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 - dependency + link_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - link local_storage_lbd: - lbd - local_storage - link_lbd_lbd_ims_core_0_port: - - lbd_lbd_ims_core_0_port + dependency_lbd_lbd_dpdk_0_port_1: + - lbd_lbd_dpdk_0_port_1 + - dependency + link_lbd_lbd_internal_0_port_0: + - lbd_lbd_internal_0_port_0 + - link + dependency_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 + - dependency + link_lbd_lbd_ims_core_0_port_2: + - lbd_lbd_ims_core_0_port_2 - link - link_lbd_lbd_internal_0_port: - - lbd_lbd_internal_0_port - - link
\ No newline at end of file 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 ea3d737e38..3babb784c2 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 @@ -11,51 +11,56 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_oam_0_port_name: + port_oam_oam_0_port_1_network_role: + type: string + required: true + port_oam_oam_0_port_1_ip_requirements: type: list required: true entry_schema: - type: string - port_oam_internal_0_port_order: - type: integer + type: org.openecomp.datatypes.network.IpRequirements + port_oam_internal_0_port_0_fixed_ips: + type: list required: true - port_oam_internal_0_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + vm_flavor_name: type: string required: true - port_oam_oam_0_port_fixed_ips: + port_oam_internal_0_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - vm_flavor_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_0_port_0_subnetpoolid: type: string required: true - port_oam_oam_0_port_vlan_requirements: + port_oam_oam_0_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_0_port_mac_requirements: + port_oam_internal_0_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_oam_internal_0_port_ip_requirements: + port_oam_oam_0_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_1_related_networks: type: list required: true entry_schema: - type: string - port_oam_oam_0_port_order: - type: integer - required: true - port_oam_internal_0_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_internal_0_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string + port_oam_oam_0_port_1_order: + type: integer + required: true vm_image_name: type: string required: true @@ -64,38 +69,40 @@ topology_template: required: true entry_schema: type: boolean - port_oam_oam_0_port_network_role: + port_oam_oam_0_port_1_allowed_address_pairs: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_internal_0_port_0_network_role_tag: type: string required: true - port_oam_internal_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_oam_internal_0_port_name: + port_oam_internal_0_port_0_name: type: list required: true entry_schema: type: string - port_oam_oam_0_port_allowed_address_pairs: + port_oam_oam_0_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_security_groups: + type: string + port_oam_oam_0_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_internal_0_port_0_security_groups: type: list required: true entry_schema: type: json - port_oam_internal_0_port_fixed_ips: + port_oam_oam_0_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_0_port_network_role_tag: - type: string - required: true - port_oam_oam_0_port_subnetpoolid: - type: string - required: true + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -103,7 +110,10 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_oam_0_port_related_networks: + port_oam_internal_0_port_0_network_role: + type: string + required: true + port_oam_internal_0_port_0_related_networks: type: list required: true entry_schema: @@ -113,43 +123,30 @@ topology_template: required: true entry_schema: type: string - port_oam_oam_0_port_network: + port_oam_internal_0_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_oam_oam_0_port_1_name: type: list required: true entry_schema: type: string - port_oam_internal_0_port_network_role_tag: - type: string - required: true - port_oam_internal_0_port_network_role: - type: string - required: true - port_oam_oam_0_port_ip_requirements: + port_oam_internal_0_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_oam_oam_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_0_port_1_subnetpoolid: + type: string required: true compute_oam_scheduler_hints: type: list required: true entry_schema: type: json - port_oam_internal_0_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_0_port_vlan_requirements: - type: list + port_oam_internal_0_port_0_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements compute_oam_availability_zone: type: list required: true @@ -165,96 +162,54 @@ topology_template: required: true entry_schema: type: string - port_oam_oam_0_port_security_groups: + port_oam_internal_0_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_0_port_1_network_role_tag: + type: string + required: true node_templates: - oam_oam_oam_0_port: + oam_oam_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_oam_0_port_mac_requirements + get_input: port_oam_internal_0_port_0_mac_requirements allowed_address_pairs: - get_input: port_oam_oam_0_port_allowed_address_pairs + get_input: port_oam_internal_0_port_0_allowed_address_pairs order: - get_input: port_oam_oam_0_port_order + get_input: port_oam_internal_0_port_0_order security_groups: get_input: - - port_oam_oam_0_port_security_groups + - port_oam_internal_0_port_0_security_groups - index_value exCP_naming: - get_input: port_oam_oam_0_port_exCP_naming + get_input: port_oam_internal_0_port_0_exCP_naming vlan_requirements: - get_input: port_oam_oam_0_port_vlan_requirements + get_input: port_oam_internal_0_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_oam_0_port_related_networks + get_input: port_oam_internal_0_port_0_related_networks ip_requirements: - get_input: port_oam_oam_0_port_ip_requirements + get_input: port_oam_internal_0_port_0_ip_requirements network_role_tag: - get_input: port_oam_oam_0_port_network_role_tag + get_input: port_oam_internal_0_port_0_network_role_tag network_role: - get_input: port_oam_oam_0_port_network_role + get_input: port_oam_internal_0_port_0_network_role subnetpoolid: - get_input: port_oam_oam_0_port_subnetpoolid + get_input: port_oam_internal_0_port_0_subnetpoolid fixed_ips: get_input: - - port_oam_oam_0_port_fixed_ips + - port_oam_internal_0_port_0_fixed_ips - index_value name: get_input: - - port_oam_oam_0_port_name + - port_oam_internal_0_port_0_name - index_value network: get_input: - - port_oam_oam_0_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: oam - relationship: tosca.relationships.network.BindsTo - oam_oam_internal_0_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_oam_internal_0_port_mac_requirements - allowed_address_pairs: - get_input: port_oam_internal_0_port_allowed_address_pairs - order: - get_input: port_oam_internal_0_port_order - security_groups: - get_input: - - port_oam_internal_0_port_security_groups - - index_value - exCP_naming: - get_input: port_oam_internal_0_port_exCP_naming - vlan_requirements: - get_input: port_oam_internal_0_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_oam_internal_0_port_related_networks - ip_requirements: - get_input: port_oam_internal_0_port_ip_requirements - network_role_tag: - get_input: port_oam_internal_0_port_network_role_tag - network_role: - get_input: port_oam_internal_0_port_network_role - subnetpoolid: - get_input: port_oam_internal_0_port_subnetpoolid - fixed_ips: - get_input: - - port_oam_internal_0_port_fixed_ips - - index_value - name: - get_input: - - port_oam_internal_0_port_name - - index_value - network: - get_input: - - port_oam_internal_0_port_network + - port_oam_internal_0_port_0_network - index_value requirements: - binding: @@ -292,21 +247,60 @@ topology_template: get_input: - compute_oam_user_data_format - index_value + oam_oam_oam_0_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_oam_oam_0_port_1_mac_requirements + allowed_address_pairs: + get_input: port_oam_oam_0_port_1_allowed_address_pairs + order: + get_input: port_oam_oam_0_port_1_order + security_groups: + get_input: + - port_oam_oam_0_port_1_security_groups + - index_value + exCP_naming: + get_input: port_oam_oam_0_port_1_exCP_naming + vlan_requirements: + get_input: port_oam_oam_0_port_1_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_oam_oam_0_port_1_related_networks + ip_requirements: + get_input: port_oam_oam_0_port_1_ip_requirements + network_role_tag: + get_input: port_oam_oam_0_port_1_network_role_tag + network_role: + get_input: port_oam_oam_0_port_1_network_role + subnetpoolid: + get_input: port_oam_oam_0_port_1_subnetpoolid + fixed_ips: + get_input: + - port_oam_oam_0_port_1_fixed_ips + - index_value + name: + get_input: + - port_oam_oam_0_port_1_name + - index_value + network: + get_input: + - port_oam_oam_0_port_1_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: oam + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam capabilities: cpu_oam: - oam - cpu - attachment_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - attachment - network.incoming.packets_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.incoming.packets - binding_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - binding + feature_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - feature disk.usage_oam: - oam - disk.usage @@ -316,24 +310,21 @@ topology_template: disk.device.write.bytes_oam: - oam - disk.device.write.bytes - binding_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - binding 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 - network.incoming.packets.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.incoming.packets.rate + network.incoming.bytes_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.bytes scalable_oam: - oam - scalable + network.outgoing.bytes_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outgoing.bytes + network.incoming.bytes_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.bytes feature_oam: - oam - feature @@ -343,57 +334,66 @@ topology_template: disk.device.usage_oam: - oam - disk.device.usage + feature_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - feature binding_oam: - oam - binding disk.device.read.bytes.rate_oam: - oam - disk.device.read.bytes.rate - network.outgoing.bytes_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outgoing.bytes + network.outgoing.bytes.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outgoing.bytes.rate disk.write.bytes.rate_oam: - oam - disk.write.bytes.rate disk.device.write.bytes.rate_oam: - oam - disk.device.write.bytes.rate + network.incoming.packets_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.packets disk.device.allocation_oam: - oam - disk.device.allocation - network.outpoing.packets_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outpoing.packets - feature_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - feature - network.incoming.packets.rate_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.incoming.packets.rate + forwarder_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - forwarder disk.ephemeral.size_oam: - oam - disk.ephemeral.size - attachment_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - attachment disk.write.requests_oam: - oam - disk.write.requests + attachment_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - attachment disk.capacity_oam: - oam - disk.capacity + network.incoming.bytes.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.bytes.rate instance_oam: - oam - instance + binding_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - binding disk.root.size_oam: - oam - disk.root.size - network.incoming.bytes_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.incoming.bytes - feature_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - feature + binding_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - binding + network.outgoing.packets.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outgoing.packets.rate + attachment_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - attachment memory_oam: - oam - memory @@ -403,24 +403,18 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests - network.incoming.bytes.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.incoming.bytes.rate - network.outgoing.bytes_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outgoing.bytes disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate + forwarder_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - forwarder disk.write.requests.rate_oam: - oam - disk.write.requests.rate disk.device.latency_oam: - oam - disk.device.latency - network.outgoing.bytes.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outgoing.bytes.rate disk.device.iops_oam: - oam - disk.device.iops @@ -430,39 +424,39 @@ topology_template: disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate + network.incoming.packets.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.packets.rate + network.incoming.packets.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.incoming.packets.rate disk.device.read.bytes_oam: - oam - disk.device.read.bytes host_oam: - oam - host + network.outpoing.packets_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.outpoing.packets endpoint_oam: - oam - endpoint disk.device.read.requests_oam: - oam - disk.device.read.requests - network.outgoing.packets.rate_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outgoing.packets.rate disk.iops_oam: - oam - disk.iops disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - network.outgoing.packets.rate_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - network.outgoing.packets.rate - 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 + network.outgoing.bytes.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outgoing.bytes.rate + network.outpoing.packets_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outpoing.packets cpu_util_oam: - oam - cpu_util @@ -475,37 +469,43 @@ topology_template: disk.latency_oam: - oam - disk.latency - network.outpoing.packets_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outpoing.packets + network.outgoing.packets.rate_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outgoing.packets.rate + network.incoming.packets_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.packets disk.write.bytes_oam: - oam - disk.write.bytes + network.outgoing.bytes_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 + - network.outgoing.bytes + network.incoming.bytes.rate_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - network.incoming.bytes.rate disk.read.requests_oam: - oam - disk.read.requests disk.device.capacity_oam: - oam - disk.device.capacity - network.outgoing.bytes.rate_oam_oam_oam_0_port: - - oam_oam_oam_0_port - - network.outgoing.bytes.rate requirements: - dependency_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - dependency + link_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - link local_storage_oam: - oam - local_storage - link_oam_oam_oam_0_port: - - oam_oam_oam_0_port + link_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 - link - dependency_oam_oam_oam_0_port: - - oam_oam_oam_0_port + dependency_oam_oam_internal_0_port_0: + - oam_oam_internal_0_port_0 + - dependency + dependency_oam_oam_oam_0_port_1: + - oam_oam_oam_0_port_1 - dependency dependency_oam: - oam - dependency - link_oam_oam_internal_0_port: - - oam_oam_internal_0_port - - link
\ No newline at end of file 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 ab1896910c..1988c6b9b3 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 @@ -11,46 +11,30 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_internal_1_port_network_role_tag: - type: string - required: true - port_oam_internal_1_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_security_groups: + port_oam_oam_1_port_1_vlan_requirements: type: list required: true entry_schema: - type: json - port_oam_internal_1_port_network_role: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_internal_1_port_0_network_role_tag: type: string required: true - port_oam_oam_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_oam_oam_1_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair vm_flavor_name: type: string required: true - port_oam_oam_1_port_ip_requirements: + port_oam_internal_1_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_network_role_tag: + port_oam_oam_1_port_1_network_role_tag: type: string required: true - port_oam_oam_1_port_security_groups: + port_oam_internal_1_port_0_name: type: list required: true entry_schema: - type: json + type: string vm_image_name: type: string required: true @@ -59,39 +43,31 @@ topology_template: required: true entry_schema: type: boolean - port_oam_internal_1_port_network: - type: list + port_oam_oam_1_port_1_order: + type: integer required: true - entry_schema: - type: string - port_oam_oam_1_port_fixed_ips: - type: list + port_oam_internal_1_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_1_port_related_networks: - type: list + port_oam_oam_1_port_1_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_internal_1_port_vlan_requirements: + port_oam_oam_1_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_1_port_ip_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_1_port_1_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_order: - type: integer + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_oam_oam_1_port_network: - type: list + port_oam_internal_1_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -99,53 +75,68 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_internal_1_port_allowed_address_pairs: + port_oam_oam_1_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_1_network_role: + type: string + required: true compute_oam_user_data_format: type: list required: true entry_schema: type: string - port_oam_internal_1_port_exCP_naming: + port_oam_oam_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_internal_1_port_0_order: + type: integer + required: true + port_oam_internal_1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_oam_internal_1_port_name: + port_oam_internal_1_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: string - port_oam_internal_1_port_fixed_ips: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_1_port_1_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_1_port_subnetpoolid: - type: string - required: true - port_oam_oam_1_port_name: + type: string + port_oam_oam_1_port_1_name: type: list required: true entry_schema: type: string - port_oam_internal_1_port_order: - type: integer + port_oam_internal_1_port_0_fixed_ips: + type: list required: true - port_oam_oam_1_port_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_1_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_1_port_subnetpoolid: - type: string - required: true compute_oam_scheduler_hints: type: list required: true entry_schema: type: json + port_oam_internal_1_port_0_security_groups: + type: list + required: true + entry_schema: + type: json + port_oam_internal_1_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_availability_zone: type: list required: true @@ -156,105 +147,69 @@ topology_template: required: true entry_schema: type: json - port_oam_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network_role: + type: string + required: true + port_oam_oam_1_port_1_security_groups: + type: list required: true + entry_schema: + type: json compute_oam_name: type: list required: true entry_schema: type: string - port_oam_oam_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_1_port_0_network: + type: list required: true - port_oam_oam_1_port_network_role: - type: string + entry_schema: + type: string + port_oam_oam_1_port_1_fixed_ips: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - oam_oam_internal_1_port: + oam_oam_oam_1_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_internal_1_port_mac_requirements + get_input: port_oam_oam_1_port_1_mac_requirements allowed_address_pairs: - get_input: port_oam_internal_1_port_allowed_address_pairs + get_input: port_oam_oam_1_port_1_allowed_address_pairs order: - get_input: port_oam_internal_1_port_order + get_input: port_oam_oam_1_port_1_order security_groups: get_input: - - port_oam_internal_1_port_security_groups + - port_oam_oam_1_port_1_security_groups - index_value exCP_naming: - get_input: port_oam_internal_1_port_exCP_naming + get_input: port_oam_oam_1_port_1_exCP_naming vlan_requirements: - get_input: port_oam_internal_1_port_vlan_requirements + get_input: port_oam_oam_1_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_internal_1_port_related_networks + get_input: port_oam_oam_1_port_1_related_networks ip_requirements: - get_input: port_oam_internal_1_port_ip_requirements + get_input: port_oam_oam_1_port_1_ip_requirements network_role_tag: - get_input: port_oam_internal_1_port_network_role_tag + get_input: port_oam_oam_1_port_1_network_role_tag network_role: - get_input: port_oam_internal_1_port_network_role + get_input: port_oam_oam_1_port_1_network_role subnetpoolid: - get_input: port_oam_internal_1_port_subnetpoolid + get_input: port_oam_oam_1_port_1_subnetpoolid fixed_ips: get_input: - - port_oam_internal_1_port_fixed_ips + - port_oam_oam_1_port_1_fixed_ips - index_value name: get_input: - - port_oam_internal_1_port_name + - port_oam_oam_1_port_1_name - index_value network: get_input: - - port_oam_internal_1_port_network - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: oam - relationship: tosca.relationships.network.BindsTo - oam_oam_oam_1_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_requirements: - get_input: port_oam_oam_1_port_mac_requirements - allowed_address_pairs: - get_input: port_oam_oam_1_port_allowed_address_pairs - order: - get_input: port_oam_oam_1_port_order - security_groups: - get_input: - - port_oam_oam_1_port_security_groups - - index_value - exCP_naming: - get_input: port_oam_oam_1_port_exCP_naming - vlan_requirements: - get_input: port_oam_oam_1_port_vlan_requirements - subinterface_indicator: false - related_networks: - get_input: port_oam_oam_1_port_related_networks - ip_requirements: - get_input: port_oam_oam_1_port_ip_requirements - network_role_tag: - get_input: port_oam_oam_1_port_network_role_tag - network_role: - get_input: port_oam_oam_1_port_network_role - subnetpoolid: - get_input: port_oam_oam_1_port_subnetpoolid - fixed_ips: - get_input: - - port_oam_oam_1_port_fixed_ips - - index_value - name: - get_input: - - port_oam_oam_1_port_name - - index_value - network: - get_input: - - port_oam_oam_1_port_network + - port_oam_oam_1_port_1_network - index_value requirements: - binding: @@ -292,21 +247,60 @@ topology_template: get_input: - compute_oam_user_data_format - index_value + oam_oam_internal_1_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + mac_requirements: + get_input: port_oam_internal_1_port_0_mac_requirements + allowed_address_pairs: + get_input: port_oam_internal_1_port_0_allowed_address_pairs + order: + get_input: port_oam_internal_1_port_0_order + security_groups: + get_input: + - port_oam_internal_1_port_0_security_groups + - index_value + exCP_naming: + get_input: port_oam_internal_1_port_0_exCP_naming + vlan_requirements: + get_input: port_oam_internal_1_port_0_vlan_requirements + subinterface_indicator: false + related_networks: + get_input: port_oam_internal_1_port_0_related_networks + ip_requirements: + get_input: port_oam_internal_1_port_0_ip_requirements + network_role_tag: + get_input: port_oam_internal_1_port_0_network_role_tag + network_role: + get_input: port_oam_internal_1_port_0_network_role + subnetpoolid: + get_input: port_oam_internal_1_port_0_subnetpoolid + fixed_ips: + get_input: + - port_oam_internal_1_port_0_fixed_ips + - index_value + name: + get_input: + - port_oam_internal_1_port_0_name + - index_value + network: + get_input: + - port_oam_internal_1_port_0_network + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: oam + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam_1 capabilities: cpu_oam: - oam - cpu - network.incoming.bytes.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.incoming.bytes.rate - network.outpoing.packets_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.outpoing.packets - network.incoming.packets.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.incoming.packets.rate + feature_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - feature disk.usage_oam: - oam - disk.usage @@ -316,38 +310,44 @@ 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 - binding_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - binding + network.incoming.bytes_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.incoming.bytes scalable_oam: - oam - scalable + network.outgoing.bytes_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outgoing.bytes + network.incoming.bytes_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.incoming.bytes feature_oam: - oam - feature disk.allocation_oam: - oam - disk.allocation - network.outgoing.packets.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.outgoing.packets.rate + network.incoming.packets.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.incoming.packets.rate disk.device.usage_oam: - oam - disk.device.usage + network.outpoing.packets_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.outpoing.packets binding_oam: - oam - binding disk.device.read.bytes.rate_oam: - oam - disk.device.read.bytes.rate - network.outgoing.bytes.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port + network.outgoing.bytes.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 - network.outgoing.bytes.rate disk.write.bytes.rate_oam: - oam @@ -358,45 +358,45 @@ topology_template: disk.device.allocation_oam: - oam - disk.device.allocation - network.incoming.bytes_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.incoming.bytes disk.ephemeral.size_oam: - oam - disk.ephemeral.size - network.incoming.packets_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.incoming.packets + network.outgoing.bytes_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.outgoing.bytes disk.write.requests_oam: - oam - disk.write.requests - attachment_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - attachment + network.incoming.packets_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.incoming.packets disk.capacity_oam: - oam - disk.capacity + network.incoming.bytes.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.outgoing.packets.rate instance_oam: - oam - instance - network.outgoing.bytes_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outgoing.bytes + network.outpoing.packets_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outpoing.packets disk.root.size_oam: - oam - disk.root.size - network.outgoing.bytes_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.outgoing.bytes - feature_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - feature - network.outgoing.packets.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outgoing.packets.rate - network.incoming.bytes.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.incoming.bytes.rate + binding_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - binding + attachment_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - attachment + binding_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - binding memory_oam: - oam - memory @@ -406,12 +406,9 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests - network.outgoing.bytes.rate_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outgoing.bytes.rate - network.incoming.bytes_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - network.incoming.bytes + network.outgoing.packets.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outgoing.packets.rate disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate @@ -424,24 +421,18 @@ topology_template: disk.device.iops_oam: - oam - disk.device.iops - network.outpoing.packets_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - network.outpoing.packets - feature_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - feature - network.incoming.packets.rate_oam_oam_oam_1_port: - - oam_oam_oam_1_port + network.incoming.packets.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 - network.incoming.packets.rate + forwarder_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - forwarder vcpus_oam: - oam - vcpus disk.device.write.requests.rate_oam: - oam - disk.device.write.requests.rate - attachment_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - attachment disk.device.read.bytes_oam: - oam - disk.device.read.bytes @@ -451,6 +442,9 @@ topology_template: endpoint_oam: - oam - endpoint + feature_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - feature disk.device.read.requests_oam: - oam - disk.device.read.requests @@ -460,12 +454,15 @@ topology_template: disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - network.incoming.packets_oam_oam_internal_1_port: - - oam_oam_internal_1_port + network.outgoing.bytes.rate_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - network.outgoing.bytes.rate + forwarder_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - forwarder + network.incoming.packets_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 - network.incoming.packets - binding_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - binding cpu_util_oam: - oam - cpu_util @@ -478,12 +475,15 @@ topology_template: disk.latency_oam: - oam - disk.latency + attachment_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - attachment disk.write.bytes_oam: - oam - disk.write.bytes - forwarder_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - forwarder + network.incoming.bytes.rate_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - network.incoming.bytes.rate disk.read.requests_oam: - oam - disk.read.requests @@ -491,21 +491,21 @@ topology_template: - oam - disk.device.capacity requirements: + link_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - link + link_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - link local_storage_oam: - oam - local_storage - link_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - link - link_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - link + dependency_oam_oam_internal_1_port_0: + - oam_oam_internal_1_port_0 + - dependency + dependency_oam_oam_oam_1_port_1: + - oam_oam_oam_1_port_1 + - dependency dependency_oam: - oam - dependency - dependency_oam_oam_internal_1_port: - - oam_oam_internal_1_port - - dependency - dependency_oam_oam_oam_1_port: - - oam_oam_oam_1_port - - dependency
\ No newline at end of file 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 d099f16268..6f42fdbce3 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 @@ -11,47 +11,33 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_oam_oam_2_port_network_role_tag: + port_oam_internal_2_port_0_subnetpoolid: type: string required: true - port_oam_oam_2_port_related_networks: + port_oam_internal_2_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_oam_oam_2_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_oam_oam_2_port_name: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: string - port_oam_internal_2_port_name: + port_oam_internal_2_port_0_name: type: list required: true entry_schema: type: string - port_oam_oam_2_port_network_role: - type: string - required: true - vm_flavor_name: - type: string - required: true - port_oam_internal_2_port_mac_requirements: + port_oam_internal_2_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_oam_oam_2_port_subnetpoolid: - type: string - required: true - port_oam_internal_2_port_subnetpoolid: + port_oam_internal_2_port_0_network_role: type: string required: true - port_oam_oam_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_allowed_address_pairs: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair vm_image_name: type: string required: true @@ -60,42 +46,47 @@ topology_template: required: true entry_schema: type: boolean - port_oam_oam_2_port_vlan_requirements: + port_oam_internal_2_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_internal_2_port_allowed_address_pairs: + type: org.openecomp.datatypes.heat.network.AddressPair + port_oam_oam_2_port_1_order: + type: integer + required: true + port_oam_oam_2_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_oam_internal_2_port_network: + type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_2_port_1_security_groups: type: list required: true entry_schema: - type: string - port_oam_internal_2_port_network_role_tag: + type: json + port_oam_oam_2_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_network_role_tag: type: string required: true - port_oam_internal_2_port_order: - type: integer + port_oam_oam_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_oam_internal_2_port_fixed_ips: + port_oam_internal_2_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_internal_2_port_network_role: - type: string - required: true - port_oam_oam_2_port_fixed_ips: + type: json + port_oam_oam_2_port_1_fixed_ips: type: list required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_oam_internal_2_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true index_value: type: integer @@ -104,52 +95,63 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_oam_internal_2_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_oam_oam_2_port_1_subnetpoolid: + type: string required: true - port_oam_oam_2_port_network: + compute_oam_user_data_format: type: list required: true entry_schema: type: string - compute_oam_user_data_format: + port_oam_internal_2_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_oam_internal_2_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_internal_2_port_0_network: type: list required: true entry_schema: - type: json - port_oam_oam_2_port_ip_requirements: + type: string + port_oam_internal_2_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_internal_2_port_vlan_requirements: + port_oam_internal_2_port_0_order: + type: integer + required: true + port_oam_oam_2_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_oam_oam_2_port_order: - type: integer + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_oam_oam_2_port_1_network_role: + type: string required: true - port_oam_internal_2_port_related_networks: + port_oam_oam_2_port_1_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: string compute_oam_scheduler_hints: type: list required: true entry_schema: type: json - port_oam_internal_2_port_ip_requirements: + port_oam_internal_2_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements + port_oam_oam_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_oam_oam_2_port_1_network: + type: list + required: true + entry_schema: + type: string compute_oam_availability_zone: type: list required: true @@ -160,168 +162,169 @@ topology_template: required: true entry_schema: type: json - port_oam_oam_2_port_allowed_address_pairs: - type: list + port_oam_internal_2_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair compute_oam_name: type: list required: true entry_schema: type: string node_templates: - oam_oam_internal_2_port: + oam: + type: org.openecomp.resource.vfc.compute.nodes.heat.oam + properties: + availability_zone: + get_input: + - compute_oam_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_oam_metadata + - index_value + config_drive: + get_input: + - compute_oam_config_drive + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_oam_name + - index_value + scheduler_hints: + get_input: + - compute_oam_scheduler_hints + - index_value + user_data_format: + get_input: + - compute_oam_user_data_format + - index_value + oam_oam_oam_2_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_internal_2_port_mac_requirements + get_input: port_oam_oam_2_port_1_mac_requirements allowed_address_pairs: - get_input: port_oam_internal_2_port_allowed_address_pairs + get_input: port_oam_oam_2_port_1_allowed_address_pairs order: - get_input: port_oam_internal_2_port_order + get_input: port_oam_oam_2_port_1_order security_groups: get_input: - - port_oam_internal_2_port_security_groups + - port_oam_oam_2_port_1_security_groups - index_value exCP_naming: - get_input: port_oam_internal_2_port_exCP_naming + get_input: port_oam_oam_2_port_1_exCP_naming vlan_requirements: - get_input: port_oam_internal_2_port_vlan_requirements + get_input: port_oam_oam_2_port_1_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_internal_2_port_related_networks + get_input: port_oam_oam_2_port_1_related_networks ip_requirements: - get_input: port_oam_internal_2_port_ip_requirements + get_input: port_oam_oam_2_port_1_ip_requirements network_role_tag: - get_input: port_oam_internal_2_port_network_role_tag + get_input: port_oam_oam_2_port_1_network_role_tag network_role: - get_input: port_oam_internal_2_port_network_role + get_input: port_oam_oam_2_port_1_network_role subnetpoolid: - get_input: port_oam_internal_2_port_subnetpoolid + get_input: port_oam_oam_2_port_1_subnetpoolid fixed_ips: get_input: - - port_oam_internal_2_port_fixed_ips + - port_oam_oam_2_port_1_fixed_ips - index_value name: get_input: - - port_oam_internal_2_port_name + - port_oam_oam_2_port_1_name - index_value network: get_input: - - port_oam_internal_2_port_network + - port_oam_oam_2_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam relationship: tosca.relationships.network.BindsTo - oam_oam_oam_2_port: + oam_oam_internal_2_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_oam_oam_2_port_mac_requirements + get_input: port_oam_internal_2_port_0_mac_requirements allowed_address_pairs: - get_input: port_oam_oam_2_port_allowed_address_pairs + get_input: port_oam_internal_2_port_0_allowed_address_pairs order: - get_input: port_oam_oam_2_port_order + get_input: port_oam_internal_2_port_0_order security_groups: get_input: - - port_oam_oam_2_port_security_groups + - port_oam_internal_2_port_0_security_groups - index_value exCP_naming: - get_input: port_oam_oam_2_port_exCP_naming + get_input: port_oam_internal_2_port_0_exCP_naming vlan_requirements: - get_input: port_oam_oam_2_port_vlan_requirements + get_input: port_oam_internal_2_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_oam_oam_2_port_related_networks + get_input: port_oam_internal_2_port_0_related_networks ip_requirements: - get_input: port_oam_oam_2_port_ip_requirements + get_input: port_oam_internal_2_port_0_ip_requirements network_role_tag: - get_input: port_oam_oam_2_port_network_role_tag + get_input: port_oam_internal_2_port_0_network_role_tag network_role: - get_input: port_oam_oam_2_port_network_role + get_input: port_oam_internal_2_port_0_network_role subnetpoolid: - get_input: port_oam_oam_2_port_subnetpoolid + get_input: port_oam_internal_2_port_0_subnetpoolid fixed_ips: get_input: - - port_oam_oam_2_port_fixed_ips + - port_oam_internal_2_port_0_fixed_ips - index_value name: get_input: - - port_oam_oam_2_port_name + - port_oam_internal_2_port_0_name - index_value network: get_input: - - port_oam_oam_2_port_network + - port_oam_internal_2_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: oam relationship: tosca.relationships.network.BindsTo - oam: - type: org.openecomp.resource.vfc.compute.nodes.heat.oam - properties: - availability_zone: - get_input: - - compute_oam_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - metadata: - get_input: - - compute_oam_metadata - - index_value - config_drive: - get_input: - - compute_oam_config_drive - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_oam_name - - index_value - scheduler_hints: - get_input: - - compute_oam_scheduler_hints - - index_value - user_data_format: - get_input: - - compute_oam_user_data_format - - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.oam_2 capabilities: cpu_oam: - oam - cpu - network.outgoing.bytes.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outgoing.bytes.rate - network.outgoing.packets.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outgoing.packets.rate disk.usage_oam: - oam - disk.usage + feature_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - feature memory.resident_oam: - oam - memory.resident - feature_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - feature - network.incoming.bytes.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.incoming.bytes.rate disk.device.write.bytes_oam: - oam - disk.device.write.bytes disk.read.bytes_oam: - oam - disk.read.bytes + network.incoming.bytes_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.bytes + network.outgoing.bytes.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outgoing.bytes.rate + network.outgoing.bytes_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outgoing.bytes + network.incoming.bytes_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.incoming.bytes scalable_oam: - oam - scalable @@ -334,12 +337,6 @@ topology_template: disk.device.usage_oam: - oam - disk.device.usage - network.outpoing.packets_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outpoing.packets - network.incoming.bytes.rate_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.bytes.rate binding_oam: - oam - binding @@ -352,39 +349,42 @@ topology_template: disk.device.write.bytes.rate_oam: - oam - disk.device.write.bytes.rate + forwarder_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - forwarder disk.device.allocation_oam: - oam - disk.device.allocation + network.incoming.packets_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.packets + feature_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - feature disk.ephemeral.size_oam: - oam - disk.ephemeral.size - network.incoming.packets_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.packets disk.write.requests_oam: - oam - disk.write.requests + attachment_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - attachment disk.capacity_oam: - oam - disk.capacity - network.outgoing.bytes_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.outgoing.bytes + network.incoming.bytes.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.bytes.rate instance_oam: - oam - instance - 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 disk.root.size_oam: - oam - disk.root.size + binding_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - binding memory_oam: - oam - memory @@ -394,33 +394,30 @@ topology_template: disk.device.write.requests_oam: - oam - disk.device.write.requests - 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 - binding_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - binding + attachment_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - attachment disk.device.read.requests.rate_oam: - oam - disk.device.read.requests.rate - feature_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - feature + forwarder_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - forwarder disk.write.requests.rate_oam: - oam - disk.write.requests.rate disk.device.latency_oam: - oam - disk.device.latency + network.incoming.packets.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.incoming.packets.rate disk.device.iops_oam: - oam - disk.device.iops + network.outpoing.packets_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outpoing.packets vcpus_oam: - oam - vcpus @@ -433,15 +430,12 @@ topology_template: host_oam: - oam - host - network.incoming.packets.rate_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.packets.rate endpoint_oam: - oam - endpoint - binding_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - binding + network.incoming.packets.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.incoming.packets.rate disk.device.read.requests_oam: - oam - disk.device.read.requests @@ -451,12 +445,9 @@ topology_template: disk.read.bytes.rate_oam: - oam - disk.read.bytes.rate - attachment_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - attachment - network.incoming.packets.rate_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - network.incoming.packets.rate + network.outgoing.bytes.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outgoing.bytes.rate cpu_util_oam: - oam - cpu_util @@ -466,46 +457,55 @@ topology_template: memory.usage_oam: - oam - memory.usage - attachment_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - attachment disk.latency_oam: - oam - disk.latency - network.incoming.packets_oam_oam_oam_2_port: - - oam_oam_oam_2_port + network.incoming.packets_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 - network.incoming.packets - network.outgoing.bytes_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.outgoing.bytes + network.outgoing.packets.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outgoing.packets.rate disk.write.bytes_oam: - oam - disk.write.bytes - network.incoming.bytes_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - network.incoming.bytes + network.outgoing.bytes_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outgoing.bytes + network.outgoing.packets.rate_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - network.outgoing.packets.rate + network.incoming.bytes.rate_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.incoming.bytes.rate + binding_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - binding disk.read.requests_oam: - oam - disk.read.requests disk.device.capacity_oam: - oam - disk.device.capacity + network.outpoing.packets_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - network.outpoing.packets requirements: - link_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - link - link_oam_oam_oam_2_port: - - oam_oam_oam_2_port - - link + dependency_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - dependency local_storage_oam: - oam - local_storage - dependency_oam_oam_internal_2_port: - - oam_oam_internal_2_port - - dependency - dependency_oam_oam_oam_2_port: - - oam_oam_oam_2_port + link_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 + - link + dependency_oam_oam_oam_2_port_1: + - oam_oam_oam_2_port_1 - dependency dependency_oam: - oam - - dependency
\ No newline at end of file + - dependency + link_oam_oam_internal_2_port_0: + - oam_oam_internal_2_port_0 + - link 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 84325428a4..f5c6a407d3 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 @@ -446,4 +446,4 @@ topology_template: - link local_storage_cscf_server_0: - cscf_server_0 - - local_storage
\ No newline at end of file + - local_storage 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 54bb2f500c..3418eb1d68 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 @@ -582,4 +582,4 @@ topology_template: - dependency local_storage_tdcore_server_0: - tdcore_server_0 - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml index 26cf3450b7..242293f376 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -3906,11 +3906,11 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_1_exCP_naming: + port_cmaui_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cmaui_port_2_exCP_naming: + port_cmaui_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -6656,4 +6656,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml index 63942e2108..97bc0655d1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml @@ -90,10 +90,10 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cmaui_port_1_exCP_naming: + port_cmaui_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cmaui_port_2_exCP_naming: + port_cmaui_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_cmaui_port_1_vlan_requirements: @@ -458,4 +458,4 @@ topology_template: - local_storage dependency_cmaui_cmaui_port_1: - cmaui_cmaui_port_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 933ff40acc..654b73714e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -597,10 +597,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_compute_port_subnetpoolid: - type: string + port_compute_port_0_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -609,68 +611,66 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_compute_port_vlan_requirements: + compute_compute_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_compute_name: + type: string + port_compute_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_compute_port_network_role: - type: string + port_compute_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_compute_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_compute_port_network: - type: list + port_compute_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_compute_port_related_networks: - type: list + port_compute_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_compute_port_network_role_tag: - type: string + port_compute_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_compute_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_compute_port_order: - type: integer - required: true - status: SUPPORTED - port_compute_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_compute_port_0_network_role: + type: string required: true status: SUPPORTED - port_compute_port_ip_requirements: - type: list + port_compute_port_0_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_compute_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_compute_port_0_order: + type: integer required: true status: SUPPORTED requirements: @@ -688,20 +688,25 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_compute_compute_port: + - dependency_compute_compute_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_compute_compute_port: + - link_compute_compute_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + attachment_compute_compute_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.write.requests_compute: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -714,25 +719,33 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_compute_compute_port: + disk.root.size_compute: 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_compute: + disk.write.requests.rate_compute: 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_compute: + disk.read.requests_compute: 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_compute: + binding_compute_compute_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -755,26 +768,32 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.iops_compute: + forwarder_compute_compute_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_compute_compute_port_0: 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_compute_compute_port: + network.incoming.bytes.rate_compute_compute_port_0: 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_compute: + disk.device.iops_compute: 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_compute_compute_port: - type: tosca.capabilities.Attachment + disk.device.write.requests.rate_compute: + 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 @@ -785,25 +804,28 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_compute: + network.incoming.packets.rate_compute_compute_port_0: 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_compute: + feature_compute_compute_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_compute: 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_compute_compute_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + cpu_compute: + 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 disk.allocation_compute: type: org.openecomp.capabilities.metric.Ceilometer @@ -822,29 +844,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_compute_compute_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.usage_compute: 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_compute_compute_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_compute_compute_port: + instance_compute: 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_compute: + network.outpoing.packets_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -880,25 +892,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_compute_compute_port: + disk.device.read.requests.rate_compute: 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_compute: + disk.read.bytes_compute: 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_compute: + disk.device.read.bytes_compute: 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_compute: + network.incoming.packets_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -916,7 +928,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_compute_compute_port: + network.outgoing.bytes_compute_compute_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -952,18 +964,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_compute_compute_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_compute_compute_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 endpoint_compute: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -991,27 +991,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_compute_compute_port: + disk.device.read.requests_compute: 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_compute: + disk.device.capacity_compute: 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_compute: + disk.device.allocation_compute: 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_compute: + network.outgoing.bytes.rate_compute_compute_port_0: 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
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index 038dc88281..fbf2553476 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -315,28 +315,28 @@ topology_template: - get_attribute: - server_pcm_001 - oam_net_gw + port_compute_port_0_network: + - get_input: port_net_name compute_compute_name: - compute_name: null vm_flavor_name: compute_flavor_name: null - vm_image_name: - get_input: compute_image_name - port_compute_port_network: - - get_input: port_net_name - port_compute_port_network_role_tag: port - compute_compute_metadata: - - get_attribute: - - server_pcm_001 - - server_pcm_id - port_compute_port_mac_requirements: + port_compute_port_0_mac_requirements: mac_count_required: is_required: false - port_compute_port_ip_requirements: + vm_image_name: + get_input: compute_image_name + port_compute_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + compute_compute_metadata: + - get_attribute: + - server_pcm_001 + - server_pcm_id + port_compute_port_0_network_role_tag: port service_template_filter: substitute_service_template: Nested_computeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index 82f94141bf..f97da8b6bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -16,9 +16,11 @@ topology_template: required: true entry_schema: type: string - port_compute_port_subnetpoolid: - type: string + port_compute_port_0_network: + type: list required: true + entry_schema: + type: string index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,56 +28,54 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_compute_port_vlan_requirements: + compute_compute_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_compute_name: + type: string + port_compute_port_0_related_networks: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_compute_port_network_role: - type: string + port_compute_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true + port_compute_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_compute_port_network: - type: list + port_compute_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: string - port_compute_port_related_networks: + port_compute_port_0_subnetpoolid: + type: string + required: true + port_compute_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_compute_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements compute_compute_metadata: type: list required: true entry_schema: type: json - port_compute_port_order: - type: integer - required: true - port_compute_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_compute_port_0_network_role: + type: string required: true - port_compute_port_ip_requirements: - type: list + port_compute_port_0_network_role_tag: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_compute_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_compute_port_0_order: + type: integer required: true node_templates: compute: @@ -89,7 +89,7 @@ topology_template: - index_value config_drive: get_attribute: - - compute_compute_port + - compute_compute_port_0 - tenant_id - port_security_enabled - device_id @@ -115,31 +115,31 @@ topology_template: get_input: - compute_compute_user_data_format - index_value - compute_compute_port: + compute_compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_compute_port_exCP_naming + get_input: port_compute_port_0_exCP_naming vlan_requirements: - get_input: port_compute_port_vlan_requirements + get_input: port_compute_port_0_vlan_requirements subinterface_indicator: false related_networks: - get_input: port_compute_port_related_networks + get_input: port_compute_port_0_related_networks ip_requirements: - get_input: port_compute_port_ip_requirements + get_input: port_compute_port_0_ip_requirements network_role_tag: - get_input: port_compute_port_network_role_tag + get_input: port_compute_port_0_network_role_tag mac_requirements: - get_input: port_compute_port_mac_requirements + get_input: port_compute_port_0_mac_requirements order: - get_input: port_compute_port_order + get_input: port_compute_port_0_order network_role: - get_input: port_compute_port_network_role + get_input: port_compute_port_0_network_role subnetpoolid: - get_input: port_compute_port_subnetpoolid + get_input: port_compute_port_0_subnetpoolid network: get_input: - - port_compute_port_network + - port_compute_port_0_network - index_value requirements: - binding: @@ -149,15 +149,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.compute capabilities: + attachment_compute_compute_port_0: + - compute_compute_port_0 + - attachment disk.write.requests_compute: - compute - disk.write.requests disk.latency_compute: - compute - disk.latency - network.incoming.bytes_compute_compute_port: - - compute_compute_port - - network.incoming.bytes disk.root.size_compute: - compute - disk.root.size @@ -167,6 +167,12 @@ topology_template: disk.read.requests_compute: - compute - disk.read.requests + binding_compute_compute_port_0: + - compute_compute_port_0 + - binding + network.incoming.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes os_compute: - compute - os @@ -176,30 +182,36 @@ topology_template: vcpus_compute: - compute - vcpus + forwarder_compute_compute_port_0: + - compute_compute_port_0 + - forwarder + network.outgoing.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.packets.rate + network.incoming.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.bytes.rate disk.device.iops_compute: - compute - disk.device.iops - network.incoming.bytes.rate_compute_compute_port: - - compute_compute_port - - network.incoming.bytes.rate disk.device.write.requests.rate_compute: - compute - disk.device.write.requests.rate - attachment_compute_compute_port: - - compute_compute_port - - attachment host_compute: - compute - host + network.incoming.packets.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets.rate + feature_compute_compute_port_0: + - compute_compute_port_0 + - feature disk.device.write.bytes_compute: - compute - disk.device.write.bytes cpu_compute: - compute - cpu - binding_compute_compute_port: - - compute_compute_port - - binding disk.allocation_compute: - compute - disk.allocation @@ -209,21 +221,15 @@ topology_template: binding_compute: - compute - binding - feature_compute_compute_port: - - compute_compute_port - - feature disk.device.usage_compute: - compute - disk.device.usage - forwarder_compute_compute_port: - - compute_compute_port - - forwarder - network.incoming.packets_compute_compute_port: - - compute_compute_port - - network.incoming.packets instance_compute: - compute - instance + network.outpoing.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.outpoing.packets disk.ephemeral.size_compute: - compute - disk.ephemeral.size @@ -239,9 +245,6 @@ topology_template: disk.iops_compute: - compute - disk.iops - network.incoming.packets.rate_compute_compute_port: - - compute_compute_port - - network.incoming.packets.rate disk.device.read.requests.rate_compute: - compute - disk.device.read.requests.rate @@ -251,15 +254,18 @@ topology_template: disk.device.read.bytes_compute: - compute - disk.device.read.bytes + network.incoming.packets_compute_compute_port_0: + - compute_compute_port_0 + - network.incoming.packets disk.write.bytes_compute: - compute - disk.write.bytes disk.usage_compute: - compute - disk.usage - network.outgoing.bytes.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes.rate + network.outgoing.bytes_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes disk.capacity_compute: - compute - disk.capacity @@ -275,12 +281,6 @@ topology_template: disk.device.write.requests_compute: - compute - disk.device.write.requests - network.outgoing.packets.rate_compute_compute_port: - - compute_compute_port - - network.outgoing.packets.rate - network.outgoing.bytes_compute_compute_port: - - compute_compute_port - - network.outgoing.bytes endpoint_compute: - compute - endpoint @@ -296,9 +296,6 @@ topology_template: scalable_compute: - compute - scalable - network.outpoing.packets_compute_compute_port: - - compute_compute_port - - network.outpoing.packets disk.device.read.requests_compute: - compute - disk.device.read.requests @@ -308,16 +305,19 @@ topology_template: disk.device.allocation_compute: - compute - disk.device.allocation + network.outgoing.bytes.rate_compute_compute_port_0: + - compute_compute_port_0 + - network.outgoing.bytes.rate requirements: local_storage_compute: - compute - local_storage - dependency_compute_compute_port: - - compute_compute_port - - dependency - link_compute_compute_port: - - compute_compute_port + link_compute_compute_port_0: + - compute_compute_port_0 - link dependency_compute: - compute - - dependency
\ No newline at end of file + - dependency + dependency_compute_compute_port_0: + - compute_compute_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml index 0c3eda5acc..359e0844cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml @@ -66,7 +66,7 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} + - port: { get_resource: pcm_server_1_mgmt_port_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} @@ -81,13 +81,13 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_server_2_mgmt_port_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -95,7 +95,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_server_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6676af82c3..869685f7e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,20 @@ node_types: org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_server_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_server_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_server_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,64 +36,50 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: - type: list + port_pcm_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string + port_pcm_server_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED - compute_pcm_server_name: + port_pcm_server_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_network: + compute_pcm_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_vlan_requirements: + port_pcm_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcm_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_pcm_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED compute_pcm_server_config_drive: @@ -94,15 +88,21 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_server_mgmt_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_pcm_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pcm_server_mgmt_port_0_security_groups: type: list required: true status: SUPPORTED @@ -123,40 +123,41 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_server_pcm_port: + - dependency_pcm_server_pcm_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_server_pcm_port: + - link_pcm_server_pcm_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.device.read.requests_pcm_server: + network.incoming.packets_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server: + network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server_pcm_port: + disk.device.read.requests_pcm_server: 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_pcm_server_pcm_port: - type: tosca.capabilities.Attachment + disk.device.write.requests.rate_pcm_server: + 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 @@ -172,19 +173,19 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_pcm_server: + network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server: + vcpus_pcm_server: 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_pcm_server_pcm_port: + memory.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -202,41 +203,35 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcm_server_pcm_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.read.requests_pcm_server: + disk.device.write.requests_pcm_server: 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_pcm_server: + disk.read.requests_pcm_server: 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_pcm_server_pcm_port: + memory.resident_pcm_server: 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_pcm_server_pcm_port: + network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server_pcm_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.iops_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -249,19 +244,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_server_pcm_port: + disk.read.bytes.rate_pcm_server: 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_pcm_server: + disk.device.capacity_pcm_server: 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_pcm_server: + network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -272,6 +267,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pcm_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -296,17 +299,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_server_pcm_port: + network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0: 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_pcm_server_pcm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -325,6 +323,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0: + 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -344,6 +348,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pcm_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu.delta_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -356,14 +365,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.bytes_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -381,6 +382,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -421,9 +428,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_server_pcm_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_pcm_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -438,12 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_server_pcm_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.bytes.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -528,14 +528,27 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_server_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_server_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pcm_server_2_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pcm_server_2_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -569,44 +582,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 capabilities: - network.incoming.packets.rate_pcm_port_0: - 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_pcm_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.outpoing.packets_pcm_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.outpoing.packets_pcm_port_0: - 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.usage_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -625,12 +601,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: - 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.usage_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -649,12 +619,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_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 vcpus_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -667,22 +631,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED cpu_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,18 +642,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: - 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_pcm_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_server_pcm_2: type: tosca.capabilities.Node occurrences: @@ -717,44 +653,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_0: - 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_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_server_pcm_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_pcm_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 - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED host_server_pcm_2: type: tosca.capabilities.Container valid_source_types: @@ -762,6 +666,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pcm_server_1_mgmt_port_0: + 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_server_pcm_2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -772,6 +682,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -791,6 +707,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_2_mgmt_port_0: + 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_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -803,12 +725,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_server_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_pcm_2: 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_pcm_server_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -845,6 +777,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_1_mgmt_port_0: + 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_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -869,6 +807,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.read.requests.rate_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -933,6 +887,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pcm_server_1_mgmt_port_0: + 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_pcm_server_1_mgmt_port_0: + 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_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -945,6 +911,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -981,6 +953,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pcm_server_2_mgmt_port_0: + 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_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1011,6 +994,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED memory.usage_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1029,6 +1017,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_1_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1053,19 +1047,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: 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_pcm_port_0: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_pcm_server_1_mgmt_port_0: + 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_pcm_port_1: - type: org.openecomp.capabilities.Forwarder + feature_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1075,6 +1076,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pcm_server_1_mgmt_port_0: + 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_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,71 +1112,76 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm_2: - type: tosca.capabilities.Scalable + feature_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - scalable_server_pcm_1: + network.outgoing.packets.rate_pcm_server_2_mgmt_port_0: + 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_server_pcm_2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.device.latency_server_pcm_2: + network.outgoing.bytes.rate_pcm_server_2_mgmt_port_0: 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_server_pcm_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_1: + disk.device.latency_server_pcm_2: 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_server_pcm_2: + disk.device.latency_server_pcm_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_pcm_port_0: + disk.device.usage_server_pcm_2: 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_server_pcm_1: + network.outgoing.bytes_pcm_server_1_mgmt_port_0: 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_pcm_port_0: + network.outgoing.bytes_pcm_server_2_mgmt_port_0: 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_server_pcm_2: + disk.device.usage_server_pcm_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.write.requests_server_pcm_1: + disk.device.write.requests_server_pcm_2: 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_pcm_port_1: + disk.device.write.requests_server_pcm_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: @@ -1197,18 +1209,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: - 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_pcm_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 org.openecomp.resource.abstract.nodes.compute: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1503,4 +1503,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml index 0e7c780c5d..aae557dd69 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_server_mgmt_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_server_mgmt_port_0_network_role_tag: + type: string + required: true + port_pcm_server_mgmt_port_0_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,66 +34,60 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_fixed_ips: + port_pcm_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_order: - type: integer - required: true - compute_pcm_server_name: + port_pcm_server_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_pcm_port_network: + compute_pcm_server_name: type: list required: true entry_schema: type: string - port_pcm_port_vlan_requirements: + port_pcm_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcm_server_user_data_format: type: list required: true entry_schema: type: string + port_pcm_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_pcm_server_config_drive: type: list required: true entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_server_mgmt_port_0_fixed_ips: + type: list required: true - port_pcm_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_server_mgmt_port_0_subnetpoolid: type: string required: true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_order: + type: integer + required: true + port_pcm_server_mgmt_port_0_security_groups: type: list required: true entry_schema: @@ -116,39 +116,39 @@ topology_template: get_input: - compute_pcm_server_user_data_format - index_value - pcm_server_pcm_port: + pcm_server_pcm_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_server_mgmt_port_0_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_server_mgmt_port_0_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_server_mgmt_port_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_server_mgmt_port_0_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_server_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_server_mgmt_port_0_network - index_value requirements: - binding: @@ -158,39 +158,42 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pcm_server capabilities: + network.incoming.packets_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.read.requests_pcm_server: - pcm_server - disk.device.read.requests disk.device.write.requests.rate_pcm_server: - pcm_server - disk.device.write.requests.rate - network.outgoing.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes.rate - attachment_pcm_server_pcm_port: - - pcm_server_pcm_port - - attachment disk.root.size_pcm_server: - pcm_server - disk.root.size disk.device.write.bytes.rate_pcm_server: - pcm_server - disk.device.write.bytes.rate + network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outpoing.packets vcpus_pcm_server: - pcm_server - vcpus memory.usage_pcm_server: - pcm_server - memory.usage - network.outgoing.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.packets.rate disk.device.read.requests.rate_pcm_server: - pcm_server - disk.device.read.requests.rate disk.device.latency_pcm_server: - pcm_server - disk.device.latency + forwarder_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - forwarder disk.device.write.requests_pcm_server: - pcm_server - disk.device.write.requests @@ -200,33 +203,30 @@ topology_template: memory.resident_pcm_server: - pcm_server - memory.resident - network.outgoing.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes - network.outpoing.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outpoing.packets - feature_pcm_server_pcm_port: - - pcm_server_pcm_port - - feature + network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.packets.rate disk.iops_pcm_server: - pcm_server - disk.iops disk.capacity_pcm_server: - pcm_server - disk.capacity - network.incoming.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes.rate disk.read.bytes.rate_pcm_server: - pcm_server - disk.read.bytes.rate disk.device.capacity_pcm_server: - pcm_server - disk.device.capacity + network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.bytes binding_pcm_server: - pcm_server - binding + binding_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - binding cpu_pcm_server: - pcm_server - cpu @@ -239,12 +239,9 @@ topology_template: disk.allocation_pcm_server: - pcm_server - disk.allocation - network.incoming.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets - forwarder_pcm_server_pcm_port: - - pcm_server_pcm_port - - forwarder + network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.usage_pcm_server: - pcm_server - disk.device.usage @@ -254,6 +251,9 @@ topology_template: instance_pcm_server: - pcm_server - instance + network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.bytes disk.write.requests_pcm_server: - pcm_server - disk.write.requests @@ -263,15 +263,15 @@ topology_template: host_pcm_server: - pcm_server - host + feature_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - feature cpu.delta_pcm_server: - pcm_server - cpu.delta disk.usage_pcm_server: - pcm_server - disk.usage - binding_pcm_server_pcm_port: - - pcm_server_pcm_port - - binding disk.device.read.bytes_pcm_server: - pcm_server - disk.device.read.bytes @@ -281,6 +281,9 @@ topology_template: feature_pcm_server: - pcm_server - feature + network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.bytes.rate disk.write.bytes.rate_pcm_server: - pcm_server - disk.write.bytes.rate @@ -302,31 +305,28 @@ topology_template: endpoint_pcm_server: - pcm_server - endpoint - network.incoming.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes + attachment_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - attachment scalable_pcm_server: - pcm_server - scalable disk.write.requests.rate_pcm_server: - pcm_server - disk.write.requests.rate - network.incoming.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets.rate disk.device.read.bytes.rate_pcm_server: - pcm_server - disk.device.read.bytes.rate requirements: - link_pcm_server_pcm_port: - - pcm_server_pcm_port + link_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 - link - dependency_pcm_server_pcm_port: - - pcm_server_pcm_port + dependency_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 - dependency local_storage_pcm_server: - pcm_server - local_storage dependency_pcm_server: - pcm_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml index bb6490a5ef..a617598044 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -92,34 +92,34 @@ topology_template: directives: - substitutable properties: + port_pcm_server_mgmt_port_0_network_role_tag: cps compute_pcm_server_availability_zone: - get_input: availabilityzone_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: cps_net_ip - port_pcm_port_network_role_tag: cps - vm_flavor_name: - get_input: pcm_flavor_name - port_pcm_port_mac_requirements: + port_pcm_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false - compute_pcm_server_name: - - get_input: pcm_server_name - port_pcm_port_network: - - get_input: cps_net_name - port_pcm_port_ip_requirements: + port_pcm_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pcm_flavor_name + port_pcm_server_mgmt_port_0_network: + - get_input: cps_net_name + compute_pcm_server_name: + - get_input: pcm_server_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_fixed_ips: + - ip_address: + get_input: cps_net_ip + port_pcm_server_mgmt_port_0_security_groups: - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml @@ -134,34 +134,34 @@ topology_template: directives: - substitutable properties: + port_pcm_server_mgmt_port_0_network_role_tag: oam compute_pcm_server_availability_zone: - get_input: availabilityzone_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: oam_net_ip - port_pcm_port_network_role_tag: oam - vm_flavor_name: - get_input: pcm_flavor_name - port_pcm_port_mac_requirements: + port_pcm_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false - compute_pcm_server_name: - - get_input: pcm_server_name - port_pcm_port_network: - - get_input: oam_net_name - port_pcm_port_ip_requirements: + port_pcm_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pcm_flavor_name + port_pcm_server_mgmt_port_0_network: + - get_input: oam_net_name + compute_pcm_server_name: + - get_input: pcm_server_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_fixed_ips: + - ip_address: + get_input: oam_net_ip + port_pcm_server_mgmt_port_0_security_groups: - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml @@ -190,18 +190,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - network.incoming.packets.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.packets.rate_pcm_server_pcm_port - network.incoming.packets.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.packets.rate_pcm_server_pcm_port - network.outpoing.packets_pcm_port_1: - - abstract_pcm_server_0 - - network.outpoing.packets_pcm_server_pcm_port - network.outpoing.packets_pcm_port_0: - - abstract_pcm_server_1 - - network.outpoing.packets_pcm_server_pcm_port disk.usage_server_pcm_2: - abstract_pcm_server_0 - disk.usage_pcm_server @@ -211,9 +199,6 @@ topology_template: disk.capacity_server_pcm_2: - abstract_pcm_server_0 - disk.capacity_pcm_server - network.incoming.bytes_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.bytes_pcm_server_pcm_port disk.usage_server_pcm_1: - abstract_pcm_server_1 - disk.usage_pcm_server @@ -223,69 +208,42 @@ topology_template: memory.resident_server_pcm_1: - abstract_pcm_server_1 - memory.resident_pcm_server - network.incoming.bytes_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.bytes_pcm_server_pcm_port vcpus_server_pcm_2: - abstract_pcm_server_0 - vcpus_pcm_server memory.resident_server_pcm_2: - abstract_pcm_server_0 - memory.resident_pcm_server - binding_pcm_port_0: - - abstract_pcm_server_1 - - binding_pcm_server_pcm_port - binding_pcm_port_1: - - abstract_pcm_server_0 - - binding_pcm_server_pcm_port cpu_server_pcm_2: - abstract_pcm_server_0 - cpu_pcm_server feature_server_pcm_1: - abstract_pcm_server_1 - feature_pcm_server - network.outgoing.packets.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.packets.rate_pcm_server_pcm_port - network.outgoing.packets.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.packets.rate_pcm_server_pcm_port feature_server_pcm_2: - abstract_pcm_server_0 - feature_pcm_server disk.device.iops_server_pcm_2: - abstract_pcm_server_0 - disk.device.iops_pcm_server - feature_pcm_port_1: - - abstract_pcm_server_0 - - feature_pcm_server_pcm_port - network.outgoing.bytes_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.bytes_pcm_server_pcm_port - feature_pcm_port_0: - - abstract_pcm_server_1 - - feature_pcm_server_pcm_port cpu_server_pcm_1: - abstract_pcm_server_1 - cpu_pcm_server - network.outgoing.bytes_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.bytes_pcm_server_pcm_port - attachment_pcm_port_0: - - abstract_pcm_server_1 - - attachment_pcm_server_pcm_port - attachment_pcm_port_1: - - abstract_pcm_server_0 - - attachment_pcm_server_pcm_port host_server_pcm_2: - abstract_pcm_server_0 - host_pcm_server + network.outpoing.packets_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0 endpoint_server_pcm_2: - abstract_pcm_server_0 - endpoint_pcm_server endpoint_server_pcm_1: - abstract_pcm_server_1 - endpoint_pcm_server + network.outpoing.packets_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0 disk.device.capacity_server_pcm_2: - abstract_pcm_server_0 - disk.device.capacity_pcm_server @@ -295,15 +253,24 @@ topology_template: disk.device.capacity_server_pcm_1: - abstract_pcm_server_1 - disk.device.capacity_pcm_server + network.incoming.bytes.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.latency_server_pcm_1: - abstract_pcm_server_1 - disk.latency_pcm_server disk.latency_server_pcm_2: - abstract_pcm_server_0 - disk.latency_pcm_server + forwarder_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - forwarder_pcm_server_pcm_server_mgmt_port_0 disk.write.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.write.requests.rate_pcm_server + forwarder_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - forwarder_pcm_server_pcm_server_mgmt_port_0 disk.write.requests.rate_server_pcm_1: - abstract_pcm_server_1 - disk.write.requests.rate_pcm_server @@ -322,6 +289,9 @@ topology_template: disk.write.bytes_server_pcm_2: - abstract_pcm_server_0 - disk.write.bytes_pcm_server + network.incoming.bytes.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.write.bytes_server_pcm_1: - abstract_pcm_server_1 - disk.write.bytes_pcm_server @@ -334,6 +304,12 @@ topology_template: disk.device.read.requests.rate_server_pcm_1: - abstract_pcm_server_1 - disk.device.read.requests.rate_pcm_server + binding_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - binding_pcm_server_pcm_server_mgmt_port_0 + binding_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - binding_pcm_server_pcm_server_mgmt_port_0 disk.device.read.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.read.requests.rate_pcm_server @@ -367,12 +343,21 @@ topology_template: disk.iops_server_pcm_1: - abstract_pcm_server_1 - disk.iops_pcm_server + network.incoming.packets.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0 + network.incoming.packets_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.packets_pcm_server_pcm_server_mgmt_port_0 disk.device.write.bytes.rate_server_pcm_1: - abstract_pcm_server_1 - disk.device.write.bytes.rate_pcm_server disk.device.write.bytes.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.bytes.rate_pcm_server + network.incoming.packets_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.packets_pcm_server_pcm_server_mgmt_port_0 disk.write.requests_server_pcm_2: - abstract_pcm_server_0 - disk.write.requests_pcm_server @@ -391,6 +376,12 @@ topology_template: cpu_util_server_pcm_2: - abstract_pcm_server_0 - cpu_util_pcm_server + network.incoming.packets.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0 + attachment_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - attachment_pcm_server_pcm_server_mgmt_port_0 disk.device.write.bytes_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.bytes_pcm_server @@ -406,6 +397,9 @@ topology_template: memory.usage_server_pcm_1: - abstract_pcm_server_1 - memory.usage_pcm_server + attachment_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - attachment_pcm_server_pcm_server_mgmt_port_0 memory.usage_server_pcm_2: - abstract_pcm_server_0 - memory.usage_pcm_server @@ -415,6 +409,9 @@ topology_template: disk.device.read.bytes_server_pcm_1: - abstract_pcm_server_1 - disk.device.read.bytes_pcm_server + network.incoming.bytes_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0 disk.read.bytes.rate_server_pcm_2: - abstract_pcm_server_0 - disk.read.bytes.rate_pcm_server @@ -427,18 +424,24 @@ topology_template: cpu.delta_server_pcm_1: - abstract_pcm_server_1 - cpu.delta_pcm_server + network.incoming.bytes_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0 cpu.delta_server_pcm_2: - abstract_pcm_server_0 - cpu.delta_pcm_server - forwarder_pcm_port_0: + network.outgoing.packets.rate_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - forwarder_pcm_server_pcm_port - forwarder_pcm_port_1: - - abstract_pcm_server_0 - - forwarder_pcm_server_pcm_port + - network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0 + feature_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - feature_pcm_server_pcm_server_mgmt_port_0 disk.device.write.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.requests.rate_pcm_server + network.outgoing.bytes.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.read.requests_server_pcm_2: - abstract_pcm_server_0 - disk.read.requests_pcm_server @@ -454,9 +457,18 @@ topology_template: disk.ephemeral.size_server_pcm_2: - abstract_pcm_server_0 - disk.ephemeral.size_pcm_server + feature_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - feature_pcm_server_pcm_server_mgmt_port_0 + network.outgoing.packets.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0 scalable_server_pcm_2: - abstract_pcm_server_0 - scalable_pcm_server + network.outgoing.bytes.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0 scalable_server_pcm_1: - abstract_pcm_server_1 - scalable_pcm_server @@ -466,30 +478,24 @@ topology_template: disk.device.latency_server_pcm_1: - abstract_pcm_server_1 - disk.device.latency_pcm_server - network.outgoing.bytes.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.bytes.rate_pcm_server_pcm_port disk.device.usage_server_pcm_2: - abstract_pcm_server_0 - disk.device.usage_pcm_server - network.incoming.packets_pcm_port_0: + network.outgoing.bytes_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - network.incoming.packets_pcm_server_pcm_port + - network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0 + network.outgoing.bytes_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0 disk.device.usage_server_pcm_1: - abstract_pcm_server_1 - disk.device.usage_pcm_server - network.outgoing.bytes.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.bytes.rate_pcm_server_pcm_port disk.device.write.requests_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.requests_pcm_server disk.device.write.requests_server_pcm_1: - abstract_pcm_server_1 - disk.device.write.requests_pcm_server - network.incoming.packets_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.packets_pcm_server_pcm_port os_server_pcm_2: - abstract_pcm_server_0 - os_pcm_server @@ -502,31 +508,25 @@ topology_template: os_server_pcm_1: - abstract_pcm_server_1 - os_pcm_server - network.incoming.bytes.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.bytes.rate_pcm_server_pcm_port - network.incoming.bytes.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.bytes.rate_pcm_server_pcm_port requirements: - link_pcm_port_0: + link_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - link_pcm_server_pcm_port - link_pcm_port_1: + - link_pcm_server_pcm_server_mgmt_port_0 + link_pcm_server_2_mgmt_port_0: - abstract_pcm_server_0 - - link_pcm_server_pcm_port + - link_pcm_server_pcm_server_mgmt_port_0 dependency_server_pcm_2: - abstract_pcm_server_0 - dependency_pcm_server + dependency_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - dependency_pcm_server_pcm_server_mgmt_port_0 dependency_server_pcm_1: - abstract_pcm_server_1 - dependency_pcm_server - dependency_pcm_port_0: + dependency_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - dependency_pcm_server_pcm_port - dependency_pcm_port_1: - - abstract_pcm_server_0 - - dependency_pcm_server_pcm_port + - dependency_pcm_server_pcm_server_mgmt_port_0 local_storage_server_pcm_2: - abstract_pcm_server_0 - local_storage_pcm_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 438512f5e8..ce3d6964c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,28 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pcm_port_1_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,80 +50,64 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED - port_pcm_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pcm_port_vlan_requirements: + port_pcm_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_network_role: + port_pcm_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_subnetpoolid: - type: string + port_pcm_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_security_groups: - type: list + port_pcm_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pcm_port_1_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: json requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -123,25 +123,20 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pcm_port: + - dependency_pd_server_pcm_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pcm_port: + - link_pd_server_pcm_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - forwarder_pd_server_pcm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -153,25 +148,30 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pcm_port: + memory.usage_pd_server: 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_pd_server: + memory_pd_server: 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_pd_server: + disk.device.usage_pd_server: 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_pd_server: + forwarder_pd_server_pcm_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pcm_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: @@ -188,19 +188,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pcm_port: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_pd_server_pcm_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 - binding_pd_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED cpu_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -231,25 +224,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.incoming.bytes.rate_pd_server_pcm_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 - memory.resident_pd_server: + attachment_pd_server_pcm_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_pcm_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 - cpu.delta_pd_server: + disk.iops_pd_server: + 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_pd_server: 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_pd_server_pcm_port: + cpu.delta_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -267,12 +271,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_pcm_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_pd_server: 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_pd_server_pcm_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 endpoint_pd_server: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -284,6 +299,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_pcm_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.allocation_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -307,7 +330,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pcm_port: + network.incoming.bytes_pd_server_pcm_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: @@ -330,12 +353,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pcm_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -354,41 +371,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pcm_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_pd_server: 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_pd_server_pcm_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_pd_server: 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_pd_server_pcm_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_pd_server_pcm_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED instance_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -402,7 +396,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pcm_port: + network.outgoing.packets.rate_pd_server_pcm_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: @@ -450,15 +444,25 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_pcm_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 org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -467,120 +471,116 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - compute_pcm_server_availability_zone: + port_pcm_port_0_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: + port_pcm_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcm_server_availability_zone: + type: list required: true status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED compute_pcm_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_network: + port_pcm_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pcm_port_vlan_requirements: + type: json + compute_pcm_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list + type: string + port_pcm_port_0_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - compute_pcm_server_user_data_format: - type: list + port_pcm_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string vm_image_name: type: string required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcm_server_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_port_subnetpoolid: + port_pcm_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_security_groups: - type: list + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json requirements: - - dependency_pcm_server: + - dependency_pcm_server_pcm_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pcm_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_server_pcm_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_server_pcm_port: + - 1 + - 1 + - dependency_pcm_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_server_pcm_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_pcm_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: disk.device.read.requests_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -594,16 +594,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_server_pcm_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcm_server_pcm_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_pcm_server_pcm_port: - type: tosca.capabilities.Attachment + binding_pcm_server_pcm_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.root.size_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -629,7 +631,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_server_pcm_port: + network.incoming.bytes.rate_pcm_server_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -647,41 +649,36 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pcm_server: + network.incoming.packets.rate_pcm_server_pcm_port_0: 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_pcm_server: + network.outgoing.packets.rate_pcm_server_pcm_port_0: 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_pcm_server: + disk.device.write.requests_pcm_server: 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_pcm_server_pcm_port: + disk.read.requests_pcm_server: 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_pcm_server_pcm_port: + memory.resident_pcm_server: 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_pcm_server_pcm_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.iops_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,12 +691,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_server_pcm_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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -729,26 +720,26 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_util_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_server_pcm_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.allocation_pcm_server: + network.incoming.bytes_pcm_server_pcm_port_0: 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_pcm_server_pcm_port: + cpu_util_pcm_server: 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_pcm_server_pcm_port: - type: org.openecomp.capabilities.Forwarder + disk.allocation_pcm_server: + 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 @@ -801,13 +792,16 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + attachment_pcm_server_pcm_port_0: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.bytes_pcm_server_pcm_port_0: + 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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -832,6 +826,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_server_pcm_port_0: + 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_pcm_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -849,41 +849,41 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_pcm_server: + network.outpoing.packets_pcm_server_pcm_port_0: 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_pcm_server: + disk.write.bytes_pcm_server: 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_pcm_server: - type: tosca.capabilities.Endpoint.Admin + disk.ephemeral.size_pcm_server: + 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_pcm_server_pcm_port: + network.outgoing.bytes.rate_pcm_server_pcm_port_0: 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_pcm_server: - type: tosca.capabilities.Scalable + endpoint_pcm_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_pcm_server: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_server_pcm_port: + disk.write.requests.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1668,4 +1668,4 @@ node_types: type: tosca.capabilities.OperatingSystem occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml index 0e7c780c5d..520a821c20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml @@ -11,11 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_port_0_network_role: + type: string + required: true + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments + type: org.openecomp.datatypes.network.IpRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -23,138 +26,135 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - compute_pcm_server_availability_zone: + port_pcm_port_0_fixed_ips: type: list required: true entry_schema: - type: string - port_pcm_port_fixed_ips: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true - vm_flavor_name: - type: string - required: true - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_order: - type: integer - required: true - compute_pcm_server_name: + type: string + port_pcm_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pcm_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pcm_server_availability_zone: type: list required: true entry_schema: type: string - port_pcm_port_vlan_requirements: + vm_flavor_name: + type: string + required: true + compute_pcm_server_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + type: string + port_pcm_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: json compute_pcm_server_user_data_format: type: list required: true entry_schema: type: string + port_pcm_port_0_order: + type: integer + required: true + port_pcm_port_0_subnetpoolid: + type: string + required: true vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pcm_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_pcm_server_config_drive: type: list required: true entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_subnetpoolid: + port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_security_groups: - type: list + port_pcm_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json node_templates: - pcm_server: - type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server - properties: - availability_zone: - get_input: - - compute_pcm_server_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - config_drive: - get_input: - - compute_pcm_server_config_drive - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_pcm_server_name - - index_value - user_data_format: - get_input: - - compute_pcm_server_user_data_format - - index_value - pcm_server_pcm_port: + pcm_server_pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_port_0_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_port_0_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_port_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_port_0_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_port_0_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_port_0_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_port_0_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_port_0_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_port_0_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pcm_server relationship: tosca.relationships.network.BindsTo + pcm_server: + type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server + properties: + availability_zone: + get_input: + - compute_pcm_server_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + config_drive: + get_input: + - compute_pcm_server_config_drive + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_pcm_server_name + - index_value + user_data_format: + get_input: + - compute_pcm_server_user_data_format + - index_value substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pcm_server capabilities: @@ -164,12 +164,12 @@ topology_template: disk.device.write.requests.rate_pcm_server: - pcm_server - disk.device.write.requests.rate - network.outgoing.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes.rate - attachment_pcm_server_pcm_port: - - pcm_server_pcm_port - - attachment + forwarder_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - forwarder + binding_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - binding disk.root.size_pcm_server: - pcm_server - disk.root.size @@ -182,15 +182,21 @@ topology_template: memory.usage_pcm_server: - pcm_server - memory.usage - network.outgoing.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.packets.rate + network.incoming.bytes.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.bytes.rate disk.device.read.requests.rate_pcm_server: - pcm_server - disk.device.read.requests.rate disk.device.latency_pcm_server: - pcm_server - disk.device.latency + network.incoming.packets.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.packets.rate + network.outgoing.packets.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.packets.rate disk.device.write.requests_pcm_server: - pcm_server - disk.device.write.requests @@ -200,24 +206,12 @@ topology_template: memory.resident_pcm_server: - pcm_server - memory.resident - network.outgoing.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes - network.outpoing.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outpoing.packets - feature_pcm_server_pcm_port: - - pcm_server_pcm_port - - feature disk.iops_pcm_server: - pcm_server - disk.iops disk.capacity_pcm_server: - pcm_server - disk.capacity - network.incoming.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes.rate disk.read.bytes.rate_pcm_server: - pcm_server - disk.read.bytes.rate @@ -233,18 +227,18 @@ topology_template: disk.device.iops_pcm_server: - pcm_server - disk.device.iops + feature_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - feature + network.incoming.bytes_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.bytes cpu_util_pcm_server: - pcm_server - cpu_util disk.allocation_pcm_server: - pcm_server - disk.allocation - network.incoming.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets - forwarder_pcm_server_pcm_port: - - pcm_server_pcm_port - - forwarder disk.device.usage_pcm_server: - pcm_server - disk.device.usage @@ -269,9 +263,12 @@ topology_template: disk.usage_pcm_server: - pcm_server - disk.usage - binding_pcm_server_pcm_port: - - pcm_server_pcm_port - - binding + attachment_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - attachment + network.outgoing.bytes_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.bytes disk.device.read.bytes_pcm_server: - pcm_server - disk.device.read.bytes @@ -284,6 +281,9 @@ topology_template: disk.write.bytes.rate_pcm_server: - pcm_server - disk.write.bytes.rate + network.incoming.packets_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.incoming.packets os_pcm_server: - pcm_server - os @@ -293,40 +293,40 @@ topology_template: disk.read.bytes_pcm_server: - pcm_server - disk.read.bytes + network.outpoing.packets_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outpoing.packets disk.write.bytes_pcm_server: - pcm_server - disk.write.bytes disk.ephemeral.size_pcm_server: - pcm_server - disk.ephemeral.size + network.outgoing.bytes.rate_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - network.outgoing.bytes.rate endpoint_pcm_server: - pcm_server - endpoint - network.incoming.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes scalable_pcm_server: - pcm_server - scalable disk.write.requests.rate_pcm_server: - pcm_server - disk.write.requests.rate - network.incoming.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets.rate disk.device.read.bytes.rate_pcm_server: - pcm_server - disk.device.read.bytes.rate requirements: - link_pcm_server_pcm_port: - - pcm_server_pcm_port - - link - dependency_pcm_server_pcm_port: - - pcm_server_pcm_port + dependency_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 - dependency + link_pcm_server_pcm_port_0: + - pcm_server_pcm_port_0 + - link local_storage_pcm_server: - pcm_server - local_storage dependency_pcm_server: - pcm_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index 33fc4138da..f808c5a23a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -11,11 +11,24 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_port_1_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_port_1_network_role_tag: + type: string + required: true + port_pcm_port_1_network: + type: list + required: true + entry_schema: + type: string + port_pcm_port_1_security_groups: + type: list + required: true + entry_schema: + type: json index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,65 +46,52 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true vm_flavor_name: type: string required: true - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_order: - type: integer - required: true - port_pcm_port_network: - type: list - required: true - entry_schema: - type: string - port_pcm_port_vlan_requirements: + port_pcm_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.heat.neutron.port.FixedIps vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_network_role: + port_pcm_port_1_subnetpoolid: type: string required: true - port_pcm_port_subnetpoolid: - type: string + port_pcm_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_config_drive: type: list required: true entry_schema: type: boolean + port_pcm_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pcm_port_security_groups: - type: list + port_pcm_port_1_order: + type: integer + required: true + port_pcm_port_1_network_role: + type: string required: true - entry_schema: - type: json node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -116,39 +116,39 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pcm_port: + pd_server_pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_port_1_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_port_1_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_port_1_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_port_1_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_port_1_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_port_1_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_port_1_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_port_1_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_port_1_network - index_value requirements: - binding: @@ -158,18 +158,12 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: - forwarder_pd_server_pcm_port: - - pd_server_pcm_port - - forwarder scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate - network.incoming.bytes_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.bytes memory.usage_pd_server: - pd_server - memory.usage @@ -179,18 +173,21 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage + forwarder_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - forwarder + network.incoming.packets_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.packets os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - feature_pd_server_pcm_port: - - pd_server_pcm_port - - feature - binding_pd_server_pcm_port: - - pd_server_pcm_port - - binding + network.outgoing.bytes.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -206,6 +203,15 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate + network.incoming.bytes.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.bytes.rate + attachment_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - attachment + network.outgoing.bytes_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -215,24 +221,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.outgoing.bytes_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.bytes vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + feature_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - feature disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests + network.incoming.packets.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.packets.rate endpoint_pd_server: - pd_server - endpoint disk.capacity_pd_server: - pd_server - disk.capacity + binding_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - binding disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -245,9 +257,9 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests - network.outgoing.packets.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.packets.rate + network.incoming.bytes_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.incoming.bytes feature_pd_server: - pd_server - feature @@ -257,9 +269,6 @@ topology_template: disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.bytes.rate disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -269,33 +278,21 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.outpoing.packets_pd_server_pcm_port: - - pd_server_pcm_port - - network.outpoing.packets disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - network.outgoing.bytes.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.outgoing.bytes.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests - network.incoming.packets_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.packets - attachment_pd_server_pcm_port: - - pd_server_pcm_port - - attachment instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - network.incoming.packets.rate_pd_server_pcm_port: - - pd_server_pcm_port - - network.incoming.packets.rate + network.outgoing.packets.rate_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -317,16 +314,19 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + network.outpoing.packets_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - network.outpoing.packets requirements: local_storage_pd_server: - pd_server - local_storage + link_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - link dependency_pd_server: - pd_server - dependency - link_pd_server_pcm_port: - - pd_server_pcm_port - - link - dependency_pd_server_pcm_port: - - pd_server_pcm_port - - dependency
\ No newline at end of file + dependency_pd_server_pcm_port_1: + - pd_server_pcm_port_1 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 8e26dac997..fc52a3f51b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -110,35 +110,35 @@ topology_template: directives: - substitutable properties: - compute_pcm_server_availability_zone: - - get_input: availabilityzone_name - port_pcm_port_fixed_ips: + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_fixed_ips: - ip_address: get_input: cps_net_ip - port_pcm_port_network_role_tag: cps + port_pcm_port_0_network: + - get_input: cps_net_name + compute_pcm_server_availability_zone: + - get_input: availabilityzone_name vm_flavor_name: get_input: pcm_flavor_name - port_pcm_port_mac_requirements: - mac_count_required: - is_required: false compute_pcm_server_name: - get_input: pcm_server_name - port_pcm_port_network: - - get_input: cps_net_name - port_pcm_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + port_pcm_port_0_security_groups: + - - get_input: security_group_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: - - - get_input: security_group_name + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml count: 1 @@ -152,35 +152,35 @@ topology_template: directives: - substitutable properties: + port_pcm_port_1_network_role_tag: oam + port_pcm_port_1_network: + - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: pd_server_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: oam_net_ip - port_pcm_port_network_role_tag: oam vm_flavor_name: get_input: pd_flavor_name - port_pcm_port_mac_requirements: + port_pcm_port_1_mac_requirements: mac_count_required: is_required: false - port_pcm_port_network: - - get_input: oam_net_name - port_pcm_port_ip_requirements: + port_pcm_port_1_fixed_ips: + - ip_address: + get_input: oam_net_ip + vm_image_name: + get_input: pd_image_name + port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - vm_image_name: - get_input: pd_image_name compute_pd_server_config_drive: - true compute_pd_server_user_data_format: - RAW - port_pcm_port_security_groups: - - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -210,19 +210,19 @@ topology_template: capabilities: network.incoming.packets.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.packets.rate_pcm_server_pcm_port + - network.incoming.packets.rate_pcm_server_pcm_port_0 disk.iops_server_pd_0: - abstract_pd_server - disk.iops_pd_server network.incoming.packets.rate_pcm_port_1: - abstract_pd_server - - network.incoming.packets.rate_pd_server_pcm_port + - network.incoming.packets.rate_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_1: - abstract_pd_server - - network.outpoing.packets_pd_server_pcm_port + - network.outpoing.packets_pd_server_pcm_port_1 network.outpoing.packets_pcm_port_0: - abstract_pcm_server - - network.outpoing.packets_pcm_server_pcm_port + - network.outpoing.packets_pcm_server_pcm_port_0 disk.write.bytes.rate_server_pd_0: - abstract_pd_server - disk.write.bytes.rate_pd_server @@ -243,19 +243,19 @@ topology_template: - memory_pd_server network.incoming.bytes_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes_pcm_server_pcm_port + - network.incoming.bytes_pcm_server_pcm_port_0 network.incoming.bytes_pcm_port_1: - abstract_pd_server - - network.incoming.bytes_pd_server_pcm_port + - network.incoming.bytes_pd_server_pcm_port_1 disk.usage_server_pcm_0: - abstract_pcm_server - disk.usage_pcm_server binding_pcm_port_0: - abstract_pcm_server - - binding_pcm_server_pcm_port + - binding_pcm_server_pcm_port_0 binding_pcm_port_1: - abstract_pd_server - - binding_pd_server_pcm_port + - binding_pd_server_pcm_port_1 vcpus_server_pcm_0: - abstract_pcm_server - vcpus_pcm_server @@ -270,34 +270,34 @@ topology_template: - feature_pcm_server network.outgoing.packets.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.packets.rate_pcm_server_pcm_port + - network.outgoing.packets.rate_pcm_server_pcm_port_0 network.outgoing.packets.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.packets.rate_pd_server_pcm_port + - network.outgoing.packets.rate_pd_server_pcm_port_1 feature_pcm_port_1: - abstract_pd_server - - feature_pd_server_pcm_port + - feature_pd_server_pcm_port_1 disk.ephemeral.size_server_pd_0: - abstract_pd_server - disk.ephemeral.size_pd_server network.outgoing.bytes_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes_pcm_server_pcm_port + - network.outgoing.bytes_pcm_server_pcm_port_0 feature_pcm_port_0: - abstract_pcm_server - - feature_pcm_server_pcm_port + - feature_pcm_server_pcm_port_0 network.outgoing.bytes_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes_pd_server_pcm_port + - network.outgoing.bytes_pd_server_pcm_port_1 cpu_server_pcm_0: - abstract_pcm_server - cpu_pcm_server attachment_pcm_port_0: - abstract_pcm_server - - attachment_pcm_server_pcm_port + - attachment_pcm_server_pcm_port_0 attachment_pcm_port_1: - abstract_pd_server - - attachment_pd_server_pcm_port + - attachment_pd_server_pcm_port_1 disk.write.bytes_server_pd_0: - abstract_pd_server - disk.write.bytes_pd_server @@ -444,10 +444,10 @@ topology_template: - cpu.delta_pcm_server forwarder_pcm_port_0: - abstract_pcm_server - - forwarder_pcm_server_pcm_port + - forwarder_pcm_server_pcm_port_0 forwarder_pcm_port_1: - abstract_pd_server - - forwarder_pd_server_pcm_port + - forwarder_pd_server_pcm_port_1 memory.resident_server_pd_0: - abstract_pd_server - memory.resident_pd_server @@ -480,10 +480,10 @@ topology_template: - disk.device.read.requests_pd_server network.outgoing.bytes.rate_pcm_port_1: - abstract_pd_server - - network.outgoing.bytes.rate_pd_server_pcm_port + - network.outgoing.bytes.rate_pd_server_pcm_port_1 network.incoming.packets_pcm_port_0: - abstract_pcm_server - - network.incoming.packets_pcm_server_pcm_port + - network.incoming.packets_pcm_server_pcm_port_0 disk.device.latency_server_pcm_0: - abstract_pcm_server - disk.device.latency_pcm_server @@ -495,13 +495,13 @@ topology_template: - disk.latency_pd_server network.outgoing.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.outgoing.bytes.rate_pcm_server_pcm_port + - network.outgoing.bytes.rate_pcm_server_pcm_port_0 memory.usage_server_pd_0: - abstract_pd_server - memory.usage_pd_server network.incoming.packets_pcm_port_1: - abstract_pd_server - - network.incoming.packets_pd_server_pcm_port + - network.incoming.packets_pd_server_pcm_port_1 disk.device.write.requests_server_pcm_0: - abstract_pcm_server - disk.device.write.requests_pcm_server @@ -519,10 +519,10 @@ topology_template: - os_pcm_server network.incoming.bytes.rate_pcm_port_0: - abstract_pcm_server - - network.incoming.bytes.rate_pcm_server_pcm_port + - network.incoming.bytes.rate_pcm_server_pcm_port_0 network.incoming.bytes.rate_pcm_port_1: - abstract_pd_server - - network.incoming.bytes.rate_pd_server_pcm_port + - network.incoming.bytes.rate_pd_server_pcm_port_1 os_server_pd_0: - abstract_pd_server - os_pd_server @@ -535,13 +535,13 @@ topology_template: - local_storage_pcm_server link_pcm_port_0: - abstract_pcm_server - - link_pcm_server_pcm_port + - link_pcm_server_pcm_port_0 link_pcm_port_1: - abstract_pd_server - - link_pd_server_pcm_port + - link_pd_server_pcm_port_1 dependency_pcm_port_0: - abstract_pcm_server - - dependency_pcm_server_pcm_port + - dependency_pcm_server_pcm_port_0 local_storage_server_pd_0: - abstract_pd_server - local_storage_pd_server @@ -550,4 +550,4 @@ topology_template: - dependency_pd_server dependency_pcm_port_1: - abstract_pd_server - - dependency_pd_server_pcm_port + - dependency_pd_server_pcm_port_1 |