diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile')
4 files changed, 599 insertions, 599 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml index 01f875739a..3cf127562e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/in/nested-pcm_v0.1.yaml @@ -57,7 +57,7 @@ parameters: description: the name of security group resources: - server_pcm: + server_pcm_1: type: OS::Nova::Server properties: config_drive: "True" @@ -66,14 +66,14 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_port_01} + - port: { get_resource: pcm_port_11} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_port_01: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -81,7 +81,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_11: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } @@ -91,4 +91,4 @@ resources: outputs: server_pcm_id: description: the pcm nova service id - value: { get_resource: server_pcm }
\ No newline at end of file + value: { get_resource: server_pcm_1 }
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index c1c907fb3d..0c714840ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,11 +8,7 @@ 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: + port_pcm_port_11_network_role_tag: type: string required: true status: SUPPORTED @@ -21,30 +17,38 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -58,72 +62,64 @@ 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_01_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway required: true status: SUPPORTED + port_pcm_port_11_network_role: + type: string + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group required: true status: SUPPORTED + port_pcm_port_11_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: type: string description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list - 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_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -141,8 +137,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_11_subnetpoolid: + type: string required: true status: SUPPORTED attributes: @@ -151,414 +151,414 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_11: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_port_0: + - 1 + - 1 + - dependency_server_pcm_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_pcm_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED 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.outgoing.bytes_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_1: + network.incoming.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_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 - disk.write.requests_server_pcm: + disk.device.write.bytes.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + network.incoming.bytes_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_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 - memory.resident_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.device.write.requests_server_pcm: + network.incoming.bytes.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_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.allocation_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.usage_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcm: + network.outgoing.packets.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_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.ephemeral.size_server_pcm: + cpu_util_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_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 - 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: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + network.outgoing.bytes_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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.packets.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.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: + 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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem + disk.device.write.bytes_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pcm: + 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 - network.outgoing.packets.rate_pcm_port_0: + 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.packets.rate_pcm_port_1: + network.incoming.packets.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node + binding_pcm_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes_pcm_port_0: + 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 - disk.device.read.bytes_server_pcm: + network.incoming.bytes.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.outgoing.bytes.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: + attachment_pcm_port_11: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: + 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: + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + 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.read.bytes.rate_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 - disk.device.allocation_server_pcm: + 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 - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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 - disk.device.read.bytes.rate_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 - cpu_util_server_pcm: + network.outpoing.packets_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcm: + network.incoming.packets.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + 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 - network.outgoing.bytes.rate_pcm_port_1: + 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 - network.incoming.packets_pcm_port_0: + 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 - binding_server_pcm: - type: tosca.capabilities.network.Bindable + disk.device.read.bytes.rate_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + network.incoming.packets_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + 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 - network.incoming.packets_pcm_port_1: + disk.device.write.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 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 + network.incoming.bytes_pcm_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + disk.write.bytes.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + 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: @@ -1126,11 +1126,7 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: 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: + port_pcm_port_11_network_role_tag: type: string required: true status: SUPPORTED @@ -1139,30 +1135,38 @@ node_types: description: availabilityzone name required: true status: SUPPORTED - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true status: SUPPORTED - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_port_01_network_role: type: string required: true status: SUPPORTED - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true status: SUPPORTED @@ -1176,72 +1180,64 @@ 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_01_network_role_tag: type: string required: true status: SUPPORTED - port_pcm_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway required: true status: SUPPORTED + port_pcm_port_11_network_role: + type: string + required: true + status: SUPPORTED security_group_name: type: string description: the name of security group required: true status: SUPPORTED + port_pcm_port_11_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: type: string description: CPS network ip required: true status: SUPPORTED - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true status: SUPPORTED - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED pcm_vol: type: string description: CPS Cluman Cinder Volume required: true status: SUPPORTED - port_pcm_port_1_ip_requirements: - type: list - 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_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED cps_net_name: @@ -1259,8 +1255,12 @@ node_types: description: CPS network mask required: true status: SUPPORTED - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pcm_port_11_subnetpoolid: + type: string required: true status: SUPPORTED attributes: @@ -1269,416 +1269,416 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_port_11: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_port_11: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_pcm: + - dependency_pcm_port_01: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcm: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_port_01: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_port_0: + - 1 + - 1 + - dependency_server_pcm_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_pcm_1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 + - 0 + - UNBOUNDED 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.outgoing.bytes_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_port_1: + network.incoming.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_01: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - memory_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 - disk.write.requests_server_pcm: + disk.device.write.bytes.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pcm_port_0: + network.incoming.bytes_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.iops_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 - memory.resident_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.device.write.requests_server_pcm: + network.incoming.bytes.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_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.allocation_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_01: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.usage_server_pcm: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pcm_port_11: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcm: + network.outgoing.packets.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_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.ephemeral.size_server_pcm: + cpu_util_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_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 - 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: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: + network.outgoing.bytes_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - 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.packets.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.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: + 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 - os_server_pcm: - type: tosca.capabilities.OperatingSystem + disk.device.write.bytes_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_server_pcm: + 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 - network.outgoing.packets.rate_pcm_port_0: + 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.packets.rate_pcm_port_1: + network.incoming.packets.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node + binding_pcm_port_11: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes_pcm_port_0: + 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 - disk.device.read.bytes_server_pcm: + network.incoming.bytes.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.outgoing.bytes.rate_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: + attachment_pcm_port_11: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - endpoint_server_pcm: + 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: + host_server_pcm_1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + 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.read.bytes.rate_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 - disk.device.allocation_server_pcm: + 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 - scalable_server_pcm: - type: tosca.capabilities.Scalable + 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 - disk.device.read.bytes.rate_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 - cpu_util_server_pcm: + network.outpoing.packets_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.requests.rate_server_pcm: + network.outgoing.bytes.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcm: + network.incoming.packets.rate_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_pcm: - type: tosca.capabilities.Container + binding_pcm_port_01: + type: tosca.capabilities.network.Bindable valid_source_types: - - tosca.nodes.SoftwareComponent + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - cpu.delta_server_pcm: + 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 - network.outgoing.bytes.rate_pcm_port_1: + 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 - network.incoming.packets_pcm_port_0: + 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 - binding_server_pcm: - type: tosca.capabilities.network.Bindable + disk.device.read.bytes.rate_server_pcm_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + network.incoming.packets_pcm_port_11: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.capacity_server_pcm: + 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 - network.incoming.packets_pcm_port_1: + disk.device.write.requests_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 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 + network.incoming.bytes_pcm_port_11: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_0: + os_server_pcm_1: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + binding_server_pcm_1: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_pcm_port_01: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcm: + disk.write.bytes.rate_server_pcm_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: + 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: - 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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml index 0c55a9b46c..8335140e6c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml @@ -61,12 +61,12 @@ topology_template: properties: pcm_flavor_name: get_input: pcm_flavor_name + port_pcm_port_11_network_role_tag: oam service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_11_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -74,23 +74,23 @@ topology_template: is_required: false pcm_image_name: get_input: pcm_image_name - port_pcm_port_1_mac_requirements: + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_01_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: + port_pcm_port_11_mac_requirements: mac_count_required: is_required: false pcm_server_name: get_input: - pcm_server_names - 0 + port_pcm_port_01_network_role_tag: cps server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server directives: @@ -98,12 +98,12 @@ topology_template: properties: pcm_flavor_name: get_input: pcm_flavor_name + port_pcm_port_11_network_role_tag: oam service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml - port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name - port_pcm_port_0_ip_requirements: + port_pcm_port_11_ip_requirements: - ip_version: 4 ip_count_required: is_required: true @@ -111,23 +111,23 @@ topology_template: is_required: false pcm_image_name: get_input: pcm_image_name - port_pcm_port_1_mac_requirements: + port_pcm_port_01_mac_requirements: mac_count_required: is_required: false - port_pcm_port_1_ip_requirements: + port_pcm_port_01_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: + port_pcm_port_11_mac_requirements: mac_count_required: is_required: false pcm_server_name: get_input: - pcm_server_names - 0 + port_pcm_port_01_network_role_tag: cps server_pcm_003: type: org.openecomp.resource.abstract.nodes.heat.pcm_server_2 directives: @@ -189,4 +189,4 @@ topology_template: - server_pcm_002 - server_pcm_001 - server_pcm_003 - - compute_port_0 + - compute_port_0
\ 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/threeNestedSameTypeTwoPointingOnSameNestedFile/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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml index d999e227be..1e198d3bda 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/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/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,10 +11,7 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string - required: true - port_pcm_port_1_network_role_tag: + port_pcm_port_11_network_role_tag: type: string required: true availabilityzone_name: @@ -23,27 +20,34 @@ topology_template: immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: + port_pcm_port_11_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer + port_pcm_port_01_ip_requirements: + type: list required: true - port_pcm_port_0_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_01_vlan_requirements: + type: list required: true - port_pcm_port_1_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_11_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_port_01_network_role: type: string required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_01_subnetpoolid: type: string required: true pcm_server_name: @@ -58,71 +62,64 @@ 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_01_network_role_tag: type: string required: true - port_pcm_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false immutable: false type: string description: CPS network gateway + port_pcm_port_11_network_role: + type: string + required: true security_group_name: label: security group name hidden: false immutable: false type: string description: the name of security group + port_pcm_port_11_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements cps_net_ip: label: CPS network ip hidden: false immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_11_order: + type: integer required: true - port_pcm_port_1_vlan_requirements: - type: list + port_pcm_port_01_order: + type: integer required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_01_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + 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_11_exCP_naming: + type: org.openecomp.datatypes.Naming required: true cps_net_name: label: CPS network name @@ -142,85 +139,88 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_01_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_11_subnetpoolid: + type: string required: true node_templates: - pcm_port_1: + pcm_port_11: 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_11_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_11_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_11_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_11_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_11_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_11_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_11_network_role_tag network: get_input: oam_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_11_order requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.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_01: 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_01_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_01_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_01_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_01_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_01_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_01_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_01_network_role_tag network: get_input: cps_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_01_order requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_pcm + node: server_pcm_1 relationship: tosca.relationships.network.BindsTo + server_pcm_1: + 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 groups: nested-pcm_v0.1_group: type: org.openecomp.groups.heat.HeatStack @@ -228,221 +228,221 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.1.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - - server_pcm - - pcm_port_0 + - pcm_port_11 + - pcm_port_01 + - server_pcm_1 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 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 - 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_server_pcm_1: + - server_pcm_1 - disk.root.size - 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.outgoing.bytes_pcm_port_11: + - pcm_port_11 + - network.outgoing.bytes + network.incoming.packets_pcm_port_01: + - pcm_port_01 + - network.incoming.packets + feature_pcm_port_01: + - pcm_port_01 + - feature + 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 + network.incoming.bytes_pcm_port_01: + - pcm_port_01 - network.incoming.bytes - binding_pcm_port_0: - - pcm_port_0 - - binding - 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_server_pcm_1: + - server_pcm_1 - disk.capacity - os_server_pcm: - - server_pcm - - os - disk.read.bytes_server_pcm: - - server_pcm + disk.write.requests_server_pcm_1: + - server_pcm_1 + - disk.write.requests + network.incoming.bytes.rate_pcm_port_11: + - pcm_port_11 + - network.incoming.bytes.rate + disk.read.bytes_server_pcm_1: + - server_pcm_1 - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 + attachment_pcm_port_01: + - pcm_port_01 + - attachment + feature_pcm_port_11: + - pcm_port_11 + - feature + network.outgoing.packets.rate_pcm_port_01: + - pcm_port_01 - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 + 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.outgoing.bytes_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes + network.outgoing.packets.rate_pcm_port_11: + - pcm_port_11 - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 + feature_server_pcm_1: + - server_pcm_1 - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes - disk.device.read.bytes_server_pcm: - - server_pcm + disk.allocation_server_pcm_1: + - server_pcm_1 + - disk.allocation + disk.device.write.bytes_server_pcm_1: + - server_pcm_1 + - disk.device.write.bytes + memory.usage_server_pcm_1: + - server_pcm_1 + - memory.usage + cpu_server_pcm_1: + - server_pcm_1 + - cpu + network.incoming.packets.rate_pcm_port_11: + - pcm_port_11 + - network.incoming.packets.rate + binding_pcm_port_11: + - pcm_port_11 + - binding + disk.device.read.bytes_server_pcm_1: + - server_pcm_1 - 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 + network.incoming.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.bytes.rate + network.outgoing.bytes.rate_pcm_port_11: + - pcm_port_11 + - network.outgoing.bytes.rate + attachment_pcm_port_11: + - pcm_port_11 - attachment - endpoint_server_pcm: - - server_pcm + 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 - - 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 - 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 + disk.device.iops_server_pcm_1: + - server_pcm_1 + - disk.device.iops + cpu.delta_server_pcm_1: + - server_pcm_1 - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 - - network.incoming.packets - binding_server_pcm: - - server_pcm - - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate - disk.device.capacity_server_pcm: - - server_pcm + host_server_pcm_1: + - server_pcm_1 + - host + disk.device.capacity_server_pcm_1: + - server_pcm_1 - disk.device.capacity - 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.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.latency_server_pcm: - - server_pcm + disk.ephemeral.size_server_pcm_1: + - server_pcm_1 + - disk.ephemeral.size + disk.latency_server_pcm_1: + - server_pcm_1 - disk.latency - disk.device.read.requests_server_pcm: - - server_pcm + network.outpoing.packets_pcm_port_11: + - pcm_port_11 + - network.outpoing.packets + network.outgoing.bytes.rate_pcm_port_01: + - pcm_port_01 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_01: + - pcm_port_01 + - network.incoming.packets.rate + binding_pcm_port_01: + - pcm_port_01 + - binding + scalable_server_pcm_1: + - server_pcm_1 + - scalable + disk.write.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.write.requests.rate + 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.incoming.packets_pcm_port_11: + - pcm_port_11 + - network.incoming.packets + disk.device.usage_server_pcm_1: + - server_pcm_1 + - disk.device.usage + disk.device.write.requests_server_pcm_1: + - server_pcm_1 + - disk.device.write.requests + 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 - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate - disk.write.bytes.rate_server_pcm: - - server_pcm + instance_server_pcm_1: + - server_pcm_1 + - instance + disk.device.read.requests.rate_server_pcm_1: + - server_pcm_1 + - disk.device.read.requests.rate + network.incoming.bytes_pcm_port_11: + - pcm_port_11 + - network.incoming.bytes + os_server_pcm_1: + - server_pcm_1 + - os + binding_server_pcm_1: + - server_pcm_1 + - binding + network.outpoing.packets_pcm_port_01: + - pcm_port_01 + - network.outpoing.packets + disk.write.bytes.rate_server_pcm_1: + - server_pcm_1 - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate + disk.device.allocation_server_pcm_1: + - server_pcm_1 + - disk.device.allocation requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link - local_storage_server_pcm: - - server_pcm - - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_11: + - pcm_port_11 - dependency - dependency_server_pcm: - - server_pcm + dependency_pcm_port_01: + - pcm_port_01 - dependency - dependency_pcm_port_1: - - pcm_port_1 + dependency_server_pcm_1: + - server_pcm_1 - dependency + link_pcm_port_01: + - pcm_port_01 + - link + link_pcm_port_11: + - pcm_port_11 + - link + local_storage_server_pcm_1: + - server_pcm_1 + - local_storage
\ No newline at end of file |