diff options
| author |   talio <tali.orenbach@amdocs.com> | 2017-11-05 11:34:51 +0200 |
|---|---|---|
| committer | talio <tali.orenbach@amdocs.com> | 2017-11-06 10:17:35 +0200 |
| commit | 777a3493a4dc4bfeb854b3b820dc5968124af87e (patch) | |
| tree | 29836c3cb2ab846b0b3241727f4b92782afdac1e /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive | |
| parent | 7b492b5f191cd5c22e3c4254f5f3ef7476122e9d (diff) | |
duplicate ids
throw an exception when a zip with duplicate ids in different files is getting uploaded
Issue - Id : SDC-554
Change-Id: I213233d8833b89788f980db859d9597d2c1cb950
Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive')
5 files changed, 675 insertions, 681 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 029052218e..435c42a81c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,14 +68,14 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_00: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_00: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -95,52 +95,45 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: + - dependency_network_2: 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 - - dependency_network: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - 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. + - link_pcm_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED + - 1 + capabilities: cpu_server_pcm: type: org.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. + feature_pcm_port_00: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_1: + memory_server_pcm: type: org.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_server_pcm: + network.incoming.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -152,179 +145,176 @@ node_types: 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. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pcm: + network.incoming.packets_pcm_port_00: type: org.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_server_pcm: + disk.device.iops_server_pcm: type: org.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: + memory.resident_server_pcm: type: org.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: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_network_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm: + disk.device.write.requests_server_pcm: type: org.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: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_network_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcm: + network.outgoing.packets.rate_pcm_port_00: type: org.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_server_pcm: + network.incoming.bytes_pcm_port_00: type: org.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_server_pcm: + network.incoming.bytes_pcm_port_01: type: org.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: + disk.device.usage_server_pcm: type: org.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_port_0: + disk.allocation_server_pcm: type: org.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_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. + attachment_pcm_port_00: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.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 + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - - 0 + - 1 - UNBOUNDED - memory.usage_server_pcm: + disk.usage_server_pcm: type: org.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: + disk.device.write.bytes_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - link_network: - type: tosca.capabilities.network.Linkable + network.outgoing.bytes_pcm_port_00: + type: org.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_server_pcm: + disk.root.size_server_pcm: type: org.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_server_pcm: - type: tosca.capabilities.OperatingSystem + disk.ephemeral.size_server_pcm: + type: org.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_server_pcm: + disk.device.latency_server_pcm: type: org.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_0: + network.outgoing.packets.rate_pcm_port_01: type: org.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: + memory.usage_server_pcm: type: org.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_1: - type: tosca.capabilities.Node + network.outgoing.bytes_pcm_port_01: + type: org.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_0: + disk.read.requests_server_pcm: type: org.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_server_pcm: + disk.capacity_server_pcm: type: org.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 + os_server_pcm: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + disk.read.bytes_server_pcm: type: org.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 + link_network_2: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment + disk.device.read.bytes_server_pcm: + type: org.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_00: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -333,14 +323,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + network.incoming.bytes.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - end_point_network: - type: tosca.capabilities.Endpoint + disk.device.read.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -350,11 +341,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_network: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -384,78 +370,87 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_network: - type: tosca.capabilities.Node + disk.device.read.bytes.rate_server_pcm: + type: org.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_server_pcm: + cpu_util_server_pcm: type: org.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_server_pcm: + network.outgoing.bytes.rate_pcm_port_01: type: org.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_server_pcm: + network.incoming.packets.rate_pcm_port_01: type: org.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: + network.incoming.packets.rate_pcm_port_00: type: org.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_server_pcm: - type: tosca.capabilities.Container + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - cpu.delta_server_pcm: + disk.write.requests.rate_server_pcm: type: org.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_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pcm_port_00: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.packets_pcm_port_0: + disk.device.write.bytes.rate_server_pcm: type: org.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_server_pcm: - type: tosca.capabilities.network.Bindable + host_server_pcm: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_00: type: org.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: + cpu.delta_server_pcm: type: org.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: + binding_server_pcm: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -490,7 +485,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: + network.outpoing.packets_pcm_port_00: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -502,7 +497,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + end_point_network_2: + type: tosca.capabilities.Endpoint + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -605,20 +605,13 @@ node_types: occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_network_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - dependency_server_pcm_005: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -626,14 +619,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_1_server_pcm_005: + - dependency_pcm_port_00_server_pcm_005: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1_server_pcm_005: + - link_pcm_port_00_server_pcm_005: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -653,26 +646,40 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0_server_pcm_005: + - dependency_network_2_server_pcm_005: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0_server_pcm_005: + - dependency_pcm_port_01_server_pcm_005: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pcm_port_01_server_pcm_005: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_network_server_pcm_005: + - dependency_server_pcm_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED + - local_storage_server_pcm_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_pcm_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -686,14 +693,13 @@ node_types: occurrences: - 1 - 1 - - dependency_network: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn + capabilities: + network.incoming.bytes.rate_pcm_port_01_server_pcm_005: + 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 - 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. @@ -717,73 +723,48 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_server_pcm: - type: org.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.device.write.bytes_server_pcm_server_pcm_005: - type: org.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_server_pcm_005: + network.outgoing.bytes_pcm_port_01_server_pcm_005: type: org.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_server_pcm: + disk.device.write.bytes_server_pcm_server_pcm_005: type: org.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_pcm_port_1_server_pcm_005: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - link_network_server_pcm_005: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED memory_server_pcm_server_pcm_005: type: org.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_server_pcm_005: + disk.capacity_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.allocation_server_pcm: + network.incoming.packets.rate_pcm_port_00_server_pcm_005: type: org.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_server_pcm_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_network_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1_server_pcm_005: + disk.device.read.requests.rate_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -794,17 +775,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_0_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.usage_server_pcm: - type: org.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_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -817,31 +787,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.root.size_server_pcm: + 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 - network.incoming.packets_pcm_port_0_server_pcm_005: + disk.write.requests_server_pcm_server_pcm_005: type: org.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: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + vcpus_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.write.requests_server_pcm_server_pcm_005: + memory.resident_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: @@ -873,24 +843,6 @@ node_types: occurrences: - 0 - UNBOUNDED - memory.usage_server_pcm: - type: org.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_server_pcm_005: - type: org.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: - type: org.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_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -903,27 +855,26 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pcm_port_00_server_pcm_005: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes_pcm_port_0_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + link_network_1: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_1_server_pcm_005: + disk.device.latency_server_pcm_server_pcm_005: type: org.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_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -939,18 +890,17 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node + link_network_2_server_pcm_005: + type: tosca.capabilities.network.Linkable 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. + feature_pcm_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pcm: + 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: @@ -961,12 +911,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_1_server_pcm_005: - type: tosca.capabilities.Node + disk.device.read.requests_server_pcm_server_pcm_005: + type: org.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_server_pcm_server_pcm_005: + 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: @@ -988,18 +939,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1_server_pcm_005: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.usage_server_pcm_server_pcm_005: type: org.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_server_pcm: + network.outgoing.bytes_pcm_port_00_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1011,18 +957,25 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_server_pcm: + endpoint_server_pcm_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_01_server_pcm_005: type: org.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_network: - type: tosca.capabilities.Attachment + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pcm: + disk.device.capacity_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: @@ -1034,66 +987,68 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_pcm: + disk.allocation_server_pcm_server_pcm_005: type: org.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_server_pcm_005: - type: tosca.capabilities.Attachment + network.outgoing.bytes.rate_pcm_port_00_server_pcm_005: + type: org.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_server_pcm: + 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. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm_server_pcm_005: + vcpus_server_pcm_server_pcm_005: type: org.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: - type: tosca.capabilities.Scalable + 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. occurrences: - 1 - UNBOUNDED - feature_network: - type: tosca.capabilities.Node + attachment_pcm_port_01_server_pcm_005: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - cpu_util_server_pcm: + memory_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 - vcpus_server_pcm_server_pcm_005: + network.incoming.packets_pcm_port_00_server_pcm_005: type: org.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_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.bytes_pcm_port_00_server_pcm_005: + type: org.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: + network.outpoing.packets_pcm_port_00_server_pcm_005: type: org.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_server_pcm: - type: tosca.capabilities.network.Bindable + disk.device.read.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. occurrences: - 1 - UNBOUNDED @@ -1103,60 +1058,59 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + disk.usage_server_pcm_server_pcm_005: type: org.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_server_pcm: + 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. occurrences: - 1 - UNBOUNDED - disk.usage_server_pcm_server_pcm_005: + network.outgoing.packets.rate_pcm_port_01_server_pcm_005: type: org.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: + instance_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.read.requests_server_pcm: + disk.device.read.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. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_1_server_pcm_005: + cpu_util_server_pcm_server_pcm_005: type: org.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_server_pcm_server_pcm_005: + disk.ephemeral.size_server_pcm_server_pcm_005: type: org.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: - type: tosca.capabilities.Node + end_point_network_1: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pcm_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + disk.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. occurrences: @@ -1168,7 +1122,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0_server_pcm_005: + disk.device.allocation_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: @@ -1180,12 +1134,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_network_server_pcm_005: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0_server_pcm_005: + disk.root.size_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,12 +1146,6 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_server_pcm: - type: org.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_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1216,9 +1159,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0_server_pcm_005: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_network_2_server_pcm_005: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_01_server_pcm_005: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1238,21 +1185,27 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_pcm: + cpu_server_pcm_server_pcm_005: type: org.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_server_pcm_server_pcm_005: + binding_pcm_port_01_server_pcm_005: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.iops_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 - memory.resident_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_network_2_server_pcm_005: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1262,15 +1215,24 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm: + 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. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_network_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_pcm_port_00_server_pcm_005: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + end_point_network_2_server_pcm_005: + type: tosca.capabilities.Endpoint occurrences: - 1 - UNBOUNDED @@ -1279,37 +1241,39 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcm: + disk.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: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0_server_pcm_005: + disk.read.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. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pcm: + cpu_util_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 - link_network: - type: tosca.capabilities.network.Linkable + disk.allocation_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.capacity_server_pcm: + disk.device.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. occurrences: - 1 - UNBOUNDED - os_server_pcm: - type: tosca.capabilities.OperatingSystem + memory.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 @@ -1319,23 +1283,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_0_server_pcm_005: + disk.device.read.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. occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin + disk.device.write.requests_server_pcm_server_pcm_005: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - end_point_network: - type: tosca.capabilities.Endpoint + disk.read.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. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm_server_pcm_005: + disk.device.iops_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: @@ -1347,61 +1313,76 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.iops_server_pcm: + disk.device.capacity_server_pcm_server_pcm_005: type: org.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_server_pcm_005: + cpu.delta_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.bytes_pcm_port_1_server_pcm_005: + network.outpoing.packets_pcm_port_01_server_pcm_005: type: org.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_0_server_pcm_005: + network.incoming.bytes.rate_pcm_port_00_server_pcm_005: type: org.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_server_pcm_005: + disk.read.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: + - 1 + - UNBOUNDED + disk.device.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. + occurrences: + - 1 + - UNBOUNDED + feature_pcm_port_00_server_pcm_005: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_pcm: + disk.ephemeral.size_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 + feature_server_pcm_server_pcm_005: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_server_pcm_server_pcm_005: type: org.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_pcm_port_0_server_pcm_005: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_01_server_pcm_005: type: org.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: + network.outgoing.packets.rate_pcm_port_00_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1413,24 +1394,25 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_1_server_pcm_005: + 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 - attachment_network_server_pcm_005: - type: tosca.capabilities.Attachment + network.outgoing.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 - network.outgoing.bytes.rate_pcm_port_1: + network.incoming.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 - network.incoming.packets_pcm_port_0: + 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: @@ -1442,8 +1424,9 @@ node_types: occurrences: - 1 - UNBOUNDED - end_point_network_server_pcm_005: - type: tosca.capabilities.Endpoint + 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: - 1 - UNBOUNDED @@ -1459,12 +1442,29 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pcm: + network.incoming.bytes_pcm_port_01_server_pcm_005: type: org.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_01_server_pcm_005: + type: org.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_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 + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED cpu.delta_server_pcm_server_pcm_005: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 480a645fdf..a1c67fba97 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -125,21 +125,13 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.nodes.heat.pcm_server + network_1: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork properties: - flavor: - get_input: pcm_flavor_name - availability_zone: - get_input: availabilityzone_name - image: - get_input: pcm_image_name - config_drive: true - user_data_format: RAW - name: - get_input: pcm_server_name + network_name: + get_input: cps_net_name server_pcm_005: type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2 directives: @@ -163,6 +155,19 @@ topology_template: get_input: cps_net_name cps_net_mask: get_input: cps_net_mask + server_pcm_1: + type: org.openecomp.resource.vfc.nodes.heat.pcm_server + properties: + flavor: + get_input: pcm_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pcm_image_name + config_drive: true + user_data_format: RAW + name: + get_input: pcm_server_name pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -186,13 +191,8 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - network: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork - properties: - network_name: - get_input: cps_net_name groups: nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack @@ -201,17 +201,20 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - pcm_port_1 - - server_pcm + - network_1 - server_pcm_005 + - server_pcm_1 - pcm_port_0 - - network outputs: server_pcm_id: description: the pcm nova service id - value: server_pcm + value: server_pcm_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: + network.incoming.bytes.rate_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes.rate_pcm_port_01 network.incoming.packets.rate_pcm_port_0: - pcm_port_0 - network.incoming.packets.rate @@ -224,72 +227,54 @@ topology_template: network.outpoing.packets_pcm_port_1: - pcm_port_1 - network.outpoing.packets - memory_server_pcm: - - server_pcm - - memory network.outpoing.packets_pcm_port_0: - pcm_port_0 - network.outpoing.packets + network.outgoing.bytes_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes_pcm_port_01 disk.device.write.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.bytes_server_pcm - network.incoming.bytes.rate_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.incoming.bytes.rate_pcm_port_1 - disk.device.iops_server_pcm: - - server_pcm - - disk.device.iops - binding_pcm_port_1_server_pcm_005: - - server_pcm_005 - - binding_pcm_port_1 - link_network_server_pcm_005: - - server_pcm_005 - - link_network memory_server_pcm_server_pcm_005: - server_pcm_005 - memory_server_pcm - network.outgoing.packets.rate_pcm_port_1_server_pcm_005: + disk.capacity_server_pcm_1: + - server_pcm_1 + - disk.capacity + network.incoming.packets.rate_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.outgoing.packets.rate_pcm_port_1 - disk.allocation_server_pcm: - - server_pcm - - disk.allocation + - network.incoming.packets.rate_pcm_port_00 + feature_network_1: + - network_1 + - feature disk.device.read.requests.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.requests.rate_server_pcm - network.outgoing.bytes_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.outgoing.bytes_pcm_port_1 os_server_pcm_server_pcm_005: - server_pcm_005 - os_server_pcm - feature_pcm_port_0_server_pcm_005: - - server_pcm_005 - - feature_pcm_port_0 - disk.usage_server_pcm: - - server_pcm - - disk.usage disk.read.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.read.bytes_server_pcm disk.device.write.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.bytes.rate_server_pcm - disk.root.size_server_pcm: - - server_pcm - - disk.root.size - network.incoming.packets_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.incoming.packets_pcm_port_0 - disk.device.latency_server_pcm: - - server_pcm - - disk.device.latency network.incoming.bytes_pcm_port_0: - pcm_port_0 - network.incoming.bytes disk.write.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.requests_server_pcm + disk.usage_server_pcm_1: + - server_pcm_1 + - disk.usage + vcpus_server_pcm_1: + - server_pcm_1 + - vcpus + memory.resident_server_pcm_1: + - server_pcm_1 + - memory.resident network.incoming.bytes_pcm_port_1: - pcm_port_1 - network.incoming.bytes @@ -302,57 +287,48 @@ topology_template: binding_pcm_port_1: - pcm_port_1 - binding - memory.usage_server_pcm: - - server_pcm - - memory.usage - network.incoming.packets.rate_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.incoming.packets.rate_pcm_port_1 - disk.read.requests_server_pcm: - - server_pcm - - disk.read.requests disk.iops_server_pcm_server_pcm_005: - server_pcm_005 - disk.iops_server_pcm disk.device.read.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.bytes.rate_server_pcm - disk.read.bytes_server_pcm: - - server_pcm - - disk.read.bytes - network.outgoing.bytes_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.outgoing.bytes_pcm_port_0 - network.outgoing.bytes.rate_pcm_port_1_server_pcm_005: + binding_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.outgoing.bytes.rate_pcm_port_1 + - binding_pcm_port_00 + link_network_1: + - network_1 + - link disk.device.latency_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.latency_server_pcm + feature_server_pcm_1: + - server_pcm_1 + - feature network.outgoing.packets.rate_pcm_port_0: - pcm_port_0 - network.outgoing.packets.rate network.outgoing.packets.rate_pcm_port_1: - pcm_port_1 - network.outgoing.packets.rate + link_network_2_server_pcm_005: + - server_pcm_005 + - link_network_2 feature_pcm_port_1: - pcm_port_1 - feature network.outgoing.bytes_pcm_port_0: - pcm_port_0 - network.outgoing.bytes - disk.device.read.bytes_server_pcm: - - server_pcm - - disk.device.read.bytes feature_pcm_port_0: - pcm_port_0 - feature - feature_pcm_port_1_server_pcm_005: - - server_pcm_005 - - feature_pcm_port_1 disk.device.read.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.requests_server_pcm + cpu_server_pcm_1: + - server_pcm_1 + - cpu network.outgoing.bytes_pcm_port_1: - pcm_port_1 - network.outgoing.bytes @@ -362,126 +338,123 @@ topology_template: attachment_pcm_port_1: - pcm_port_1 - attachment - attachment_pcm_port_1_server_pcm_005: - - server_pcm_005 - - attachment_pcm_port_1 disk.device.usage_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.usage_server_pcm - disk.device.read.requests.rate_server_pcm: - - server_pcm - - disk.device.read.requests.rate + network.outgoing.bytes_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes_pcm_port_00 disk.read.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.read.requests_server_pcm - vcpus_server_pcm: - - server_pcm - - vcpus - attachment_network: - - network - - attachment - disk.write.bytes_server_pcm: - - server_pcm - - disk.write.bytes + endpoint_server_pcm_1: + - server_pcm_1 + - endpoint + network.incoming.packets.rate_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.packets.rate_pcm_port_01 + host_server_pcm_1: + - server_pcm_1 + - host + disk.device.capacity_server_pcm_1: + - server_pcm_1 + - disk.device.capacity disk.write.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.bytes.rate_server_pcm - disk.read.bytes.rate_server_pcm: - - server_pcm - - disk.read.bytes.rate - attachment_pcm_port_0_server_pcm_005: - - server_pcm_005 - - attachment_pcm_port_0 - disk.device.allocation_server_pcm: - - server_pcm - - disk.device.allocation disk.allocation_server_pcm_server_pcm_005: - server_pcm_005 - disk.allocation_server_pcm - scalable_server_pcm: - - server_pcm - - scalable - feature_network: - - network - - feature - cpu_util_server_pcm: - - server_pcm - - cpu_util + network.outgoing.bytes.rate_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outgoing.bytes.rate_pcm_port_00 + disk.latency_server_pcm_1: + - server_pcm_1 + - disk.latency vcpus_server_pcm_server_pcm_005: - server_pcm_005 - vcpus_server_pcm - host_server_pcm: - - server_pcm - - host - cpu.delta_server_pcm: - - server_pcm - - cpu.delta - binding_server_pcm: - - server_pcm - - binding + disk.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.write.requests.rate + attachment_pcm_port_01_server_pcm_005: + - server_pcm_005 + - attachment_pcm_port_01 + memory_server_pcm_1: + - server_pcm_1 + - memory + network.incoming.packets_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.incoming.packets_pcm_port_00 + network.incoming.bytes_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes_pcm_port_00 + network.outpoing.packets_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outpoing.packets_pcm_port_00 + disk.device.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes.rate disk.write.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.bytes_server_pcm - disk.device.capacity_server_pcm: - - server_pcm - - disk.device.capacity - disk.device.write.requests.rate_server_pcm: - - server_pcm - - disk.device.write.requests.rate disk.usage_server_pcm_server_pcm_005: - server_pcm_005 - disk.usage_server_pcm - disk.latency_server_pcm: - - server_pcm - - disk.latency - disk.device.read.requests_server_pcm: - - server_pcm - - disk.device.read.requests - network.outpoing.packets_pcm_port_1_server_pcm_005: + disk.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.write.bytes + network.outgoing.packets.rate_pcm_port_01_server_pcm_005: - server_pcm_005 - - network.outpoing.packets_pcm_port_1 + - network.outgoing.packets.rate_pcm_port_01 + instance_server_pcm_1: + - server_pcm_1 + - instance + disk.device.read.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests.rate cpu_util_server_pcm_server_pcm_005: - server_pcm_005 - cpu_util_server_pcm - feature_server_pcm: - - server_pcm - - feature disk.ephemeral.size_server_pcm_server_pcm_005: - server_pcm_005 - disk.ephemeral.size_server_pcm - disk.write.bytes.rate_server_pcm: - - server_pcm + end_point_network_1: + - network_1 + - end_point + binding_server_pcm_1: + - server_pcm_1 + - binding + disk.write.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.write.bytes.rate memory.resident_server_pcm_server_pcm_005: - server_pcm_005 - memory.resident_server_pcm - network.incoming.bytes_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.incoming.bytes_pcm_port_0 + disk.device.allocation_server_pcm_1: + - server_pcm_1 + - disk.device.allocation disk.capacity_server_pcm_server_pcm_005: - server_pcm_005 - disk.capacity_server_pcm - feature_network_server_pcm_005: - - server_pcm_005 - - feature_network - network.outgoing.bytes.rate_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.outgoing.bytes.rate_pcm_port_0 + disk.root.size_server_pcm_1: + - server_pcm_1 + - disk.root.size disk.latency_server_pcm_server_pcm_005: - server_pcm_005 - disk.latency_server_pcm - cpu_server_pcm: - - server_pcm - - cpu disk.write.requests.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.write.requests.rate_server_pcm host_server_pcm_server_pcm_005: - server_pcm_005 - host_server_pcm - network.outpoing.packets_pcm_port_0_server_pcm_005: + attachment_network_2_server_pcm_005: + - server_pcm_005 + - attachment_network_2 + feature_pcm_port_01_server_pcm_005: - server_pcm_005 - - network.outpoing.packets_pcm_port_0 + - feature_pcm_port_01 disk.read.bytes.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.read.bytes.rate_server_pcm @@ -491,123 +464,150 @@ topology_template: endpoint_server_pcm_server_pcm_005: - server_pcm_005 - endpoint_server_pcm - disk.write.requests_server_pcm: - - server_pcm - - disk.write.requests cpu_server_pcm_server_pcm_005: - server_pcm_005 - cpu_server_pcm - memory.resident_server_pcm: - - server_pcm - - memory.resident + binding_pcm_port_01_server_pcm_005: + - server_pcm_005 + - binding_pcm_port_01 + disk.iops_server_pcm_1: + - server_pcm_1 + - disk.iops + feature_network_2_server_pcm_005: + - server_pcm_005 + - feature_network_2 disk.device.read.bytes_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.read.bytes_server_pcm - disk.device.write.requests_server_pcm: - - server_pcm - - disk.device.write.requests - disk.device.usage_server_pcm: - - server_pcm - - disk.device.usage + disk.device.write.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes.rate + attachment_network_1: + - network_1 + - attachment + attachment_pcm_port_00_server_pcm_005: + - server_pcm_005 + - attachment_pcm_port_00 + end_point_network_2_server_pcm_005: + - server_pcm_005 + - end_point_network_2 feature_server_pcm_005: - server_pcm_005 - feature - disk.device.write.bytes_server_pcm: - - server_pcm + disk.write.requests_server_pcm_1: + - server_pcm_1 + - disk.write.requests + disk.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.read.bytes + cpu_util_server_pcm_1: + - server_pcm_1 + - cpu_util + disk.allocation_server_pcm_1: + - server_pcm_1 + - disk.allocation + disk.device.write.bytes_server_pcm_1: + - server_pcm_1 - disk.device.write.bytes - network.outgoing.packets.rate_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.outgoing.packets.rate_pcm_port_0 - disk.ephemeral.size_server_pcm: - - server_pcm - - disk.ephemeral.size - link_network: - - network - - link - disk.capacity_server_pcm: - - server_pcm - - disk.capacity - os_server_pcm: - - server_pcm - - os + memory.usage_server_pcm_1: + - server_pcm_1 + - memory.usage memory.usage_server_pcm_server_pcm_005: - server_pcm_005 - memory.usage_server_pcm - network.incoming.packets.rate_pcm_port_0_server_pcm_005: - - server_pcm_005 - - network.incoming.packets.rate_pcm_port_0 - endpoint_server_pcm: - - server_pcm - - endpoint - end_point_network: - - network - - end_point + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes disk.device.write.requests_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.requests_server_pcm + disk.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.read.bytes.rate + disk.device.iops_server_pcm_1: + - server_pcm_1 + - disk.device.iops disk.device.iops_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.iops_server_pcm - disk.iops_server_pcm: - - server_pcm - - disk.iops disk.device.capacity_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.capacity_server_pcm - network.incoming.bytes_pcm_port_1_server_pcm_005: + cpu.delta_server_pcm_1: + - server_pcm_1 + - cpu.delta + network.outpoing.packets_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.outpoing.packets_pcm_port_01 + network.incoming.bytes.rate_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.incoming.bytes_pcm_port_1 - network.incoming.bytes.rate_pcm_port_0_server_pcm_005: + - network.incoming.bytes.rate_pcm_port_00 + disk.read.requests_server_pcm_1: + - server_pcm_1 + - disk.read.requests + disk.device.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests.rate + feature_pcm_port_00_server_pcm_005: - server_pcm_005 - - network.incoming.bytes.rate_pcm_port_0 + - feature_pcm_port_00 + disk.ephemeral.size_server_pcm_1: + - server_pcm_1 + - disk.ephemeral.size feature_server_pcm_server_pcm_005: - server_pcm_005 - feature_server_pcm - disk.device.read.bytes.rate_server_pcm: - - server_pcm - - disk.device.read.bytes.rate disk.device.write.requests.rate_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.write.requests.rate_server_pcm - binding_pcm_port_0_server_pcm_005: + scalable_server_pcm_1: + - server_pcm_1 + - scalable + network.outgoing.bytes.rate_pcm_port_01_server_pcm_005: - server_pcm_005 - - binding_pcm_port_0 - disk.write.requests.rate_server_pcm: - - server_pcm - - disk.write.requests.rate - disk.device.write.bytes.rate_server_pcm: - - server_pcm - - disk.device.write.bytes.rate + - network.outgoing.bytes.rate_pcm_port_01 + network.outgoing.packets.rate_pcm_port_00_server_pcm_005: + - server_pcm_005 + - network.outgoing.packets.rate_pcm_port_00 disk.device.allocation_server_pcm_server_pcm_005: - server_pcm_005 - disk.device.allocation_server_pcm - network.incoming.packets_pcm_port_1_server_pcm_005: - - server_pcm_005 - - network.incoming.packets_pcm_port_1 - attachment_network_server_pcm_005: - - server_pcm_005 - - attachment_network + disk.device.latency_server_pcm_1: + - server_pcm_1 + - disk.device.latency network.outgoing.bytes.rate_pcm_port_1: - pcm_port_1 - network.outgoing.bytes.rate network.incoming.packets_pcm_port_0: - pcm_port_0 - network.incoming.packets + disk.device.usage_server_pcm_1: + - server_pcm_1 + - disk.device.usage network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - network.outgoing.bytes.rate - end_point_network_server_pcm_005: - - server_pcm_005 - - end_point_network + disk.device.write.requests_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests network.incoming.packets_pcm_port_1: - pcm_port_1 - network.incoming.packets disk.root.size_server_pcm_server_pcm_005: - server_pcm_005 - disk.root.size_server_pcm - instance_server_pcm: - - server_pcm - - instance + network.incoming.bytes_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.bytes_pcm_port_01 + network.incoming.packets_pcm_port_01_server_pcm_005: + - server_pcm_005 + - network.incoming.packets_pcm_port_01 + disk.device.read.requests_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests + os_server_pcm_1: + - server_pcm_1 + - os cpu.delta_server_pcm_server_pcm_005: - server_pcm_005 - cpu.delta_server_pcm @@ -621,45 +621,45 @@ topology_template: dependency_server_pcm_005: - server_pcm_005 - dependency - link_pcm_port_1_server_pcm_005: + dependency_network_2_server_pcm_005: - server_pcm_005 - - link_pcm_port_1 - dependency_pcm_port_1_server_pcm_005: + - dependency_network_2 + dependency_pcm_port_01_server_pcm_005: - server_pcm_005 - - dependency_pcm_port_1 - local_storage_server_pcm: - - server_pcm - - local_storage - dependency_pcm_port_0_server_pcm_005: - - server_pcm_005 - - dependency_pcm_port_0 + - dependency_pcm_port_01 dependency_pcm_port_0: - pcm_port_0 - dependency - dependency_server_pcm: - - server_pcm - - dependency local_storage_server_pcm_server_pcm_005: - server_pcm_005 - local_storage_server_pcm dependency_pcm_port_1: - pcm_port_1 - dependency + link_pcm_port_00_server_pcm_005: + - server_pcm_005 + - link_pcm_port_00 dependency_server_pcm_server_pcm_005: - server_pcm_005 - dependency_server_pcm + local_storage_server_pcm_1: + - server_pcm_1 + - local_storage link_pcm_port_0: - pcm_port_0 - link link_pcm_port_1: - pcm_port_1 - link - dependency_network: - - network - - dependency - link_pcm_port_0_server_pcm_005: + dependency_pcm_port_00_server_pcm_005: - server_pcm_005 - - link_pcm_port_0 - dependency_network_server_pcm_005: + - dependency_pcm_port_00 + dependency_server_pcm_1: + - server_pcm_1 + - dependency + dependency_network_1: + - network_1 + - dependency + link_pcm_port_01_server_pcm_005: - server_pcm_005 - - dependency_network
\ No newline at end of file + - link_pcm_port_01
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index 16b003af18..806d12ea62 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -76,7 +76,7 @@ topology_template: type: string description: OAM network name node_templates: - pcm_port_1: + pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -89,13 +89,13 @@ topology_template: - get_input: security_group_name fixed_ips: - ip_address: - get_input: oam_net_ip + get_input: cps_net_ip mac_requirements: mac_count_required: is_required: false - network_role_tag: oam + network_role_tag: cps network: - get_input: oam_net_name + get_input: cps_net_name requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -114,7 +114,12 @@ topology_template: user_data_format: RAW name: get_input: pcm_server_name - pcm_port_0: + network_2: + type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork + properties: + network_name: + get_input: cps_net_name + pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -127,23 +132,18 @@ topology_template: - get_input: security_group_name fixed_ips: - ip_address: - get_input: cps_net_ip + get_input: oam_net_ip mac_requirements: mac_count_required: is_required: false - network_role_tag: cps + network_role_tag: oam network: - get_input: cps_net_name + get_input: oam_net_name requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pcm relationship: tosca.relationships.network.BindsTo - network: - type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork - properties: - network_name: - get_input: cps_net_name groups: nested-pcm_v0.1_2_group: type: org.openecomp.groups.heat.HeatStack @@ -151,10 +151,10 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.1_2.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 + - pcm_port_00 - server_pcm - - pcm_port_0 - - network + - network_2 + - pcm_port_01 outputs: server_pcm_id: description: the pcm nova service id @@ -162,48 +162,72 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1_2 capabilities: - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate cpu_server_pcm: - server_pcm - cpu - network.incoming.packets.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.packets.rate - network.outpoing.packets_pcm_port_1: - - pcm_port_1 - - network.outpoing.packets + feature_pcm_port_00: + - pcm_port_00 + - feature memory_server_pcm: - server_pcm - memory + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets disk.write.requests_server_pcm: - server_pcm - disk.write.requests - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + feature_pcm_port_01: + - pcm_port_01 + - feature + network.incoming.packets_pcm_port_00: + - pcm_port_00 + - network.incoming.packets disk.device.iops_server_pcm: - server_pcm - disk.device.iops memory.resident_server_pcm: - server_pcm - memory.resident + attachment_network_2: + - network_2 + - attachment disk.device.write.requests_server_pcm: - server_pcm - disk.device.write.requests + feature_network_2: + - network_2 + - feature + network.outgoing.packets.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.packets.rate + network.incoming.bytes_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes + network.incoming.bytes_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes disk.device.usage_server_pcm: - server_pcm - disk.device.usage disk.allocation_server_pcm: - server_pcm - disk.allocation + attachment_pcm_port_00: + - pcm_port_00 + - attachment + attachment_pcm_port_01: + - pcm_port_01 + - attachment disk.usage_server_pcm: - server_pcm - disk.usage disk.device.write.bytes_server_pcm: - server_pcm - disk.device.write.bytes + network.outgoing.bytes_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes disk.root.size_server_pcm: - server_pcm - disk.root.size @@ -213,27 +237,18 @@ topology_template: disk.device.latency_server_pcm: - server_pcm - disk.device.latency - network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes - binding_pcm_port_0: - - pcm_port_0 - - binding - binding_pcm_port_1: - - pcm_port_1 - - binding + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.packets.rate memory.usage_server_pcm: - server_pcm - memory.usage + network.outgoing.bytes_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes disk.read.requests_server_pcm: - server_pcm - disk.read.requests - link_network: - - network - - link disk.capacity_server_pcm: - server_pcm - disk.capacity @@ -243,48 +258,27 @@ topology_template: disk.read.bytes_server_pcm: - server_pcm - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 - - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes + link_network_2: + - network_2 + - link disk.device.read.bytes_server_pcm: - server_pcm - disk.device.read.bytes - feature_pcm_port_0: - - pcm_port_0 - - feature - network.outgoing.bytes_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes - attachment_pcm_port_0: - - pcm_port_0 - - attachment - attachment_pcm_port_1: - - pcm_port_1 - - attachment + network.incoming.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.bytes.rate endpoint_server_pcm: - server_pcm - endpoint + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_pcm: - server_pcm - disk.device.read.requests.rate - end_point_network: - - network - - end_point vcpus_server_pcm: - server_pcm - vcpus - attachment_network: - - network - - attachment disk.write.bytes_server_pcm: - server_pcm - disk.write.bytes @@ -300,45 +294,48 @@ topology_template: scalable_server_pcm: - server_pcm - scalable - feature_network: - - network - - feature disk.device.read.bytes.rate_server_pcm: - server_pcm - disk.device.read.bytes.rate cpu_util_server_pcm: - server_pcm - cpu_util + network.outgoing.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.packets.rate + network.incoming.packets.rate_pcm_port_00: + - pcm_port_00 + - network.incoming.packets.rate + binding_pcm_port_01: + - pcm_port_01 + - binding disk.write.requests.rate_server_pcm: - server_pcm - disk.write.requests.rate + binding_pcm_port_00: + - pcm_port_00 + - binding disk.device.write.bytes.rate_server_pcm: - server_pcm - disk.device.write.bytes.rate host_server_pcm: - server_pcm - host + network.outgoing.bytes.rate_pcm_port_00: + - pcm_port_00 + - network.outgoing.bytes.rate cpu.delta_server_pcm: - server_pcm - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets binding_server_pcm: - server_pcm - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets instance_server_pcm: - server_pcm - instance @@ -354,34 +351,37 @@ topology_template: feature_server_pcm: - server_pcm - feature - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate + network.outpoing.packets_pcm_port_00: + - pcm_port_00 + - network.outpoing.packets disk.write.bytes.rate_server_pcm: - server_pcm - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + end_point_network_2: + - network_2 + - end_point + network.outpoing.packets_pcm_port_01: + - pcm_port_01 + - network.outpoing.packets requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link - dependency_network: - - network + dependency_pcm_port_00: + - pcm_port_00 - dependency local_storage_server_pcm: - server_pcm - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_01: + - pcm_port_01 - dependency + link_pcm_port_01: + - pcm_port_01 + - link + link_pcm_port_00: + - pcm_port_00 + - link dependency_server_pcm: - server_pcm - dependency - dependency_pcm_port_1: - - pcm_port_1 + dependency_network_2: + - network_2 - 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/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml index 66a03796fb..61c1944bc7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1.yaml @@ -78,21 +78,21 @@ resources: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_1} - config: { get_resource: script_init} script_init: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_1} - network: + network_1: type: OS::Contrail::VirtualNetwork properties: name: { get_param: cps_net_name} - server_pcm: + server_pcm_1: type: OS::Nova::Server properties: config_drive: "True" @@ -126,13 +126,7 @@ resources: - ip_address: { get_param: oam_net_ip } security_groups: [{ get_param: security_group_name }] - #pcm_vol_attachment: - # type: OS::Cinder::VolumeAttachment - # properties: - # volume_id: { get_param: pcm_vol } - # mountpoint: /dev/vdb - # instance_uuid: { get_resource: server_pcm } outputs: server_pcm_id: description: the pcm nova service id - value: { get_resource: server_pcm }
\ No newline at end of file + value: { get_resource: server_pcm_1 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml index 11be0dd63b..5f44c88c80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/inputs/nested-pcm_v0.1_2.yaml @@ -50,16 +50,16 @@ resources: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_2} - config: { get_resource: script_init} script_init: type: OS::Heat::MultipartMime properties: parts: - - config: { get_resource: network} + - config: { get_resource: network_2} - network: + network_2: type: OS::Contrail::VirtualNetwork properties: name: { get_param: cps_net_name} @@ -73,8 +73,8 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_port_00} + - port: { get_resource: pcm_port_01} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} @@ -82,7 +82,7 @@ resources: user_data: get_resource: server_init - pcm_port_0: + pcm_port_00: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -90,7 +90,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_01: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } |