diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType')
4 files changed, 413 insertions, 413 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml index 0c3eda5acc..359e0844cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedWithTwoComputesOfSameType/in/nested-pcm_v0.1.yaml @@ -66,7 +66,7 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} + - port: { get_resource: pcm_server_1_mgmt_port_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} @@ -81,13 +81,13 @@ resources: flavor: { get_param: pcm_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_server_2_mgmt_port_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW - pcm_port_0: + pcm_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -95,7 +95,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_server_2_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6676af82c3..869685f7e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,20 @@ node_types: org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_pcm_port_related_networks: + port_pcm_server_mgmt_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_server_mgmt_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pcm_server_mgmt_port_0_network_role: + type: string + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,64 +36,50 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_fixed_ips: - type: list + port_pcm_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string + port_pcm_server_mgmt_port_0_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pcm_port_order: - type: integer - required: true - status: SUPPORTED - compute_pcm_server_name: + port_pcm_server_mgmt_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_network: + compute_pcm_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_port_vlan_requirements: + port_pcm_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcm_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_pcm_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED compute_pcm_server_config_drive: @@ -94,15 +88,21 @@ node_types: status: SUPPORTED entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_server_mgmt_port_0_fixed_ips: + type: list required: true status: SUPPORTED - port_pcm_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pcm_server_mgmt_port_0_security_groups: type: list required: true status: SUPPORTED @@ -123,40 +123,41 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_server_pcm_port: + - dependency_pcm_server_pcm_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_server_pcm_port: + - link_pcm_server_pcm_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - disk.device.read.requests_pcm_server: + network.incoming.packets_pcm_server_pcm_server_mgmt_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.requests.rate_pcm_server: + network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_server_pcm_port: + disk.device.read.requests_pcm_server: type: org.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_server_pcm_port: - type: tosca.capabilities.Attachment + disk.device.write.requests.rate_pcm_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -172,19 +173,19 @@ node_types: occurrences: - 1 - UNBOUNDED - vcpus_pcm_server: + network.outpoing.packets_pcm_server_pcm_server_mgmt_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 - memory.usage_pcm_server: + vcpus_pcm_server: type: org.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_server_pcm_port: + memory.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -202,41 +203,35 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests_pcm_server: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_pcm_server_pcm_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.read.requests_pcm_server: + disk.device.write.requests_pcm_server: type: org.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_pcm_server: + disk.read.requests_pcm_server: type: org.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_server_pcm_port: + memory.resident_pcm_server: type: org.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_server_pcm_port: + network.incoming.packets.rate_pcm_server_pcm_server_mgmt_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 - feature_pcm_server_pcm_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.iops_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -249,19 +244,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pcm_server_pcm_port: + disk.read.bytes.rate_pcm_server: type: org.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_pcm_server: + disk.device.capacity_pcm_server: type: org.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_pcm_server: + network.outgoing.bytes_pcm_server_pcm_server_mgmt_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: @@ -272,6 +267,14 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pcm_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED cpu_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -296,17 +299,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_server_pcm_port: + network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_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 - forwarder_pcm_server_pcm_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.usage_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -325,6 +323,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_pcm_server_mgmt_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.write.requests_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -344,6 +348,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pcm_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu.delta_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -356,14 +365,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_server_pcm_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.bytes_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -381,6 +382,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_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.write.bytes.rate_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -421,9 +428,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_server_pcm_port: - 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_server_pcm_server_mgmt_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -438,12 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pcm_server_pcm_port: - type: org.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_pcm_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -528,14 +528,27 @@ node_types: description: the pcm nova service id status: SUPPORTED requirements: - - dependency_pcm_port_1: + - dependency_pcm_server_1_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: + - link_pcm_server_1_mgmt_port_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_pcm_server_2_mgmt_port_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_pcm_server_2_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -569,44 +582,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pcm_port_0: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - link_pcm_port_0: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets.rate_pcm_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - 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. - 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.usage_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -625,12 +601,6 @@ node_types: occurrences: - 1 - UNBOUNDED - 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.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. @@ -649,12 +619,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pcm_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED vcpus_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -667,22 +631,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pcm_port_0: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.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 - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED cpu_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,18 +642,6 @@ node_types: occurrences: - 1 - UNBOUNDED - 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 - 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 feature_server_pcm_2: type: tosca.capabilities.Node occurrences: @@ -717,44 +653,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_0: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node - 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. - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED host_server_pcm_2: type: tosca.capabilities.Container valid_source_types: @@ -762,6 +666,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pcm_server_1_mgmt_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 endpoint_server_pcm_2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -772,6 +682,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pcm_server_2_mgmt_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.capacity_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -791,6 +707,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_2_mgmt_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.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. @@ -803,12 +725,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pcm_server_1_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + forwarder_pcm_server_2_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + 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. @@ -845,6 +777,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_server_1_mgmt_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.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. @@ -869,6 +807,22 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + binding_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED disk.device.read.requests.rate_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -933,6 +887,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pcm_server_1_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pcm_server_1_mgmt_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.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. @@ -945,6 +911,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_server_2_mgmt_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.write.requests_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -981,6 +953,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pcm_server_2_mgmt_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 + attachment_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1011,6 +994,11 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED memory.usage_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1029,6 +1017,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_1_mgmt_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.read.bytes.rate_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1053,19 +1047,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_server_2_mgmt_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 cpu.delta_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - forwarder_pcm_port_0: - type: org.openecomp.capabilities.Forwarder + network.outgoing.packets.rate_pcm_server_1_mgmt_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 - forwarder_pcm_port_1: - type: org.openecomp.capabilities.Forwarder + feature_pcm_server_1_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1075,6 +1076,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pcm_server_1_mgmt_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.read.requests_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1105,71 +1112,76 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_server_pcm_2: - type: tosca.capabilities.Scalable + feature_pcm_server_2_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - scalable_server_pcm_1: + network.outgoing.packets.rate_pcm_server_2_mgmt_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 + scalable_server_pcm_2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - disk.device.latency_server_pcm_2: + network.outgoing.bytes.rate_pcm_server_2_mgmt_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.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. + scalable_server_pcm_1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_1: + disk.device.latency_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pcm_2: + 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 - network.incoming.packets_pcm_port_0: + disk.device.usage_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.usage_server_pcm_1: + network.outgoing.bytes_pcm_server_1_mgmt_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_0: + network.outgoing.bytes_pcm_server_2_mgmt_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.requests_server_pcm_2: + 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 - disk.device.write.requests_server_pcm_1: + disk.device.write.requests_server_pcm_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_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: @@ -1197,18 +1209,6 @@ node_types: 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. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_pcm_port_1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.compute: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -1503,4 +1503,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml index 0e7c780c5d..aae557dd69 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml @@ -11,11 +11,17 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_related_networks: + port_pcm_server_mgmt_port_0_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pcm_server_mgmt_port_0_network_role_tag: + type: string + required: true + port_pcm_server_mgmt_port_0_network_role: + type: string + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,66 +34,60 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_fixed_ips: + port_pcm_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_pcm_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_order: - type: integer - required: true - compute_pcm_server_name: + port_pcm_server_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_pcm_port_network: + compute_pcm_server_name: type: list required: true entry_schema: type: string - port_pcm_port_vlan_requirements: + port_pcm_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pcm_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pcm_server_user_data_format: type: list required: true entry_schema: type: string + port_pcm_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true vm_image_name: type: string required: true - port_pcm_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_pcm_server_config_drive: type: list required: true entry_schema: type: boolean - port_pcm_port_network_role: - type: string + port_pcm_server_mgmt_port_0_fixed_ips: + type: list required: true - port_pcm_port_subnetpoolid: + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_server_mgmt_port_0_subnetpoolid: type: string required: true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_order: + type: integer + required: true + port_pcm_server_mgmt_port_0_security_groups: type: list required: true entry_schema: @@ -116,39 +116,39 @@ topology_template: get_input: - compute_pcm_server_user_data_format - index_value - pcm_server_pcm_port: + pcm_server_pcm_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_requirements: - get_input: port_pcm_port_mac_requirements + get_input: port_pcm_server_mgmt_port_0_mac_requirements order: - get_input: port_pcm_port_order + get_input: port_pcm_server_mgmt_port_0_order security_groups: get_input: - - port_pcm_port_security_groups + - port_pcm_server_mgmt_port_0_security_groups - index_value exCP_naming: - get_input: port_pcm_port_exCP_naming + get_input: port_pcm_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pcm_port_vlan_requirements + get_input: port_pcm_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pcm_port_ip_requirements + get_input: port_pcm_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pcm_port_related_networks + get_input: port_pcm_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pcm_port_network_role_tag + get_input: port_pcm_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pcm_port_network_role + get_input: port_pcm_server_mgmt_port_0_network_role fixed_ips: get_input: - - port_pcm_port_fixed_ips + - port_pcm_server_mgmt_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pcm_port_subnetpoolid + get_input: port_pcm_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pcm_port_network + - port_pcm_server_mgmt_port_0_network - index_value requirements: - binding: @@ -158,39 +158,42 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pcm_server capabilities: + network.incoming.packets_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.packets + network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.read.requests_pcm_server: - pcm_server - disk.device.read.requests disk.device.write.requests.rate_pcm_server: - pcm_server - disk.device.write.requests.rate - network.outgoing.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes.rate - attachment_pcm_server_pcm_port: - - pcm_server_pcm_port - - attachment disk.root.size_pcm_server: - pcm_server - disk.root.size disk.device.write.bytes.rate_pcm_server: - pcm_server - disk.device.write.bytes.rate + network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outpoing.packets vcpus_pcm_server: - pcm_server - vcpus memory.usage_pcm_server: - pcm_server - memory.usage - network.outgoing.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.packets.rate disk.device.read.requests.rate_pcm_server: - pcm_server - disk.device.read.requests.rate disk.device.latency_pcm_server: - pcm_server - disk.device.latency + forwarder_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - forwarder disk.device.write.requests_pcm_server: - pcm_server - disk.device.write.requests @@ -200,33 +203,30 @@ topology_template: memory.resident_pcm_server: - pcm_server - memory.resident - network.outgoing.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outgoing.bytes - network.outpoing.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.outpoing.packets - feature_pcm_server_pcm_port: - - pcm_server_pcm_port - - feature + network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.packets.rate disk.iops_pcm_server: - pcm_server - disk.iops disk.capacity_pcm_server: - pcm_server - disk.capacity - network.incoming.bytes.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes.rate disk.read.bytes.rate_pcm_server: - pcm_server - disk.read.bytes.rate disk.device.capacity_pcm_server: - pcm_server - disk.device.capacity + network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.bytes binding_pcm_server: - pcm_server - binding + binding_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - binding cpu_pcm_server: - pcm_server - cpu @@ -239,12 +239,9 @@ topology_template: disk.allocation_pcm_server: - pcm_server - disk.allocation - network.incoming.packets_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets - forwarder_pcm_server_pcm_port: - - pcm_server_pcm_port - - forwarder + network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.usage_pcm_server: - pcm_server - disk.device.usage @@ -254,6 +251,9 @@ topology_template: instance_pcm_server: - pcm_server - instance + network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.bytes disk.write.requests_pcm_server: - pcm_server - disk.write.requests @@ -263,15 +263,15 @@ topology_template: host_pcm_server: - pcm_server - host + feature_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - feature cpu.delta_pcm_server: - pcm_server - cpu.delta disk.usage_pcm_server: - pcm_server - disk.usage - binding_pcm_server_pcm_port: - - pcm_server_pcm_port - - binding disk.device.read.bytes_pcm_server: - pcm_server - disk.device.read.bytes @@ -281,6 +281,9 @@ topology_template: feature_pcm_server: - pcm_server - feature + network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - network.incoming.bytes.rate disk.write.bytes.rate_pcm_server: - pcm_server - disk.write.bytes.rate @@ -302,31 +305,28 @@ topology_template: endpoint_pcm_server: - pcm_server - endpoint - network.incoming.bytes_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.bytes + attachment_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 + - attachment scalable_pcm_server: - pcm_server - scalable disk.write.requests.rate_pcm_server: - pcm_server - disk.write.requests.rate - network.incoming.packets.rate_pcm_server_pcm_port: - - pcm_server_pcm_port - - network.incoming.packets.rate disk.device.read.bytes.rate_pcm_server: - pcm_server - disk.device.read.bytes.rate requirements: - link_pcm_server_pcm_port: - - pcm_server_pcm_port + link_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 - link - dependency_pcm_server_pcm_port: - - pcm_server_pcm_port + dependency_pcm_server_pcm_server_mgmt_port_0: + - pcm_server_pcm_server_mgmt_port_0 - dependency local_storage_pcm_server: - pcm_server - local_storage dependency_pcm_server: - pcm_server - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml index bb6490a5ef..a617598044 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/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/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -92,34 +92,34 @@ topology_template: directives: - substitutable properties: + port_pcm_server_mgmt_port_0_network_role_tag: cps compute_pcm_server_availability_zone: - get_input: availabilityzone_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: cps_net_ip - port_pcm_port_network_role_tag: cps - vm_flavor_name: - get_input: pcm_flavor_name - port_pcm_port_mac_requirements: + port_pcm_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false - compute_pcm_server_name: - - get_input: pcm_server_name - port_pcm_port_network: - - get_input: cps_net_name - port_pcm_port_ip_requirements: + port_pcm_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pcm_flavor_name + port_pcm_server_mgmt_port_0_network: + - get_input: cps_net_name + compute_pcm_server_name: + - get_input: pcm_server_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_fixed_ips: + - ip_address: + get_input: cps_net_ip + port_pcm_server_mgmt_port_0_security_groups: - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml @@ -134,34 +134,34 @@ topology_template: directives: - substitutable properties: + port_pcm_server_mgmt_port_0_network_role_tag: oam compute_pcm_server_availability_zone: - get_input: availabilityzone_name - port_pcm_port_fixed_ips: - - ip_address: - get_input: oam_net_ip - port_pcm_port_network_role_tag: oam - vm_flavor_name: - get_input: pcm_flavor_name - port_pcm_port_mac_requirements: + port_pcm_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false - compute_pcm_server_name: - - get_input: pcm_server_name - port_pcm_port_network: - - get_input: oam_net_name - port_pcm_port_ip_requirements: + port_pcm_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: pcm_flavor_name + port_pcm_server_mgmt_port_0_network: + - get_input: oam_net_name + compute_pcm_server_name: + - get_input: pcm_server_name compute_pcm_server_user_data_format: - RAW vm_image_name: get_input: pcm_image_name compute_pcm_server_config_drive: - true - port_pcm_port_security_groups: + port_pcm_server_mgmt_port_0_fixed_ips: + - ip_address: + get_input: oam_net_ip + port_pcm_server_mgmt_port_0_security_groups: - - get_input: security_group_name service_template_filter: substitute_service_template: Nested_pcm_serverServiceTemplate.yaml @@ -190,18 +190,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1 capabilities: - network.incoming.packets.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.packets.rate_pcm_server_pcm_port - network.incoming.packets.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.packets.rate_pcm_server_pcm_port - network.outpoing.packets_pcm_port_1: - - abstract_pcm_server_0 - - network.outpoing.packets_pcm_server_pcm_port - network.outpoing.packets_pcm_port_0: - - abstract_pcm_server_1 - - network.outpoing.packets_pcm_server_pcm_port disk.usage_server_pcm_2: - abstract_pcm_server_0 - disk.usage_pcm_server @@ -211,9 +199,6 @@ topology_template: disk.capacity_server_pcm_2: - abstract_pcm_server_0 - disk.capacity_pcm_server - network.incoming.bytes_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.bytes_pcm_server_pcm_port disk.usage_server_pcm_1: - abstract_pcm_server_1 - disk.usage_pcm_server @@ -223,69 +208,42 @@ topology_template: memory.resident_server_pcm_1: - abstract_pcm_server_1 - memory.resident_pcm_server - network.incoming.bytes_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.bytes_pcm_server_pcm_port vcpus_server_pcm_2: - abstract_pcm_server_0 - vcpus_pcm_server memory.resident_server_pcm_2: - abstract_pcm_server_0 - memory.resident_pcm_server - binding_pcm_port_0: - - abstract_pcm_server_1 - - binding_pcm_server_pcm_port - binding_pcm_port_1: - - abstract_pcm_server_0 - - binding_pcm_server_pcm_port cpu_server_pcm_2: - abstract_pcm_server_0 - cpu_pcm_server feature_server_pcm_1: - abstract_pcm_server_1 - feature_pcm_server - network.outgoing.packets.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.packets.rate_pcm_server_pcm_port - network.outgoing.packets.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.packets.rate_pcm_server_pcm_port feature_server_pcm_2: - abstract_pcm_server_0 - feature_pcm_server disk.device.iops_server_pcm_2: - abstract_pcm_server_0 - disk.device.iops_pcm_server - feature_pcm_port_1: - - abstract_pcm_server_0 - - feature_pcm_server_pcm_port - network.outgoing.bytes_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.bytes_pcm_server_pcm_port - feature_pcm_port_0: - - abstract_pcm_server_1 - - feature_pcm_server_pcm_port cpu_server_pcm_1: - abstract_pcm_server_1 - cpu_pcm_server - network.outgoing.bytes_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.bytes_pcm_server_pcm_port - attachment_pcm_port_0: - - abstract_pcm_server_1 - - attachment_pcm_server_pcm_port - attachment_pcm_port_1: - - abstract_pcm_server_0 - - attachment_pcm_server_pcm_port host_server_pcm_2: - abstract_pcm_server_0 - host_pcm_server + network.outpoing.packets_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0 endpoint_server_pcm_2: - abstract_pcm_server_0 - endpoint_pcm_server endpoint_server_pcm_1: - abstract_pcm_server_1 - endpoint_pcm_server + network.outpoing.packets_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outpoing.packets_pcm_server_pcm_server_mgmt_port_0 disk.device.capacity_server_pcm_2: - abstract_pcm_server_0 - disk.device.capacity_pcm_server @@ -295,15 +253,24 @@ topology_template: disk.device.capacity_server_pcm_1: - abstract_pcm_server_1 - disk.device.capacity_pcm_server + network.incoming.bytes.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.latency_server_pcm_1: - abstract_pcm_server_1 - disk.latency_pcm_server disk.latency_server_pcm_2: - abstract_pcm_server_0 - disk.latency_pcm_server + forwarder_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - forwarder_pcm_server_pcm_server_mgmt_port_0 disk.write.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.write.requests.rate_pcm_server + forwarder_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - forwarder_pcm_server_pcm_server_mgmt_port_0 disk.write.requests.rate_server_pcm_1: - abstract_pcm_server_1 - disk.write.requests.rate_pcm_server @@ -322,6 +289,9 @@ topology_template: disk.write.bytes_server_pcm_2: - abstract_pcm_server_0 - disk.write.bytes_pcm_server + network.incoming.bytes.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.write.bytes_server_pcm_1: - abstract_pcm_server_1 - disk.write.bytes_pcm_server @@ -334,6 +304,12 @@ topology_template: disk.device.read.requests.rate_server_pcm_1: - abstract_pcm_server_1 - disk.device.read.requests.rate_pcm_server + binding_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - binding_pcm_server_pcm_server_mgmt_port_0 + binding_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - binding_pcm_server_pcm_server_mgmt_port_0 disk.device.read.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.read.requests.rate_pcm_server @@ -367,12 +343,21 @@ topology_template: disk.iops_server_pcm_1: - abstract_pcm_server_1 - disk.iops_pcm_server + network.incoming.packets.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0 + network.incoming.packets_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.packets_pcm_server_pcm_server_mgmt_port_0 disk.device.write.bytes.rate_server_pcm_1: - abstract_pcm_server_1 - disk.device.write.bytes.rate_pcm_server disk.device.write.bytes.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.bytes.rate_pcm_server + network.incoming.packets_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.packets_pcm_server_pcm_server_mgmt_port_0 disk.write.requests_server_pcm_2: - abstract_pcm_server_0 - disk.write.requests_pcm_server @@ -391,6 +376,12 @@ topology_template: cpu_util_server_pcm_2: - abstract_pcm_server_0 - cpu_util_pcm_server + network.incoming.packets.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.packets.rate_pcm_server_pcm_server_mgmt_port_0 + attachment_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - attachment_pcm_server_pcm_server_mgmt_port_0 disk.device.write.bytes_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.bytes_pcm_server @@ -406,6 +397,9 @@ topology_template: memory.usage_server_pcm_1: - abstract_pcm_server_1 - memory.usage_pcm_server + attachment_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - attachment_pcm_server_pcm_server_mgmt_port_0 memory.usage_server_pcm_2: - abstract_pcm_server_0 - memory.usage_pcm_server @@ -415,6 +409,9 @@ topology_template: disk.device.read.bytes_server_pcm_1: - abstract_pcm_server_1 - disk.device.read.bytes_pcm_server + network.incoming.bytes_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0 disk.read.bytes.rate_server_pcm_2: - abstract_pcm_server_0 - disk.read.bytes.rate_pcm_server @@ -427,18 +424,24 @@ topology_template: cpu.delta_server_pcm_1: - abstract_pcm_server_1 - cpu.delta_pcm_server + network.incoming.bytes_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.incoming.bytes_pcm_server_pcm_server_mgmt_port_0 cpu.delta_server_pcm_2: - abstract_pcm_server_0 - cpu.delta_pcm_server - forwarder_pcm_port_0: + network.outgoing.packets.rate_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - forwarder_pcm_server_pcm_port - forwarder_pcm_port_1: - - abstract_pcm_server_0 - - forwarder_pcm_server_pcm_port + - network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0 + feature_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - feature_pcm_server_pcm_server_mgmt_port_0 disk.device.write.requests.rate_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.requests.rate_pcm_server + network.outgoing.bytes.rate_pcm_server_1_mgmt_port_0: + - abstract_pcm_server_1 + - network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0 disk.read.requests_server_pcm_2: - abstract_pcm_server_0 - disk.read.requests_pcm_server @@ -454,9 +457,18 @@ topology_template: disk.ephemeral.size_server_pcm_2: - abstract_pcm_server_0 - disk.ephemeral.size_pcm_server + feature_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - feature_pcm_server_pcm_server_mgmt_port_0 + network.outgoing.packets.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.packets.rate_pcm_server_pcm_server_mgmt_port_0 scalable_server_pcm_2: - abstract_pcm_server_0 - scalable_pcm_server + network.outgoing.bytes.rate_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.bytes.rate_pcm_server_pcm_server_mgmt_port_0 scalable_server_pcm_1: - abstract_pcm_server_1 - scalable_pcm_server @@ -466,30 +478,24 @@ topology_template: disk.device.latency_server_pcm_1: - abstract_pcm_server_1 - disk.device.latency_pcm_server - network.outgoing.bytes.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.outgoing.bytes.rate_pcm_server_pcm_port disk.device.usage_server_pcm_2: - abstract_pcm_server_0 - disk.device.usage_pcm_server - network.incoming.packets_pcm_port_0: + network.outgoing.bytes_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - network.incoming.packets_pcm_server_pcm_port + - network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0 + network.outgoing.bytes_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - network.outgoing.bytes_pcm_server_pcm_server_mgmt_port_0 disk.device.usage_server_pcm_1: - abstract_pcm_server_1 - disk.device.usage_pcm_server - network.outgoing.bytes.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.outgoing.bytes.rate_pcm_server_pcm_port disk.device.write.requests_server_pcm_2: - abstract_pcm_server_0 - disk.device.write.requests_pcm_server disk.device.write.requests_server_pcm_1: - abstract_pcm_server_1 - disk.device.write.requests_pcm_server - network.incoming.packets_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.packets_pcm_server_pcm_port os_server_pcm_2: - abstract_pcm_server_0 - os_pcm_server @@ -502,31 +508,25 @@ topology_template: os_server_pcm_1: - abstract_pcm_server_1 - os_pcm_server - network.incoming.bytes.rate_pcm_port_0: - - abstract_pcm_server_1 - - network.incoming.bytes.rate_pcm_server_pcm_port - network.incoming.bytes.rate_pcm_port_1: - - abstract_pcm_server_0 - - network.incoming.bytes.rate_pcm_server_pcm_port requirements: - link_pcm_port_0: + link_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - link_pcm_server_pcm_port - link_pcm_port_1: + - link_pcm_server_pcm_server_mgmt_port_0 + link_pcm_server_2_mgmt_port_0: - abstract_pcm_server_0 - - link_pcm_server_pcm_port + - link_pcm_server_pcm_server_mgmt_port_0 dependency_server_pcm_2: - abstract_pcm_server_0 - dependency_pcm_server + dependency_pcm_server_2_mgmt_port_0: + - abstract_pcm_server_0 + - dependency_pcm_server_pcm_server_mgmt_port_0 dependency_server_pcm_1: - abstract_pcm_server_1 - dependency_pcm_server - dependency_pcm_port_0: + dependency_pcm_server_1_mgmt_port_0: - abstract_pcm_server_1 - - dependency_pcm_server_pcm_port - dependency_pcm_port_1: - - abstract_pcm_server_0 - - dependency_pcm_server_pcm_port + - dependency_pcm_server_pcm_server_mgmt_port_0 local_storage_server_pcm_2: - abstract_pcm_server_0 - local_storage_pcm_server |