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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles | |
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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles')
2 files changed, 278 insertions, 278 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 2a6a954a1f..1d966f2d29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -82,6 +82,20 @@ node_types: required: true status: SUPPORTED requirements: + - 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 + occurrences: + - 0 + - UNBOUNDED - dependency_template_VMInt_OAM_lb_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -121,20 +135,6 @@ node_types: occurrences: - 1 - 1 - - dependency_server_cmaui: - 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 - occurrences: - - 0 - - UNBOUNDED - dependency_server_abc: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -163,25 +163,13 @@ node_types: - 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: @@ -193,23 +181,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: @@ -227,14 +210,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: @@ -260,13 +242,13 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.device.write.requests_server_cmaui: + network.incoming.bytes_template_VMInt_OAM_lb_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_template_VMInt_OAM_lb_3: + 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: @@ -289,60 +271,67 @@ 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 - network.outgoing.packets.rate_template_VMInt_OAM_lb_2: + 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 - network.outgoing.packets.rate_template_VMInt_OAM_lb_1: + 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.root.size_server_cmaui: + network.outgoing.packets.rate_template_VMInt_OAM_lb_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.capacity_server_abc: + network.outgoing.packets.rate_template_VMInt_OAM_lb_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 - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + 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 - disk.device.write.bytes.rate_server_cmaui: + 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_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: @@ -383,12 +372,24 @@ node_types: occurrences: - 1 - UNBOUNDED + 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: + - 1 + - UNBOUNDED disk.read.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: - 1 - UNBOUNDED + 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 network.incoming.packets_template_VMInt_OAM_lb_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -442,18 +443,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_server_cmaui: - type: tosca.capabilities.Node + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_template_VMInt_OAM_lb_3: + network.incoming.bytes.rate_template_VMInt_OAM_lb_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_template_VMInt_OAM_lb_1: + 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: @@ -477,13 +479,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_abc_port_1: + 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 - memory.usage_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: @@ -495,31 +497,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_cmaui: + 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.iops_server_cmaui: + 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 - disk.device.iops_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 - disk.read.bytes_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.allocation_server_abc: + 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: @@ -531,19 +533,18 @@ node_types: occurrences: - 1 - UNBOUNDED - cpu_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 - disk.write.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_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_cmaui: + 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: @@ -555,19 +556,17 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_template_VMInt_OAM_lb_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_server_cmaui_1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.latency_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. + scalable_server_cmaui_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.read.requests_server_cmaui: + network.outgoing.bytes.rate_template_VMInt_OAM_lb_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: @@ -579,49 +578,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_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.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. - 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. - occurrences: - - 1 - - UNBOUNDED disk.root.size_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_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: + network.incoming.packets.rate_template_VMInt_OAM_lb_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_template_VMInt_OAM_lb_3: + 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: @@ -639,9 +620,8 @@ node_types: 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 @@ -661,14 +641,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_VMInt_OAM_lb_1: - type: tosca.capabilities.Node + os_server_cmaui_1: + type: tosca.capabilities.OperatingSystem 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. + feature_template_VMInt_OAM_lb_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -678,11 +657,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. @@ -695,7 +669,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: @@ -712,7 +686,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_cmaui: + 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: @@ -724,6 +698,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. @@ -789,7 +770,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: @@ -801,19 +782,13 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.latency_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 - vcpus_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 - disk.device.write.bytes_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: @@ -833,13 +808,7 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.allocation_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.requests_server_cmaui: + 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: @@ -864,8 +833,27 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + 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 + 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 + 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 + 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 @@ -881,6 +869,18 @@ node_types: 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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index c36c9421ca..c36dce1d2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -88,6 +88,20 @@ topology_template: type: string description: Image for CMAUI server node_templates: + server_cmaui_1: + 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 + contrail_service_instance_ind: true + name: + get_input: + - cmaui_names + - 0 template_VMInt_OAM_lb_1: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -103,7 +117,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_2: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface @@ -120,7 +134,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_3: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface @@ -138,22 +152,8 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_1 relationship: tosca.relationships.network.BindsTo - 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 - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 server_abc: type: org.openecomp.resource.vfc.nodes.heat.abc properties: @@ -201,54 +201,45 @@ topology_template: heat_file: ../Artifacts/nested1.yml description: cmaui server template for vMMSC members: + - server_cmaui_1 - template_VMInt_OAM_lb_1 - template_VMInt_OAM_lb_2 - template_VMInt_OAM_lb_3 - - server_cmaui - server_abc - abc_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 @@ -258,12 +249,12 @@ topology_template: binding_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - binding - disk.device.write.requests_server_cmaui: - - server_cmaui - - disk.device.write.requests network.incoming.bytes_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - network.incoming.bytes + disk.read.requests_server_cmaui_1: + - server_cmaui_1 + - disk.read.requests network.incoming.bytes_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - network.incoming.bytes @@ -273,14 +264,20 @@ topology_template: 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 network.outgoing.packets.rate_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 @@ -288,21 +285,18 @@ topology_template: network.outgoing.packets.rate_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.outgoing.packets.rate - 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 - os_server_cmaui: - - server_cmaui - - os - disk.device.write.bytes.rate_server_cmaui: - - server_cmaui - - disk.device.write.bytes.rate network.outpoing.packets_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.outpoing.packets @@ -321,9 +315,15 @@ topology_template: attachment_abc_port_1: - abc_port_1 - attachment + 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 network.incoming.packets_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.incoming.packets @@ -351,15 +351,15 @@ topology_template: disk.write.requests.rate_server_abc: - server_abc - disk.write.requests.rate - feature_server_cmaui: - - server_cmaui - - feature network.outgoing.bytes.rate_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - network.outgoing.bytes.rate network.incoming.bytes.rate_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.incoming.bytes.rate + disk.iops_server_cmaui_1: + - server_cmaui_1 + - disk.iops network.incoming.bytes.rate_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - network.incoming.bytes.rate @@ -369,90 +369,81 @@ topology_template: 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 - 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 + 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 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 disk.device.iops_server_abc: - server_abc - disk.device.iops - cpu_server_cmaui: - - server_cmaui - - cpu - 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.write.bytes_server_cmaui_1: + - server_cmaui_1 + - disk.write.bytes + feature_server_cmaui_1: + - server_cmaui_1 + - feature + disk.allocation_server_cmaui_1: + - server_cmaui_1 + - disk.allocation network.incoming.packets_abc_port_1: - abc_port_1 - network.incoming.packets + binding_server_cmaui_1: + - server_cmaui_1 + - binding + scalable_server_cmaui_1: + - server_cmaui_1 + - scalable network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.outgoing.bytes.rate - disk.device.latency_server_cmaui: - - server_cmaui - - disk.device.latency - disk.read.requests_server_cmaui: - - server_cmaui - - disk.read.requests network.outgoing.bytes.rate_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - network.outgoing.bytes.rate - disk.device.capacity_server_cmaui: - - server_cmaui - - disk.device.capacity - disk.usage_server_cmaui: - - server_cmaui - - disk.usage - disk.device.usage_server_cmaui: - - server_cmaui - - disk.device.usage 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 network.incoming.packets.rate_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - network.incoming.packets.rate disk.device.latency_server_abc: - server_abc - disk.device.latency + disk.usage_server_cmaui_1: + - server_cmaui_1 + - disk.usage network.incoming.packets.rate_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - network.incoming.packets.rate network.incoming.packets.rate_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - network.incoming.packets.rate - disk.device.read.requests_server_cmaui: - - server_cmaui - - disk.device.read.requests + endpoint_server_cmaui_1: + - server_cmaui_1 + - endpoint feature_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - feature @@ -462,39 +453,39 @@ topology_template: memory_server_abc: - server_abc - memory + os_server_cmaui_1: + - server_cmaui_1 + - os feature_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - feature - memory_server_cmaui: - - server_cmaui - - memory 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 + 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 @@ -528,33 +519,27 @@ 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 - - vcpus - disk.device.write.bytes_server_cmaui: - - server_cmaui - - disk.device.write.bytes + instance_server_cmaui_1: + - server_cmaui_1 + - instance + disk.device.read.requests.rate_server_cmaui_1: + - server_cmaui_1 + - disk.device.read.requests.rate binding_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - binding binding_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - binding - disk.allocation_server_cmaui: - - server_cmaui - - disk.allocation - disk.write.requests_server_cmaui: - - server_cmaui - - disk.write.requests + vcpus_server_cmaui_1: + - server_cmaui_1 + - vcpus disk.device.write.requests.rate_server_abc: - server_abc - disk.device.write.requests.rate @@ -564,15 +549,30 @@ topology_template: host_server_abc: - server_abc - host - 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 + 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 + 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 @@ -589,12 +589,6 @@ topology_template: dependency_server_abc: - server_abc - dependency - dependency_server_cmaui: - - server_cmaui - - dependency - local_storage_server_cmaui: - - server_cmaui - - local_storage link_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - link @@ -613,6 +607,12 @@ topology_template: link_abc_port_1: - abc_port_1 - link + 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 |