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/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out | |
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/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out')
4 files changed, 516 insertions, 516 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 92ea0fa5e7..9ff008ea80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,43 +8,49 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_0_network_role: - type: string - required: true - status: SUPPORTED - port_pcm_port_1_network_role_tag: - type: string + port_pcm_port_02_order: + type: integer required: true status: SUPPORTED - availabilityzone_name: - type: string - description: availabilityzone name + port_pcm_port_12_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_02_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - pcm_image_name: + availabilityzone_name: type: string - description: PCRF CM image name + description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_order: + port_pcm_port_12_order: type: integer required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: + port_pcm_port_02_network_role: type: string required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + pcm_image_name: type: string + description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_02_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_port_12_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_02_subnetpoolid: type: string required: true status: SUPPORTED @@ -58,29 +64,19 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED oam_net_name: type: string description: OAM network name required: true status: SUPPORTED - port_pcm_port_1_network_role: + port_pcm_port_12_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway @@ -96,34 +92,28 @@ node_types: description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_1_vlan_requirements: + port_pcm_port_12_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED - pcm_vol: + port_pcm_port_12_subnetpoolid: type: string - description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list + pcm_vol: + type: string + description: CPS Cluman Cinder Volume required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -141,29 +131,26 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_12_network_role_tag: + type: string required: true status: SUPPORTED + port_pcm_port_12_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_02_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements attributes: server_pcm_id: type: string description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_server_pcm: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -178,57 +165,63 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: + - dependency_pcm_port_12: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: + - link_pcm_port_12: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - capabilities: - network.incoming.packets.rate_pcm_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + - dependency_pcm_port_02: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED + - link_pcm_port_02: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: cpu_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_1: + memory_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_1: + disk.write.requests_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_server_pcm: + network.incoming.packets_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_02: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + network.outgoing.bytes_pcm_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: @@ -252,6 +245,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_port_02: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.usage_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -264,6 +263,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_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.usage_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -276,12 +281,22 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pcm_port_02: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.root.size_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + feature_pcm_port_12: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -294,33 +309,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_0: + network.outgoing.packets.rate_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + memory.usage_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_pcm_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - memory.usage_server_pcm: + network.outgoing.bytes_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -349,74 +350,66 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: + disk.device.read.bytes_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_1: + network.outgoing.bytes.rate_pcm_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 - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_0: + network.incoming.packets.rate_pcm_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.read.bytes_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pcm_port_12: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node + endpoint_server_pcm: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.incoming.bytes.rate_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment + disk.device.read.requests.rate_server_pcm: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_1: + attachment_pcm_port_12: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + vcpus_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_pcm: + disk.write.bytes_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pcm: + network.outgoing.packets.rate_pcm_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: @@ -457,61 +450,68 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcm: + network.outpoing.packets_pcm_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 - host_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - cpu.delta_server_pcm: + network.incoming.packets.rate_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_1: + disk.write.requests.rate_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_port_0: + binding_pcm_port_02: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.write.bytes.rate_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + host_server_pcm: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + cpu.delta_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + network.incoming.packets_pcm_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_pcm_port_1: + binding_server_pcm: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -541,24 +541,24 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_server_pcm: - type: tosca.capabilities.Node + network.incoming.bytes_pcm_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_pcm_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pcm: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + network.outpoing.packets_pcm_port_02: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + disk.write.bytes.rate_server_pcm: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -723,14 +723,14 @@ node_types: occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_server_pcm_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: + - local_storage_server_pcm_1: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo @@ -751,13 +751,13 @@ node_types: - 1 - 1 capabilities: - network.incoming.packets.rate_pcm_port_0: + disk.root.size_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_server_pcm: + network.incoming.packets.rate_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -775,85 +775,67 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.write.requests_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_server_pcm: + disk.iops_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_server_pcm: + disk.device.write.bytes.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_server_pcm: + disk.capacity_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pcm: + disk.write.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcm: + disk.read.bytes_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_server_pcm: + network.incoming.bytes_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcm: + disk.usage_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_server_pcm: + cpu_util_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_server_pcm: + vcpus_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pcm_port_0: + memory.resident_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -879,42 +861,30 @@ node_types: occurrences: - 0 - UNBOUNDED - memory.usage_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - disk.read.requests_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pcm_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.capacity_server_pcm: + network.outgoing.packets.rate_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - os_server_pcm: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes_server_pcm: + network.outgoing.packets.rate_pcm_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_0: + disk.allocation_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pcm_port_1: + disk.device.write.bytes_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -925,13 +895,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pcm_port_0: + memory.usage_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_pcm: + network.outgoing.bytes_pcm_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -942,6 +912,12 @@ node_types: occurrences: - 1 - UNBOUNDED + cpu_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_pcm_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -958,84 +934,96 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: + disk.device.read.bytes_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_server_pcm_1: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_server_pcm: + disk.read.bytes.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_server_pcm: + disk.device.iops_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_server_pcm: + cpu.delta_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_server_pcm: + disk.device.capacity_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_pcm: + disk.read.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_server_pcm: - type: tosca.capabilities.Scalable + disk.device.write.requests.rate_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_server_pcm: + disk.ephemeral.size_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_util_server_pcm: + disk.latency_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + scalable_server_pcm_1: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcm: + memory_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.latency_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + disk.device.read.bytes.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1053,8 +1041,9 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_server_pcm: - type: tosca.capabilities.network.Bindable + disk.device.usage_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -1064,7 +1053,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + disk.device.write.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1076,32 +1065,32 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_pcm: + disk.write.bytes_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_server_pcm: + disk.device.read.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_server_pcm: + instance_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests_server_pcm: + disk.device.read.requests.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_server_pcm: - type: tosca.capabilities.Node + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED @@ -1111,7 +1100,18 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1417,4 +1417,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index c44e813cab..d2af2b96c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -63,34 +63,34 @@ topology_template: get_input: pcm_flavor_name service_template_filter: substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam + port_pcm_port_12_mac_requirements: + mac_count_required: + is_required: false availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_02_mac_requirements: + mac_count_required: + is_required: false + pcm_image_name: + get_input: pcm_image_name + port_pcm_port_02_network_role_tag: cps + pcm_server_name: + get_input: + - pcm_server_names + - 0 + port_pcm_port_12_network_role_tag: oam + port_pcm_port_12_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - pcm_image_name: - get_input: pcm_image_name - port_pcm_port_1_mac_requirements: - mac_count_required: - is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_02_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_0_network_role_tag: cps - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false - pcm_server_name: - get_input: - - pcm_server_names - - 0 server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1 directives: @@ -193,4 +193,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - compute_port_0 - - abstract_compute + - abstract_compute
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 8f2e3460e3..e0431278ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -175,9 +175,9 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - server_pcm: + server_pcm_1: type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server properties: flavor: @@ -219,7 +219,7 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo groups: nested-pcm_v0.1_group: @@ -229,69 +229,60 @@ topology_template: description: heat template that creates PCRF Cluman stack members: - pcm_port_1 - - server_pcm + - server_pcm_1 - pcm_port_0 outputs: server_pcm_id: description: the pcm nova service id - value: server_pcm + value: server_pcm_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1 capabilities: + disk.root.size_server_pcm_1: + - server_pcm_1 + - disk.root.size network.incoming.packets.rate_pcm_port_0: - pcm_port_0 - network.incoming.packets.rate - cpu_server_pcm: - - server_pcm - - cpu network.incoming.packets.rate_pcm_port_1: - pcm_port_1 - network.incoming.packets.rate network.outpoing.packets_pcm_port_1: - pcm_port_1 - network.outpoing.packets - memory_server_pcm: - - server_pcm - - memory - disk.write.requests_server_pcm: - - server_pcm - - disk.write.requests network.outpoing.packets_pcm_port_0: - pcm_port_0 - network.outpoing.packets - disk.device.iops_server_pcm: - - server_pcm - - disk.device.iops - memory.resident_server_pcm: - - server_pcm - - memory.resident - disk.device.write.requests_server_pcm: - - server_pcm - - disk.device.write.requests - disk.device.usage_server_pcm: - - server_pcm - - disk.device.usage - disk.allocation_server_pcm: - - server_pcm - - disk.allocation - disk.usage_server_pcm: - - server_pcm - - disk.usage - disk.device.write.bytes_server_pcm: - - server_pcm - - disk.device.write.bytes - disk.root.size_server_pcm: - - server_pcm - - disk.root.size - disk.ephemeral.size_server_pcm: - - server_pcm - - disk.ephemeral.size - disk.device.latency_server_pcm: - - server_pcm - - disk.device.latency + disk.iops_server_pcm_1: + - server_pcm_1 + - disk.iops + disk.device.write.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes.rate + disk.capacity_server_pcm_1: + - server_pcm_1 + - disk.capacity + disk.write.requests_server_pcm_1: + - server_pcm_1 + - disk.write.requests + disk.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.read.bytes network.incoming.bytes_pcm_port_0: - pcm_port_0 - network.incoming.bytes + disk.usage_server_pcm_1: + - server_pcm_1 + - disk.usage + cpu_util_server_pcm_1: + - server_pcm_1 + - cpu_util + vcpus_server_pcm_1: + - server_pcm_1 + - vcpus + memory.resident_server_pcm_1: + - server_pcm_1 + - memory.resident network.incoming.bytes_pcm_port_1: - pcm_port_1 - network.incoming.bytes @@ -301,39 +292,36 @@ topology_template: binding_pcm_port_1: - pcm_port_1 - binding - memory.usage_server_pcm: - - server_pcm - - memory.usage - disk.read.requests_server_pcm: - - server_pcm - - disk.read.requests - disk.capacity_server_pcm: - - server_pcm - - disk.capacity - os_server_pcm: - - server_pcm - - os - disk.read.bytes_server_pcm: - - server_pcm - - disk.read.bytes + feature_server_pcm_1: + - server_pcm_1 + - feature network.outgoing.packets.rate_pcm_port_0: - pcm_port_0 - network.outgoing.packets.rate network.outgoing.packets.rate_pcm_port_1: - pcm_port_1 - network.outgoing.packets.rate + disk.allocation_server_pcm_1: + - server_pcm_1 + - disk.allocation + disk.device.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes feature_pcm_port_1: - pcm_port_1 - feature + memory.usage_server_pcm_1: + - server_pcm_1 + - memory.usage network.outgoing.bytes_pcm_port_0: - pcm_port_0 - network.outgoing.bytes - disk.device.read.bytes_server_pcm: - - server_pcm - - disk.device.read.bytes feature_pcm_port_0: - pcm_port_0 - feature + cpu_server_pcm_1: + - server_pcm_1 + - cpu network.outgoing.bytes_pcm_port_1: - pcm_port_1 - network.outgoing.bytes @@ -343,87 +331,99 @@ topology_template: attachment_pcm_port_1: - pcm_port_1 - attachment - endpoint_server_pcm: - - server_pcm + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes + endpoint_server_pcm_1: + - server_pcm_1 - endpoint - disk.device.read.requests.rate_server_pcm: - - server_pcm - - disk.device.read.requests.rate - vcpus_server_pcm: - - server_pcm - - vcpus - disk.write.bytes_server_pcm: - - server_pcm - - disk.write.bytes - disk.iops_server_pcm: - - server_pcm - - disk.iops - disk.read.bytes.rate_server_pcm: - - server_pcm + disk.read.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.read.bytes.rate - disk.device.allocation_server_pcm: - - server_pcm - - disk.device.allocation - scalable_server_pcm: - - server_pcm + disk.device.iops_server_pcm_1: + - server_pcm_1 + - disk.device.iops + cpu.delta_server_pcm_1: + - server_pcm_1 + - cpu.delta + host_server_pcm_1: + - server_pcm_1 + - host + disk.device.capacity_server_pcm_1: + - server_pcm_1 + - disk.device.capacity + disk.read.requests_server_pcm_1: + - server_pcm_1 + - disk.read.requests + disk.device.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests.rate + disk.ephemeral.size_server_pcm_1: + - server_pcm_1 + - disk.ephemeral.size + disk.latency_server_pcm_1: + - server_pcm_1 + - disk.latency + scalable_server_pcm_1: + - server_pcm_1 - scalable - disk.device.read.bytes.rate_server_pcm: - - server_pcm - - disk.device.read.bytes.rate - cpu_util_server_pcm: - - server_pcm - - cpu_util - disk.write.requests.rate_server_pcm: - - server_pcm + disk.write.requests.rate_server_pcm_1: + - server_pcm_1 - disk.write.requests.rate - disk.device.write.bytes.rate_server_pcm: - - server_pcm - - disk.device.write.bytes.rate - host_server_pcm: - - server_pcm - - host - cpu.delta_server_pcm: - - server_pcm - - cpu.delta + memory_server_pcm_1: + - server_pcm_1 + - memory + disk.device.latency_server_pcm_1: + - server_pcm_1 + - disk.device.latency + disk.device.read.bytes.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.bytes.rate network.outgoing.bytes.rate_pcm_port_1: - pcm_port_1 - network.outgoing.bytes.rate network.incoming.packets_pcm_port_0: - pcm_port_0 - network.incoming.packets - binding_server_pcm: - - server_pcm - - binding + disk.device.usage_server_pcm_1: + - server_pcm_1 + - disk.device.usage network.outgoing.bytes.rate_pcm_port_0: - pcm_port_0 - network.outgoing.bytes.rate - disk.device.capacity_server_pcm: - - server_pcm - - disk.device.capacity + disk.device.write.requests_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests network.incoming.packets_pcm_port_1: - pcm_port_1 - network.incoming.packets - instance_server_pcm: - - server_pcm - - instance - disk.device.write.requests.rate_server_pcm: - - server_pcm - - disk.device.write.requests.rate - disk.latency_server_pcm: - - server_pcm - - disk.latency - disk.device.read.requests_server_pcm: - - server_pcm + disk.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.write.bytes + disk.device.read.requests_server_pcm_1: + - server_pcm_1 - disk.device.read.requests - feature_server_pcm: - - server_pcm - - feature + instance_server_pcm_1: + - server_pcm_1 + - instance + disk.device.read.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests.rate + os_server_pcm_1: + - server_pcm_1 + - os network.incoming.bytes.rate_pcm_port_0: - pcm_port_0 - network.incoming.bytes.rate - disk.write.bytes.rate_server_pcm: - - server_pcm + binding_server_pcm_1: + - server_pcm_1 + - binding + disk.write.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.write.bytes.rate + disk.device.allocation_server_pcm_1: + - server_pcm_1 + - disk.device.allocation network.incoming.bytes.rate_pcm_port_1: - pcm_port_1 - network.incoming.bytes.rate @@ -434,15 +434,15 @@ topology_template: link_pcm_port_1: - pcm_port_1 - link - local_storage_server_pcm: - - server_pcm - - local_storage + dependency_server_pcm_1: + - server_pcm_1 + - dependency dependency_pcm_port_0: - pcm_port_0 - dependency - dependency_server_pcm: - - server_pcm - - dependency dependency_pcm_port_1: - pcm_port_1 - dependency + local_storage_server_pcm_1: + - server_pcm_1 + - 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/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 0fbb5e3cd9..f6d3eae817 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -11,39 +11,44 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string + port_pcm_port_02_order: + type: integer required: true - port_pcm_port_1_network_role_tag: - type: string + port_pcm_port_12_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_02_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: - type: list + port_pcm_port_12_order: + type: integer + required: true + port_pcm_port_02_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer - required: true - port_pcm_port_0_subnetpoolid: + port_pcm_port_02_network_role_tag: type: string required: true - port_pcm_port_1_subnetpoolid: - type: string + port_pcm_port_12_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_02_subnetpoolid: type: string required: true pcm_server_name: @@ -58,26 +63,18 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_12_network_role: type: string required: true - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -96,33 +93,28 @@ topology_template: immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_1_vlan_requirements: + port_pcm_port_12_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_12_subnetpoolid: + type: string + required: true pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true cps_net_name: label: CPS network name @@ -142,80 +134,88 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_12_network_role_tag: + type: string + required: true + port_pcm_port_12_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_02_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: - pcm_port_1: + server_pcm: + type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server + properties: + flavor: + get_input: pcm_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pcm_image_name + config_drive: true + user_data_format: RAW + name: + get_input: pcm_server_name + pcm_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_12_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_12_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_12_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_12_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_12_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_12_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_12_network_role_tag network: get_input: oam_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_12_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pcm relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server - properties: - flavor: - get_input: pcm_flavor_name - availability_zone: - get_input: availabilityzone_name - image: - get_input: pcm_image_name - config_drive: true - user_data_format: RAW - name: - get_input: pcm_server_name - pcm_port_0: + pcm_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_02_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_02_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_02_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_02_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_02_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_02_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_02_network_role_tag network: get_input: cps_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_02_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -228,9 +228,9 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.2.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - server_pcm - - pcm_port_0 + - pcm_port_12 + - pcm_port_02 outputs: server_pcm_id: description: the pcm nova service id @@ -238,27 +238,24 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server capabilities: - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate cpu_server_pcm: - server_pcm - cpu - network.incoming.packets.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.packets.rate - network.outpoing.packets_pcm_port_1: - - pcm_port_1 - - network.outpoing.packets memory_server_pcm: - server_pcm - memory disk.write.requests_server_pcm: - server_pcm - disk.write.requests - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + network.incoming.packets_pcm_port_02: + - pcm_port_02 + - network.incoming.packets + feature_pcm_port_02: + - pcm_port_02 + - feature + network.outgoing.bytes_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes disk.device.iops_server_pcm: - server_pcm - disk.device.iops @@ -268,42 +265,48 @@ topology_template: disk.device.write.requests_server_pcm: - server_pcm - disk.device.write.requests + network.incoming.bytes_pcm_port_02: + - pcm_port_02 + - network.incoming.bytes disk.device.usage_server_pcm: - server_pcm - disk.device.usage disk.allocation_server_pcm: - server_pcm - disk.allocation + network.incoming.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes.rate disk.usage_server_pcm: - server_pcm - disk.usage disk.device.write.bytes_server_pcm: - server_pcm - disk.device.write.bytes + attachment_pcm_port_02: + - pcm_port_02 + - attachment disk.root.size_server_pcm: - server_pcm - disk.root.size + feature_pcm_port_12: + - pcm_port_12 + - feature disk.ephemeral.size_server_pcm: - server_pcm - disk.ephemeral.size disk.device.latency_server_pcm: - server_pcm - disk.device.latency - network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes - binding_pcm_port_0: - - pcm_port_0 - - binding - binding_pcm_port_1: - - pcm_port_1 - - binding + network.outgoing.packets.rate_pcm_port_02: + - pcm_port_02 + - network.outgoing.packets.rate memory.usage_server_pcm: - server_pcm - memory.usage + network.outgoing.bytes_pcm_port_02: + - pcm_port_02 + - network.outgoing.bytes disk.read.requests_server_pcm: - server_pcm - disk.read.requests @@ -316,45 +319,39 @@ topology_template: disk.read.bytes_server_pcm: - server_pcm - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 - - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes disk.device.read.bytes_server_pcm: - server_pcm - disk.device.read.bytes - feature_pcm_port_0: - - pcm_port_0 - - feature - network.outgoing.bytes_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes - attachment_pcm_port_0: - - pcm_port_0 - - attachment - attachment_pcm_port_1: - - pcm_port_1 - - attachment + network.outgoing.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.packets.rate + binding_pcm_port_12: + - pcm_port_12 + - binding endpoint_server_pcm: - server_pcm - endpoint + network.incoming.bytes.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_pcm: - server_pcm - disk.device.read.requests.rate + attachment_pcm_port_12: + - pcm_port_12 + - attachment vcpus_server_pcm: - server_pcm - vcpus disk.write.bytes_server_pcm: - server_pcm - disk.write.bytes + network.outgoing.packets.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.packets.rate disk.iops_server_pcm: - server_pcm - disk.iops @@ -373,9 +370,21 @@ topology_template: cpu_util_server_pcm: - server_pcm - cpu_util + network.outgoing.bytes.rate_pcm_port_02: + - pcm_port_02 + - network.outgoing.bytes.rate + network.outpoing.packets_pcm_port_12: + - pcm_port_12 + - network.outpoing.packets + network.incoming.packets.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.packets.rate disk.write.requests.rate_server_pcm: - server_pcm - disk.write.requests.rate + binding_pcm_port_02: + - pcm_port_02 + - binding disk.device.write.bytes.rate_server_pcm: - server_pcm - disk.device.write.bytes.rate @@ -385,24 +394,15 @@ topology_template: cpu.delta_server_pcm: - server_pcm - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 + network.incoming.packets_pcm_port_12: + - pcm_port_12 - network.incoming.packets binding_server_pcm: - server_pcm - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets instance_server_pcm: - server_pcm - instance @@ -415,34 +415,34 @@ topology_template: disk.device.read.requests_server_pcm: - server_pcm - disk.device.read.requests + network.incoming.bytes_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes feature_server_pcm: - server_pcm - feature - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate + network.outpoing.packets_pcm_port_02: + - pcm_port_02 + - network.outpoing.packets disk.write.bytes.rate_server_pcm: - server_pcm - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link + dependency_pcm_port_02: + - pcm_port_02 + - dependency local_storage_server_pcm: - server_pcm - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_12: + - pcm_port_12 - dependency + link_pcm_port_12: + - pcm_port_12 + - link dependency_server_pcm: - server_pcm - dependency - dependency_pcm_port_1: - - pcm_port_1 - - dependency + link_pcm_port_02: + - pcm_port_02 + - link
\ No newline at end of file |