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/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared | |
| 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/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared')
6 files changed, 694 insertions, 694 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 5163613c02..8512e8ac6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -70,27 +70,40 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_cmaui_port_2: + - dependency_cmaui_port_12: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_2: + - link_cmaui_port_12: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_cmaui: + - dependency_cmaui_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui: + - link_cmaui_port_11: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_server_cmaui_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -124,39 +137,14 @@ node_types: occurrences: - 1 - 1 - - dependency_cmaui_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_cmaui_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 capabilities: - cpu.delta_server_cmaui: - type: org.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_cmaui: - type: org.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_server_abc: type: org.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_cmaui: + disk.device.usage_server_cmaui_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: @@ -168,23 +156,18 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + os_server_abc: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_cmaui: + cpu_server_abc: type: org.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_abc: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - cpu_server_abc: + disk.device.latency_server_cmaui_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: @@ -202,14 +185,13 @@ node_types: occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.root.size_server_cmaui_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_server_cmaui: + disk.device.write.requests.rate_server_cmaui_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: @@ -228,19 +210,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_cmaui: - type: org.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_cmaui_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_cmaui_port_1: + disk.read.requests_server_cmaui_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: @@ -251,54 +221,55 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_abc: + disk.device.iops_server_cmaui_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_server_cmaui: + disk.device.read.bytes.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_cmaui: + disk.read.bytes_server_cmaui_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.root.size_server_cmaui: + disk.write.requests_server_abc: type: org.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_abc: + disk.device.read.bytes_server_cmaui_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.bytes_server_abc: + disk.write.requests.rate_server_cmaui_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_cmaui_port_2: + disk.capacity_server_abc: type: org.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_cmaui: - type: tosca.capabilities.OperatingSystem + cpu_server_cmaui_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.bytes.rate_server_cmaui: + disk.device.write.bytes_server_abc: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -321,7 +292,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_cmaui_port_1: + disk.ephemeral.size_server_cmaui_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: @@ -333,221 +304,183 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_abc_port_1: + disk.capacity_server_cmaui_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_abc: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.write.requests.rate_server_abc: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_12: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_server_cmaui: + feature_cmaui_port_11: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_cmaui_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_cmaui_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - instance_server_abc: + network.outpoing.packets_abc_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_abc_port_1: + network.incoming.bytes.rate_cmaui_port_11: type: org.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_server_cmaui: + network.incoming.bytes.rate_cmaui_port_12: type: org.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_abc: + network.outgoing.bytes_cmaui_port_11: type: org.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_cmaui: + network.outgoing.bytes_cmaui_port_12: type: org.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_cmaui_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. + endpoint_server_abc: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_cmaui_port_1: + disk.write.requests.rate_server_abc: type: org.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_cmaui: + disk.iops_server_cmaui_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_server_cmaui: + instance_server_abc: type: org.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_cmaui_port_2: + disk.device.write.requests_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_cmaui: + network.incoming.packets.rate_abc_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_cmaui_port_1: + disk.device.write.bytes.rate_server_abc: type: org.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_abc: + disk.device.write.bytes.rate_server_cmaui_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_server_abc: + cpu_util_server_cmaui_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_cmaui_port_1: + network.incoming.packets.rate_cmaui_port_12: type: org.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_cmaui_port_2: + network.incoming.packets.rate_cmaui_port_11: type: org.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_cmaui: + disk.allocation_server_abc: type: org.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_cmaui_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_cmaui_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + disk.write.bytes.rate_server_cmaui_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui: + disk.device.write.bytes_server_cmaui_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_abc_port_1: + network.outpoing.packets_cmaui_port_11: type: org.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_cmaui_port_2: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.device.latency_server_cmaui: + disk.device.iops_server_abc: type: org.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_cmaui: + network.outpoing.packets_cmaui_port_12: type: org.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_cmaui: + disk.write.bytes_server_cmaui_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_cmaui_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_server_cmaui_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cmaui_port_2: + disk.allocation_server_cmaui_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_cmaui: + network.incoming.packets_abc_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_cmaui: - 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_cmaui_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + scalable_server_cmaui_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -557,27 +490,26 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui: + disk.write.requests_server_cmaui_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.rate_server_cmaui: + disk.device.latency_server_abc: type: org.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_abc: + disk.usage_server_cmaui_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_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_server_cmaui_1: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED @@ -587,9 +519,8 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -599,11 +530,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED memory.usage_server_abc: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -616,7 +542,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_cmaui: + disk.device.allocation_server_cmaui_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: @@ -633,7 +559,19 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + network.outgoing.bytes.rate_cmaui_port_11: + type: org.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_cmaui_port_12: + type: org.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_cmaui_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: @@ -645,6 +583,13 @@ node_types: occurrences: - 1 - UNBOUNDED + host_server_cmaui_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_server_abc: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -704,7 +649,7 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_server_cmaui: + disk.device.capacity_server_cmaui_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: @@ -716,53 +661,55 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui: + instance_server_cmaui_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_cmaui: + disk.device.read.requests.rate_server_cmaui_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.bytes_server_cmaui: + network.outgoing.packets.rate_cmaui_port_12: type: org.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_cmaui_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_cmaui_port_12: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.incoming.bytes.rate_cmaui_port_2: + vcpus_server_cmaui_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_cmaui: + disk.device.write.requests.rate_server_abc: type: org.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_cmaui: + network.outgoing.packets.rate_cmaui_port_11: type: org.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_abc: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_cmaui_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_server_abc: type: org.openecomp.capabilities.metric.Ceilometer @@ -777,20 +724,37 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cmaui_port_1: + disk.read.bytes.rate_server_cmaui_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_cmaui_port_2: + disk.device.read.requests_server_cmaui_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_cmaui: - type: tosca.capabilities.Endpoint.Admin + cpu.delta_server_cmaui_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_cmaui_port_12: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + attachment_cmaui_port_11: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + memory.resident_server_cmaui_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 @@ -806,6 +770,42 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_cmaui_port_12: + type: org.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_cmaui_port_11: + type: org.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_cmaui_port_12: + type: org.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_cmaui_port_11: + type: org.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_cmaui_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.usage_server_cmaui_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_abc: type: tosca.capabilities.Node occurrences: @@ -860,336 +860,336 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_server_cmaui: + - dependency_cmaui_port_21: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_cmaui_port_21: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_cmaui_port_1: + - 1 + - 1 + - dependency_server_cmaui_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cmaui_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_cmaui_2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED capabilities: - cpu.delta_server_cmaui: + disk.write.bytes.rate_server_cmaui_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.write.requests.rate_server_cmaui: + disk.device.write.bytes_server_cmaui_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.allocation_server_cmaui: + disk.device.usage_server_cmaui_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_server_cmaui: - type: tosca.capabilities.Scalable + disk.write.bytes_server_cmaui_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.rate_server_cmaui: - 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_cmaui_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cmaui_port_1: + disk.device.latency_server_cmaui_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_server_cmaui: + disk.allocation_server_cmaui_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 - feature_cmaui_port_1: - type: tosca.capabilities.Node + binding_server_cmaui_2: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_cmaui: + disk.root.size_server_cmaui_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.bytes.rate_server_cmaui: + disk.device.write.requests.rate_server_cmaui_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 - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.packets.rate_cmaui_port_21: + type: org.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_cmaui: + network.outgoing.packets.rate_cmaui_port_21: type: org.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_cmaui: + binding_cmaui_port_21: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + vcpus_server_cmaui_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.write.requests_server_cmaui: + scalable_server_cmaui_2: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_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.requests_server_cmaui: + disk.write.requests_server_cmaui_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.capacity_server_cmaui: + disk.device.iops_server_cmaui_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_cmaui_port_1: + disk.usage_server_cmaui_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.usage_server_cmaui: + disk.device.capacity_server_cmaui_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_cmaui_port_1: + network.outpoing.packets_cmaui_port_21: type: org.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_cmaui: + disk.device.read.bytes.rate_server_cmaui_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 - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + endpoint_server_cmaui_2: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.capacity_server_cmaui: + disk.read.bytes_server_cmaui_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.write.requests.rate_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + os_server_cmaui_2: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cmaui_port_21: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - instance_server_cmaui: + disk.device.read.bytes_server_cmaui_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.bytes_server_cmaui: + network.incoming.bytes.rate_cmaui_port_21: type: org.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_cmaui: + disk.write.requests.rate_server_cmaui_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.root.size_server_cmaui: + memory_server_cmaui_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_server_cmaui: - type: tosca.capabilities.network.Bindable + cpu_server_cmaui_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.rate_server_cmaui: + network.outgoing.bytes.rate_cmaui_port_21: type: org.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_cmaui: + disk.device.allocation_server_cmaui_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 - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + host_server_cmaui_2: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_cmaui: + disk.ephemeral.size_server_cmaui_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_cmaui_port_1: + disk.capacity_server_cmaui_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.resident_server_cmaui: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_cmaui_port_21: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.latency_server_cmaui: + network.incoming.bytes_cmaui_port_21: type: org.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_cmaui: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_cmaui_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - vcpus_server_cmaui: + instance_server_cmaui_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.write.bytes_server_cmaui: + network.incoming.packets_cmaui_port_21: type: org.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_cmaui_port_1: + disk.iops_server_cmaui_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.allocation_server_cmaui: + disk.device.write.requests_server_cmaui_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.write.requests_server_cmaui: + disk.device.read.requests_server_cmaui_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.usage_server_cmaui: + disk.read.bytes.rate_server_cmaui_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.ephemeral.size_server_cmaui: + cpu.delta_server_cmaui_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_cmaui_port_1: + disk.device.read.requests.rate_server_cmaui_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.rate_cmaui_port_1: + network.outgoing.bytes_cmaui_port_21: type: org.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_cmaui: - type: tosca.capabilities.Endpoint.Admin + memory.resident_server_cmaui_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.iops_server_cmaui: + disk.latency_server_cmaui_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.iops_server_cmaui: + cpu_util_server_cmaui_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_server_cmaui: + disk.device.write.bytes.rate_server_cmaui_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_cmaui_port_1: + memory.usage_server_cmaui_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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml index 4f0f52d340..aa6da4f4d8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml @@ -204,7 +204,7 @@ topology_template: service_template_filter: substitute_service_template: nested2ServiceTemplate.yaml requirements: - - link_cmaui_port_1: + - link_cmaui_port_21: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -220,17 +220,17 @@ topology_template: p2: get_input: shared_network_id2 requirements: - - link_cmaui_port_2: + - link_cmaui_port_12: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_abc_port_1: + - link_cmaui_port_11: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_cmaui_port_1: + - link_abc_port_1: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net2 relationship: tosca.relationships.network.LinksTo test_net1: type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork @@ -275,17 +275,17 @@ topology_template: p2: get_input: shared_network_id2 requirements: - - link_cmaui_port_2: + - link_cmaui_port_12: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_abc_port_1: + - link_cmaui_port_11: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_cmaui_port_1: + - link_abc_port_1: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net2 relationship: tosca.relationships.network.LinksTo groups: main_group: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index 15e635979b..ca425196ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -76,7 +76,7 @@ topology_template: type: string description: Image for CMAUI server node_templates: - cmaui_port_2: + cmaui_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -101,9 +101,36 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo - server_cmaui: + cmaui_port_11: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + replacement_policy: AUTO + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group_name + fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 0 + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: p1 + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: server_cmaui_1 + relationship: tosca.relationships.network.BindsTo + server_cmaui_1: type: org.openecomp.resource.vfc.nodes.heat.cmaui properties: flavor: @@ -156,33 +183,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: server_abc relationship: tosca.relationships.network.BindsTo - cmaui_port_1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - mac_requirements: - mac_count_required: - is_required: false - network: - get_input: p1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo groups: nested1_group: type: org.openecomp.groups.heat.HeatStack @@ -190,98 +190,83 @@ topology_template: heat_file: ../Artifacts/nested1.yml description: cmaui server template for vMMSC members: - - cmaui_port_2 - - server_cmaui + - cmaui_port_12 + - cmaui_port_11 + - server_cmaui_1 - server_abc - abc_port_1 - - cmaui_port_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested1 capabilities: - cpu.delta_server_cmaui: - - server_cmaui - - cpu.delta - disk.device.write.requests.rate_server_cmaui: - - server_cmaui - - disk.device.write.requests.rate disk.write.bytes.rate_server_abc: - server_abc - disk.write.bytes.rate - disk.device.allocation_server_cmaui: - - server_cmaui - - disk.device.allocation + disk.device.usage_server_cmaui_1: + - server_cmaui_1 + - disk.device.usage memory.resident_server_abc: - server_abc - memory.resident - scalable_server_cmaui: - - server_cmaui - - scalable - disk.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.read.bytes.rate os_server_abc: - server_abc - os cpu_server_abc: - server_abc - cpu + disk.device.latency_server_cmaui_1: + - server_cmaui_1 + - disk.device.latency network.outgoing.packets.rate_abc_port_1: - abc_port_1 - network.outgoing.packets.rate disk.device.usage_server_abc: - server_abc - disk.device.usage - host_server_cmaui: - - server_cmaui - - host - cpu_util_server_cmaui: - - server_cmaui - - cpu_util + disk.root.size_server_cmaui_1: + - server_cmaui_1 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.requests.rate binding_abc_port_1: - abc_port_1 - binding disk.device.write.requests_server_abc: - server_abc - disk.device.write.requests - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests - network.outgoing.bytes_cmaui_port_2: - - cmaui_port_2 - - network.outgoing.bytes - network.outgoing.bytes_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.bytes + disk.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.read.requests feature_abc_port_1: - abc_port_1 - feature + disk.device.iops_server_cmaui_1: + - server_cmaui_1 + - disk.device.iops + disk.device.read.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.bytes.rate + disk.read.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.read.bytes disk.write.requests_server_abc: - server_abc - disk.write.requests - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui + disk.device.read.bytes_server_cmaui_1: + - server_cmaui_1 - disk.device.read.bytes - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size + disk.write.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.write.requests.rate disk.capacity_server_abc: - server_abc - disk.capacity + cpu_server_cmaui_1: + - server_cmaui_1 + - cpu disk.device.write.bytes_server_abc: - server_abc - disk.device.write.bytes - network.incoming.packets_cmaui_port_2: - - cmaui_port_2 - - network.incoming.packets - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate disk.device.read.bytes.rate_server_abc: - server_abc - disk.device.read.bytes.rate @@ -291,171 +276,159 @@ topology_template: attachment_abc_port_1: - abc_port_1 - attachment - network.incoming.packets_cmaui_port_1: - - cmaui_port_1 - - network.incoming.packets + disk.ephemeral.size_server_cmaui_1: + - server_cmaui_1 + - disk.ephemeral.size disk.read.bytes_server_abc: - server_abc - disk.read.bytes + disk.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.capacity + feature_cmaui_port_12: + - cmaui_port_12 + - feature + feature_cmaui_port_11: + - cmaui_port_11 + - feature network.outpoing.packets_abc_port_1: - abc_port_1 - network.outpoing.packets + network.incoming.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes.rate + network.incoming.bytes.rate_cmaui_port_12: + - cmaui_port_12 + - network.incoming.bytes.rate + network.outgoing.bytes_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.bytes + network.outgoing.bytes_cmaui_port_12: + - cmaui_port_12 + - network.outgoing.bytes endpoint_server_abc: - server_abc - endpoint disk.write.requests.rate_server_abc: - server_abc - disk.write.requests.rate - feature_server_cmaui: - - server_cmaui - - feature - binding_cmaui_port_1: - - cmaui_port_1 - - binding - binding_cmaui_port_2: - - cmaui_port_2 - - binding + disk.iops_server_cmaui_1: + - server_cmaui_1 + - disk.iops instance_server_abc: - server_abc - instance + disk.device.write.requests_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.requests network.incoming.packets.rate_abc_port_1: - abc_port_1 - network.incoming.packets.rate - memory.usage_server_cmaui: - - server_cmaui - - memory.usage disk.device.write.bytes.rate_server_abc: - server_abc - disk.device.write.bytes.rate - disk.ephemeral.size_server_cmaui: - - server_cmaui - - disk.ephemeral.size - network.outgoing.bytes.rate_cmaui_port_2: - - cmaui_port_2 - - network.outgoing.bytes.rate - network.outgoing.bytes.rate_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.bytes.rate - disk.iops_server_cmaui: - - server_cmaui - - disk.iops - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops - network.incoming.bytes_cmaui_port_2: - - cmaui_port_2 - - network.incoming.bytes - disk.read.bytes_server_cmaui: - - server_cmaui - - disk.read.bytes - network.incoming.bytes_cmaui_port_1: - - cmaui_port_1 - - network.incoming.bytes + disk.device.write.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.bytes.rate + cpu_util_server_cmaui_1: + - server_cmaui_1 + - cpu_util + network.incoming.packets.rate_cmaui_port_12: + - cmaui_port_12 + - network.incoming.packets.rate + network.incoming.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets.rate disk.allocation_server_abc: - server_abc - disk.allocation + disk.write.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.device.write.bytes + network.outpoing.packets_cmaui_port_11: + - cmaui_port_11 + - network.outpoing.packets disk.device.iops_server_abc: - server_abc - disk.device.iops - network.incoming.packets.rate_cmaui_port_1: - - cmaui_port_1 - - network.incoming.packets.rate - network.incoming.packets.rate_cmaui_port_2: - - cmaui_port_2 - - network.incoming.packets.rate - cpu_server_cmaui: - - server_cmaui - - cpu - feature_cmaui_port_1: - - cmaui_port_1 - - feature - feature_cmaui_port_2: - - cmaui_port_2 + network.outpoing.packets_cmaui_port_12: + - cmaui_port_12 + - network.outpoing.packets + disk.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes + feature_server_cmaui_1: + - server_cmaui_1 - feature - disk.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.write.bytes.rate - disk.device.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.read.bytes.rate + disk.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.allocation network.incoming.packets_abc_port_1: - abc_port_1 - network.incoming.packets - attachment_cmaui_port_2: - - cmaui_port_2 - - attachment - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.read.requests_server_cmaui: - - server_cmaui - - disk.read.requests - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity - network.outgoing.packets.rate_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.packets.rate - network.outgoing.packets.rate_cmaui_port_2: - - cmaui_port_2 - - network.outgoing.packets.rate - disk.usage_server_cmaui: - - server_cmaui - - disk.usage - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage - attachment_cmaui_port_1: - - cmaui_port_1 - - attachment + binding_server_cmaui_1: + - server_cmaui_1 + - binding + scalable_server_cmaui_1: + - server_cmaui_1 + - scalable disk.root.size_server_abc: - server_abc - disk.root.size - disk.capacity_server_cmaui: - - server_cmaui - - disk.capacity - disk.write.requests.rate_server_cmaui: - - server_cmaui - - disk.write.requests.rate + disk.write.requests_server_cmaui_1: + - server_cmaui_1 + - disk.write.requests disk.device.latency_server_abc: - server_abc - disk.device.latency - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests + disk.usage_server_cmaui_1: + - server_cmaui_1 + - disk.usage + endpoint_server_cmaui_1: + - server_cmaui_1 + - endpoint memory_server_abc: - server_abc - memory - memory_server_cmaui: - - server_cmaui - - memory + os_server_cmaui_1: + - server_cmaui_1 + - os disk.device.read.bytes_server_abc: - server_abc - disk.device.read.bytes - binding_server_cmaui: - - server_cmaui - - binding memory.usage_server_abc: - server_abc - memory.usage disk.read.requests_server_abc: - server_abc - disk.read.requests - disk.device.read.requests.rate_server_cmaui: - - server_cmaui - - disk.device.read.requests.rate + disk.device.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.device.allocation disk.usage_server_abc: - server_abc - disk.usage scalable_server_abc: - server_abc - scalable - disk.write.bytes_server_cmaui: - - server_cmaui - - disk.write.bytes + network.outgoing.bytes.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_cmaui_port_12: + - cmaui_port_12 + - network.outgoing.bytes.rate + memory_server_cmaui_1: + - server_cmaui_1 + - memory disk.write.bytes_server_abc: - server_abc - disk.write.bytes + host_server_cmaui_1: + - server_cmaui_1 + - host disk.read.bytes.rate_server_abc: - server_abc - disk.read.bytes.rate @@ -486,57 +459,84 @@ topology_template: network.incoming.bytes_abc_port_1: - abc_port_1 - network.incoming.bytes - memory.resident_server_cmaui: - - server_cmaui - - memory.resident + disk.device.capacity_server_cmaui_1: + - server_cmaui_1 + - disk.device.capacity disk.device.allocation_server_abc: - server_abc - disk.device.allocation - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - vcpus_server_cmaui: - - server_cmaui + instance_server_cmaui_1: + - server_cmaui_1 + - instance + disk.device.read.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests.rate + network.outgoing.packets.rate_cmaui_port_12: + - cmaui_port_12 + - network.outgoing.packets.rate + binding_cmaui_port_12: + - cmaui_port_12 + - binding + vcpus_server_cmaui_1: + - server_cmaui_1 - vcpus - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes - network.incoming.bytes.rate_cmaui_port_1: - - cmaui_port_1 - - network.incoming.bytes.rate - network.incoming.bytes.rate_cmaui_port_2: - - cmaui_port_2 - - network.incoming.bytes.rate - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests disk.device.write.requests.rate_server_abc: - server_abc - disk.device.write.requests.rate + network.outgoing.packets.rate_cmaui_port_11: + - cmaui_port_11 + - network.outgoing.packets.rate + binding_cmaui_port_11: + - cmaui_port_11 + - binding disk.device.read.requests_server_abc: - server_abc - disk.device.read.requests host_server_abc: - server_abc - host - network.outpoing.packets_cmaui_port_1: - - cmaui_port_1 - - network.outpoing.packets - network.outpoing.packets_cmaui_port_2: - - cmaui_port_2 - - network.outpoing.packets - endpoint_server_cmaui: - - server_cmaui - - endpoint + disk.read.bytes.rate_server_cmaui_1: + - server_cmaui_1 + - disk.read.bytes.rate + disk.device.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests + cpu.delta_server_cmaui_1: + - server_cmaui_1 + - cpu.delta + attachment_cmaui_port_12: + - cmaui_port_12 + - attachment + attachment_cmaui_port_11: + - cmaui_port_11 + - attachment + memory.resident_server_cmaui_1: + - server_cmaui_1 + - memory.resident cpu.delta_server_abc: - server_abc - cpu.delta disk.latency_server_abc: - server_abc - disk.latency + network.incoming.bytes_cmaui_port_12: + - cmaui_port_12 + - network.incoming.bytes + network.incoming.packets_cmaui_port_11: + - cmaui_port_11 + - network.incoming.packets + network.incoming.packets_cmaui_port_12: + - cmaui_port_12 + - network.incoming.packets + network.incoming.bytes_cmaui_port_11: + - cmaui_port_11 + - network.incoming.bytes + disk.latency_server_cmaui_1: + - server_cmaui_1 + - disk.latency + memory.usage_server_cmaui_1: + - server_cmaui_1 + - memory.usage feature_server_abc: - server_abc - feature @@ -550,27 +550,27 @@ topology_template: dependency_server_abc: - server_abc - dependency - dependency_server_cmaui: - - server_cmaui + link_cmaui_port_11: + - cmaui_port_11 + - link + dependency_cmaui_port_11: + - cmaui_port_11 - dependency - local_storage_server_cmaui: - - server_cmaui - - local_storage - dependency_cmaui_port_1: - - cmaui_port_1 + dependency_cmaui_port_12: + - cmaui_port_12 - dependency + link_cmaui_port_12: + - cmaui_port_12 + - link link_abc_port_1: - abc_port_1 - link - link_cmaui_port_2: - - cmaui_port_2 - - link - link_cmaui_port_1: - - cmaui_port_1 - - link - dependency_cmaui_port_2: - - cmaui_port_2 + dependency_server_cmaui_1: + - server_cmaui_1 - dependency + local_storage_server_cmaui_1: + - server_cmaui_1 + - local_storage local_storage_server_abc: - server_abc - local_storage
\ 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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml index 1d2d9ada48..33bcd18ae7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -52,20 +52,7 @@ topology_template: immutable: false type: string node_templates: - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - name: - get_input: - - cmaui_names - - 0 - cmaui_port_1: + cmaui_port_21: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: AUTO @@ -90,8 +77,21 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo + server_cmaui_2: + type: org.openecomp.resource.vfc.nodes.heat.cmaui + properties: + flavor: + get_input: cmaui_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: cmaui_image + name: + get_input: + - cmaui_names + - 0 groups: nested2_group: type: org.openecomp.groups.heat.HeatStack @@ -99,177 +99,177 @@ topology_template: heat_file: ../Artifacts/nested2.yml description: cmaui server template for vMMSC members: - - server_cmaui - - cmaui_port_1 + - cmaui_port_21 + - server_cmaui_2 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 capabilities: - cpu.delta_server_cmaui: - - server_cmaui - - cpu.delta - disk.device.write.requests.rate_server_cmaui: - - server_cmaui - - disk.device.write.requests.rate - disk.device.allocation_server_cmaui: - - server_cmaui - - disk.device.allocation - scalable_server_cmaui: - - server_cmaui - - scalable - disk.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.read.bytes.rate - network.incoming.packets.rate_cmaui_port_1: - - cmaui_port_1 - - network.incoming.packets.rate - cpu_server_cmaui: - - server_cmaui - - cpu - feature_cmaui_port_1: - - cmaui_port_1 - - feature - disk.write.bytes.rate_server_cmaui: - - server_cmaui + disk.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 - disk.write.bytes.rate - disk.device.read.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.read.bytes.rate - host_server_cmaui: - - server_cmaui - - host - cpu_util_server_cmaui: - - server_cmaui - - cpu_util - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests - disk.read.requests_server_cmaui: - - server_cmaui - - disk.read.requests - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity - network.outgoing.packets.rate_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.packets.rate - disk.usage_server_cmaui: - - server_cmaui - - disk.usage - network.outgoing.bytes_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.bytes - disk.device.usage_server_cmaui: - - server_cmaui + disk.device.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes + disk.device.usage_server_cmaui_2: + - server_cmaui_2 - disk.device.usage - attachment_cmaui_port_1: - - cmaui_port_1 - - attachment - disk.capacity_server_cmaui: - - server_cmaui - - disk.capacity - disk.write.requests.rate_server_cmaui: - - server_cmaui - - disk.write.requests.rate - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests - instance_server_cmaui: - - server_cmaui - - instance - disk.device.read.bytes_server_cmaui: - - server_cmaui - - disk.device.read.bytes - memory_server_cmaui: - - server_cmaui - - memory - disk.root.size_server_cmaui: - - server_cmaui - - disk.root.size - binding_server_cmaui: - - server_cmaui - - binding - disk.device.read.requests.rate_server_cmaui: - - server_cmaui - - disk.device.read.requests.rate - disk.write.bytes_server_cmaui: - - server_cmaui + disk.write.bytes_server_cmaui_2: + - server_cmaui_2 - disk.write.bytes - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate - network.incoming.packets_cmaui_port_1: - - cmaui_port_1 - - network.incoming.packets - memory.resident_server_cmaui: - - server_cmaui - - memory.resident - disk.latency_server_cmaui: - - server_cmaui - - disk.latency - feature_server_cmaui: - - server_cmaui + feature_server_cmaui_2: + - server_cmaui_2 - feature - binding_cmaui_port_1: - - cmaui_port_1 + disk.device.latency_server_cmaui_2: + - server_cmaui_2 + - disk.device.latency + disk.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.allocation + binding_server_cmaui_2: + - server_cmaui_2 + - binding + disk.root.size_server_cmaui_2: + - server_cmaui_2 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests.rate + network.incoming.packets.rate_cmaui_port_21: + - cmaui_port_21 + - network.incoming.packets.rate + network.outgoing.packets.rate_cmaui_port_21: + - cmaui_port_21 + - network.outgoing.packets.rate + binding_cmaui_port_21: + - cmaui_port_21 - binding - vcpus_server_cmaui: - - server_cmaui + vcpus_server_cmaui_2: + - server_cmaui_2 - vcpus - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes - network.incoming.bytes.rate_cmaui_port_1: - - cmaui_port_1 - - network.incoming.bytes.rate - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui + scalable_server_cmaui_2: + - server_cmaui_2 + - scalable + disk.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.read.requests + disk.write.requests_server_cmaui_2: + - server_cmaui_2 - disk.write.requests - memory.usage_server_cmaui: - - server_cmaui - - memory.usage - disk.ephemeral.size_server_cmaui: - - server_cmaui - - disk.ephemeral.size - network.outpoing.packets_cmaui_port_1: - - cmaui_port_1 + disk.device.iops_server_cmaui_2: + - server_cmaui_2 + - disk.device.iops + disk.usage_server_cmaui_2: + - server_cmaui_2 + - disk.usage + disk.device.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.device.capacity + network.outpoing.packets_cmaui_port_21: + - cmaui_port_21 - network.outpoing.packets - network.outgoing.bytes.rate_cmaui_port_1: - - cmaui_port_1 - - network.outgoing.bytes.rate - endpoint_server_cmaui: - - server_cmaui + disk.device.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes.rate + endpoint_server_cmaui_2: + - server_cmaui_2 - endpoint - disk.iops_server_cmaui: - - server_cmaui - - disk.iops - disk.device.iops_server_cmaui: - - server_cmaui - - disk.device.iops - disk.read.bytes_server_cmaui: - - server_cmaui + disk.read.bytes_server_cmaui_2: + - server_cmaui_2 - disk.read.bytes - network.incoming.bytes_cmaui_port_1: - - cmaui_port_1 + os_server_cmaui_2: + - server_cmaui_2 + - os + feature_cmaui_port_21: + - cmaui_port_21 + - feature + disk.device.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes + network.incoming.bytes.rate_cmaui_port_21: + - cmaui_port_21 + - network.incoming.bytes.rate + disk.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests.rate + memory_server_cmaui_2: + - server_cmaui_2 + - memory + cpu_server_cmaui_2: + - server_cmaui_2 + - cpu + network.outgoing.bytes.rate_cmaui_port_21: + - cmaui_port_21 + - network.outgoing.bytes.rate + disk.device.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.device.allocation + host_server_cmaui_2: + - server_cmaui_2 + - host + disk.ephemeral.size_server_cmaui_2: + - server_cmaui_2 + - disk.ephemeral.size + disk.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.capacity + attachment_cmaui_port_21: + - cmaui_port_21 + - attachment + network.incoming.bytes_cmaui_port_21: + - cmaui_port_21 - network.incoming.bytes + instance_server_cmaui_2: + - server_cmaui_2 + - instance + network.incoming.packets_cmaui_port_21: + - cmaui_port_21 + - network.incoming.packets + disk.iops_server_cmaui_2: + - server_cmaui_2 + - disk.iops + disk.device.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests + disk.device.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests + disk.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes.rate + cpu.delta_server_cmaui_2: + - server_cmaui_2 + - cpu.delta + disk.device.read.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests.rate + network.outgoing.bytes_cmaui_port_21: + - cmaui_port_21 + - network.outgoing.bytes + memory.resident_server_cmaui_2: + - server_cmaui_2 + - memory.resident + disk.latency_server_cmaui_2: + - server_cmaui_2 + - disk.latency + cpu_util_server_cmaui_2: + - server_cmaui_2 + - cpu_util + disk.device.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes.rate + memory.usage_server_cmaui_2: + - server_cmaui_2 + - memory.usage requirements: - dependency_server_cmaui: - - server_cmaui + dependency_cmaui_port_21: + - cmaui_port_21 - dependency - local_storage_server_cmaui: - - server_cmaui + link_cmaui_port_21: + - cmaui_port_21 + - link + local_storage_server_cmaui_2: + - server_cmaui_2 - local_storage - dependency_cmaui_port_1: - - cmaui_port_1 - - dependency - link_cmaui_port_1: - - cmaui_port_1 - - link
\ No newline at end of file + dependency_server_cmaui_2: + - server_cmaui_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/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml index 66a15d0440..7efee256c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested1.yml @@ -40,7 +40,7 @@ parameters: type: string resources: - cmaui_port_1: + cmaui_port_11: type: OS::Neutron::Port properties: network: { get_param: p1 } @@ -48,7 +48,7 @@ resources: security_groups: [{get_param: security_group_name}] replacement_policy: AUTO - cmaui_port_2: + cmaui_port_12: type: OS::Neutron::Port properties: network: { get_param: p2 } @@ -64,7 +64,7 @@ resources: security_groups: [{get_param: security_group_name}] replacement_policy: AUTO - server_cmaui: + server_cmaui_1: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} @@ -72,8 +72,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_1 } - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_port_11 } + - port: { get_resource: cmaui_port_12 } server_abc: type: OS::Nova::Server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml index b09d3aff8e..12e1b219f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/inputfiles/nested2.yml @@ -29,7 +29,7 @@ parameters: resources: - cmaui_port_1: + cmaui_port_21: type: OS::Neutron::Port properties: network: { get_param: p1 } @@ -37,7 +37,7 @@ resources: security_groups: [{get_param: security_group_name}] replacement_policy: AUTO - server_cmaui: + server_cmaui_2: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} @@ -45,4 +45,4 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_flavor } networks: - - port: { get_resource: cmaui_port_1 }
\ No newline at end of file + - port: { get_resource: cmaui_port_21 }
\ No newline at end of file |